Skip to content

Commit f9bafd2

Browse files
authored
Merge pull request nus-cs2113-AY2324S1#7 from AY2324S1-CS2113-F11-3/master
Update
2 parents 036d5b4 + 44ca7c0 commit f9bafd2

File tree

4 files changed

+41
-14
lines changed

4 files changed

+41
-14
lines changed

data/events/event.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
submit v1.0 | 2023-10-29T23:59:59 | 2023-10-30T23:59:59
2-
eat dinner | 2023-12-20T19:00 | 2023-12-20T20:00
1+
submit v1.0 | 2023-10-29T23:59:59 | 2023-10-30T23:59:59
2+
eat dinner | 2023-12-20T19:00 | 2023-12-20T20:00

data/flashcards/flashcard.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
1+
<<<<<<< HEAD
2+
d | a | - | - | -
3+
dfdf | dfdf | - | - | -
4+
dfdf | asdfdf | - | - | -
5+
ddf | dfdf | - | - | -
6+
hello | bye | - | - | -
7+
hello | bye | - | - | -
8+
end program | hello | - | - | -
9+
hello | world | - | - | -
10+
=======
111
ddd | dfdf | - | - | -
212
ddff | a | - | - | -
13+
>>>>>>> 261fd825cf1feb1bc2f840634aa32b90d2497208

docs/DeveloperGuide.md

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ The `Storage` component,
1818
* saves automatically when changes occur.
1919
* component loads automatically when the program starts.
2020
* component can check if the saved txt file has been damaged.
21+
22+
### Calendar Components
2123

24+
The `Calendar` component,
25+
* Add events
26+
* Delete events
27+
* List events
28+
* Find events
2229

2330
## Product scope
2431

@@ -29,7 +36,7 @@ study for their courses and need an easy way to schedule and plan the
2936
studying of their flashcards.
3037

3138
TaskLinker is a CLI tool and as such, it is tailored towards students who
32-
type fast and prefer a functional, but barebones app that runs in the
39+
type fast and prefer a functional, but bare-bones app that runs in the
3340
terminal over a GUI that looks more impressive but is slower to use.
3441

3542
As such, computer science students represent good target users of TaskLinker.
@@ -41,17 +48,21 @@ and track their flashcard and general academic progress in the courses they are
4148
taking.
4249

4350

44-
4551
## User Stories
4652

47-
| Version | As a ... | I want to ... | So that I can ...|
48-
|---------|----------|---------------|------------------|
49-
| v1.0 |user|create new flashcards|add new knowledge I want to study|
50-
| v1.0 |user|list all my flashcards|get a quick overview of my flashcard collection|
51-
| v1.0 |user|review my flashcards|so that I can memorize their contents|
52-
| v2.0 |new user|be able to invoke a help command|get advice/tips for how to use TaskLinker if I don' know how|
53-
| v2.0 |user reviewing flashcards|rate how hard it was to remeber their content|see harder flashcards more often and easy flashcards less frequently during reviews|
54-
|v2.0 |experienced user|use the delete and review feature by typing a one-line command|be faster than having to go through the prompt-anser workflow these features usually require|
53+
| Version | As a ... | I want to ... | So that I can ... |
54+
|---------|---------------------------|----------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
55+
| v1.0 | user | Delete event from my Calendar | remove unnecessary events from the Calendar |
56+
| v1.0 | user | Add event to my Calendar | create new necessary events on my Calendar |
57+
| v1.0 | user | List all events in my Calendar | keep track of all my events and deadlines |
58+
| v1.0 | user | list all my flashcards | get a quick overview of my flashcard collection |
59+
| v1.0 | user | create new flashcards | add new knowledge I want to study |
60+
| v1.0 | user | review my flashcards | so that I can memorize their contents |
61+
| v2.0 | new user | be able to invoke a help command | get advice/tips for how to use TaskLinker if I don' know how |
62+
| v2.0 | user reviewing flashcards | rate how hard it was to remember their content | see harder flashcards more often and easy flashcards less frequently during reviews |
63+
| v2.0 | experienced user | use the delete and review feature by typing a one-line command | be faster than having to go through the prompt-answer workflow these features usually require |
64+
| v2.0 | user | find events from my Calendar | find events without listing them all |
65+
| v2.0 | user | delete all events from my Calendar | don't need to remove events one by one |
5566

5667
## Non-Functional Requirements
5768

src/main/java/seedu/duke/Duke.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@@author wendelinwemhoener
1+
//@@author wendelinwemhoener & bayasgalankherlen
22

33
package seedu.duke;
44

@@ -24,21 +24,25 @@ private void run() {
2424
boolean shouldTerminate = false;
2525

2626
while (!shouldTerminate) {
27+
System.out.print("Enter your command: ");
2728
input = scanner.nextLine();
2829

2930
if (fc.isResponsible(input)) {
3031
fc.processInput(input);
3132
} else if (cm.isResponsible(input)) {
3233
cm.processInput(input);
34+
} else if (input.equals("exit program")) {
35+
System.out.println(" You are exiting TaskLinker! Bye!");
36+
break;
3337
} else if (input.startsWith("help")) {
3438
printHelp();
3539
} else {
3640
System.out.println(" Invalid command! Please try again.");
3741
}
3842
}
39-
4043
}
4144

45+
4246
private void printHelp() {
4347
System.out.println(" If you need help, please consult our " +
4448
"user guide at https://ay2324s1-cs2113-f11-3.github" +
@@ -59,3 +63,4 @@ private void printHelp() {
5963
}
6064
}
6165
}
66+

0 commit comments

Comments
 (0)