Merge branch 'master' into branch-ppp-dg

build.gradle

@@ -70,7 +70,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
+    archiveName = 'TaskMaster2103.jar'
 }
 
 defaultTasks 'clean', 'test'

docs/UserGuide.md

@@ -161,7 +161,7 @@ Format: `find KEYWORD [MORE_KEYWORDS]`
 Examples:
 
 - `find John` returns `john` and `John Doe`
-- `find alex david` returns `Alex Yeoh`, `David Li`<br>
+- `find teammate1 teaching` returns `Teammate1`, `Teaching Assistant`<br>
   ![result for 'find alex david'](images/findAlexDavidResult.png)
 
 ### Deleting a person : `delete`
@@ -379,18 +379,16 @@ Upon clicking the Add Task Dialog button, the following popup window should appe
 
 ![result for pressing +new button](images/guiAddTaskDialog.png)
 
-Enter relevant text into the text fields.
+Enter relevant text into the text fields. 
 
-**[TODO: PLACE FILLED ADD TASK DIALOG HERE]**
+To add tags or contacts, type the tag into the text field and press the `Enter` key. The tag should be displayed as seen below.
 
-To add tags, type the tag into the text field and press the `Enter` key. The tag should be displayed as seen below.
-
-![result for adding new tag](images/guiAddTag.png)
+![result for adding new tag](images/guiAddTaskDialogFilled.png)
 
 To finish adding a task, click the `Save` button. The task should be added to the task list.
 
-- Pressing the `Enter` key on text fields other than the "Tags" field should add the task to the task list.
-- If invalid arguments are provided, the task will still be added without the invalid arguments upon clicking "Save" or the `Enter` key.
+- Text typed in the tags and contact text fields will not be added to the task if `Enter` is not pressed to add the tag/contact.
+
 
 ### The Task pane
 

docs/team/jeffsieu.md

@@ -25,18 +25,18 @@ Given below are my contributions to the project.
   - Highlights: To solve this, ***every command and command parser*** had to be refactored to include information about every parameter accepted, and their *multiplicity* (optional or not, can accept multiple or not). Once this was done, however, it allowed for many useful abstractions like auto-generation of command usage message, and detailed error messages that tell the user how exactly the format is wrong.
 - **Code contributed**: [RepoSense link](https://nus-cs2103-ay2122s1.github.io/tp-dashboard/?search=&sort=groupTitle&sortWithin=title&timeframe=commit&mergegroup=&groupSelect=groupByRepos&breakdown=true&checkedFileTypes=docs~functional-code~test-code~other&since=2021-09-17&tabOpen=true&tabType=authorship&tabAuthor=jeffsieu&tabRepo=AY2122S1-CS2103-F09-2%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code~other&authorshipIsBinaryFileTypeChecked=false)
 - **Enhancement to existing features**
-  - Rethemed the GUI to have a more uniform aesthetic [`#179`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/179).
-  - Update help window [`#184`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/184)
-  - Slash to focus on command input [`#56`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/56)
+  - Rethemed the GUI to have a more uniform aesthetic ([`#179`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/179)).
+  - Revamped the help window to be auto-generated ([`#184`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/184)).
+  - Implemented slash-to-focus on the command input ([`#56`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/56)).
 
 - **Testing**
-  - Added test cases for task-related commands. [`#58`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/58)
+  - Added test cases for task-related commands ([`#58`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/58)).
 
 - **Documentation**
   - Added `task add`, `task edit` and `task delete` use cases in [`#32`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/32)
-  - Added `task filter` in Developer Guide [`#71`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/71), [`#77`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/77)
+  - Added `task filter` in Developer Guide ([`#71`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/71), [`#77`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/77)).
 
 - **GUI**
-  - Added GUI task list with checkboxes in [`#40`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/40), [`#51`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/51), [`#57`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/57)
+  - Added GUI task list with checkboxes ([`#40`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/40), [`#51`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/51), [`#57`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/57)).
 - Community:
-  - PRs reviewed (with non-trivial comments):[`#44`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/44)[`#70`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/70), [`#89`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/89)
+  - PRs reviewed (with non-trivial comments): [`#44`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/44), [`#70`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/70), [`#89`](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/89)

docs/team/koh-jx.md

@@ -3,36 +3,36 @@ layout: page
 title: Koh Jia Xian's Project Portfolio Page
 
 ---
+## Project: TaskMaster2103
 
-## Technical skills
+TaskMaster2103 is an extension to [AddressBook - Level 3](https://se-education.org/addressbook-level3/), a CLI-based address book JavaFX application.
+TaskMaster2103 offers task-related features, and a streamlined GUI to better accommodate your academic needs.
 
-Programming competencies: Java, Python, C/C++, C#, Javascript, HTML/CSS
+Given below are my contributions to the project.
+- **New Feature**: Added AddressBook integration and GUI into tasks ([#81](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/88))
+  - What it does: allows users to designate certain contacts to tasks
+  - Justification: integration of AddressBook capabilities with TaskMaster2103 would help with the app's cohesiveness.
+  - Highlights: tasks contacts are displayed differently based on whether these contacts are present in the AddressBook. The contacts' names and display are updated automatically with changes to any data.
 
-Technologies: ReactJS, Redux, Django, SQLite, AWS S3. Firebase
+- **New Feature**: Added the ability to purge tasks (Initial: [#69](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/69), Refactor: [#90](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/90))
+  - What it does: allows users mass-delete tasks
+  - Justification: users may want to clear out tasks. For example, work-related tasks after the semester is complete.
+  - Highlights: unlike `clear`, purge tasks purge all currently-filtered or listed tasks; users are able to effortlessly designate what kind of task to delete.
 
-## Work Experience
+- **Code contributed**: [RepoSense link](https://nus-cs2103-ay2122s1.github.io/tp-dashboard/?search=&sort=groupTitle&sortWithin=title&timeframe=commit&mergegroup=&groupSelect=groupByRepos&breakdown=true&checkedFileTypes=docs~functional-code~test-code~other&since=2021-09-17&tabOpen=true&tabType=authorship&tabAuthor=koh-jx&tabRepo=AY2122S1-CS2103-F09-2%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code&authorshipIsBinaryFileTypeChecked=false)
 
-NIL
+- **Enhancements to new/existing features**
+  - Implemented `task done`, and `undo` for some commands
+  - Extended `edit` for tasks  ([#42](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/42))
 
-## Projects and Competitions
+- **Testing** ([#53](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/53), [#186](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/186), [#189](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/189))
+  - Added test cases for `undo`, `redo`, `task done`, `task edit`, `task purge` and other task-related commands and parsers.
+  - Integrated contacts into existing test cases
+  - Set up test utils for task-related tests
 
-#### CP2106 Independent Software Development Project (Orbital 2020)
+- **Documentation**
+  - Add documentation for contacts, `task edit`, NFRs and glossary in Developer Guide ([#74](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/74), [#194](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/194))
+  - Add task-related commands, GUI instructions, and fix bugs in UG ([#163](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/163))
 
-- Co-developed a timetabler/scheduler web app using ReactJS.
-
-#### GEQ1917 NUSe Telegram bot and channel
-
-- Developed a bot that fosters a culture of mutual exchange of unwanted goods.
-
-#### CS2103 Software Engineering (individual Project)
-
-- Worked on a greenfield project on a basic task management chatbot in Java.
-
-#### RV Dining Hall Telegram Bot
-
-- Monitors and reports the number of seats available in the dining hall.
-
-
-## Additional Information
-
-- Fluent in English, Chinese (spoken and written)
+- Community:
+  - PRs reviewed (with non-trivial comments) include [#175](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/175), [#79](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/79), [#58](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/58)

docs/team/yeppog.md

@@ -49,7 +49,8 @@ Below are my contributions to the project.
     - Highlights: also added a hyperlink to the hosted User Guide that opens the browser, to prevent unneccesary copy
     pasting of the guide link.
 
-- **Testing**: Added test cases for respective commands or features that were added by myself.
+- **Testing**: Added test cases for respective commands or features that were added by myself (`InputHistory` and
+  `CommandHistory`).
 
 - **Documentation**:
 
@@ -61,32 +62,3 @@ Below are my contributions to the project.
 - **Community**:
 
     - PRs reviewed (non-trivial) [#86](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/86), [#188](https://github.com/AY2122S1-CS2103-F09-2/tp/pull/188)
-
-
-
-## Technical skills
-
-Programming competencies: Java, Python, C, Javascript/Typescript, Golang
-Technologies: ReactJS, ReactTS, Redux, Angular 2, MongoDB, Postgressql, SQL, Docker, Jest
-
-## Work Experience
-
-### Software Engineering Intern, Qavar Pte Lt
-
-
-- Handled a full stack project in Golang, Angular and Docker
-- Used Angular to create front-end site from given wireframes.
-- Wrote unit test code in Jest.
-
-## Projects and Competitions
-
-### CP2106 Independent Software Development Project (Orbital)
-
-- Created a social media platform for rock climbers to share solutions to climbing routes.
-- Wrote a custom backend system using NodeJs, Typescript, MongoDB.
-- Used React Typescript to handle the frontend of the website.
-
-## Additional Information
-
-- Fluent in English, Chinese (spoken and written)
-- Basic competency in Japanese

src/main/java/seedu/address/ui/TaskCard.java

@@ -7,7 +7,9 @@
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
+import javafx.scene.text.TextFlow;
 import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.task.DoneTaskCommand;
 import seedu.address.model.task.Contact;
@@ -35,6 +37,12 @@ public class TaskCard extends UiPart<Region> {
     @FXML
     private FlowPane contacts;
 
+    @FXML
+    private HBox textBox;
+
+    @FXML
+    private TextFlow nameTextFlow;
+
     /**
      * Creates a card representing a task. Used in a task list to display a task.
      * @param task The task to represent
@@ -45,6 +53,10 @@ public TaskCard(Task task, Index index, Consumer<? super DoneTaskCommand> doneCo
 
         name.setText(index.getOneBased() + ".  " + task.getTitle());
 
+        nameTextFlow.prefWidthProperty().bind(textBox.widthProperty().subtract(20).multiply(0.95));
+        name.prefWidthProperty().bind(nameTextFlow.widthProperty().subtract(5));
+
+
         if (task.getDescription().isEmpty()) {
             description.setVisible(false);
             description.setManaged(false);

src/main/resources/view/TaskCard.fxml

@@ -5,30 +5,40 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-
+<?import javafx.scene.text.TextFlow?>
 
 <VBox spacing="8.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <VBox spacing="4.0">
             <children>
-                <AnchorPane>
-                    <children>
-                        <Label fx:id="name"
-                               styleClass="cell_big_label" text="\$name" AnchorPane.leftAnchor="0.0"
-                               AnchorPane.topAnchor="0.0"/>
-                        <CheckBox fx:id="isCompleted"
-                                  mnemonicParsing="false" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
-                    </children>
-                </AnchorPane>
-                <FlowPane fx:id="tags"/>
+            <HBox fx:id="textBox" fillHeight="false" prefWidth="200.0">
+               <children>
+                      <AnchorPane HBox.hgrow="SOMETIMES">
+                          <children>
+                        <TextFlow fx:id="nameTextFlow">
+                           <children>
+                                    <Label fx:id="name" styleClass="cell_big_label" text="\$name" />
+                           </children>
+                        </TextFlow>
+                          </children>
+                      </AnchorPane>
+                  <AnchorPane HBox.hgrow="NEVER">
+                     <children>
+                              <CheckBox fx:id="isCompleted" mnemonicParsing="false" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                     </children>
+                  </AnchorPane>
+               </children>
+            </HBox>
+                <FlowPane fx:id="tags" />
             </children>
         </VBox>
-        <Label fx:id="timestamp" styleClass="cell_small_label,timestamp" text="\$timestamp"/>
-        <Label fx:id="description" styleClass="cell_small_label" text="\$description" wrapText="true"/>
-        <FlowPane fx:id="contacts"/>
+        <Label fx:id="timestamp" styleClass="cell_small_label,timestamp" text="\$timestamp" />
+        <Label fx:id="description" styleClass="cell_small_label" text="\$description" wrapText="true" />
+        <FlowPane fx:id="contacts" />
     </children>
     <padding>
-        <Insets bottom="8.0" left="16.0" right="16.0" top="8.0"/>
+        <Insets bottom="8.0" left="16.0" right="16.0" top="8.0" />
     </padding>
 </VBox>

src/main/resources/view/TaskListPanel.fxml

@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox spacing="8.0" styleClass="raised-pane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+<VBox minWidth="275.0" spacing="8.0" styleClass="raised-pane" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <VBox spacing="8.0">
             <children>