diff --git a/README.adoc b/README.adoc index ed58bc52f9..7643cba774 100644 --- a/README.adoc +++ b/README.adoc @@ -16,14 +16,13 @@ endif::[] * <> * <> -* <> * <> * <> == Acknowledgements -* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by +* Some parts of this application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by _Marco Jakob_. -* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5] +* Libraries used: https://openjfx.io/[JavaFX], https://github.com/junit-team/junit5[JUnit5] == Licence : link:LICENSE[MIT] \ No newline at end of file diff --git a/build.gradle b/build.gradle index b1f889e523..4d795d86ac 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ dependencies { shadowJar { archiveBaseName = "duke" - archiveVersion = "v1.3.1f" + archiveVersion = "v1.4.1" archiveClassifier = null archiveAppendix = null } diff --git a/docs/AboutUs.adoc b/docs/AboutUs.adoc index 717c12e3b9..f76512625a 100644 --- a/docs/AboutUs.adoc +++ b/docs/AboutUs.adoc @@ -10,16 +10,16 @@ We are a team based in the http://www.comp.nus.edu.sg[School of Computing, Natio === Ting Wei image::talesrune.png[width="150", align="left"] -{empty}[https://github.com/talesrune[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/team/talesrune.adoc[portfolio]] +{empty}[https://github.com/talesrune[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/team/talesrune.pdf[portfolio]] -Role: Team Lead + -Responsibilities: Gui, Update +Role: Lead Developer + +Responsibilities: GUI, Update ''' === Rui Huan image::e0318465.png[width="150", align="left"] -{empty}[https://github.com/e0318465[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/team/e0318465.adoc[portfolio]] +{empty}[https://github.com/e0318465[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/team/e0318465.adoc[portfolio]] Role: Developer + Responsibilities: Contact Management @@ -28,7 +28,7 @@ Responsibilities: Contact Management === Yu Xuan image::maxxyx96.png[width="150", align="left"] -{empty}[https://github.com/maxxyx96[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/team/maxxyx96.adoc[portfolio]] +{empty}[https://github.com/maxxyx96[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/team/maxxyx96.adoc[portfolio]] Role: Developer + Responsibilities: Budget Management @@ -37,7 +37,7 @@ Responsibilities: Budget Management === Gervaise Ang image::gervaiseang.png[width="150", align="left"] -{empty}[https://github.com/gervaiseang[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/team/gervaiseang.adoc[portfolio]] +{empty}[https://github.com/gervaiseang[github]] [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/team/gervaiseang.adoc[portfolio]] Role: Developer + Responsibilities: Help & Reminders diff --git a/docs/ContactUs.adoc b/docs/ContactUs.adoc new file mode 100644 index 0000000000..0613930ac4 --- /dev/null +++ b/docs/ContactUs.adoc @@ -0,0 +1,5 @@ += Contact Us +:site-section: ContactUs +:stylesDir: stylesheets + +* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2113-T13-4/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve. \ No newline at end of file diff --git a/team/e0318465.adoc b/docs/team/e0318465.adoc similarity index 100% rename from team/e0318465.adoc rename to docs/team/e0318465.adoc diff --git a/team/gervaiseang.adoc b/docs/team/gervaiseang.adoc similarity index 100% rename from team/gervaiseang.adoc rename to docs/team/gervaiseang.adoc diff --git a/team/maxxyx96.adoc b/docs/team/maxxyx96.adoc similarity index 100% rename from team/maxxyx96.adoc rename to docs/team/maxxyx96.adoc diff --git a/docs/team/talesrune.pdf b/docs/team/talesrune.pdf new file mode 100644 index 0000000000..a84dffbaba Binary files /dev/null and b/docs/team/talesrune.pdf differ diff --git a/src/main/resources/sample/duke.txt b/src/main/resources/sample/duke.txt index d96fd36a73..b7dd7881b7 100644 --- a/src/main/resources/sample/duke.txt +++ b/src/main/resources/sample/duke.txt @@ -1,11 +1,11 @@ T|1|read a book|read page 578 -D|0|submit homework|cs1010|10/11/2019 1800 +D|0|submit homework|cs1010|13/11/2019 0000 F|1|take computing class|empty|2 hours T|0|dance|empty F|0|build a robot|empty|3 hours -D|1|dance two|SAMPLE|02/11/2019 2000 -D|1|CS2113 proj|empty|02/11/2019 0000 -D|0|cs3230 exam|empty|09/11/2019 1900 +D|1|dance two|SAMPLE|15/11/2019 2000 +D|1|CS2113 proj|empty|16/11/2019 0000 +D|0|cs3230 exam|empty|17/11/2019 1900 T|0|go to supermarket|empty F|0|nap|empty|4 hours T|1|running|five laps diff --git a/team/talesrune.adoc b/team/talesrune.adoc deleted file mode 100644 index 3c1c972aad..0000000000 --- a/team/talesrune.adoc +++ /dev/null @@ -1,63 +0,0 @@ -= Lim Ting Wei - Project Portfolio - -== PROJECT: Duke Manager - ---- - -== Overview - -DUKE Manager is an electronic handbook which is resulted from extending the project from DUKE in CS2113, using Java and Object Oriented Programming. - -DUKE Manager has a friendly Graphical User Interface (GUI) which helps to keep track of the user's tasks. Also, it has an option for users who prefer Command Line Interface style by using the text box. - -My role is to create a GUI to the DUKE Manager, as well as implementing some features like Update, Filter, DetectAnomalies, and Notes to improve the efficiency for the user. - -== Summary of contributions - -* *Main Enhancement*: added the ability to update existing tasks. -** What it does: This enhancement allows Duke Manager to be able to update either task description, date and time, or task's type to existing tasks. -** Justification: This feature improves the efficiency of DUKE manager as the user may want to update an existing task instead of deleting and then adding a new task. This saves time for the user, so that the user can manage the tasklist quickly and efficiently. -** Highlights: The update command can be used for both existing and new types of task. However, the update command is only implemented for majority of the tasks. Some parts of a certain type of task are too narrow for them to be included in update command. For example, the user will not be able to update the duration and unit of FixedDuration. - -* *Minor Enhancements*: - -** *Notes Feature*: added notes so that users will be able to add/update/delete/show notes of a task in DUKE Manager. - -** *DetectAnomalies*: added code to detect tasks that clash with the same date and time when adding a new task, or updating an existing task in DUKE Manager. - -** *Filter*: added filter so that the users can filter out tasks in the task list based on the type of task. - - - -* *Code contributed*: [https://nuscs2113-ay1920s1.github.io/dashboard/#search=talesrune&sort=groupTitle&sortWithin=title&since=2019-09-21&timeframe=commit&mergegroup=false&groupSelect=groupByRepos&breakdown=false[RepoSense]] - -** *Update Related Code*: [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/src/main/java/duke/command/UpdateCommand.java[Update Command]] - -** *Notes Related Code*: [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/src/main/java/duke/command/AddNotesCommand.java[Add Notes Command]][https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/src/main/java/duke/command/DeleteNotesCommand.java[Delete Notes Command]][https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/src/main/java/duke/command/ShowNotesCommand.java[Show Notes Command]] - -** *Filter Related Code*: [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/src/main/java/duke/command/FilterCommand.java[Filter Command]] - -* *Other contributions*: - -** Project management: Managed releases mid-v1.1 - v1.3 (4 releases) on Github - -** Enhancements to existing features: Designed and created GUI from scratch. - -** Documentation: Helped out populating the user guide during its inital stage, implemented own features into both user guide and developer guide. - -** Tools: -*** Integrated shadowJar, javadoc, JavaUI, JUnit, and Gradle into project. - -== Contributions to the User Guide -Contributed the following sections of the [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/UserGuide.adoc[User Guide]]: - -*Update* - -*Notes* - -*Filter* - -*DetectAnomalies* - -== Contributions to the Developer Guide -Contributed the following sections of the [https://github.com/AY1920S1-CS2113-T13-4/main/blob/master/docs/DeveloperGuide.adoc[Developer Guide]]: \ No newline at end of file