Skip to content

Commit e3695b8

Browse files
authored
Merge pull request #366 from markuz5116/branch-update-DG
Update DG
2 parents aa995d8 + 1020ea0 commit e3695b8

8 files changed

Lines changed: 12 additions & 5 deletions

File tree

-51.8 KB
Loading
-34.1 KB
Loading
-34.2 KB
Loading
-53 KB
Loading
-52.3 KB
Loading

docs/team/markuz5116.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ It is written in Java, and has about 17 kLOC contributed.
2525
in the future. It required the need to add in a parser for find commands to differentiate between finding persons,
2626
modules and events. Therefore, this implementation required adding of new classes and a change in the logic of RemindMe.
2727
* Credits: *{AddressBook3's Parser and AddressBook3's FindPersonCommand}*
28+
29+
2830
* **New Feature**: Added the ability to clear modules, persons and general events respectively.
2931
* What it does: allows the user to clear specifically modules, general events or persons without changing the other entities in RemindMe.
3032
* Justification: With the addition of modules and general events, there will be instances where users want to clear the
@@ -34,11 +36,15 @@ It is written in Java, and has about 17 kLOC contributed.
3436
Therefore, I added ways to parse the respective inputs from the user to differentiate when to clear the whole of
3537
RemindMe, modules, persons, or general events.
3638
* Credits: *{AddressBook3's Parser and AddressBook3's ClearCommand}*
39+
40+
3741
* **Code contributed**: [RepoSense link](https://nus-cs2103-ay2021s2.github.io/tp-dashboard/?search=w15-1&sort=groupTitle&sortWithin=title&timeframe=commit&mergegroup=&groupSelect=groupByRepos&breakdown=true&since=2021-02-19&checkedFileTypes=docs~functional-code~test-code~other&tabOpen=true&tabType=authorship&tabAuthor=markuz5116&tabRepo=AY2021S2-CS2103T-W15-1%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code~other&authorshipIsBinaryFileTypeChecked=false)
3842

43+
3944
* **Project management**:
4045
* Managed releases `v1.2` - `v1.4` (4 releases) on GitHub
4146

47+
4248
* **Enhancements to existing features**:
4349
* Wrote additional tests for new features (Pull requests [\#118](https://github.com/AY2021S2-CS2103T-W15-1/tp/pull/118),
4450
[\#129](https://github.com/AY2021S2-CS2103T-W15-1/tp/pull/129), [\#131](https://github.com/AY2021S2-CS2103T-W15-1/tp/pull/131),
@@ -48,6 +54,7 @@ It is written in Java, and has about 17 kLOC contributed.
4854
* Wrote specific error messages for each commands (Pull requests [\#312](https://github.com/AY2021S2-CS2103T-W15-1/tp/pull/312),
4955
[\#316](https://github.com/AY2021S2-CS2103T-W15-1/tp/pull/316), [\#325](https://github.com/AY2021S2-CS2103T-W15-1/tp/pull/325))
5056

57+
5158
* **Documentation**:
5259
* User Guide:
5360
* Added documentations for the features `clear` and `find` (Pull request [\#169](https://github.com/AY2021S2-CS2103T-W15-1/tp/pull/169))

src/main/java/seedu/address/model/module/Assignment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void toggleDoneStatus() {
8484

8585
@Override
8686
public String toString() {
87-
return description + " due: " + deadline.format(LocalDateTimeUtil.DATETIME_FORMATTER)
87+
return description + "\n due: " + deadline.format(LocalDateTimeUtil.DATETIME_FORMATTER)
8888
+ " " + isDone();
8989
}
9090

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@ private void switchTabByErrorCommandText(String commandText) {
230230
|| commandText.contains("e/");
231231
boolean isEvents = commandText.contains("g/");
232232

233-
if (isPersons) {
234-
displayPanel.showContacts();
233+
if (isEvents) {
234+
displayPanel.showEvents();
235235
} else if (isModules) {
236236
displayPanel.showModules();
237-
} else if (isEvents) {
238-
displayPanel.showEvents();
237+
} else if (isPersons) {
238+
displayPanel.showContacts();
239239
} else {
240240
logger.info("No switching of tabs");
241241
}

0 commit comments

Comments
 (0)