From 130ace5d38cd2390d05b590fa6a0f1be4fbb10ee Mon Sep 17 00:00:00 2001 From: swatimahadevan Date: Wed, 13 Oct 2021 19:54:06 +0800 Subject: [PATCH 1/2] io and click logo --- .../java/seedu/duke/constants/Messages.java | 10 +++---- text-ui-test/EXPECTED.TXT | 28 +++++++++++++++++++ text-ui-test/input.txt | 13 ++++++++- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/main/java/seedu/duke/constants/Messages.java b/src/main/java/seedu/duke/constants/Messages.java index f364ebb2da..2a9ee44dd8 100644 --- a/src/main/java/seedu/duke/constants/Messages.java +++ b/src/main/java/seedu/duke/constants/Messages.java @@ -2,11 +2,11 @@ public class Messages { - public static final String LOGO = "\t" + " ____ _\n" - + "\t" + "| _ \\ _ _| | _____\n" - + "\t" + "| | | | | | | |/ / _ \\\n" - + "\t" + "| |_| | |_| | < __/\n" - + "\t" + "|____/ \\__,_|_|\\_\\___|\n\n"; + public static final String LOGO = "\t" + " _____ _ _ _ \n" + + "\t" + "/ __ \\ |(_) | |\n" + + "\t" + "| / \\/ |_ ___| | __\n" + + "\t" + "| \\__/\\ | | (__| <\n" + + "\t" + "\\_____/_|_|\\___|_|\\_\\\n\n"; public static final String EMPTY_STRING = ""; public static final String LINE_PREFIX = "\t"; diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index a078bc6598..b15f905f3e 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -28,6 +28,34 @@ creating new file... Hello! I'm Duke What can I do for you? __________________________________________________ +Nice. I've added Samurai Burger to the list, with 433 calories! + __________________________________________________ +Nice. I've added McFlurry to the list, with 165 calories! + __________________________________________________ +1st,You consumed Samurai Burger , which has a calorie count of : 433! +2nd,You consumed McFlurry , which has a calorie count of : 165! +Wow, that's a lot of food! Finished reading today's list +You consumed 598 calories in total today! + __________________________________________________ +Added cs2113t | softwareengineering | Expected grade: A + __________________________________________________ +Added cs1231 | discrete structure + __________________________________________________ +Here are the modules in your list: +1. cs2113t | softwareengineering | Expected grade: A +2. cs1231 | discrete structure | Expected grade: N/A + __________________________________________________ +I have deleted this module: +cs1231 | discrete structure | Expected grade: N/A + __________________________________________________ +Great you have added the note: Today's stuff + __________________________________________________ +Great you have added the entry: Random Observation + __________________________________________________ +Task has been added successfully! + __________________________________________________ +Task has been deleted! + __________________________________________________ __________________________________________________ Bye. Hope to see you again soon! __________________________________________________ diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index a3abe50906..a9140b4e15 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1 +1,12 @@ -exit +food add n/ Samurai Burger c/ 433 +food add n/ McFlurry c/ 165 +food list +module add c/cs2113t n/softwareengineering e/A +module add c/cs1231 n/discrete structure +module list +module delete 2 +journal notebook n/ Today's stuff +journal entry n/ Today's stuff e/ Random Observation +calendar todo n/ sometask d/ 10-10-2021 +calendar delete 1 +exit \ No newline at end of file From fec4dd2e0b2910bf922ca1347caeb46c4c015b76 Mon Sep 17 00:00:00 2001 From: swatimahadevan Date: Wed, 13 Oct 2021 20:02:26 +0800 Subject: [PATCH 2/2] fixed click logo and more io --- journalData/journalEntries.txt | 1 + .../seedu/duke/commands/ListJournalCommand.java | 2 +- src/main/java/seedu/duke/constants/Messages.java | 4 ++-- text-ui-test/EXPECTED.TXT | 16 +++++++++++----- text-ui-test/input.txt | 2 ++ 5 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 journalData/journalEntries.txt diff --git a/journalData/journalEntries.txt b/journalData/journalEntries.txt new file mode 100644 index 0000000000..7dca132b36 --- /dev/null +++ b/journalData/journalEntries.txt @@ -0,0 +1 @@ +Today's stuff|Random Observation diff --git a/src/main/java/seedu/duke/commands/ListJournalCommand.java b/src/main/java/seedu/duke/commands/ListJournalCommand.java index 7f69157c4d..b0fc1efbeb 100644 --- a/src/main/java/seedu/duke/commands/ListJournalCommand.java +++ b/src/main/java/seedu/duke/commands/ListJournalCommand.java @@ -23,7 +23,7 @@ public void execute(Ui ui, Storage storage) { ArrayList notes = storage.collectionOfNotes.getNotesArrayList(); ArrayList entries = storage.collectionOfEntries.getEntriesArrayList(); for (Note note : notes) { - System.out.println("The notebook " + note.getNoteName() + " contains: "); + System.out.println("The notebook " + note.getNoteName() + " contains:"); for (Entry entry : entries) { if (entry.getEntryNoteName().equals(note.getNoteName())) { System.out.println(entry.getNameOfJournalEntry()); diff --git a/src/main/java/seedu/duke/constants/Messages.java b/src/main/java/seedu/duke/constants/Messages.java index 2a9ee44dd8..869460be0b 100644 --- a/src/main/java/seedu/duke/constants/Messages.java +++ b/src/main/java/seedu/duke/constants/Messages.java @@ -2,7 +2,7 @@ public class Messages { - public static final String LOGO = "\t" + " _____ _ _ _ \n" + public static final String LOGO = "\t" + " _____ _ _ _\n" + "\t" + "/ __ \\ |(_) | |\n" + "\t" + "| / \\/ |_ ___| | __\n" + "\t" + "| \\__/\\ | | (__| <\n" @@ -51,7 +51,7 @@ public class Messages { public static final int INDEX_TODO_DATE = 2; public static final int TOTAL_SIZE = 32; public static final String ADDED_TASK = "Task has been added successfully!"; - public static final String LIST_TASKS_HEADER = "Here's your task list: "; + public static final String LIST_TASKS_HEADER = "Here's your task list:"; public static final String DISPLAY_LINE = "-------------------------" + "----------------------------------------" + "-----------------------------------------"; diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index b15f905f3e..71b5b38fea 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -19,11 +19,11 @@ creating new file... Hey, I didn't find journalEntries.txt in journalData/! creating new file... __________________________________________________ - ____ _ - | _ \ _ _| | _____ - | | | | | | | |/ / _ \ - | |_| | |_| | < __/ - |____/ \__,_|_|\_\___| + _____ _ _ _ + / __ \ |(_) | | + | / \/ |_ ___| | __ + | \__/\ | | (__| < + \_____/_|_|\___|_|\_\ Hello! I'm Duke What can I do for you? @@ -52,8 +52,14 @@ Great you have added the note: Today's stuff __________________________________________________ Great you have added the entry: Random Observation __________________________________________________ +The notebook Today's stuff contains: +Random Observation + __________________________________________________ Task has been added successfully! __________________________________________________ +Here's your task list: +1. sometask (on: 10-10-2021) + __________________________________________________ Task has been deleted! __________________________________________________ __________________________________________________ diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index a9140b4e15..a5894685b1 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -7,6 +7,8 @@ module list module delete 2 journal notebook n/ Today's stuff journal entry n/ Today's stuff e/ Random Observation +journal list calendar todo n/ sometask d/ 10-10-2021 +calendar list calendar delete 1 exit \ No newline at end of file