Skip to content

Commit

Permalink
Merge 37dc07a into 6535d51
Browse files Browse the repository at this point in the history
  • Loading branch information
choonx99 committed Nov 10, 2019
2 parents 6535d51 + 37dc07a commit 78f074f
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 91 deletions.
86 changes: 0 additions & 86 deletions docs/DeveloperGuide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -926,92 +926,6 @@ amounts.
+
Use case ends.

//[none]
//[#_UC19]
//=== UC19 - Description +
//Preconditions: precond
//
//Guarantees:
//
//* g1
//* g2
//
//[none]
//*MSS*
//
//.
//.
//.
//.
//+
//Use case ends.
//
//[none]
//*Extensions*
//
//[none]
//* 1a. AltScene1
//[none]
//** 1a1. AltScene1a
//+
//Use case ends.
//
//* 2a. AltScene2
//[none]
//** 2a1. AltScene2a
//+
//Use case ends.
//
//* 3a. AltScene3
//[none]
//** 3a1. AltScene3a
//** 3a2. AltScene3b
//+
//Use case resumes at step 2.
//
//[none]
//[#_UC20]
//=== UC20 - Description +
//Preconditions: precond
//
//Guarantees:
//
//* g1
//* g2
//
//[none]
//*MSS*
//
//.
//.
//.
//.
//+
//Use case ends.
//
//[none]
//*Extensions*
//
//[none]
//* 1a. AltScene1
//[none]
//** 1a1. AltScene1a
//+
//Use case ends.
//
//* 2a. AltScene2
//[none]
//** 2a1. AltScene2a
//+
//Use case ends.
//
//* 3a. AltScene3
//[none]
//** 3a1. AltScene3a
//** 3a2. AltScene3b
//+
//Use case resumes at step 2.

_{More may be added}_

[appendix]
Expand Down
2 changes: 1 addition & 1 deletion docs/diagrams/LogicClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ LogicManager .left.> Command : executes >

LogicManager --> Model
Command .right.> Model
note right of XYZCommand: XYZCommand = AddExpenseCommand, \nFindCommand, etc
note right of XYZCommand: XYZCommand = AddExpenseCommand, \nFindCommand, DeleteCommand, \nEditBudgetCommand etc

Logic ..> CommandResult
LogicManager .down.> CommandResult
Expand Down
30 changes: 26 additions & 4 deletions docs/diagrams/ModelClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ Interface ReadOnlyExpenseList <<Interface>>
Interface Model <<Interface>>
Interface ObservableList <<Interface>>
Class ExpenseList
Class BudgetList
Class ExchangeData
Class ReadOnlyExpenseList
Class ReadOnlyBudgetList
Class Model
Class ModelManager
Class UserPrefs
Expand All @@ -21,9 +23,18 @@ Class Expense
Class Amount
Class Date
Class Name
Class Currency
Class UniqueExpenseList
}

Package Budget {
Class Budget
Class Amount
Class Date
Class Name
Class UniqueBudgetList
}

Package Tag {
Class Tag
}
Expand All @@ -33,19 +44,30 @@ Class HiddenOutside #FFFFFF
HiddenOutside ..> Model

ExpenseList .up.|> ReadOnlyExpenseList
BudgetList .up.|> ReadOnlyBudgetList

ModelManager .up.|> Model
Model .right.> ObservableList
ModelManager o--> "1" ExpenseList
ModelManager o--> "1" BudgetList
ModelManager o-left-> "1" UserPrefs
UserPrefs .up.|> ReadOnlyUserPrefs

ExpenseList *--> "1" UniqueExpenseList
UniqueExpenseList o--> "*" Expense
Expense *--> Name
Expense *--> Amount
Expense *--> Date
Expense *--> "*" Tag
Expense *--> "1" Name
Expense *--> "1" Amount
Expense *--> "1" Date
Expense *--> "1" Tag
Expense *--> "1" Currency

BudgetList *--> "1" UniqueBudgetList
UniqueBudgetList o--> "*" Budget
Budget *--> "1" Name
Budget *--> "1" Amount
Budget *--> "1" Date
Budget *--> "1" Currency
Budget *--> "1" ExpenseList

Name -[hidden]right-> Amount
Amount -[hidden]right-> Date
Expand Down
11 changes: 11 additions & 0 deletions docs/diagrams/UiClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Class MainWindow
Class HelpWindow
Class ResultDisplay
Class ExpenseListPanel
Class BudgetListPanel
Class BudgetCard
Class StatsDisplay
Class ExpenseCard
Class StatusBarFooter
Class CommandBox
Expand All @@ -34,20 +37,28 @@ MainWindow --> HelpWindow
MainWindow *-down-> CommandBox
MainWindow *-down-> ResultDisplay
MainWindow *-down-> ExpenseListPanel
MainWindow *-down-> BudgetListPanel
MainWindow *-down-> StatsDisplay
MainWindow *-down-> StatusBarFooter

ExpenseListPanel -down-> ExpenseCard
BudgetListPanel -down-> BudgetCard

MainWindow -left-|> UiPart

ResultDisplay --|> UiPart
CommandBox --|> UiPart
ExpenseListPanel --|> UiPart
BudgetListPanel --|> UiPart
StatsDisplay --|> UiPart
ExpenseCard --|> UiPart
BudgetCard --|> UiPart
StatusBarFooter --|> UiPart
HelpWindow -down-|> UiPart

ExpenseCard ..> Model
BudgetCard ..> Model
StatsDisplay ..> Model
UiManager -right-> Logic
MainWindow -left-> Logic

Expand Down
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/UiClassDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 78f074f

Please sign in to comment.