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

[F11-3] TaskLinker #28

Closed
wants to merge 328 commits into from
Closed
Show file tree
Hide file tree
Changes from 97 commits
Commits
Show all changes
328 commits
Select commit Hold shift + click to select a range
b346920
Merge pull request #32 from wendelinwemhoener/master
wendelinwemhoener Oct 19, 2023
8083d7c
Merge pull request #1 from Brian030601/A-CalendarIssues
Brian030601 Oct 19, 2023
3e94866
Merge branch 'master' into master
Brian030601 Oct 19, 2023
012d36d
Merge pull request #33 from Brian030601/master
Brian030601 Oct 19, 2023
647b47e
Unify calendar and flashcard mode
wendelinwemhoener Oct 19, 2023
418ce43
Merge pull request #34 from wendelinwemhoener/unify-flashcard-and-cal…
wendelinwemhoener Oct 19, 2023
3cf93fe
Format for Event Storage
junhyeong0411 Oct 19, 2023
44cee0d
Format for Event Storage
junhyeong0411 Oct 19, 2023
f62ccac
Merge pull request #36 from junhyeong0411/master
junhyeong0411 Oct 19, 2023
18e8f65
Added Event Storage
junhyeong0411 Oct 19, 2023
913c42c
Merge pull request #37 from junhyeong0411/master
junhyeong0411 Oct 19, 2023
b60ffc3
Merge pull request #4 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Oct 20, 2023
a8eff67
Fix UI Messages
Brian030601 Oct 20, 2023
4c5ded5
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Oct 20, 2023
77a2404
delete assertion
junhyeong0411 Oct 20, 2023
fddc134
re-add assertions
junhyeong0411 Oct 20, 2023
051176a
Adding loggers
junhyeong0411 Oct 20, 2023
f2cf466
Logging edited
junhyeong0411 Oct 20, 2023
fdc7f47
Logging edited 2
junhyeong0411 Oct 20, 2023
8691f15
Improve Ui
Brian030601 Oct 20, 2023
afff1d7
Get back to no-assertion
junhyeong0411 Oct 20, 2023
d0c716e
Logging again
junhyeong0411 Oct 20, 2023
bfe60a3
Merge pull request #40 from junhyeong0411/master
junhyeong0411 Oct 20, 2023
20d423d
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Oct 20, 2023
93549d4
Explain how to use flashcards in the UG
wendelinwemhoener Oct 22, 2023
f6aa40b
Merge pull request #48 from wendelinwemhoener/improve-flashcard-docum…
wendelinwemhoener Oct 22, 2023
f940601
Implement basic help command
wendelinwemhoener Oct 22, 2023
e813cf2
Merge pull request #49 from wendelinwemhoener/add-help-command
wendelinwemhoener Oct 22, 2023
ff87f96
Allow rating the difficulty of a review
wendelinwemhoener Oct 22, 2023
32bc6bb
Merge pull request #51 from wendelinwemhoener/allow-rating-review-dif…
wendelinwemhoener Oct 22, 2023
bf3d233
Add ability to delete all flashcards
wendelinwemhoener Oct 23, 2023
4158e27
Implement delete single flashcard feature
wendelinwemhoener Oct 24, 2023
e031d09
Merge pull request #54 from wendelinwemhoener/allow-deleting-flashcards
wendelinwemhoener Oct 24, 2023
c5ad99d
Handle empty flashcardlist when listing flashcards
wendelinwemhoener Oct 24, 2023
a1f94ee
Implement calculating global flashcard id
wendelinwemhoener Oct 24, 2023
ff329d5
Merge pull request #55 from wendelinwemhoener/minor-flashcard-usabili…
wendelinwemhoener Oct 24, 2023
8d89909
Making Java CI test pass
junhyeong0411 Oct 25, 2023
daf32ed
Merge pull request #56 from junhyeong0411/master
junhyeong0411 Oct 25, 2023
20104be
Making Java CI test pass (again)
junhyeong0411 Oct 25, 2023
281140a
Merge pull request #57 from junhyeong0411/master
junhyeong0411 Oct 25, 2023
f9dbd3e
Add expert mode for deleting and reviewing
wendelinwemhoener Oct 26, 2023
7931262
Merge pull request #58 from wendelinwemhoener/add-new-command-syntax
wendelinwemhoener Oct 26, 2023
5111380
Merge pull request #5 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Oct 26, 2023
cfc6c28
Update DeveloperGuide.md about storage
junhyeong0411 Oct 26, 2023
df39bcd
Update DG with user stories
wendelinwemhoener Oct 26, 2023
261fd82
Merge pull request #60 from wendelinwemhoener/add-flashcards-to-dg
wendelinwemhoener Oct 26, 2023
036d5b4
Merge pull request #6 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Oct 27, 2023
d96c628
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Oct 27, 2023
49a7356
Add Calendar Components to DG
Brian030601 Oct 27, 2023
44ca7c0
Merge pull request #62 from Brian030601/master
Brian030601 Oct 27, 2023
f9bafd2
Merge pull request #7 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Oct 29, 2023
3ef61d9
Save Flsahcard review
junhyeong0411 Nov 1, 2023
d29bf66
Merge pull request #64 from junhyeong0411/master
junhyeong0411 Nov 1, 2023
f4057bf
Save Flsahcard id
junhyeong0411 Nov 1, 2023
7fa78eb
Merge pull request #65 from junhyeong0411/master
junhyeong0411 Nov 1, 2023
de5908d
Update UserGuide.md
junhyeong0411 Nov 1, 2023
b687034
Added some logs
junhyeong0411 Nov 1, 2023
72da6d7
Merge pull request #66 from junhyeong0411/master
junhyeong0411 Nov 1, 2023
a0c8455
Added some Test
junhyeong0411 Nov 2, 2023
482aeac
Resolve Codestyle Error
junhyeong0411 Nov 2, 2023
19841ea
Merge pull request #67 from junhyeong0411/master
junhyeong0411 Nov 2, 2023
f7cc236
Add FindEvent & DeleteAllEvent
Brian030601 Nov 2, 2023
5d72f0b
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 2, 2023
115bdba
Merge pull request #69 from Brian030601/master
Brian030601 Nov 2, 2023
5427ad9
Merge pull request #8 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 2, 2023
cc99fef
Fix Command Formatting
Brian030601 Nov 2, 2023
5227adf
Remove txt files
Brian030601 Nov 2, 2023
f798d69
Resolve data directory error
junhyeong0411 Nov 2, 2023
11a1094
Merge remote-tracking branch 'upstream/master'
junhyeong0411 Nov 2, 2023
67efcbf
Merge pull request #71 from Brian030601/master
Brian030601 Nov 2, 2023
c575b52
Disable INFO logs
junhyeong0411 Nov 2, 2023
ec59735
Add event txt
junhyeong0411 Nov 2, 2023
09e24fe
Add event txt again
junhyeong0411 Nov 2, 2023
76051f4
Merge branch 'master' into master
junhyeong0411 Nov 2, 2023
e47704f
Merge pull request #73 from junhyeong0411/master
junhyeong0411 Nov 2, 2023
8018be8
Write Userguide
Brian030601 Nov 2, 2023
2d7f50f
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 2, 2023
e0566a0
Change Command Names
Brian030601 Nov 2, 2023
8322567
Merge pull request #74 from Brian030601/master
Brian030601 Nov 2, 2023
7c50237
Update DG
Brian030601 Nov 2, 2023
c1c3c25
Merge pull request #76 from Brian030601/master
Brian030601 Nov 2, 2023
36e08cc
Fix null reference error in delete flashcard cmd
wendelinwemhoener Nov 2, 2023
c98f163
Merge pull request #77 from wendelinwemhoener/fix-null-pointer-error
wendelinwemhoener Nov 2, 2023
81d2a9a
Add spaced repetition flashcard mode
wendelinwemhoener Nov 2, 2023
b359c58
Merge pull request #78 from wendelinwemhoener/add-spaced-repetition-mode
wendelinwemhoener Nov 2, 2023
90c4608
Changed Storage
junhyeong0411 Nov 2, 2023
a011ec3
Changed Storage (more)
junhyeong0411 Nov 2, 2023
b25fe19
Merge pull request #79 from junhyeong0411/master
junhyeong0411 Nov 2, 2023
acaca86
Changed Storage (more)
junhyeong0411 Nov 2, 2023
f9d4284
Add FlashcardStorage puml
junhyeong0411 Nov 2, 2023
c9e21bb
Merge pull request #80 from junhyeong0411/master
junhyeong0411 Nov 2, 2023
52417f1
Add FlashcardStorage puml image
junhyeong0411 Nov 2, 2023
622d277
Merge pull request #81 from junhyeong0411/master
junhyeong0411 Nov 2, 2023
b0a159a
Add Storage puml to DeveloperGuide
junhyeong0411 Nov 2, 2023
5dfcd28
Add deleting flashcards to UG
wendelinwemhoener Nov 3, 2023
e1833f6
Merge pull request #82 from wendelinwemhoener/improve-ug
wendelinwemhoener Nov 3, 2023
a746f34
Merge pull request #9 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 3, 2023
1a9ed5a
Add JavaDoc to flashcards
wendelinwemhoener Nov 3, 2023
5ba3bfe
Merge pull request #83 from wendelinwemhoener/add-flashcard-javadoc
wendelinwemhoener Nov 3, 2023
e86cd05
Merge pull request #10 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 5, 2023
abd888c
Updated event printing to centralised location in Event object
Cheezeblokz Nov 5, 2023
15de82c
Added expert command input class and incorporated expert command inpu…
Cheezeblokz Nov 5, 2023
d798070
Merge pull request #115 from Cheezeblokz/master
Cheezeblokz Nov 5, 2023
737fcd5
Fix Delete Event Bug
Brian030601 Nov 6, 2023
1751c8e
Merge pull request #116 from Brian030601/master
Brian030601 Nov 6, 2023
29b9680
Fix Exit & Find Bug
Brian030601 Nov 6, 2023
f5a5d15
Merge pull request #117 from Brian030601/master
Brian030601 Nov 6, 2023
3693a46
Fix AddEvent Time
Brian030601 Nov 6, 2023
9e3a64d
Merge pull request #118 from Brian030601/master
Brian030601 Nov 6, 2023
9503102
Add Exceptions
Brian030601 Nov 6, 2023
67360f0
Merge pull request #119 from Brian030601/master
Brian030601 Nov 6, 2023
6cfa449
Add JavaDoc
Brian030601 Nov 7, 2023
0658db7
Update ReadMe
Brian030601 Nov 7, 2023
f68a5b5
Merge pull request #120 from Brian030601/master
Brian030601 Nov 7, 2023
8fe143a
Merge pull request #11 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 8, 2023
28dcb76
- Added goal event relevant classes for keeping track of flashcard count
Cheezeblokz Nov 9, 2023
b28958f
-Integrated goal event adding capabilities to existing system
Cheezeblokz Nov 9, 2023
b4126f4
Merge pull request #121 from Cheezeblokz/master
Cheezeblokz Nov 9, 2023
a47d8b7
Merge pull request #12 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 9, 2023
591785e
- Implemented DualEventCommand class for handling expert inputs for e…
Cheezeblokz Nov 9, 2023
c2030dd
- Implemented dual input method (beginner and expert) for add event a…
Cheezeblokz Nov 9, 2023
52d8a15
Update bangjunhyeong.md
junhyeong0411 Nov 9, 2023
fbc0b16
Merge pull request #122 from Cheezeblokz/master
Cheezeblokz Nov 9, 2023
c1b3d17
Update UG
wendelinwemhoener Nov 9, 2023
3211e0e
Merge pull request #123 from wendelinwemhoener/fix-pde-bugs-flashcards
wendelinwemhoener Nov 9, 2023
acd8d8f
Add difficulty entry bug
wendelinwemhoener Nov 9, 2023
50c2a43
Merge pull request #124 from wendelinwemhoener/fix-difficulty-entry-u…
wendelinwemhoener Nov 9, 2023
05988ff
Fix random review mode
wendelinwemhoener Nov 9, 2023
926e67d
Merge pull request #125 from wendelinwemhoener/fix-random-review-mode
wendelinwemhoener Nov 9, 2023
4e66e2a
Fix capitalization issues
wendelinwemhoener Nov 9, 2023
8a87a53
Merge pull request #126 from wendelinwemhoener/fix-command-capitaliza…
wendelinwemhoener Nov 9, 2023
ae90ca5
Update UG with info about flashcard id
wendelinwemhoener Nov 9, 2023
acead75
Merge pull request #128 from wendelinwemhoener/update-ug-with-flashca…
wendelinwemhoener Nov 9, 2023
f9e3aae
Stop accepting extra words after commands
wendelinwemhoener Nov 9, 2023
ac318ea
Merge pull request #129 from wendelinwemhoener/dont-accept-extra-word…
wendelinwemhoener Nov 9, 2023
bd9d2e6
Disallow extra words in command input
wendelinwemhoener Nov 9, 2023
634f2e9
Merge pull request #130 from wendelinwemhoener/no-extra-words
wendelinwemhoener Nov 9, 2023
a3155ea
Rename bangjunhyeong.md to junhyeong0411.md
junhyeong0411 Nov 9, 2023
4f745be
Add wendelinwemhoener PPP
wendelinwemhoener Nov 9, 2023
9c55afa
Merge pull request #131 from wendelinwemhoener/add-wendelinwemhoener-ppp
wendelinwemhoener Nov 9, 2023
9e2bcc7
Fix typo
wendelinwemhoener Nov 9, 2023
9a1a605
Merge pull request #132 from wendelinwemhoener/fix-flashcard-typo
wendelinwemhoener Nov 9, 2023
98c92c7
Draft PPP
Brian030601 Nov 9, 2023
b6e8820
Merge pull request #133 from Brian030601/master
Brian030601 Nov 9, 2023
bd306cf
Draft PPP 1.0v
Brian030601 Nov 9, 2023
3189f2b
Merge pull request #134 from Brian030601/master
Brian030601 Nov 9, 2023
72f1031
Merge pull request #13 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 10, 2023
230e87b
Add exception for file changes in flashcard.txt
junhyeong0411 Nov 10, 2023
e62b18d
Merge pull request #135 from junhyeong0411/master
junhyeong0411 Nov 10, 2023
ff8cb87
Add exception for file changes in event.txt
junhyeong0411 Nov 10, 2023
a893037
Restore event.txt file
junhyeong0411 Nov 10, 2023
138bcf3
Merge pull request #137 from junhyeong0411/master
junhyeong0411 Nov 10, 2023
435c297
Disallow creating empty flashcards
wendelinwemhoener Nov 11, 2023
05c5c3d
Merge pull request #138 from wendelinwemhoener/disallow-empty-flashcards
wendelinwemhoener Nov 11, 2023
70a5c2a
Disallow empty flashcard back
wendelinwemhoener Nov 11, 2023
c73bf41
Merge pull request #139 from wendelinwemhoener/disallow-empty-flashca…
wendelinwemhoener Nov 11, 2023
146311d
Merge pull request #14 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 12, 2023
8ab034c
- Implemented dual input command for delete event and find event
Cheezeblokz Nov 12, 2023
7cd4dda
- Implementation of calendar into flashcard component to increment fl…
Cheezeblokz Nov 12, 2023
a8f0822
- fixed gradle code formatting errors
Cheezeblokz Nov 12, 2023
19aa81d
Merge pull request #140 from Cheezeblokz/master
Cheezeblokz Nov 12, 2023
f7c2ea7
Improve Javadoc
wendelinwemhoener Nov 12, 2023
0f3b5fd
Merge branch 'master' into add-assertions-and-javadoc
wendelinwemhoener Nov 12, 2023
643dff1
Merge pull request #141 from wendelinwemhoener/add-assertions-and-jav…
wendelinwemhoener Nov 12, 2023
5c38987
Merge pull request #15 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 12, 2023
57ecb03
Add Javadoc
wendelinwemhoener Nov 12, 2023
46e0909
Merge pull request #142 from wendelinwemhoener/fix-calendar-integration
wendelinwemhoener Nov 12, 2023
56a2586
Minor changes
wendelinwemhoener Nov 12, 2023
5ba0d48
Merge pull request #143 from wendelinwemhoener/refactoring
wendelinwemhoener Nov 12, 2023
7ed4fba
Update UG
wendelinwemhoener Nov 12, 2023
c39af40
Merge pull request #144 from wendelinwemhoener/improve-ug-further
wendelinwemhoener Nov 12, 2023
98f97c0
Fix RepoSense
Brian030601 Nov 12, 2023
3011f85
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 12, 2023
ab95457
Merge pull request #145 from Brian030601/master
Brian030601 Nov 12, 2023
af3498b
Added dual commands to UG
wendelinwemhoener Nov 12, 2023
6918a0d
Merge pull request #146 from wendelinwemhoener/add-dual-command-to-ug
wendelinwemhoener Nov 12, 2023
67b3817
Merge pull request #16 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 13, 2023
6665b9f
Fix RepoSense
Brian030601 Nov 13, 2023
2c1eeb3
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 13, 2023
8e62ec5
Add more exception-handling
wendelinwemhoener Nov 13, 2023
ff2ed43
Added more logging
wendelinwemhoener Nov 13, 2023
cbff51f
Merge pull request #148 from wendelinwemhoener/add-logging-and-more-e…
wendelinwemhoener Nov 13, 2023
7cb8385
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 13, 2023
ff87cbe
Fix Git Username
Brian030601 Nov 13, 2023
3b55748
Add links to DG
wendelinwemhoener Nov 13, 2023
e5c1734
Merge pull request #149 from wendelinwemhoener/add-flashcards-to-dg
wendelinwemhoener Nov 13, 2023
4f205aa
Update UG
Brian030601 Nov 13, 2023
815057d
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 13, 2023
4bb7f00
Merge pull request #150 from Brian030601/master
Brian030601 Nov 13, 2023
556ac73
Add JUnit Tests
Brian030601 Nov 13, 2023
bdcd066
Merge pull request #17 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 13, 2023
d080eab
Add some Javadoc
junhyeong0411 Nov 13, 2023
80d2fe4
Merge remote-tracking branch 'upstream/master'
junhyeong0411 Nov 13, 2023
5550963
Merge pull request #151 from junhyeong0411/master
junhyeong0411 Nov 13, 2023
3bfbf08
Merge pull request #18 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 13, 2023
9f69f5a
no message
Cheezeblokz Nov 13, 2023
ddea79d
Add Glosarry & Non-Functional Requirements
Brian030601 Nov 13, 2023
994983c
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 13, 2023
280e114
Revert "no message"
Cheezeblokz Nov 13, 2023
d4eb3f8
Add class diagram
wendelinwemhoener Nov 13, 2023
80dd6de
Merge pull request #152 from wendelinwemhoener/add-flashcards-to-dg
wendelinwemhoener Nov 13, 2023
7e4efbe
Draft Manual Test
Brian030601 Nov 13, 2023
a2806ec
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 13, 2023
3e9bca2
Add Acknowledgements
Brian030601 Nov 13, 2023
8a43369
Merge pull request #153 from Brian030601/master
Brian030601 Nov 13, 2023
afcf26e
Update junhyeong0411.md
junhyeong0411 Nov 13, 2023
c705a14
Update junhyeong0411.md
junhyeong0411 Nov 13, 2023
76cb15a
Update DeveloperGuide.md
junhyeong0411 Nov 13, 2023
a2f6808
Merge branch 'master' of https://github.com/junhyeong0411/tp
junhyeong0411 Nov 13, 2023
7fe34e3
Refactor some java files
junhyeong0411 Nov 13, 2023
f8d650a
Merge pull request #19 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 13, 2023
e46dc71
Update junhyeong0411.md
junhyeong0411 Nov 13, 2023
a783702
- Updated Developer Guide Calendar package class diagram
Cheezeblokz Nov 13, 2023
4fc532c
Merge branch 'master' of https://github.com/Cheezeblokz/tp
Cheezeblokz Nov 13, 2023
8c1d6da
Update junhyeong0411.md
junhyeong0411 Nov 13, 2023
ef016ae
Merge pull request #154 from junhyeong0411/master
junhyeong0411 Nov 13, 2023
36b4349
Update junhyeong0411.md
junhyeong0411 Nov 13, 2023
ed4e6b6
Update junhyeong0411.md
junhyeong0411 Nov 13, 2023
a685520
Update PPP
Brian030601 Nov 13, 2023
3b466ca
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 13, 2023
461e422
- Developer Guide Update
Cheezeblokz Nov 13, 2023
b77ece1
Merge pull request #20 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 13, 2023
dc530a9
Merge pull request #155 from Cheezeblokz/master
Cheezeblokz Nov 13, 2023
bba4a21
Update DG
Brian030601 Nov 13, 2023
d5a9e77
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 13, 2023
05860c3
Update PPP
Cheezeblokz Nov 13, 2023
8000634
Merge pull request #21 from AY2324S1-CS2113-F11-3/master
Cheezeblokz Nov 13, 2023
0264189
Merge pull request #156 from Cheezeblokz/master
Cheezeblokz Nov 13, 2023
c1915ed
Update DG
Brian030601 Nov 13, 2023
a89ed2a
Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp
Brian030601 Nov 13, 2023
8e71ffe
Merge pull request #157 from Brian030601/master
Brian030601 Nov 13, 2023
8cd1a37
Finish PPP
Brian030601 Nov 13, 2023
bd14b6e
Merge pull request #158 from Brian030601/master
Brian030601 Nov 13, 2023
b0063ea
Update UG
wendelinwemhoener Nov 13, 2023
8ebca4c
Merge pull request #159 from wendelinwemhoener/add-flashcards-to-dg
wendelinwemhoener Nov 13, 2023
be81f9c
Minor improvements
wendelinwemhoener Nov 13, 2023
45fa4df
Merge pull request #160 from wendelinwemhoener/further-flashcard-dg-i…
wendelinwemhoener Nov 13, 2023
350bb27
Merge pull request #161 from junhyeong0411/master
junhyeong0411 Nov 13, 2023
92924c8
Update PPP
wendelinwemhoener Nov 13, 2023
2f37f82
Merge pull request #162 from wendelinwemhoener/further-flashcard-dg-i…
wendelinwemhoener Nov 13, 2023
1439853
Add info about sequence diagram
wendelinwemhoener Nov 13, 2023
66044c2
Implement minor changes to PPP
wendelinwemhoener Nov 13, 2023
44f06b2
Update PPP
wendelinwemhoener Nov 13, 2023
242d609
Merge pull request #163 from wendelinwemhoener/further-flashcard-dg-i…
wendelinwemhoener Nov 13, 2023
7cd4edf
Finish PPP
wendelinwemhoener Nov 14, 2023
dfcf8ce
Merge pull request #164 from wendelinwemhoener/further-flashcard-dg-i…
wendelinwemhoener Nov 14, 2023
f6924be
Fix test code of my team mates
wendelinwemhoener Nov 14, 2023
5e9ea1d
Merge pull request #165 from wendelinwemhoener/further-flashcard-dg-i…
wendelinwemhoener Nov 14, 2023
9b6a4de
Finalize PPP
Brian030601 Nov 14, 2023
32b75eb
Merge pull request #166 from Brian030601/master
Brian030601 Nov 14, 2023
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ Steps for publishing documentation to the public:
1. Scroll down to the `GitHub Pages` section.
1. Set the `source` as `master branch /docs folder`.
1. Optionally, use the `choose a theme` button to choose a theme for your documentation.

3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ checkstyle {
toolVersion = '10.2'
}

run{
run {
standardInput = System.in
enableAssertions = true
}
2 changes: 2 additions & 0 deletions data/events/event.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
submit v1.0 | 2023-10-29T23:59:59 | 2023-10-30T23:59:59
eat dinner | 2023-12-20T19:00 | 2023-12-20T20:00
8 changes: 8 additions & 0 deletions data/flashcards/flashcard.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
d | a | - | - | -
dfdf | dfdf | - | - | -
dfdf | asdfdf | - | - | -
ddf | dfdf | - | - | -
hello | bye | - | - | -
hello | bye | - | - | -
end program | hello | - | - | -
hello | world | - | - | -
15 changes: 8 additions & 7 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# About us

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)

Display | Name | Github Profile | Portfolio
--------|:------------------:|:--------------:|:---------:
![](https://media.licdn.com/dms/image/C4D03AQGTLbALYjG82Q/profile-displayphoto-shrink_800_800/0/1580629728751?e=1701907200&v=beta&t=PEfw_qZfZA39rJRfo5_Pg4o_RmbPwdneiPX3ftNt9dA) | Wendelin Wemhoener | [Github](https://github.com/wendelinwemhoener/) | [Portfolio](docs/team/wendelinwemhoener.md)
![](https://via.placeholder.com/100.png?text=Photo) | Zhu Jingxi | [Github](https://github.com/Cheezeblokz) | [Portfolio](docs/team/zhujingxi.md)
![](/Users/brian/Desktop/Colgate/NUS Fall 2023/CS2113/Team Project/docs/photo/kherlenbayasgalan.jpg) | Kherlen Bayasgalan | [Github](https://github.com/Brian030601) | [Portfolio](docs/team/kherlenbayasgalan.md)
![](https://via.placeholder.com/100.png?text=Photo) | Bang Junhyeong | [Github](https://github.com/junhyeong0411) | [Portfolio](docs/team/bangjunhyeong.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
1 change: 1 addition & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: minima
Binary file added docs/photo/kherlenbayasgalan.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions docs/team/bangjunhyeong.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Bang Junhyeong - Project Portfolio Page

## Overview


### Summary of Contributions
6 changes: 6 additions & 0 deletions docs/team/kherlenbayasgalan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Kherlen Bayasgalan - Project Portfolio Page

## Overview


### Summary of Contributions
6 changes: 6 additions & 0 deletions docs/team/wendelinwemhoener.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Wendelin Wemhoener - Project Portfolio Page

## Overview


### Summary of Contributions
2 changes: 1 addition & 1 deletion docs/team/johndoe.md → docs/team/zhujingxi.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# John Doe - Project Portfolio Page
# Zhu Jingxi - Project Portfolio Page

## Overview

Expand Down
6 changes: 6 additions & 0 deletions flashcard.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dfdfdf | aaaaaaaaaaaaaaaaaaa | - | - | -
flash1 | dfdfdf | - | - | -
adfdf | dfdfdf | - | - | -
dfdfdf | dfdfdfdfdf | - | - | -
who is this | me | - | - | -
dfdfdfdaaaaaaaaaaaaa | dd | - | - | -
47 changes: 33 additions & 14 deletions src/main/java/seedu/duke/Duke.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
//@@author wendelinwemhoener

package seedu.duke;

import seedu.duke.calendar.CalendarManager;
import seedu.duke.flashcard.FlashcardComponent;

import java.util.ArrayList;
import java.util.Scanner;

public class Duke {
/**
* Main entry-point for the java.duke.Duke application.
*/
public Duke() {}

public static void main(String[] args) {
String logo = " ____ _ \n"
+ "| _ \\ _ _| | _____ \n"
+ "| | | | | | | |/ / _ \\\n"
+ "| |_| | |_| | < __/\n"
+ "|____/ \\__,_|_|\\_\\___|\n";
System.out.println("Hello from\n" + logo);
System.out.println("What is your name?");

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

private void run() {
FlashcardComponent fc = new FlashcardComponent();
CalendarManager cm = new CalendarManager(new ArrayList<>());

Scanner scanner = new Scanner(System.in);
String input;
boolean shouldTerminate = false;

while (!shouldTerminate) {
input = scanner.nextLine();

if (fc.isResponsible(input)) {
fc.processInput(input);

} else if (cm.isResponsible(input)) {
cm.processInput(input);
} else {
System.out.println(" Invalid command! Please try again.");
}
}

}
}
}
7 changes: 7 additions & 0 deletions src/main/java/seedu/duke/calendar/Calendar.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//@@ kherlenbayasgalan & jingxizhu

package seedu.duke.calendar;

public class Calendar {
EventList eventList;
}
25 changes: 25 additions & 0 deletions src/main/java/seedu/duke/calendar/CalendarCommandParser.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//@@ kherlenbayasgalan & jingxizhu

package seedu.duke.calendar;

import seedu.duke.calendar.command.AddEventCommand;
import seedu.duke.calendar.command.DeleteEventCommand;
import seedu.duke.calendar.command.EventCommand;
import seedu.duke.calendar.command.ListCalendarEventsCommand;
import seedu.duke.calendar.command.UnknownCommand;

public class CalendarCommandParser {
public EventCommand parseInput(String input) {
assert input != null : "input is null";

if (input.startsWith("add event")) {
return new AddEventCommand();
} else if (input.startsWith("delete event")) {
return new DeleteEventCommand();
} else if (input.startsWith("list event")) {
return new ListCalendarEventsCommand();
}

return new UnknownCommand();
}
}
72 changes: 72 additions & 0 deletions src/main/java/seedu/duke/calendar/CalendarManager.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
//@@ kherlenbayasgalan & jingxizhu

package seedu.duke.calendar;

import seedu.duke.calendar.command.EventCommand;
import seedu.duke.calendar.command.UnknownCommand;
import seedu.duke.calendar.Event;
import seedu.duke.flashcard.FlashcardStorage;

import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Scanner;

public class CalendarManager {
Calendar calendar;
CalendarUi calendarUi;
EventList eventList;
CalendarCommandParser calendarCommandParser;
Scanner scanner;

private EventStorage storage;

public CalendarManager(ArrayList<Event> events) {

EventDirectory eventdirectory = new EventDirectory();
eventdirectory.listEventFiles();

storage = new EventStorage("./data/events/event.txt");

try{
eventList = storage.loadEvents();
} catch (FileNotFoundException e){
System.out.println("Making new file for Events");
eventList = new EventList(events);
}

calendar = new Calendar();
calendarUi = new CalendarUi(eventList);
calendarCommandParser = new CalendarCommandParser();
scanner = new Scanner(System.in);

}

public EventStorage getStorage(){
return this.storage;
}

public boolean validCommand(String input) {
EventCommand command = calendarCommandParser.parseInput(input);

return !(command instanceof UnknownCommand);
}

public boolean isResponsible(String input) {
return validCommand(input);
}

public void processInput(String input) {
startCalendar(input);

storage.saveEvents(eventList.getEvent());
}

public void startCalendar(String input) {
EventCommand command = calendarCommandParser.parseInput(input);
assert !(command instanceof seedu.duke.calendar.command.UnknownCommand) :
"Command cannot be " + "unknown";
calendarUi.executeCommand(command);
//calendarCommandParser.parseInput(command);
}

}
19 changes: 19 additions & 0 deletions src/main/java/seedu/duke/calendar/CalendarUi.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package seedu.duke.calendar;

import seedu.duke.calendar.command.EventCommand;

import java.util.Scanner;

public class CalendarUi {
private Scanner scanner;
private EventList eventList;

public CalendarUi (EventList eventList) {
scanner = new Scanner(System.in);
this.eventList = eventList;
}

public void executeCommand(EventCommand command) {
command.execute(scanner, eventList);
}
}
51 changes: 51 additions & 0 deletions src/main/java/seedu/duke/calendar/Event.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
//@@author @@kherlenbayasgalan & @@ Jingxizhu

package seedu.duke.calendar;

import java.time.LocalDateTime;

public class Event {
private String name;
private LocalDateTime from;
private LocalDateTime to;

public Event(String name, LocalDateTime from, LocalDateTime to) {
this.name = name;
this.from = from;
this.to = to;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public LocalDateTime getFrom() {
return from;
}

public void setFrom(LocalDateTime from) {
this.from = from;
}

public LocalDateTime getTo() {
return to;
}

public void setTo(LocalDateTime to) {
this.to = to;
}

@Override
public String toString() {
return "Event{" +
"name='" + name + '\'' +
", from=" + from +
", to=" + to +
'}';
}

}
67 changes: 67 additions & 0 deletions src/main/java/seedu/duke/calendar/EventDirectory.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package seedu.duke.calendar;

import java.io.File;

/**
* directory for directory
* can list-up txt files in text folder
* In version 1, using only event.txt
* In version 2, can select or create
*/

public class EventDirectory {
String path;
File file;

public EventDirectory(){
path = "./data/events";

file = new File(path);
if(!file.exists()){
if(file.mkdir()){
System.out.println(" Created events directory");
} else{
System.out.println(" Failed to create directory");
}
} else{
System.out.println(" Using data/events directory");
}
}

/**
* list-up saved files
* selecting file is for version 2
*/
public void listEventFiles(){
String[] eventFiles = file.list();
if(eventFiles == null){
System.out.println("Failed to find files");
} else if(eventFiles.length == 0){
System.out.println("No files exist");
} else{
for(String eventFile : eventFiles){
System.out.println(" "+eventFile);
}
}
}

/**
* return default directory
* for version 1
* @return directory for flashcard txt file
*/
public String defaultDirectory() {
return this.path + "/event.txt";
}

/**
* return directory of flashcard txt file
* for version 2
* @param path
* @return
*/
public String eventDirectory(String path) {
return this.path + path;
}

}
Loading