Skip to content

Commit

Permalink
Merge pull request #250 from randallnhr/master
Browse files Browse the repository at this point in the history
Export diagrams
  • Loading branch information
gitsac authored Apr 10, 2023
2 parents 00c0d5c + 86abcfb commit e8807dd
Show file tree
Hide file tree
Showing 15 changed files with 112 additions and 11 deletions.
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"logLevel" : "INFO",
"userPrefsFilePath" : "preferences.json"
}
}
63 changes: 63 additions & 0 deletions data/fastTrack.json
Original file line number Diff line number Diff line change
@@ -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" : [ ]
}
8 changes: 4 additions & 4 deletions docs/diagrams/ParserClasses.puml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Class XYZCommand

package "Parser classes"{
Class "<<interface>>\nParser" as Parser
Class AddressBookParser
Class ExpenseTrackerParser
Class XYZCommandParser
Class CliSyntax
Class ParserUtil
Expand All @@ -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
Expand Down
Binary file modified docs/images/ArchitectureDiagram.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 modified docs/images/ArchitectureSequenceDiagram.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 modified docs/images/ComponentManagers.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 modified docs/images/DeleteSequenceDiagram.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 modified docs/images/LogicClassDiagram.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 modified docs/images/ModelClassDiagram.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 modified docs/images/ParserClasses.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 modified docs/images/StorageClassDiagram.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 modified docs/images/UiClassDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions docs/team/randallnhr.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -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

Expand Down
36 changes: 36 additions & 0 deletions fasttrack.log.0
Original file line number Diff line number Diff line change
@@ -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 ] =============================
6 changes: 3 additions & 3 deletions preferences.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"windowHeight" : 700.0,
"windowCoordinates" : {
"x" : 214,
"y" : 114
"y" : 84
}
},
"expenseTrackerFilePath" : "data/fastTrack.json"
}
"expenseTrackerFilePath" : "data\\fastTrack.json"
}

0 comments on commit e8807dd

Please sign in to comment.