Merge branch 'master' of https://github.com/antonTan96/tp into PPP-up…

…date-final
AY2324S1-CS2103T-T08-3 · Nov 13, 2023 · fdea707 · fdea707
2 parents ff94da0 + 0307f48
commit fdea707
Show file tree

Hide file tree

Showing 38 changed files with 696 additions and 502 deletions.
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/diagrams/ArchitectureSequenceDiagram.puml b/docs/diagrams/ArchitectureSequenceDiagram.puml
@@ -8,10 +8,10 @@ Participant ":Logic" as logic LOGIC_COLOR
 Participant ":Model" as model MODEL_COLOR
 Participant ":Storage" as storage STORAGE_COLOR
 
-user -[USER_COLOR]> ui : "delete 1"
+user -[USER_COLOR]> ui : "deleteE 1"
 activate ui UI_COLOR
 
-ui -[UI_COLOR]> logic : execute("delete 1")
+ui -[UI_COLOR]> logic : execute("deleteE 1")
 activate logic LOGIC_COLOR
 
 logic -[LOGIC_COLOR]> model : deleteEmployee(p)

diff --git a/docs/diagrams/EmployeeClassDiagram.puml b/docs/diagrams/EmployeeClassDiagram.puml
@@ -11,7 +11,6 @@ Class Email
 Class Name
 Class Phone
 Class Tag
-Class Project
 
 Class I #FFFFFF
 }
@@ -23,14 +22,12 @@ Employee *-down-> "1" Name
 Employee *-down-> "1" Phone
 Employee *-down-> "1" Email
 Employee *-down-> "1" Address
-Employee -down-> "*" Project
 Employee -down-> "*" Tag
 
 Name -[hidden]right-> Phone
 Phone -[hidden]right-> Email
 Email -[hidden]right-> Address
-Address -[hidden]right-> Project
-Project -[hidden]right-> Tag
+Address -[hidden]right-> Tag
 
 hide class fields
 @enduml
diff --git a/docs/diagrams/ModelClassDiagram.puml b/docs/diagrams/ModelClassDiagram.puml
@@ -14,8 +14,10 @@ Class UserPrefs
 
 Class UniqueEmployeeList
 Class UniqueProjectList
+Class TaskList
 Class Employee
 Class Project
+Class Task
 
 Class I #FFFFFF
 }
@@ -36,6 +38,8 @@ TaskHub *--> "1" UniqueEmployeeList
 UniqueEmployeeList --> "~* all" Employee
 TaskHub *--> "1" UniqueProjectList
 UniqueProjectList --> "~* all" Project
+Project *--> "1" TaskList
+TaskList --> "*" Task
 
 Employee -[hidden]up--> I
 UniqueEmployeeList -[hidden]right-> I

diff --git a/docs/diagrams/ProjectClassDiagram.puml b/docs/diagrams/ProjectClassDiagram.puml
@@ -12,7 +12,7 @@ Class UniqueEmployeeList
 Class Employee
 Class TaskList
 Class Task
-Class ProjectPriority
+Class Priority
 Class CompletionStatus
 
 Class I #FFFFFF
@@ -21,14 +21,14 @@ Class I #FFFFFF
 Class HiddenOutside #FFFFFF
 HiddenOutside ..> Project
 
-Project -down-> "1" Name
+Project *-down-> "1" Name
 Project -down-> "0..1" Deadline
 Project *-down-> "1" UniqueEmployeeList
 Project *-down-> "1" TaskList
-Project *-down-> "1" ProjectPriority
+Project *-down-> "1" Priority
 Project *-down-> "1" CompletionStatus
 
-Task *-left-> "0..1" Employee
+Task -left-> "0..1" Employee
 
 UniqueEmployeeList --> "~* filtered" Employee
 TaskList --> "*" Task

diff --git a/docs/diagrams/StorageClassDiagram.puml b/docs/diagrams/StorageClassDiagram.puml
@@ -46,4 +46,5 @@ JsonAdaptedProject --> "*" JsonAdaptedEmployee
 JsonAdaptedTask -right-> "0..1" JsonAdaptedEmployee
 JsonAdaptedEmployee --> "*" JsonAdaptedTag
 
+hide class fields
 @enduml
diff --git a/docs/images/ArchitectureSequenceDiagram.png b/docs/images/ArchitectureSequenceDiagram.png
diff --git a/docs/images/DataFileWithProject.png b/docs/images/DataFileWithProject.png
diff --git a/docs/images/DataFileWithoutProjects.png b/docs/images/DataFileWithoutProjects.png
diff --git a/docs/images/Employee.png b/docs/images/Employee.png
diff --git a/docs/images/EmployeeClassDiagram.png b/docs/images/EmployeeClassDiagram.png
diff --git a/docs/images/ModelClassDiagram.png b/docs/images/ModelClassDiagram.png
diff --git a/docs/images/Project.png b/docs/images/Project.png
diff --git a/docs/images/ProjectClassDiagram.png b/docs/images/ProjectClassDiagram.png
diff --git a/docs/images/QuickStartEnd.png b/docs/images/QuickStartEnd.png
diff --git a/docs/images/QuickStartStart.png b/docs/images/QuickStartStart.png
diff --git a/docs/images/StorageClassDiagram.png b/docs/images/StorageClassDiagram.png
diff --git a/docs/images/Tasks.png b/docs/images/Tasks.png
diff --git a/docs/team/timleow.md b/docs/team/timleow.md
@@ -9,11 +9,10 @@ title: Timothy Leow's Project Portfolio Page
 TaskHub is a desktop project management application used by project managers to manage projects and their team members in each project. The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java.
 ## Summary of Contributions
 
-### Code Contributed:
-My code contributions to TaskHub can be found [here](https://nus-cs2103-ay2324s1.github.io/tp-dashboard/?search=&sort=groupTitle&sortWithin=title&timeframe=commit&mergegroup=&groupSelect=groupByRepos&breakdown=true&checkedFileTypes=docs~functional-code~test-code&since=2023-09-22&tabOpen=true&tabType=authorship&tabAuthor=timleow&tabRepo=AY2324S1-CS2103T-T08-3%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code&authorshipIsBinaryFileTypeChecked=false&authorshipIsIgnoredFilesChecked=false%23%2F):
+#### Code Contributed:
+My code contributions to TaskHub can be found [here](https://nus-cs2103-ay2324s1.github.io/tp-dashboard/?search=&sort=groupTitle&sortWithin=title&timeframe=commit&mergegroup=&groupSelect=groupByRepos&breakdown=true&checkedFileTypes=docs~functional-code~test-code&since=2023-09-22&tabOpen=true&tabType=authorship&tabAuthor=timleow&tabRepo=AY2324S1-CS2103T-T08-3%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code&authorshipIsBinaryFileTypeChecked=false&authorshipIsIgnoredFilesChecked=false%23%2F).
 
-### Enhancements implemented:
-<img src="../images/HelpWindow.png" width="280" />
+#### Enhancements implemented:
 
 - **Upgraded Help Window:**
   - Modified `Ui` for `HelpWindow.java`.
@@ -22,7 +21,6 @@ My code contributions to TaskHub can be found [here](https://nus-cs2103-ay2324s1
   - Added value to the `help` command.
 
 
-<img src="../images/TasksUi.png" width="280" />
 
 - **`Task` Model, `addT`, and `deleteT` Command:**
   - Created infrastructure for tasks in both the `model` and `Ui` files - the Ui can be seen in the 'Tasks' section of the `Project`s in the screenshot above.
@@ -31,47 +29,39 @@ My code contributions to TaskHub can be found [here](https://nus-cs2103-ay2324s1
   - Enhanced `addT` to allow task assignment to an employee upon creation using the optional `em/` parameter.
 
 
-### Contributions to the UG:
+#### Contributions to the UG:
 - **Introductory section**
   - Getting Started
     - Installing and launching TaskHub
     - Understanding the components of TaskHub
+    - Quick Start
 - **Features section**
   - Explanation for `addT` command.
   - Explanation for `deleteT` command.
 
-### Contributions to the DG:
+#### Contributions to the DG:
 - **Architecture, UI Component, Logic component, Model Component, Employee, Project, Task components**
   - Addition of tasks to the Class Diagram for Ui component 
   - Minor updates and diagram changes to other components (e.g., removing attributes section, updating command names/links)
 - **Implementation Section**
   - Upgraded Help Feature
   - Add Task feature (created sequence diagram for this)
-### Contributions to team-based tasks:
+
+#### Contributions to team-based tasks:
 - Set up the GitHub team org/repo
 - Updated diagrams in DG related to Tasks
 - Created tags to help with bug triaging post PE-D
 - Generated table for PR review allocations here:
 
-<img src="../images/PRReview.png" width="280" />
-
-### Review/mentoring contributions:
+#### Review/mentoring contributions:
 - Within the team, we had decided that each of us were to review 2 of our teammates. I mainly reviewed Anton and Aslam's PRs.
 - Helped Anton with centering the TaskHub logo in [this PR ](https://github.com/AY2324S1-CS2103T-T08-3/tp/pull/167/files/9539b1872903d50de0d94125b550a784ac42b0cf), by providing a code block which gave advice on handling positioning of components on Java FXML.
 - Gave Aslam code quality suggestions in [this PR](https://github.com/AY2324S1-CS2103T-T08-3/tp/pull/109) so that we could sync up our implementation of deadlines in both `Tasks` and `Projects`.
 
-### Contributions beyond the project team:
-To be added soon.
-#### Evidence of helping others e.g. responses you posted in our forum, bugs you reported in other team's products,
+#### Contributions beyond the project team:
+##### Evidence of helping others e.g. responses you posted in our forum, bugs you reported in other team's products,
 - Reported an above average bug count of 10 with value-added suggestions to my allocated PE-D team, can be seen from the [PE-D](https://github.com/timleow/ped/issues) repo.
-  <img src="../images/timPEDbugs.png" width="280" />
 
-#### Evidence of technical leadership e.g. sharing useful information in the forum
+##### Evidence of technical leadership e.g. sharing useful information in the forum
 - Participated in the forum in this [issue](https://github.com/nus-cs2103-AY2324S1/forum/issues/145).
 --- ---
-
-### Contribution to developer guide (extracts)
-To be added soon.
-### Contribution to user guide (extracts)
-To be added soon.
-
diff --git a/src/main/java/seedu/address/logic/commands/SortTaskCommand.java b/src/main/java/seedu/address/logic/commands/SortTaskCommand.java
@@ -2,10 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-import java.util.List;
-
 import seedu.address.model.Model;
-import seedu.address.model.project.Project;
 
 
 /**
@@ -21,10 +18,7 @@ public class SortTaskCommand extends Command {
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
-        List<Project> lastShownProjectList = model.getFilteredProjectList();
-        for (Project project : lastShownProjectList) {
-            project.sortTasksByDeadlineAndCompletion();
-        }
+        model.sortTasksByDeadlineAndCompletion();
         return new CommandResult(MESSAGE_SUCCESS);
     }
 }
diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
@@ -119,4 +119,10 @@ public interface Model {
      */
     void updateFilteredProjectList(Predicate<Project> predicate);
 
+    /**
+     * Sorts tasks in tasks list of each project according to completion and deadline.
+     * Incomplete tasks will appear before complete tasks and tasks will be arranged in ascending deadline order.
+     */
+    void sortTasksByDeadlineAndCompletion();
+
 }
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
@@ -169,6 +169,13 @@ public void updateFilteredProjectList(Predicate<Project> predicate) {
         filteredProjects.setPredicate(predicate);
     }
 
+    @Override
+    public void sortTasksByDeadlineAndCompletion() {
+        for (Project project : filteredProjects) {
+            project.sortTasksByDeadlineAndCompletion();
+        }
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other == this) {

diff --git a/src/test/java/seedu/address/logic/commands/AddEmployeeCommandTest.java b/src/test/java/seedu/address/logic/commands/AddEmployeeCommandTest.java
@@ -7,24 +7,18 @@
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalEmployees.ALICE;
 
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.function.Predicate;
 
 import org.junit.jupiter.api.Test;
 
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
 import seedu.address.logic.Messages;
 import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
 import seedu.address.model.ReadOnlyTaskHub;
-import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.TaskHub;
 import seedu.address.model.employee.Employee;
-import seedu.address.model.project.Project;
 import seedu.address.testutil.EmployeeBuilder;
+import seedu.address.testutil.ModelStub;
 
 public class AddEmployeeCommandTest {
 
@@ -86,110 +80,6 @@ public void toStringMethod() {
         assertEquals(expected, addEmployeeCommand.toString());
     }
 
-    /**
-     * A default model stub that have all the methods failing.
-     */
-    private class ModelStub implements Model {
-        @Override
-        public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public ReadOnlyUserPrefs getUserPrefs() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public GuiSettings getGuiSettings() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setGuiSettings(GuiSettings guiSettings) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public Path getTaskHubFilePath() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setTaskHubFilePath(Path taskHubFilePath) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void addEmployee(Employee employee) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void addProject(Project project) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setTaskHub(ReadOnlyTaskHub newData) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public ReadOnlyTaskHub getTaskHub() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public boolean hasEmployee(Employee employee) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public boolean hasProject(Project project) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void deleteEmployee(Employee target) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void deleteProject(Project project) {
-            throw new AssertionError("This method should not be called.");
-        }
-        @Override
-        public void setEmployee(Employee target, Employee editedEmployee) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public ObservableList<Employee> getFilteredEmployeeList() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public ObservableList<Project> getFilteredProjectList() {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void updateFilteredEmployeeList(Predicate<Employee> predicate) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void setProject(Project projectToEdit, Project editedProject) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public void updateFilteredProjectList(Predicate<Project> predicate) {
-            throw new AssertionError("This method should not be called.");
-        }
-    }
-
     /**
      * A Model stub that contains a single employee.
      */