-
Notifications
You must be signed in to change notification settings - Fork 141
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CS2113-W10-1] BudgetBuddy #16
Open
telferang
wants to merge
549
commits into
nus-cs2113-AY2425S1:master
Choose a base branch
from
AY2425S1-CS2113-W10-1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+9,844
−109
Open
Changes from 1 commit
Commits
Show all changes
549 commits
Select commit
Hold shift + click to select a range
c791ca2
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Chinorea f671d68
Add Edit Income Feature
Chinorea 19adea3
Merge pull request #108 from Chinorea/branch-Edit-Income
Chinorea cca9230
Add sequence diagram for Add Budget feature in DG
ZiliaAJY 849e891
Merge remote-tracking branch 'upstream/master' into branch-DG
ZiliaAJY 3039a81
Update EXPECTED.TXT to include new output format for 'list budget' fe…
ZiliaAJY 1c1b0c0
Merge pull request #109 from ZiliaAJY/branch-DG
ZiliaAJY 9366cdb
Update details for Deduct Budget and List Budget features in DG
ZiliaAJY e786a89
Add sequence diagram for Deduct Budget feature
ZiliaAJY 73f70f4
Merge pull request #110 from ZiliaAJY/branch-DG
ZiliaAJY d470708
Fix auto-correction of invalid dates
ZiliaAJY be136b4
Merge pull request #111 from ZiliaAJY/branch-bugfixes
ZiliaAJY d825598
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Chinorea a01e4ab
Update DG with ListExpense Feature
Chinorea 93bd796
Update Sequence Diagram for ListExpense
Chinorea 9c7f0aa
Add Function to Display PieChart of Expense
Alfred-Goh02 8bbf67a
Edit Code For CheckStyle Tests
Alfred-Goh02 f347db7
Merge pull request #112 from Alfred-Goh02/branch-piechart
Alfred-Goh02 1cb9dc8
Update DG for ListIncome Feature
Chinorea c04e459
Update developer guide
telferang 8219c58
Update user guide
telferang 51b8909
Fix bug when "delete income" or "delete expense" is entered
telferang 68c6261
Fix remove the extra empty line when displaying remaining budget
telferang 994bcda
Update text ui test
telferang 8e4c5e6
Add missing new line for some function
telferang 566a256
Merge pull request #114 from telferang/branch-UG
telferang f5550ec
Update DG for Edit Expenses Feature
Chinorea eafa01b
Update DG for EditIncome Feature
Chinorea 00da131
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
Chinorea b805682
Update UG with updated features
Chinorea 82d0d61
Merge pull request #115 from Chinorea/branch-DeveloperGuide
Chinorea ab8b9e1
Merge branch 'branch-DeveloperGuide'
Chinorea 633091d
Allow dates to be optional when adding or deducting budgets
ZiliaAJY 08d9396
Update UG with Add, Deduct and List Budgets features
ZiliaAJY 1985ab1
Fix UI display and update EXPECTED.TXT to include updated display for…
ZiliaAJY 0b782e5
Merge pull request #116 from ZiliaAJY/branch-UG
ZiliaAJY 009704b
Fix PNG links in DG
Alfred-Goh02 d64c4fb
Merge pull request #118 from Alfred-Goh02/branch-DG
Alfred-Goh02 0fbfc56
Update UG
Alfred-Goh02 4baf582
Fix Text-UI Test
Alfred-Goh02 4426d8d
Merge pull request #121 from Alfred-Goh02/branch-UG
Alfred-Goh02 885eca3
Update input.txt and EXPECTED.TXT for Budget display
ZiliaAJY e68eed4
Merge pull request #122 from ZiliaAJY/branch-bugfixes
ZiliaAJY 70fd6c4
Remove deep nesting in SavingsManager displaySavingsByMonth method
b55c7d4
Fix indentation checkstyle error
aeacb12
Merge pull request #124 from ChuaCleon/branch_removeDeepNesting
ChuaCleon 540e287
Update DisplaySavings and SearchExpense sequence diagrams.
fcbb521
Merge pull request #126 from ChuaCleon/branch_updateDGBreakdownExpense
ChuaCleon 917b10a
Edit DG Sequence diagrams.
96585a3
Merge pull request #127 from ChuaCleon/branch_updateDGBreakdownExpense
ChuaCleon c45a356
Fix Coding Styles based on PR
Alfred-Goh02 56efc13
Add positive JUnit test for breakdownExpensesByCategory
4a1dd1c
Merge pull request #129 from Alfred-Goh02/branch-fixes
Alfred-Goh02 b26f8d2
Merge pull request #130 from ChuaCleon/branch-addMoreJUnitTests
ChuaCleon 6af6acc
Add unit tests for Budget-related classes
ZiliaAJY 517bd3f
Edit displayHelpMessage() method in Ui class
41b7f70
Merge pull request #131 from ZiliaAJY/branch-JUnit
ZiliaAJY fa534bd
Merge branch 'master' into branch-addMoreJUnitTests
2bf07b6
Merge pull request #132 from ChuaCleon/branch-addMoreJUnitTests
ChuaCleon 3d6884b
Add Features to and Reformat DG
Alfred-Goh02 d787506
Merge pull request #133 from Alfred-Goh02/branch-DG
Alfred-Goh02 f6060b0
Modify Diagram based on PR Comments
Alfred-Goh02 336b825
Merge pull request #134 from Alfred-Goh02/branch-DG
Alfred-Goh02 8b8d350
Add sequence diagrams
ZiliaAJY b26af81
Update details for list budget and display income spent in DG
ZiliaAJY a2a998e
Merge remote-tracking branch 'upstream/master' into branch-DG
ZiliaAJY b592931
Merge pull request #135 from ZiliaAJY/branch-DG
ZiliaAJY 1f8ae99
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Chinorea c540a88
Reformat DG to add parts relevant to different subsections
e00ab87
Merge pull request #136 from ChuaCleon/branch-reformatDG
ChuaCleon 0774cac
Update developer guide
telferang f31526b
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
telferang 1ba34ec
Merge pull request #137 from telferang/branch-DG-update
telferang f55640e
Update and Reformat Style on UG
Alfred-Goh02 a900f41
Merge pull request #138 from Alfred-Goh02/branch-UG
Alfred-Goh02 31ccad8
Add instructions for manual testing of features
c6411dd
Merge pull request #140 from ChuaCleon/branch-manualTesting
ChuaCleon 2030978
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Chinorea 444f922
Update details for budgets and display income spent in UG
ZiliaAJY 11bd19f
Arrange order for budgets and display income spent
ZiliaAJY 24a073d
Merge pull request #141 from ZiliaAJY/branch-UG
ZiliaAJY 22e06c6
Update DG Contents (List and Edit Features)
Chinorea 855f4dd
Merge branch 'branch-DeveloperGuide' into branch-Edit-Expense
Chinorea 2ca2a09
Align EditCommands to validator style and Fix incorrect output for er…
Chinorea eb3a668
Merge branch 'branch-Edit-Expense' into branch-DeveloperGuide
Chinorea a5d3f2f
Update DG (Edit Features)
Chinorea 485b8e4
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
Chinorea cb6557f
Fix checkstyles
Chinorea c5dcb30
Fix Checkstyle Errors
Chinorea cd0e0ee
Merge pull request #142 from Chinorea/branch-DeveloperGuide
Chinorea 19bc15d
Complete Manual Testing Section in DG and Fix Bug
Alfred-Goh02 9ebde31
Merge pull request #144 from Alfred-Goh02/branch-DG
Alfred-Goh02 ae57f48
Update command to list expenses and list incomes
telferang 8480c2c
Merge remote-tracking branch 'tpUpstream/master' into branch-standardize
telferang 9d564ad
Update expected.txt
telferang bd19444
Merge pull request #146 from telferang/branch-standardize
telferang b8f33aa
Update DG
Chinorea 0fffb57
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
Chinorea 692eb8d
Merge pull request #147 from Chinorea/branch-DeveloperGuide
Chinorea 10492a7
Edit DG sequence diagrams according to comments
6b391dc
Merge pull request #148 from ChuaCleon/branch-updateDGSequenceDiagram…
ChuaCleon c1d1ff9
Fix UML Diagrams for DG
Alfred-Goh02 1ec965a
Merge pull request #149 from Alfred-Goh02/branch-DG
Alfred-Goh02 6e14955
Update manual testing for budgets and display income spent in UG
ZiliaAJY 61a98d5
Modify display of budget deletion
ZiliaAJY 236dd59
Fix false deduction when specified category does not exist for budget
ZiliaAJY 3996501
Add BeforeEach for JUnit Tests for DeductBudgetValidatorTest
ZiliaAJY ffa0712
Add Additional Test Cases for Manual Testing
Alfred-Goh02 2aec3bd
Merge pull request #150 from Alfred-Goh02/branch-DG
Alfred-Goh02 59b8fa8
Add JUnit Tests for Display Income Spent
ZiliaAJY 564ab42
Merge conflicts with upstream/master and branch-JUnit
ZiliaAJY 5ea94b5
Remove unused import
ZiliaAJY 0f00d4f
Update EXPECTED.TXT to include updated display of budget deletion
ZiliaAJY 13f1099
Merge pull request #151 from ZiliaAJY/branch-JUnit
ZiliaAJY a9b1875
Update JUnit Test
Chinorea 0c165d9
Merge pull request #152 from Chinorea/master
Chinorea bff1c03
Add Activity Diagram and Edit DG
Alfred-Goh02 149f815
Merge pull request #153 from Alfred-Goh02/branch-DG
Alfred-Goh02 ec0234a
Bold text
ZiliaAJY 9e7a61a
Fix saving duplicate budgets to storage
ZiliaAJY 56ded1c
Merge pull request #154 from ZiliaAJY/branch-bugfixes
ZiliaAJY 4d9a797
Fix Developer Guide alignment
ZiliaAJY e5d7d3c
Merge pull request #155 from ZiliaAJY/branch-DG
ZiliaAJY 6b0ffc2
Add PPP
Chinorea 69275ef
Merge pull request #157 from Chinorea/branch-PPP
Chinorea a960673
Update PPP
ZiliaAJY b1598e8
Merge pull request #158 from ZiliaAJY/branch-PPP
ZiliaAJY ac83e8f
Remove first income and first expense display for DisplaySavings feat…
0772390
Merge pull request #214 from ChuaCleon/branch-removeFirstExpenseAndIn…
ChuaCleon f9cf320
Display all savings numbers in 2 decimal places.
1376d27
Merge pull request #215 from ChuaCleon/branch-removeFirstExpenseAndIn…
ChuaCleon b5c9467
Edit SearchExpenseCommand and SearchExpenseValidator to search for co…
1a6058b
Merge pull request #216 from ChuaCleon/branch-searchExpensesInvalidCo…
ChuaCleon 8e6f60b
Create PPP document
29ca1ca
Merge pull request #217 from ChuaCleon/branch-createPPP
ChuaCleon 3ee9653
Edit displayHelpMessage method to display features to new user.
56cc6fc
Merge pull request #218 from ChuaCleon/branch-editDisplayHelpMessage
ChuaCleon bf19898
Edit isCommand() method of BreakdownExpensesCommand to validate comma…
66c46f4
Merge pull request #219 from ChuaCleon/branch-updateBreakdownExpenseBug
ChuaCleon 68b5345
Add JUnit Tests to Improve Coverage
Alfred-Goh02 5431a6d
Edit Code to Pass CheckStyle Tests
Alfred-Goh02 3b08f03
Include Braces for If Statements in Storage Test
Alfred-Goh02 10fa8da
Merge pull request #220 from Alfred-Goh02/branch-J-Unit
Alfred-Goh02 b41e445
Change Frame Name for Display Charts
Alfred-Goh02 5922535
Merge pull request #221 from Alfred-Goh02/branch-J-Unit
Alfred-Goh02 081036e
Add JUnit test for Expense Manager to improve coverage
2784253
Merge pull request #222 from ChuaCleon/branch-AddJUnit
ChuaCleon a78d563
Update Project Portfolio Page.
b035e71
Merge pull request #223 from ChuaCleon/branch-updatePPP
ChuaCleon 92f732a
Change "search expense" to "search expenses" in User Guide.
a0bf965
Merge pull request #224 from ChuaCleon/branch-editUserGuide
ChuaCleon aac65c1
Add Additional Explanation and fix bugs in UG for list and edit commands
Chinorea dec91cf
Align Parsing of date and month parsing
Chinorea c324827
Add PPP file
telferang 7151c79
Fix formatting of UG information for Edit and List features
Chinorea a330464
Merge pull request #225 from telferang/branch-ppp
telferang 54ca6c3
Fix Edge Cases output bug for Edit features
Chinorea 6fd7fe5
Fix images not showing on UG
Chinorea 6ab01e4
Merge pull request #226 from Chinorea/branch-PE-D-Issues
Chinorea a74ec3c
Update PPP and add placeholder image
Chinorea b08fa94
Update PPP and add placeholder image
Chinorea d2046d8
Edit deduct budget description to provide clarity
ZiliaAJY cb063bb
Make display of budget categories more organised
ZiliaAJY 2d2500e
Add details to deduct budget
ZiliaAJY 8356a3c
Stop tracking logs
ZiliaAJY be7ca4f
Handle unexpected inputs in commands
ZiliaAJY b39d3ad
Restrict input amount to 2dp only
ZiliaAJY 6335a0c
Update listBudgets() to include case of no budgets recorded
ZiliaAJY 6bda18d
Update list budgets display
ZiliaAJY 6686524
Update EXPECTED.TXT to include new UI display
ZiliaAJY e8e02ea
Update JUnit Tests
ZiliaAJY 22978da
Add images of expected outputs into UG
ZiliaAJY 3a996ce
Update JUnit tests
ZiliaAJY 3fd0aa4
Merge pull request #228 from ZiliaAJY/branch-PED-issues
ZiliaAJY 971d085
Remove PPP sample file
ZiliaAJY f941510
Update PPP
ZiliaAJY 0c43657
Merge pull request #229 from ZiliaAJY/branch-PPP
ZiliaAJY fa521fc
Add example usages of features into UG.
dcf0bee
Update PPP
telferang 0a244aa
Update user guide
telferang 1d2abe2
Merge pull request #230 from ChuaCleon/branch-updateUGExample
ChuaCleon 69d61c0
Update parser to ignore storage entries with negative amount
telferang 5ec4ae8
Update the code to show amount with only 2 decimal place
telferang 70168cb
Update expected.txt
telferang f277d0d
Add screenshot for user guide
telferang e83835b
Merge pull request #231 from telferang/branch-bug
telferang fcbfdc8
Complete Personal Portfolio Page
Alfred-Goh02 e5e7bee
Merge pull request #232 from Alfred-Goh02/branch-PPP
Alfred-Goh02 2ec08e7
Edit Code to Adhere to Java Coding Standard
Alfred-Goh02 26d1bb4
Refactor amountValidator code
telferang e4cebfd
Merge remote-tracking branch 'tpUpstream/master' into branch-bug
telferang 1c9d101
Fix Table on AboutUs Page
Alfred-Goh02 5788c47
Edit Code for CheckStyle Error
Alfred-Goh02 4467444
Merge pull request #233 from Alfred-Goh02/branch-BugFix
Alfred-Goh02 5578fee
Update PPP
telferang 808b26a
Merge pull request #234 from telferang/branch-bug
telferang 7e3b892
Update PPP
Chinorea e0026bc
Fix PE-D identified issues
Chinorea b103b32
Fix automated CLI test expected out
Chinorea 153c3c2
Update PPP
ZiliaAJY fe5a502
Merge pull request #236 from ZiliaAJY/branch-PPP
ZiliaAJY 5017aeb
Fix Text and JUnit test case values
Chinorea c0e6d48
Fix JUnit Test Cases
Chinorea ff71c10
Merge pull request #235 from Chinorea/branch-PE-D-Issues
Chinorea 7dcd6be
Update PPP
ZiliaAJY 86a3d26
Fix JUnit Tests Bugs and User Guide Bugs
Alfred-Goh02 3b79cc7
Merge pull request #237 from ZiliaAJY/branch-PPP
ZiliaAJY 56a37c0
Merge pull request #238 from Alfred-Goh02/branch-BugFix
Alfred-Goh02 f5bb4ef
Update PPP with Relevant Pull Requests
Alfred-Goh02 dbfb15d
Merge pull request #239 from Alfred-Goh02/branch-PPP
Alfred-Goh02 9fe6951
Modify UML Diagram to Fix PED Issues
Alfred-Goh02 4e843f9
Merge pull request #240 from Alfred-Goh02/branch-DG
Alfred-Goh02 9248a4f
Refactor code according to coding standard
telferang ba16eea
Add DeleteIncomeValidator Junit test
telferang 75bb41a
Remove wildcard import
telferang c66a0e3
Merge pull request #241 from telferang/branch-bug
telferang 9f11888
Update UG
telferang 1a99515
Merge pull request #242 from telferang/branch-bug
telferang 8ce583f
Fix Bugs and Update UG
Alfred-Goh02 4d08707
Merge pull request #243 from Alfred-Goh02/branch-BugFix
Alfred-Goh02 5ccff9c
Revert "Fix Bugs and Update UG"
Alfred-Goh02 29d0560
Update PPP
telferang 4de16ff
Merge pull request #244 from AY2425S1-CS2113-W10-1/revert-243-branch-…
Alfred-Goh02 f2b63c5
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
telferang d5e4e36
Merge pull request #245 from telferang/branch-updatePPP
telferang b6173b5
Update readme to display PPP
3dce375
Merge branch 'branch-updateReadme'
cb8f7a9
Update PPP and UG
Alfred-Goh02 03c96a5
Fix Validator Test
Alfred-Goh02 bf2ee6b
Merge pull request #246 from Alfred-Goh02/branch-PPP
Alfred-Goh02 47e8731
Update Edit feature naming
Chinorea 352781a
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
Chinorea baaa8c9
Update JUnit Tests
Chinorea 4893d9e
Update Home Page
ZiliaAJY 1ce4965
Merge pull request #247 from Chinorea/branch-PE-D-Issues
Chinorea 6e74982
Merge pull request #248 from ZiliaAJY/branch-Homepage
ZiliaAJY 64c1b49
Fix naming convention in UG
Chinorea 4858c11
Merge pull request #249 from Chinorea/branch-PE-D-Issues
Chinorea 7758a95
Fix naming convention in DG Manual Testing
Chinorea 9366ada
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
f030076
Add s into search expenses in command summary of UG
a2ce7a3
Merge pull request #250 from Chinorea/branch-PE-D-Issues
Chinorea 8b1bed3
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
032d718
Merge branch 'master' into branch-addSInSearchExpense
720074f
Edit formatting errors in DG.
083792a
Merge pull request #251 from ChuaCleon/branch-addSInSearchExpense
ChuaCleon 9497515
Refactor code to use more SLAP
telferang 6a4ba6b
Update help command
telferang 6e0e47c
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
telferang 3f747a8
Merge pull request #252 from telferang/branch-updatePPP
telferang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update DG with ListExpense Feature
commit a01e4ab1376c164a1bcf16022a49eb86e267ee38
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if methods are called by the SavingsManager class, should the class be declared as static and have its name in italics?
