From a1daab4837dfb0f6aaa7c2d35f741970db270185 Mon Sep 17 00:00:00 2001 From: sharif-jobayed Date: Fri, 5 Jul 2024 04:45:41 +0600 Subject: [PATCH 1/8] Set up Student.java --- .gitignore | 5 +---- src/school/management/system/Student.java | 24 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/school/management/system/Student.java diff --git a/.gitignore b/.gitignore index 43e3b04..f68d109 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,4 @@ bin/ .vscode/ ### Mac OS ### -.DS_Store - -# IntelliJ Idea -/.idea/ +.DS_Store \ No newline at end of file diff --git a/src/school/management/system/Student.java b/src/school/management/system/Student.java new file mode 100644 index 0000000..6ed9af8 --- /dev/null +++ b/src/school/management/system/Student.java @@ -0,0 +1,24 @@ +package school.management.system; + +public class Student { + private int id; + private String name; + private int grade; + private int feesPaid; + private int feesTotal; + + public Student (int id, String name, int grade) { + this.feesPaid = 0; + this.feesTotal = 30000; + this.id = id; + this.name = name; + this.grade = grade; + } + + public void setGrade (int grade) { + this.grade = grade; + } + public void updateFeesPaid (int feesPaid) { + this.feesPaid = feesPaid; + } +} From f56ef665278ab713857663e5a7f9fb34f5ff76fa Mon Sep 17 00:00:00 2001 From: sharif-jobayed Date: Fri, 5 Jul 2024 04:46:15 +0600 Subject: [PATCH 2/8] Indent Student.java --- src/school/management/system/Student.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/school/management/system/Student.java b/src/school/management/system/Student.java index 6ed9af8..7f6c6de 100644 --- a/src/school/management/system/Student.java +++ b/src/school/management/system/Student.java @@ -7,7 +7,7 @@ public class Student { private int feesPaid; private int feesTotal; - public Student (int id, String name, int grade) { + public Student(int id, String name, int grade) { this.feesPaid = 0; this.feesTotal = 30000; this.id = id; @@ -15,10 +15,11 @@ public Student (int id, String name, int grade) { this.grade = grade; } - public void setGrade (int grade) { + public void setGrade(int grade) { this.grade = grade; } - public void updateFeesPaid (int feesPaid) { + + public void updateFeesPaid(int feesPaid) { this.feesPaid = feesPaid; } } From ce61874c529b6734b47ad85d2b4326c685b1fc54 Mon Sep 17 00:00:00 2001 From: sharif-jobayed Date: Fri, 5 Jul 2024 04:46:57 +0600 Subject: [PATCH 3/8] Correct updateFeesPaid --- src/school/management/system/Student.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/school/management/system/Student.java b/src/school/management/system/Student.java index 7f6c6de..0d98d40 100644 --- a/src/school/management/system/Student.java +++ b/src/school/management/system/Student.java @@ -20,6 +20,6 @@ public void setGrade(int grade) { } public void updateFeesPaid(int feesPaid) { - this.feesPaid = feesPaid; + this.feesPaid += feesPaid; } } From 7070d3ef7f9a6028fd029efce523741d23073474 Mon Sep 17 00:00:00 2001 From: sharif-jobayed Date: Fri, 5 Jul 2024 05:07:48 +0600 Subject: [PATCH 4/8] Set up Teacher.java --- src/school/management/system/Student.java | 20 ++++++++++++++++ src/school/management/system/Teacher.java | 29 +++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 src/school/management/system/Teacher.java diff --git a/src/school/management/system/Student.java b/src/school/management/system/Student.java index 0d98d40..b15387d 100644 --- a/src/school/management/system/Student.java +++ b/src/school/management/system/Student.java @@ -22,4 +22,24 @@ public void setGrade(int grade) { public void updateFeesPaid(int feesPaid) { this.feesPaid += feesPaid; } + + public int getId() { + return this.id; + } + + public String getName() { + return this.name; + } + + public int getGrade() { + return this.grade; + } + + public int getFeesPaid() { + return this.feesPaid; + } + + public int getFeesTotal() { + return this.feesTotal; + } } diff --git a/src/school/management/system/Teacher.java b/src/school/management/system/Teacher.java new file mode 100644 index 0000000..78bc207 --- /dev/null +++ b/src/school/management/system/Teacher.java @@ -0,0 +1,29 @@ +package school.management.system; + +public class Teacher { + private int id; + private String name; + private int salary; + + public Teacher(int id, String name, int salary) { + this.id = id; + this.name = name; + this.salary = salary; + } + + public int getId() { + return this.id; + } + + public String getName() { + return this.name; + } + + public int getSalary() { + return this.salary; + } + + public void setSalary(int salary) { + this.salary += salary; + } +} From 60cfed0f608b3c1597678f135f3d582a0ce9e6e6 Mon Sep 17 00:00:00 2001 From: sharif-jobayed Date: Sat, 6 Jul 2024 02:49:53 +0600 Subject: [PATCH 5/8] Set up School.java --- src/school/management/system/Main.java | 24 ++++++++++ src/school/management/system/School.java | 57 ++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 src/school/management/system/Main.java create mode 100644 src/school/management/system/School.java diff --git a/src/school/management/system/Main.java b/src/school/management/system/Main.java new file mode 100644 index 0000000..3cecb58 --- /dev/null +++ b/src/school/management/system/Main.java @@ -0,0 +1,24 @@ +package school.management.system; + +import java.util.ArrayList; +import java.util.List; + +public class Main { + public static void main(String[] args) { + List teacherList = new ArrayList<>(); + teacherList.add(new Teacher(1, "Imran Khan", 100000)); + teacherList.add(new Teacher(2, "Javed Miandad", 70000)); + teacherList.add(new Teacher(3, "Diego Maradona", 85000)); + + List studentList = new ArrayList<>(); + studentList.add(new Student(1, "Wasim Akram", 5)); + studentList.add(new Student(2, "Inzamam-ul-Haq", 4)); + studentList.add(new Student(3, "Lionel Messi", 5)); + + List schoolList = new ArrayList<>(); + schoolList.add(new School(teacherList, studentList)); + + School ghs = schoolList.get(0); + System.out.println("GHS School has earned $"+ghs.getTotalMoneyEarned()+" so far."); + } +} diff --git a/src/school/management/system/School.java b/src/school/management/system/School.java new file mode 100644 index 0000000..4c7cc2e --- /dev/null +++ b/src/school/management/system/School.java @@ -0,0 +1,57 @@ +package school.management.system; + +import java.util.List; + +public class School { + private List teachers; + private List students; + private int totalMoneyEarned; + private int totalMoneySpent; + + public School(List teachers, List students) { + this.teachers = teachers; + this.students = students; + this.totalMoneyEarned = 0; + this.totalMoneySpent = 0; + } + + public void setTeachers(List teachers) { + this.teachers = teachers; + } + + public void setStudents(List students) { + this.students = students; + } + + public void updateTotalMoneyEarned(int moneyEarned) { + this.totalMoneyEarned += moneyEarned; + } + + public void updateTotalMoneySpent(int moneySpent) { + this.totalMoneyEarned -= moneySpent; + } + + public List getTeachers() { + return teachers; + } + + public List getStudents() { + return students; + } + + public int getTotalMoneyEarned() { + return totalMoneyEarned; + } + + public int getTotalMoneySpent() { + return totalMoneySpent; + } + + public void addTeacher (Teacher teacher) { + this.teachers.add(teacher); + } + + public void addStudent (Student student) { + this.students.add(student); + } +} From 95f659d9416008dcc754f8dca928ea1df92f2d13 Mon Sep 17 00:00:00 2001 From: sharif-jobayed Date: Sat, 6 Jul 2024 04:03:14 +0600 Subject: [PATCH 6/8] Paid fees by students --- src/school/management/system/Main.java | 36 ++++++++++++++++++----- src/school/management/system/School.java | 10 +++---- src/school/management/system/Student.java | 7 +++++ 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/src/school/management/system/Main.java b/src/school/management/system/Main.java index 3cecb58..1c195a6 100644 --- a/src/school/management/system/Main.java +++ b/src/school/management/system/Main.java @@ -5,20 +5,40 @@ public class Main { public static void main(String[] args) { + // Teachers list List teacherList = new ArrayList<>(); - teacherList.add(new Teacher(1, "Imran Khan", 100000)); - teacherList.add(new Teacher(2, "Javed Miandad", 70000)); - teacherList.add(new Teacher(3, "Diego Maradona", 85000)); + teacherList.add(new Teacher(0001, "Imran Khan", 100000)); + teacherList.add(new Teacher(0002, "Javed Miandad", 70000)); + teacherList.add(new Teacher(0003, "Shane Warne", 85000)); + // Students list List studentList = new ArrayList<>(); - studentList.add(new Student(1, "Wasim Akram", 5)); - studentList.add(new Student(2, "Inzamam-ul-Haq", 4)); - studentList.add(new Student(3, "Lionel Messi", 5)); + studentList.add(new Student(0001, "Wasim Akram", 5)); + studentList.add(new Student(0002, "Inzamam-ul-Haq", 4)); + studentList.add(new Student(0003, "Saqlain Mushtaq", 5)); + // Schools list List schoolList = new ArrayList<>(); schoolList.add(new School(teacherList, studentList)); - School ghs = schoolList.get(0); - System.out.println("GHS School has earned $"+ghs.getTotalMoneyEarned()+" so far."); + // Cricket school + School cricketSchool = schoolList.get(0); + System.out.println("cricketSchool School has earned $"+cricketSchool.getTotalMoneyEarned()+" so far."); + + // Students + Student wasim = studentList.get(0); + Student inzi = studentList.get(1); + Student saqlain = studentList.get(2); + + // Student's payments + wasim.updateFeesPaid(5000); + System.out.println(wasim.getName()+" has paid $"+wasim.getFeesPaid()+" & cricketSchool School has earned $"+cricketSchool.getTotalMoneyEarned()+" so far."); + + inzi.updateFeesPaid(5000); + System.out.println(inzi.getName()+" has paid $"+inzi.getFeesPaid()+" & cricketSchool School has earned $"+cricketSchool.getTotalMoneyEarned()+" so far."); + + saqlain.updateFeesPaid(5000); + System.out.println(saqlain.getName()+" has paid $"+saqlain.getFeesPaid()+" & cricketSchool School has earned $"+cricketSchool.getTotalMoneyEarned()+" so far."); + } } diff --git a/src/school/management/system/School.java b/src/school/management/system/School.java index 4c7cc2e..f71d8cc 100644 --- a/src/school/management/system/School.java +++ b/src/school/management/system/School.java @@ -5,7 +5,7 @@ public class School { private List teachers; private List students; - private int totalMoneyEarned; + private static int totalMoneyEarned; private int totalMoneySpent; public School(List teachers, List students) { @@ -23,8 +23,8 @@ public void setStudents(List students) { this.students = students; } - public void updateTotalMoneyEarned(int moneyEarned) { - this.totalMoneyEarned += moneyEarned; + public static void updateTotalMoneyEarned(int moneyEarned) { + totalMoneyEarned += moneyEarned; } public void updateTotalMoneySpent(int moneySpent) { @@ -47,11 +47,11 @@ public int getTotalMoneySpent() { return totalMoneySpent; } - public void addTeacher (Teacher teacher) { + public void addTeacher(Teacher teacher) { this.teachers.add(teacher); } - public void addStudent (Student student) { + public void addStudent(Student student) { this.students.add(student); } } diff --git a/src/school/management/system/Student.java b/src/school/management/system/Student.java index b15387d..615921c 100644 --- a/src/school/management/system/Student.java +++ b/src/school/management/system/Student.java @@ -1,5 +1,7 @@ package school.management.system; +import static school.management.system.School.updateTotalMoneyEarned; + public class Student { private int id; private String name; @@ -21,6 +23,7 @@ public void setGrade(int grade) { public void updateFeesPaid(int feesPaid) { this.feesPaid += feesPaid; + updateTotalMoneyEarned(feesPaid); } public int getId() { @@ -42,4 +45,8 @@ public int getFeesPaid() { public int getFeesTotal() { return this.feesTotal; } + + public int getDueFees() { + return feesTotal-feesPaid; + } } From ce6679b14dc8a0c052d2815424fecb4c0efe4dbf Mon Sep 17 00:00:00 2001 From: sharif-jobayed Date: Sat, 6 Jul 2024 04:09:51 +0600 Subject: [PATCH 7/8] Set teacher's salaries --- src/school/management/system/Main.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/school/management/system/Main.java b/src/school/management/system/Main.java index 1c195a6..35731ad 100644 --- a/src/school/management/system/Main.java +++ b/src/school/management/system/Main.java @@ -7,9 +7,9 @@ public class Main { public static void main(String[] args) { // Teachers list List teacherList = new ArrayList<>(); - teacherList.add(new Teacher(0001, "Imran Khan", 100000)); - teacherList.add(new Teacher(0002, "Javed Miandad", 70000)); - teacherList.add(new Teacher(0003, "Shane Warne", 85000)); + teacherList.add(new Teacher(0001, "Imran Khan", 10000)); + teacherList.add(new Teacher(0002, "Javed Miandad", 7000)); + teacherList.add(new Teacher(0003, "Shane Warne", 8500)); // Students list List studentList = new ArrayList<>(); From 39a2cdd38243910620137c7ec72859ce18c846e3 Mon Sep 17 00:00:00 2001 From: sharif-jobayed Date: Sat, 6 Jul 2024 06:17:48 +0600 Subject: [PATCH 8/8] Set teacher's salaries --- src/school/management/system/Main.java | 16 +++++++++++++++- src/school/management/system/School.java | 4 ++-- src/school/management/system/Teacher.java | 3 +++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/school/management/system/Main.java b/src/school/management/system/Main.java index 35731ad..1e56626 100644 --- a/src/school/management/system/Main.java +++ b/src/school/management/system/Main.java @@ -25,12 +25,17 @@ public static void main(String[] args) { School cricketSchool = schoolList.get(0); System.out.println("cricketSchool School has earned $"+cricketSchool.getTotalMoneyEarned()+" so far."); + // Teachers + Teacher skipper = teacherList.get(0); + Teacher baadeMian = teacherList.get(1); + Teacher warnie = teacherList.get(2); + // Students Student wasim = studentList.get(0); Student inzi = studentList.get(1); Student saqlain = studentList.get(2); - // Student's payments + // Student's fees payments wasim.updateFeesPaid(5000); System.out.println(wasim.getName()+" has paid $"+wasim.getFeesPaid()+" & cricketSchool School has earned $"+cricketSchool.getTotalMoneyEarned()+" so far."); @@ -40,5 +45,14 @@ public static void main(String[] args) { saqlain.updateFeesPaid(5000); System.out.println(saqlain.getName()+" has paid $"+saqlain.getFeesPaid()+" & cricketSchool School has earned $"+cricketSchool.getTotalMoneyEarned()+" so far."); + // Teacher's salary payments + skipper.setSalary(skipper.getSalary()); + System.out.println(skipper.getName()+" has been paid & the school's current balance is "+ cricketSchool.getTotalMoneyEarned()); + + baadeMian.setSalary(baadeMian.getSalary()); + System.out.println(baadeMian.getName()+" has been paid & the school's current balance is "+ cricketSchool.getTotalMoneyEarned()); + + warnie.setSalary(warnie.getSalary()); + System.out.println(warnie.getName()+" has been paid & the school's current balance is "+ cricketSchool.getTotalMoneyEarned()); } } diff --git a/src/school/management/system/School.java b/src/school/management/system/School.java index f71d8cc..4ef22b8 100644 --- a/src/school/management/system/School.java +++ b/src/school/management/system/School.java @@ -27,8 +27,8 @@ public static void updateTotalMoneyEarned(int moneyEarned) { totalMoneyEarned += moneyEarned; } - public void updateTotalMoneySpent(int moneySpent) { - this.totalMoneyEarned -= moneySpent; + public static void updateTotalMoneySpent(int moneySpent) { + totalMoneyEarned -= moneySpent; } public List getTeachers() { diff --git a/src/school/management/system/Teacher.java b/src/school/management/system/Teacher.java index 78bc207..4350c75 100644 --- a/src/school/management/system/Teacher.java +++ b/src/school/management/system/Teacher.java @@ -1,5 +1,7 @@ package school.management.system; +import static school.management.system.School.updateTotalMoneySpent; + public class Teacher { private int id; private String name; @@ -25,5 +27,6 @@ public int getSalary() { public void setSalary(int salary) { this.salary += salary; + updateTotalMoneySpent(salary); } }