diff --git a/config.json b/config.json index a0edc78a820..7fa1993db74 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { "logLevel" : "INFO", "userPrefsFilePath" : "preferences.json" -} +} \ No newline at end of file diff --git a/data/fastTrack.json b/data/fastTrack.json new file mode 100644 index 00000000000..5f6ca740b9a --- /dev/null +++ b/data/fastTrack.json @@ -0,0 +1,63 @@ +{ + "categories" : [ { + "categoryName" : "Food", + "summary" : "For food" + }, { + "categoryName" : "Entertainment", + "summary" : "For entertainment" + }, { + "categoryName" : "Transportation", + "summary" : "For bus, car, train" + }, { + "categoryName" : "Shopping", + "summary" : "" + }, { + "categoryName" : "Housing", + "summary" : "" + } ], + "expenses" : [ { + "name" : "Meal at JE", + "amount" : "4.5", + "date" : "2023-04-10", + "category" : { + "categoryName" : "Food", + "summary" : "For food" + } + }, { + "name" : "Groceries", + "amount" : "56.3", + "date" : "2023-03-25", + "category" : { + "categoryName" : "Food", + "summary" : "For food" + } + }, { + "name" : "Shoes", + "amount" : "75.0", + "date" : "2023-03-20", + "category" : { + "categoryName" : "Shopping", + "summary" : "" + } + }, { + "name" : "Movie ticket", + "amount" : "12.99", + "date" : "2023-03-15", + "category" : { + "categoryName" : "Entertainment", + "summary" : "For entertainment" + } + }, { + "name" : "MRT fare", + "amount" : "45.8", + "date" : "2023-03-10", + "category" : { + "categoryName" : "Transportation", + "summary" : "For bus, car, train" + } + } ], + "budget" : { + "amount" : "0.0" + }, + "recurringGenerators" : [ ] +} \ No newline at end of file diff --git a/docs/diagrams/ParserClasses.puml b/docs/diagrams/ParserClasses.puml index 0c7424de6e0..09fbe9bee88 100644 --- a/docs/diagrams/ParserClasses.puml +++ b/docs/diagrams/ParserClasses.puml @@ -9,7 +9,7 @@ Class XYZCommand package "Parser classes"{ Class "<>\nParser" as Parser -Class AddressBookParser +Class ExpenseTrackerParser Class XYZCommandParser Class CliSyntax Class ParserUtil @@ -19,12 +19,12 @@ Class Prefix } Class HiddenOutside #FFFFFF -HiddenOutside ..> AddressBookParser +HiddenOutside ..> ExpenseTrackerParser -AddressBookParser .down.> XYZCommandParser: creates > +ExpenseTrackerParser .down.> XYZCommandParser: creates > XYZCommandParser ..> XYZCommand : creates > -AddressBookParser ..> Command : returns > +ExpenseTrackerParser ..> Command : returns > XYZCommandParser .up.|> Parser XYZCommandParser ..> ArgumentMultimap XYZCommandParser ..> ArgumentTokenizer diff --git a/docs/images/ArchitectureDiagram.png b/docs/images/ArchitectureDiagram.png index 86c60246ccb..74bdb501671 100644 Binary files a/docs/images/ArchitectureDiagram.png and b/docs/images/ArchitectureDiagram.png differ diff --git a/docs/images/ArchitectureSequenceDiagram.png b/docs/images/ArchitectureSequenceDiagram.png index 2f1346869d0..c1ed26b45ea 100644 Binary files a/docs/images/ArchitectureSequenceDiagram.png and b/docs/images/ArchitectureSequenceDiagram.png differ diff --git a/docs/images/ComponentManagers.png b/docs/images/ComponentManagers.png index b5764ff9273..b345322362b 100644 Binary files a/docs/images/ComponentManagers.png and b/docs/images/ComponentManagers.png differ diff --git a/docs/images/DeleteSequenceDiagram.png b/docs/images/DeleteSequenceDiagram.png index fa327b39618..aedc85399b3 100644 Binary files a/docs/images/DeleteSequenceDiagram.png and b/docs/images/DeleteSequenceDiagram.png differ diff --git a/docs/images/LogicClassDiagram.png b/docs/images/LogicClassDiagram.png index 9e9ba9f79e5..1371203e3bd 100644 Binary files a/docs/images/LogicClassDiagram.png and b/docs/images/LogicClassDiagram.png differ diff --git a/docs/images/ModelClassDiagram.png b/docs/images/ModelClassDiagram.png index 04070af60d8..b40862a292a 100644 Binary files a/docs/images/ModelClassDiagram.png and b/docs/images/ModelClassDiagram.png differ diff --git a/docs/images/ParserClasses.png b/docs/images/ParserClasses.png index e7b4c8880cd..17b35e322f5 100644 Binary files a/docs/images/ParserClasses.png and b/docs/images/ParserClasses.png differ diff --git a/docs/images/StorageClassDiagram.png b/docs/images/StorageClassDiagram.png index 2533a5c1af0..de673b8ae5e 100644 Binary files a/docs/images/StorageClassDiagram.png and b/docs/images/StorageClassDiagram.png differ diff --git a/docs/images/UiClassDiagram.png b/docs/images/UiClassDiagram.png index 785e04dbab4..52527f26cd4 100644 Binary files a/docs/images/UiClassDiagram.png and b/docs/images/UiClassDiagram.png differ diff --git a/docs/team/randallnhr.md b/docs/team/randallnhr.md index f14b10f43c4..a9909ee50f4 100644 --- a/docs/team/randallnhr.md +++ b/docs/team/randallnhr.md @@ -16,7 +16,8 @@ The following [link](https://nus-cs2103-ay2223s2.github.io/tp-dashboard/?search= #### **Enhancements implemented:** * Implemented commands for `Category` * `addcat` - allows users of FastTrack to add a new `Category` into FastTrack. - * `delcat` - allows users to delete an existing `Category` in FastTrack. Expenses with the deleted category will have its category replaced with the `MiscellaneuosCategory`. + * `delcat` - allows users to delete an existing `Category` in FastTrack. + * Expenses with the deleted category will have its category replaced with the `MiscellaneuosCategory`. * `lcat` - allows users to list all added `Category`, used to determine index for edit and delete category commands. * Implemented `delcat` command and parser. (PR) * What it does: This feature allows users to delete an existing `Category` in FastTrack. Expenses with the deleted category will have its category replaced with the `MiscellaneuosCategory`. @@ -29,9 +30,10 @@ The following [link](https://nus-cs2103-ay2223s2.github.io/tp-dashboard/?search= * Implemented commands for `RecurringExpenseManager` * `addrec` - allows users to add `RecurringExpenseManager` objects into FastTrack * `delrec` - allows users to delete a `RecurringExpenseManager` object. - * +* Implemented `CLEAR` command to allow users to clear all existing data at ease. -#### **Contributions to the UG:** to be added soon +#### **Contributions to the UG:** +* Added comm #### **Contributions to the DG:** to be added soon diff --git a/fasttrack.log.0 b/fasttrack.log.0 new file mode 100644 index 00000000000..f97ce9bd472 --- /dev/null +++ b/fasttrack.log.0 @@ -0,0 +1,36 @@ +Apr 10, 2023 10:00:51 PM fasttrack.MainApp init +INFO: =============================[ Initializing ExpenseTracker ]=========================== +Apr 10, 2023 10:00:51 PM fasttrack.MainApp initConfig +INFO: Using config file : config.json +Apr 10, 2023 10:00:51 PM fasttrack.MainApp initPrefs +INFO: Using prefs file : preferences.json +Apr 10, 2023 10:00:51 PM fasttrack.commons.core.LogsCenter init +INFO: currentLogLevel: INFO +Apr 10, 2023 10:00:51 PM fasttrack.commons.util.JsonUtil readJsonFile +INFO: Json file data\fastTrack.json not found +Apr 10, 2023 10:00:51 PM fasttrack.MainApp initModelManager +INFO: Data file not found. Will be starting with a sample ExpenseTracker +Apr 10, 2023 10:00:51 PM fasttrack.MainApp initModelManager +INFO: fine +Apr 10, 2023 10:00:51 PM fasttrack.MainApp start +INFO: Starting ExpenseTracker V1.3.1ea +Apr 10, 2023 10:00:51 PM fasttrack.ui.UiManager start +INFO: Starting UI... +Apr 10, 2023 10:01:10 PM fasttrack.MainApp stop +INFO: ============================ [ Stopping Expense Tracker ] ============================= +Apr 10, 2023 10:01:18 PM fasttrack.MainApp init +INFO: =============================[ Initializing ExpenseTracker ]=========================== +Apr 10, 2023 10:01:18 PM fasttrack.MainApp initConfig +INFO: Using config file : config.json +Apr 10, 2023 10:01:18 PM fasttrack.MainApp initPrefs +INFO: Using prefs file : preferences.json +Apr 10, 2023 10:01:18 PM fasttrack.commons.core.LogsCenter init +INFO: currentLogLevel: INFO +Apr 10, 2023 10:01:18 PM fasttrack.MainApp initModelManager +INFO: fine +Apr 10, 2023 10:01:18 PM fasttrack.MainApp start +INFO: Starting ExpenseTracker V1.3.1ea +Apr 10, 2023 10:01:18 PM fasttrack.ui.UiManager start +INFO: Starting UI... +Apr 10, 2023 10:01:23 PM fasttrack.MainApp stop +INFO: ============================ [ Stopping Expense Tracker ] ============================= diff --git a/preferences.json b/preferences.json index 87783242742..77091f17cda 100644 --- a/preferences.json +++ b/preferences.json @@ -4,8 +4,8 @@ "windowHeight" : 700.0, "windowCoordinates" : { "x" : 214, - "y" : 114 + "y" : 84 } }, - "expenseTrackerFilePath" : "data/fastTrack.json" -} + "expenseTrackerFilePath" : "data\\fastTrack.json" +} \ No newline at end of file