Merge pull request #144 from Timenikhil/fix-mark

Fix Mark Command

Author: nathanshew

docs/images/Ui.png

@@ -115,13 +115,17 @@ public void removeStudent(Student key) {
     public void markStudent(Student student) {
         requireNonNull(student);
         student.mark();
+        setStudent(student, student);
     }
 
     /**
      * Marks all students as paid.
      */
     public void markAllStudents() {
         students.forEach(Student::mark);
+        for (Student student : students) {
+            setStudent(student, student);
+        }
     }
 
     /**
@@ -132,13 +136,17 @@ public void markAllStudents() {
     public void unmarkStudent(Student student) {
         requireNonNull(student);
         student.unmark();
+        setStudent(student, student);
     }
 
     /**
      * Marks all students as unpaid.
      */
     public void unmarkAllStudents() {
         students.forEach(Student::unmark);
+        for (Student student : students) {
+            setStudent(student, student);
+        }
     }
 
     // ------------------ lesson-level operations -----------------------

src/main/java/seedu/edulog/model/EduLog.java

@@ -28,23 +28,7 @@ public class Student {
     private final Fee fee;
 
     /**
-     * Every field must be present and not null except isPresent. I suggest
-     * we keep this constructor so that we do not break all the test cases
-     */
-    public Student(Name name, Phone phone, Email email, Address address, Set<Tag> tags) {
-        requireAllNonNull(name, phone, email, address, tags);
-        this.name = name;
-        this.phone = phone;
-        this.email = email;
-        this.address = address;
-        this.tags.addAll(tags);
-        this.hasPaid = false;
-        this.fee = new Fee(100);
-
-    }
-
-    /**
-     * New constructor with Fee
+     * Every field must be present and not null except hasPaid.
      */
     public Student(Name name, Phone phone, Email email, Address address, Set<Tag> tags, Fee fee) {
         requireAllNonNull(name, phone, email, address, tags);

src/main/java/seedu/edulog/model/student/Student.java

@@ -11,6 +11,7 @@
 import seedu.edulog.model.calendar.Lesson;
 import seedu.edulog.model.student.Address;
 import seedu.edulog.model.student.Email;
+import seedu.edulog.model.student.Fee;
 import seedu.edulog.model.student.Name;
 import seedu.edulog.model.student.Phone;
 import seedu.edulog.model.student.Student;
@@ -24,22 +25,22 @@ public static Student[] getSampleStudents() {
         return new Student[] {
             new Student(new Name("Alex Yeoh"), new Phone("87438807"), new Email("[email protected]"),
                 new Address("Blk 30 Geylang Street 29, #06-40"),
-                getTagSet("friends")),
+                getTagSet("friends"), new Fee("100")),
             new Student(new Name("Bernice Yu"), new Phone("99272758"), new Email("[email protected]"),
                 new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
-                getTagSet("colleagues", "friends")),
+                getTagSet("colleagues", "friends"), new Fee("200")),
             new Student(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("[email protected]"),
                 new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
-                getTagSet("neighbours")),
+                getTagSet("neighbours"), new Fee("100")),
             new Student(new Name("David Li"), new Phone("91031282"), new Email("[email protected]"),
                 new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
-                getTagSet("family")),
+                getTagSet("family"), new Fee("100")),
             new Student(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("[email protected]"),
                 new Address("Blk 47 Tampines Street 20, #17-35"),
-                getTagSet("classmates")),
+                getTagSet("classmates"), new Fee("100")),
             new Student(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("[email protected]"),
                 new Address("Blk 45 Aljunied Street 85, #11-31"),
-                getTagSet("colleagues"))
+                getTagSet("colleagues"), new Fee("100"))
         };
     }
 

src/main/java/seedu/edulog/model/util/SampleDataUtil.java

@@ -44,12 +44,12 @@ public class StudentCard extends UiPart<Region> {
     private FlowPane tags;
     @FXML
     private ImageView paidStatusIcon;
+    @FXML
+    private Label fee;
 
     private final Image paidIcon = new Image(getClass().getResource("/images/paid.png").toExternalForm());
     private final Image unpaidIcon = new Image(getClass().getResource("/images/unpaid.png").toExternalForm());
 
-    private Label fee;
-
     /**
      * Creates a {@code StudentCode} with the given {@code Student} and index to display.
      */