Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CS2113-T13-3] WhereGotTime #36

Open
wants to merge 525 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 237 commits
Commits
Show all changes
525 commits
Select commit Hold shift + click to select a range
1300749
Updated UG - included design for delete, clear, list and find functions
tammykoh Oct 29, 2020
9778bde
Updated DG - included sequence diagrams for delete, clear, list and f…
tammykoh Oct 29, 2020
0969d04
Merge branch 'tammy-developer-guide'
tammykoh Oct 29, 2020
7483ae0
updated DG
yeapcl Oct 29, 2020
8c493e6
Updated UG - renamed heading
tammykoh Oct 29, 2020
fc45902
updated DG
yeapcl Oct 29, 2020
f738291
Merge branch 'master' into brach-yeapcl-Documentation
yeapcl Oct 29, 2020
5cb3593
Merge pull request #110 from yeapcl/brach-yeapcl-Documentation
yeapcl Oct 29, 2020
bc77070
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
tammykoh Oct 29, 2020
03fcb0d
Merge branch 'master' of https://github.com/tammykoh/tp
tammykoh Oct 29, 2020
db0e688
Deleted unused line in ClearCommand
tammykoh Oct 29, 2020
28a31eb
Merge pull request #112 from tammykoh/master
yeapcl Oct 29, 2020
cf2b387
updated UG
yeapcl Oct 30, 2020
ae2978f
Merge pull request #119 from yeapcl/brach-yeapcl-Documentation
yeapcl Oct 30, 2020
7637598
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Oct 30, 2020
283b162
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Oct 30, 2020
5daa8b8
Fixed the crash in login when username/password is inputted. now thro…
manuelmanuntag96 Nov 1, 2020
165b567
Fixed the error where users can input just whitespaces. Now throws an…
manuelmanuntag96 Nov 1, 2020
90fa15d
Merge pull request #164 from manuelmanuntag96/Manuel-LogInErrorFix
yeapcl Nov 1, 2020
2f70377
Merge pull request #165 from manuelmanuntag96/Manuel-EmptyStringFix
yeapcl Nov 1, 2020
b757361
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 1, 2020
52a91b4
Fixed the error messages that show inaccurate messages. Now made clea…
manuelmanuntag96 Nov 1, 2020
c2c0b41
Fixed the bug where special characters are not sanitised and would br…
manuelmanuntag96 Nov 1, 2020
561e84e
Merge pull request #168 from manuelmanuntag96/Manuel-BugFixes
yeapcl Nov 1, 2020
98757b8
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 1, 2020
858ed67
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 1, 2020
ca19e43
Deep-rename to replace 'duke' with 'WhereGotTime'
yeapcl Nov 1, 2020
ffbe5da
updated build.gradle for renaming duke to WhereGotTime
yeapcl Nov 1, 2020
534232f
Merge pull request #169 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
yellow-fellow Nov 1, 2020
78a6530
Updated documentation bugs
yellow-fellow Nov 1, 2020
40b5f42
Update UserGuide.md
yellow-fellow Nov 1, 2020
4aa9207
Merge branch 'master' into master
yellow-fellow Nov 1, 2020
1ee674a
Merge pull request #170 from yellow-fellow/master
yellow-fellow Nov 1, 2020
296c4d6
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 1, 2020
c77dd24
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 1, 2020
803219d
Merge branch 'master' into branch-yeapcl-Documentation
yeapcl Nov 1, 2020
4728705
Bug Fix for V2.0
Nov 2, 2020
4eaa3d0
Merge pull request #171 from weisiong24/BugFixes
yellow-fellow Nov 2, 2020
1c54405
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 2, 2020
5826c8e
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 2, 2020
a1a6321
changed exception naming to WhereGotTimeException
yeapcl Nov 2, 2020
5c2419a
1. Command is no longer case sensitive
yeapcl Nov 2, 2020
5f5d157
Edit command no longer accepts input if user does not log in to Where…
yeapcl Nov 2, 2020
1ec2e12
fixed checkstyleMain
yeapcl Nov 2, 2020
01f8230
Merge pull request #174 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
tammykoh Nov 2, 2020
9196717
replaced all duke occurrences to WhereGotTime
yeapcl Nov 2, 2020
6680063
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 2, 2020
0a3b4d3
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 2, 2020
606a5e3
Minor Bug fixes
Nov 3, 2020
0a37ea4
Merge pull request #175 from weisiong24/BugFixes
yeapcl Nov 3, 2020
2f79645
Edited the format for the login command
manuelmanuntag96 Nov 3, 2020
1335e69
corrected the runtest.bat expected outputs
manuelmanuntag96 Nov 3, 2020
9729156
Corrected the parse_loginCommand_parsedCorrectly()
manuelmanuntag96 Nov 3, 2020
2e9552d
Merge pull request #178 from manuelmanuntag96/Manuel-NewLoginFormat
yeapcl Nov 3, 2020
c82367f
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 3, 2020
c32aa66
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 3, 2020
e824793
1. Fixed bugs in EditCommand where the program accepts invalid timing…
yeapcl Nov 4, 2020
aee81ed
Merge pull request #180 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
weisiong24 Nov 4, 2020
1291d7a
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 4, 2020
95f7498
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 4, 2020
a200327
Bug Fixes for v2.1
Nov 4, 2020
2eec44c
1. Bug fix for EditCommand
yeapcl Nov 4, 2020
5d9ab4b
fixed checkstyle error
yeapcl Nov 4, 2020
3dd0f1b
Merge pull request #182 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
weisiong24 Nov 4, 2020
42b7996
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 4, 2020
cd922ee
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 4, 2020
e3baad8
Merge pull request #181 from weisiong24/BugFixes
yeapcl Nov 4, 2020
c241c76
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 4, 2020
bf3c239
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 4, 2020
dcddb47
bug fix where user is allowed to perform edit and compare commands wi…
yeapcl Nov 4, 2020
06ca3cf
Merge pull request #183 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
yeapcl Nov 4, 2020
4a7332e
improved EditCommand where if new timings and original timings are id…
yeapcl Nov 4, 2020
e143f04
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 4, 2020
c8825f3
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 4, 2020
fbdb1c6
Merge pull request #184 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
weisiong24 Nov 5, 2020
f201471
Updated Expected outputs for Edit,list,login,find,delete,clear,exit C…
Nov 5, 2020
5e4ae1b
Updates to Userguid expected outputs and command formats corrections
Nov 5, 2020
7264e33
Merge pull request #186 from weisiong24/BugFixes
yeapcl Nov 5, 2020
7a1139b
Implemented the Remove Feature
manuelmanuntag96 Nov 5, 2020
a3e9dda
Merge pull request #187 from manuelmanuntag96/Manuel-RemoveFunction
yeapcl Nov 5, 2020
08629fd
Updates to UserGuide
Nov 6, 2020
3ecef96
Merge pull request #188 from weisiong24/BugFixes
weisiong24 Nov 6, 2020
7f38589
Update to UserGuide command summary
Nov 6, 2020
ff43337
Merge pull request #189 from weisiong24/BugFixes
weisiong24 Nov 6, 2020
3be4e27
Updates to Developer Guide
Nov 6, 2020
69e6e55
Merge pull request #190 from weisiong24/BugFixes
weisiong24 Nov 6, 2020
9534dcb
Update UserGuide.md
weisiong24 Nov 6, 2020
f44cea8
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 6, 2020
1a7df37
Updates the About Us and the table of content for User Guide
Nov 6, 2020
4ea94e9
Merge pull request #191 from weisiong24/BugFixes
weisiong24 Nov 6, 2020
168b3fb
Added more test cases for UserListTest.java
manuelmanuntag96 Nov 6, 2020
d597d42
Updated Userguide and add more Junit testing
Nov 6, 2020
b706959
Updates to User Guide and added more Junit test
Nov 6, 2020
3739eea
Merge pull request #193 from weisiong24/BugFixes
weisiong24 Nov 6, 2020
52c09b0
Added more test cases for parse login and remove validity in ParserTe…
manuelmanuntag96 Nov 6, 2020
4b8f344
Added even more test cases for parse login and remove validity in Par…
manuelmanuntag96 Nov 6, 2020
eba5fc8
Added more test cases for LogInCommand in LogInCommandTest.java
manuelmanuntag96 Nov 6, 2020
0b43bbf
Edited Remove User Command to new format: remove /username /password
manuelmanuntag96 Nov 6, 2020
bf09077
Edited to comply with gradlew checkstyle
manuelmanuntag96 Nov 6, 2020
4e00b9a
removed printl for debugging
manuelmanuntag96 Nov 6, 2020
8b1bac9
Updated Compare Command overall UX
yellow-fellow Nov 6, 2020
9135965
Removed case-sensitivity for day
tammykoh Nov 6, 2020
0b1af38
Updated error handling exception
yellow-fellow Nov 6, 2020
2b1ac78
Clarified error message for wrong day
tammykoh Nov 6, 2020
c6d97cc
Merge pull request #196 from yellow-fellow/master
yeapcl Nov 6, 2020
591e19e
Merge pull request #195 from manuelmanuntag96/Manuel-RemoveWithPassword
yeapcl Nov 6, 2020
98e2db6
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 6, 2020
695c91a
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 6, 2020
0066693
Improved CompareCommand such the current user's name would not appear…
yeapcl Nov 6, 2020
c6d5018
Further improved user-friendliness of UI with more concise instructions
yeapcl Nov 6, 2020
68e787d
fixed checkstyle and updated expected.txt for new UI messages
yeapcl Nov 6, 2020
becb5c3
Merge pull request #198 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
weisiong24 Nov 7, 2020
610f132
Merge remote-tracking branch 'upstream/master' into tammy-fixing-bugs
tammykoh Nov 7, 2020
47cb0c2
Merge branch 'tammy-fixing-bugs'
tammykoh Nov 7, 2020
54ccd62
Fixed checkstyle error
tammykoh Nov 7, 2020
37ff559
Merge pull request #199 from tammykoh/master
yeapcl Nov 7, 2020
85faea6
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 7, 2020
19d5c7e
Editted the basics of Manuel's PPP
manuelmanuntag96 Nov 7, 2020
324d8cc
Edited Manuel's PPP
manuelmanuntag96 Nov 7, 2020
4a59754
Merge pull request #200 from manuelmanuntag96/Manuel-PPP
manuelmanuntag96 Nov 7, 2020
5b29597
Revamped EditCommand UI to improve user-friendliness
yeapcl Nov 7, 2020
b48ee64
Merge pull request #202 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
weisiong24 Nov 7, 2020
5b735c7
Updated Add Command checks
Nov 7, 2020
3d83fd4
Updates to add command checks
Nov 7, 2020
f6b86b7
Merge pull request #203 from weisiong24/BugFixes
yeapcl Nov 7, 2020
fcb8b76
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 7, 2020
eecf9ec
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 7, 2020
3d0ae2f
edited timings are now restricted to 1-hour block
yeapcl Nov 7, 2020
090f55f
Updated the error messages for the add commands
Nov 7, 2020
4cf4788
Merge pull request #204 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
weisiong24 Nov 7, 2020
9cef4a2
Merge pull request #205 from weisiong24/BugFixes
yeapcl Nov 7, 2020
c3d8e69
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
yeapcl Nov 7, 2020
49400fb
Merge branch 'master' into branch-yeapcl-enhanceProgramUsability
yeapcl Nov 7, 2020
98e702f
Updated UserGuide,Developer Guide for updated edit command and Added …
Nov 7, 2020
5f92acd
Merge pull request #206 from weisiong24/BugFixes
weisiong24 Nov 7, 2020
4d25f52
Updated ppp
Nov 7, 2020
c7519e1
Merge pull request #207 from weisiong24/BugFixes
weisiong24 Nov 7, 2020
5b46506
Update ppp
Nov 7, 2020
c50136b
Merge pull request #208 from weisiong24/BugFixes
weisiong24 Nov 7, 2020
284287e
Updates ppp
Nov 7, 2020
20e0415
Merge pull request #209 from weisiong24/BugFixes
weisiong24 Nov 7, 2020
3ba815b
Added more exception types
yeapcl Nov 7, 2020
5be1b7b
edited outputstream for windows CI test
yeapcl Nov 7, 2020
9dd99d3
minor fix for checkstyle
yeapcl Nov 7, 2020
4b560e8
modified text formatting for windows gradle junit test
yeapcl Nov 7, 2020
5d4dcc2
edited expected runtest results
yeapcl Nov 7, 2020
6b39532
fix outputstream for windows
yeapcl Nov 7, 2020
39a1de6
Updates profie pic
Nov 8, 2020
a519411
Merge pull request #211 from weisiong24/BugFixes
weisiong24 Nov 8, 2020
073ccf6
Updates ppp
Nov 8, 2020
e33b28e
Merge pull request #212 from weisiong24/BugFixes
weisiong24 Nov 8, 2020
b62e122
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 8, 2020
510248f
Merge pull request #210 from yeapcl/branch-yeapcl-JUnitTest
tammykoh Nov 8, 2020
15195ff
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 8, 2020
72e4a2b
Added more to Manuel's PPP
manuelmanuntag96 Nov 8, 2020
5c31061
Merge pull request #213 from manuelmanuntag96/Manuel-PPP2
manuelmanuntag96 Nov 8, 2020
a0cb6e7
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 8, 2020
34f187b
Update manuelmanuntag96.md
manuelmanuntag96 Nov 8, 2020
b35e708
Update manuelmanuntag96.md
manuelmanuntag96 Nov 8, 2020
7ee8352
Update manuelmanuntag96.md
manuelmanuntag96 Nov 8, 2020
51f100c
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 8, 2020
b0202ce
Update manuelmanuntag96.md
manuelmanuntag96 Nov 8, 2020
42c2a1b
Updated PPP
yellow-fellow Nov 8, 2020
956d53b
Updated PPP
yellow-fellow Nov 8, 2020
e611798
Merge branch 'master' into tammy-fixing-bugs
tammykoh Nov 8, 2020
1b77694
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp …
yeapcl Nov 8, 2020
9c86357
Created 'clear /all' function
tammykoh Nov 8, 2020
4ceef92
Editted comments for clear command
tammykoh Nov 8, 2020
ef33ae6
bug fix
yeapcl Nov 8, 2020
9958b16
Added 'clear /all' into UG
tammykoh Nov 8, 2020
210ca08
Merge branch 'master' into tammy-developer-guide
tammykoh Nov 8, 2020
68f621c
bug fix
yeapcl Nov 8, 2020
506b0ca
Added activation bar for UI in find, list, delete, clear sequence dia…
tammykoh Nov 8, 2020
6147894
Merge branch 'tammy-fixing-bugs'
tammykoh Nov 8, 2020
b284b19
Merge branch 'tammy-developer-guide'
tammykoh Nov 8, 2020
25b4217
bug fix
yeapcl Nov 8, 2020
224126b
bug fix
yeapcl Nov 8, 2020
b45d36e
bug fix
yeapcl Nov 8, 2020
2ced37e
format fix attempt
yeapcl Nov 8, 2020
3dda531
format fix attempt
yeapcl Nov 8, 2020
8075136
finally found the elusive bug
yeapcl Nov 8, 2020
b6f9a11
Added PPP
tammykoh Nov 8, 2020
1e55864
Merge branch 'tammy-ppp'
tammykoh Nov 8, 2020
81e82f8
Merge branch 'master' into tammy-testing
tammykoh Nov 8, 2020
c7108dd
junit test for EditCommand 100% line coverage and successful on gradl…
yeapcl Nov 8, 2020
9aea675
JUnit for EditCommand
yeapcl Nov 8, 2020
d796ecd
Added more test for ClearCommand
tammykoh Nov 8, 2020
d7b8510
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp …
yeapcl Nov 8, 2020
b7ca1f8
code clean up
yeapcl Nov 8, 2020
c5e8f32
format fix
yeapcl Nov 8, 2020
eefe435
Merge pull request #215 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
yeapcl Nov 8, 2020
79fb149
further code clean up.
yeapcl Nov 8, 2020
0279a5d
slightly improved storage initialisation messages
yeapcl Nov 8, 2020
0b6350f
Merge pull request #216 from yeapcl/branch-yeapcl-enhanceProgramUsabi…
yeapcl Nov 8, 2020
e737e6b
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp …
yeapcl Nov 8, 2020
0a17c40
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
tammykoh Nov 9, 2020
b9e5429
Merge branch 'master' into tammy-testing
tammykoh Nov 9, 2020
3167aee
Included more test for ClearCommand to increase test coverage
tammykoh Nov 9, 2020
68d52ab
Added tests for DeleteCommand
tammykoh Nov 9, 2020
1b05634
Added test for FindCommand
tammykoh Nov 9, 2020
10a95ff
Added test for ListCommand
tammykoh Nov 9, 2020
7e92388
Added test to Parser for list, find, clear and delete commands
tammykoh Nov 9, 2020
b8664ad
Merge branch 'tammy-testing'
tammykoh Nov 9, 2020
a22cd6d
Fixed checkstyle error
tammykoh Nov 9, 2020
3441f95
Updated expected output
tammykoh Nov 9, 2020
420eb3a
Merge pull request #217 from tammykoh/master
yeapcl Nov 9, 2020
38caab1
updated PPP and UG
yeapcl Nov 9, 2020
519318d
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp …
yeapcl Nov 9, 2020
0b0c2e9
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 9, 2020
b617394
Added Remove Feature Details in UG
manuelmanuntag96 Nov 9, 2020
6ffcb4e
Merge pull request #218 from manuelmanuntag96/Manuel-RemoveUserUG
manuelmanuntag96 Nov 9, 2020
bd1a4ef
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
manuelmanuntag96 Nov 9, 2020
c3812c1
Edited Manuel's PPP part 3
manuelmanuntag96 Nov 9, 2020
a07ee12
Merge pull request #219 from manuelmanuntag96/Manuel-PPP3
manuelmanuntag96 Nov 9, 2020
c782ced
further update to PPP
yeapcl Nov 9, 2020
1229ea0
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp …
yeapcl Nov 9, 2020
1b3bb89
Merge pull request #220 from yeapcl/branch-yeapcl-Documentation
yeapcl Nov 9, 2020
2df1048
Update manuelmanuntag96.md
manuelmanuntag96 Nov 9, 2020
65aca4b
further update to UG and PPP
yeapcl Nov 9, 2020
609069f
Merge pull request #221 from yeapcl/branch-yeapcl-Documentation
yeapcl Nov 9, 2020
e310362
Update UserGuide.md
manuelmanuntag96 Nov 9, 2020
23cd0d6
updated test cases and UG
yeapcl Nov 9, 2020
7dba860
Added logging for list, clear, find and delete functions
tammykoh Nov 9, 2020
444762d
Merge branch 'master' into tammy-logging
tammykoh Nov 9, 2020
d34c5c3
Merge branch 'tammy-logging'
tammykoh Nov 9, 2020
d3e5f7c
Merge branch 'master' into tammy-testing
tammykoh Nov 9, 2020
dd61a00
added more javadoc and improved UG
yeapcl Nov 9, 2020
4986d4d
minor formatting fix
yeapcl Nov 9, 2020
d13bbb2
formatting fix
yeapcl Nov 9, 2020
809ec9c
Merge pull request #222 from yeapcl/branch-yeapcl-Documentation
yeapcl Nov 9, 2020
59697ce
Added test for compare command
tammykoh Nov 9, 2020
52718a0
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp …
tammykoh Nov 9, 2020
bfc412c
Merge branch 'master' into tammy-testing
tammykoh Nov 9, 2020
36d2352
Merge branch 'tammy-testing'
tammykoh Nov 9, 2020
a233d54
Fixed checkstyle
tammykoh Nov 9, 2020
4d74922
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp
tammykoh Nov 9, 2020
7ad5154
Merge pull request #223 from tammykoh/master
tammykoh Nov 9, 2020
af6aec0
Deleted temporary storage folder
tammykoh Nov 9, 2020
524d26c
further documentation update
yeapcl Nov 9, 2020
16873ee
update DG
yeapcl Nov 9, 2020
e8bfb1e
further update DG
yeapcl Nov 9, 2020
7c9c91e
Merge pull request #225 from yeapcl/branch-yeapcl-Documentation
yeapcl Nov 9, 2020
36d4012
Merge pull request #224 from tammykoh/master
yeapcl Nov 9, 2020
932bfde
updated JAR link to 2.1
yeapcl Nov 9, 2020
c5c339c
Merge pull request #226 from yeapcl/branch-yeapcl-Documentation
yeapcl Nov 9, 2020
d9f7cf3
Updated JAR link
tammykoh Nov 9, 2020
4da7466
Merge pull request #227 from tammykoh/master
yeapcl Nov 9, 2020
f21ab36
format fix
yeapcl Nov 9, 2020
5bc0a07
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T13-3/tp …
yeapcl Nov 9, 2020
d8497a5
Merge pull request #228 from yeapcl/branch-yeapcl-Documentation
yeapcl Nov 9, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,12 @@ src/main/resources/docs/
bin/

/text-ui-test/ACTUAL.txt
text-ui-test/EXPECTED-UNIX.TXT
AddCommand.log
AddCommand.log.1
AddCommand.log.2
LogInCommand.log.1
LogInCommand.log
LogInCommand.log.lck
AddCommand.log.3
data/duke.txt
AddCommand.log.lck
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = true
}
10 changes: 5 additions & 5 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

Display | Name | Github Profile | Portfolio
--------|:----:|:--------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Yeap Chun Lik | [Github](https://github.com/yeapcl) | [Portfolio](docs/team/yeapcl.md)
![](https://via.placeholder.com/100.png?text=Photo) | wei siong| [Github](https://github.com/weisiong24) | [Portfolio](docs/team/weisiong.md)
![](https://via.placeholder.com/100.png?text=Photo) | Tammy Koh | [Github](https://github.com/tammykoh) | [Portfolio](docs/team/tammykoh.md)
![](https://via.placeholder.com/100.png?text=Photo) | Manuntag Manuel II Papa | [Github](https://github.com/manuelmanuntag96) | [Portfolio](docs/team/manuelmanuntag.md)
![](https://via.placeholder.com/100.png?text=Photo) | Huang Shaohang | [Github](https://github.com/yellow-fellow) | [Portfolio](docs/team/yellow-fellow.md)
151 changes: 144 additions & 7 deletions docs/DeveloperGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,138 @@

## Design & implementation

{Describe the design and implementation of the product. Use UML diagrams and short code snippets where applicable.}
### Add Function

#### System Architecture of the Add Function<br/>

![](team/Architect-digram.PNG)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this diagram it looks like the user can by pass the interface and directly add commands? Its a bit confusing whether this was intended or why it was designed this way. Further explanation on this part of the diagram would be helpful

image


The Architecture Diagram given above explains the high-level design of the add command.<br/>

Below we will discuss a quick overview of each component.

* UI: The User Interface of the app<br/>
* Add Command: The main logic command of the add function<br/>
* Timetable: The arraylist where events that are added are stored accordingly<br/>

#### Design of the Add Function<br/>

UML Class Diagram of the Add function:
![](team/uml.PNG)<br/>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The UML diagram looked a bit strange with the large blank spaces within the classes and the much smaller font used for the multiplicities.

image

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The filled in black arrow heads were to be avoided iirc? (inheritance or association issue?)

image


1) The Add function gets the inputs from the User and places it to the event class so that
it can parser to string.<br/>
2) It will then pass the event data onto UI class to display and inform user of the event added
to the timetable.<br/>
3) Next,the add function will pass all the parameters (event name,day,time
and location) to the timetable class into its arraylist divided by the day of the week<br/>

#### Sequence Design of Add Function<br/>
![](team/seqdiagram.jpg)<br/>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

You could perhaps indicate more clearly where the arrows are coming from or going.
For the sake of neatness you could try to do the diagrams in software like powerpoint some or uml creator or something instead of writing cause the pencil marks here are a bit messy sorry

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could also perhaps use the same software to create your uml diagrams for the sake of consistency, as the diagrams vary in style along the document.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

  1. parsedInputs[] cannot be a method call.
  2. "Return" lines should orginate from the point of deactivation
  3. "new event" method call line should not point backwards in time. Perhaps you can reformat this diagram such that it is a straight line.


#### Improvements to be made to Version 2.0<br/>
* To ensure that the users do not enter duplicate event that has the same timing or in between the time
that is entered.
* A verification check is added to the add command of the version 2.0 of WhereGotTime.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could perhaps add a segment to explain the above sequence diagram?

E.g.
* add /CS2113 Lec /Mon /1200-1400 /LT21<br/>
* add /CS2113 Lec /Mon /1300-1400 /LT22<br/>
* add /CS2040C Tut /Mon /1300-1500 /LT32<br/>

The above would result in the first line being add,
while the other two will result in the app giving an error message
prompting the user to re-enter again.<br/>

### Edit Function<br/>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This segment seems incomplete? Minimally some description of what these functions are instead of simply listing would be helpful to the reader.


### Delete Function<br/>

### Clear Function<br/>

### Display Function<br/>

### Compare Function<br/>
#### System Architecture of the Compare Function<br/>
![](team/CompareCommand_ClassDiagram.jpg) <br/>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

this diagram faces a similar issue of why the user can by pass the ui as mentioned above

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue with the second "blue" user.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

For this diagram why are there two different coloured users and why do they have different access to the program? The purpose of drawing this additional user and their role is unclear, even in the explanation below.

The duplicated timetable box is also confusing.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Here is there supposed to be a chronological order to the diagram that I haven't noticed.?
If not then the 2 users and 2 timetables confound the reader.

The System Architecture given above explains the high-level design of the <b>COMPARE</b> command.<br/>

Listed below are some features we will be highlighting:<br/>

* Ui: The User Interface of the app<br/>
* CompareCommand: The main logic command of the <b>COMPARE</b> function<br/>
* Timetable: The arraylist where events that are added are stored accordingly<br/>
* User: User(s) of the program<br/>
* UserList: An arraylist of User<br/>

#### Design of the Compare Function<br/>
![](team/CompareCommand_UML_Diagram.jpg)<br/>

1) The <b>COMPARE</b> function gets the inputs from the User and retrieves the User's / Target User's<br/>
timetables based on a specific day. It will then compare the timetables and return an arraylist
of common timeslots.<br/>
2) It will then pass the arraylist onto Ui class to display the range of common <br/>
timeslots the User and Target User have on a specific day of the week.<br/>


#### Sequence Design of Compare Function<br/>
![](team/CompareCommand_SequenceDesign.jpg) <br/>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

For this diagram it is a bit disorganized and confusing.

Firstly, it is a bit unclear whether the User class here refers to the User class in the compare function (in which case there shouldn't be a random method call coming from it) or if it refers to an actual user (in which case the notation should be the stick figure not the class header)

Secondly, from the CompareCommand activation bar has an unknown return coming from the middle of the activation bar, while the parsedInputs method call being made to the same activation bar is too low down. This is also the case with the activation bar for the self invoked method call execute and the common time array method call to the UI class.

It is also unclear where the method call to the UI intends to return to as it is chronologically further down than the end of the return from the parsedInputs method.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Here there is a significant lack of explaination given and the diagram appears to be slightly messy and confounding. For example what is the user written here. Is it a class or the user operating the program.


#### Improvements to be made to Version 2.0<br/>
* Display a range of timings instead of individual hours<br/>
* Remove edge cases<br/>

E.g.<br/>
* compare /Alex /Mon<br/>
* compare /Tammy /Mon<br/>

These cases above would no longer output "0000HR, 0100HR" etc but
instead "0000HR - 1000HR"

### Login Function
#### Class Diagram
![](team/LogInCommand_Class_Diagram_v001.png)

#### Sequence Diagram
![](team/LogInCommand_Sequence_v001.png)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing colons for all objects
image

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opt should be used instead of alt here as there are no alternatives provided.

1.) When the user inputs a Login Command, a LogInCommand Object is created with the input member Username and Password.
<br/>
2.) The Login Command is then executed by sending the users UserList, ui Ui and the User nowUser to the method where
it search the users to check if the input Username already exists with the correct password.
<br/>
3.) If the User already exists, it will return the User back to the method as currentUser. Otherwise, it will create a
User with the input Username and Password.
<br/>

#### Improvements to be made to Version 2.0<br/>
* In order to protect the User's privacy, the User's Passwords have been encrypted on the save file.
* A Cryptography Class with encipherPassword and decipherPassword has been implemented as part of the version 2.0 of
WhereGotTime.

## Product scope
### Target user profile

{Describe the target user profile}
Our Application, WhereGotTime is developed for University students.

### Value proposition

{Describe the value proposition: what problem does it solve?}
It was developed to solve the inconvenience students face when accessing timetables and lecture venues and
to keep track of their timetable.
It is also developed to assist in finding common available time slots for students to study with their peers.

## User Stories

|Version| As a ... | I want to ... | So that I can ...|
|--------|----------|---------------|------------------|
|v1.0|new user|see usage instructions|refer to them when I forget how to use the application|
|v2.0|user|find a to-do item by name|locate a to-do without having to go through the entire list|
|v1.0|new user|login to my own timetable|be sure that it is my own timetable that is shown there|
|v1.0|new user|add events into my timetable for the day|refer to the timetable to remind me of the event|
|v1.0|new user|edit events that I have entered into my timetable for the day|easily change the details as I need it|
|v1.0|new user|delete events in my timetable for the day|remove an event in the timetable that I do not wish to keep|
|v1.0|new user|clear my timetable for the day|so that I can remove all the entries I have entered wrongly|
|v1.0|new user|compare my timetable with my friends|schedule a common time for revision together|
|v2.0|user|have my password encrypted|only I can access my own timetables|
|v2.0|user|be assured that my inputs are correctly added|my input are correctly convey into the timetable|
|v2.0|user|access my saved timetables|I do not have to manually enter the timetables again|

## Non-Functional Requirements

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part was left empty.
image


Expand All @@ -31,4 +145,27 @@

## Instructions for manual testing
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it better to follow the format given in here?


{Give instructions on how to do a manual product testing e.g., how to load sample data to be used for testing}
login Alex /123123<br/>
add /CS2113 Lec /mon /1200-1300 /LT21<br/>
add /CS3243 Lec /mon /1400-1500 /LT22<br/>
add /CS2040C Tut /mon /0800-1000 /COM1-2<br/>
add /CG2028 Tut /Thu /0900-1100 /E4-4-1<br/>
add /CG2023 Lec /Fri /1700-1800 /E7-3-10<br/>
list /all<br/>
list /mon<br/>
edit /mon /3 /1300-1400<br/>
edit /fri /1 /0900-1100<br/>
list /all<br/>
list /mon<br/>
login Tammy /321321<br/>
add /CS2113 Lec /mon /1200-1300 /LT21<br/>
add /CS2040C Tut /mon /0800-1000 /COM1-2<br/>
add /CG2028 Tut /Thu /0900-1100 /E4-4-1<br/>
compare /Alex /mon<br/>
list /mon<br/>
edit /mon /2 /1000-1200<br/>
compare /Alex /mon<br/>
login Alex /123123<br/>
delete /mon /2<br/>
clear /fri<br/>
bye<br/>
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Duke
# WhereGotTime

{Give product intro here}
An useful timetable app where you can enter events and compare timetable to find common timeslot between you and your peers.

Useful links:
* [User Guide](UserGuide.md)
Expand Down
61 changes: 46 additions & 15 deletions docs/UserGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,61 @@

## Introduction

{Give a product intro}
WhereGotTime is an application for the student to check their timetable and compare them against their peers for a common timeslot to be able so that they can schedule a study time together

## Quick Start

{Give steps to get started quickly}

1. Ensure that you have Java 11 or above installed.
1. Down the latest version of `Duke` from [here](http://link.to/duke).
1. Ensure you have Java 11 or above installed in your Computer.
1. Down the latest version of WhereGotTime.jar from [here](https://github.com/AY2021S1-CS2113-T13-3/tp/releases/tag/v1.0).
1. Copy the jar file into an empty folder you want to use as the home folder for your WhereGotTime.
1. Open a command window in that folder
1. Run the command java -jar {filename}.jar e.g., java -jar Duke.jar (i.e., run the command in the same folder as the jar file)
1. Type the command in the command box and press Enter to execute it. e.g. typing <strong>exit</strong> and pressing Enter will close the app.<br/>
Some example commands you can try:
1. login John Snow /123123: login as John Snow
1. add /CS2113 Lec /fri /1600-1800 /lt23: Adds an event named CS2113 Lecture for current logged in the student (John Snow) to Time Table
1. edit /mon /3 /1300-1400 : Edits an event named CS2113 on Fri for current logged in student (John Snow) in the TimeTable
1. list /all: list of all the classes that John Snow has in a new line, enumerated.
1. delete 2 : Deletes the 2nd class shown in the current list.
1. clear /day: Deletes all classes in the current list for John Snow

## Features
* Login user
* Add timetable
* Edit timetable
* Compare timetable
* Delete timetable
* Clear timetable
* exit program

### Adding a timetable: `add`
Adds a new timetable to the list of timetable arraylist.

Format: `add /event name /day /timeStart-timeEnd /Location`

Example of usage:

{Give detailed description of each feature}

### Adding a todo: `todo`
Adds a new item to the list of todo items.
`add /CS2040C Tut /mon /0800-1000 /COM1-2`

Format: `todo n/TODO_NAME d/DEADLINE`
`add /CG2028 Tut /Thu /0900-1100 /E4-4-1`

* The `DEADLINE` can be in a natural language format.
* The `TODO_NAME` cannot contain punctuation.
### Comparing timetables: `compare`
Compares current User's timetable to Target user's timetable.

Format: `compare /TargetUser's name /day`

Example of usage:

`todo n/Write the rest of the User Guide d/next week`
`compare /Alex /Mon`

`compare /Tammy /Mon`

### Exiting the program: `bye`
Exits the Program<br/>

Format: `bye`


`todo n/Refactor the User Guide to remove passive voice d/13/04/2020`

## FAQ

Expand All @@ -39,4 +68,6 @@ Example of usage:

{Give a 'cheat sheet' of commands here}

* Add todo `todo n/TODO_NAME d/DEADLINE`
* Add timetable `add /event name /day /timeStart-timeEnd /Location`
* Edit timetable `edit /day /index /timeStart-timeEnd`
* Exit program `bye`
1 change: 1 addition & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-slate
Binary file added docs/team/Architect-digram.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/team/CompareCommand_ClassDiagram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/team/CompareCommand_SequenceDesign.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/team/CompareCommand_UML_Diagram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/team/LogInCommand_Class_Diagram_v001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/team/LogInCommand_Sequence_v001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/team/seqdiagram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/team/uml.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/main/java/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: seedu.duke.Duke

67 changes: 64 additions & 3 deletions src/main/java/seedu/duke/Duke.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,72 @@
package seedu.duke;

import java.util.Scanner;
import seedu.duke.command.AddCommand;
import seedu.duke.command.Command;
import seedu.duke.command.LogInCommand;
import seedu.duke.exception.DukeException;
import seedu.duke.parser.Parser;
import seedu.duke.task.TaskList;
import seedu.duke.ui.Ui;
import seedu.duke.user.User;
import seedu.duke.user.UserList;

import seedu.duke.storage.Storage;

public class Duke {

private Storage storage;
private TaskList tasks;
private UserList users;
private final Ui ui;

public Duke() {
ui = new Ui();
try {
users = new UserList();
storage = new Storage();
storage.load(users);
} catch (DukeException e) {
users = new UserList();
ui.showError(e.getMessage());
}
}

public void run() {
ui.showWelcome();
boolean isExit = false;
User nowUser = null;
while (!isExit) {
try {
String fullCommand = ui.readCommand();
ui.showLine(); // show the divider line ("_______")
Command c = Parser.parse(fullCommand);
c.execute(users, ui, nowUser/*, storage*/);
storage.write(users);

if (c.isLogIn()) {
nowUser = c.getCurrentUser();
//System.out.println(nowUser.getName() + users.getTotalUserCount());
}
//System.out.println(nowUser.getName());
isExit = c.isExit();
} catch (DukeException e) {
ui.showError(e.getMessage());
} finally {
ui.showLine();
}
}
}

public static void main(String[] args) {
new Duke().run();
}



/**
* Main entry-point for the java.duke.Duke application.
*/
public static void main(String[] args) {
/* public static void main(String[] args) {
String logo = " ____ _ \n"
+ "| _ \\ _ _| | _____ \n"
+ "| | | | | | | |/ / _ \\\n"
Expand All @@ -17,5 +77,6 @@ public static void main(String[] args) {

Scanner in = new Scanner(System.in);
System.out.println("Hello " + in.nextLine());
}

}*/
}
Loading