Skip to content
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
wants to merge 549 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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 Oct 28, 2024
f671d68
Add Edit Income Feature
Chinorea Oct 28, 2024
19adea3
Merge pull request #108 from Chinorea/branch-Edit-Income
Chinorea Oct 28, 2024
cca9230
Add sequence diagram for Add Budget feature in DG
ZiliaAJY Oct 28, 2024
849e891
Merge remote-tracking branch 'upstream/master' into branch-DG
ZiliaAJY Oct 28, 2024
3039a81
Update EXPECTED.TXT to include new output format for 'list budget' fe…
ZiliaAJY Oct 28, 2024
1c1b0c0
Merge pull request #109 from ZiliaAJY/branch-DG
ZiliaAJY Oct 28, 2024
9366cdb
Update details for Deduct Budget and List Budget features in DG
ZiliaAJY Oct 29, 2024
e786a89
Add sequence diagram for Deduct Budget feature
ZiliaAJY Oct 29, 2024
73f70f4
Merge pull request #110 from ZiliaAJY/branch-DG
ZiliaAJY Oct 29, 2024
d470708
Fix auto-correction of invalid dates
ZiliaAJY Oct 29, 2024
be136b4
Merge pull request #111 from ZiliaAJY/branch-bugfixes
ZiliaAJY Oct 29, 2024
d825598
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Chinorea Oct 29, 2024
a01e4ab
Update DG with ListExpense Feature
Chinorea Oct 29, 2024
93bd796
Update Sequence Diagram for ListExpense
Chinorea Oct 29, 2024
9c7f0aa
Add Function to Display PieChart of Expense
Alfred-Goh02 Oct 29, 2024
8bbf67a
Edit Code For CheckStyle Tests
Alfred-Goh02 Oct 29, 2024
f347db7
Merge pull request #112 from Alfred-Goh02/branch-piechart
Alfred-Goh02 Oct 29, 2024
1cb9dc8
Update DG for ListIncome Feature
Chinorea Oct 29, 2024
c04e459
Update developer guide
telferang Oct 29, 2024
8219c58
Update user guide
telferang Oct 29, 2024
51b8909
Fix bug when "delete income" or "delete expense" is entered
telferang Oct 29, 2024
68c6261
Fix remove the extra empty line when displaying remaining budget
telferang Oct 29, 2024
994bcda
Update text ui test
telferang Oct 29, 2024
8e4c5e6
Add missing new line for some function
telferang Oct 29, 2024
566a256
Merge pull request #114 from telferang/branch-UG
telferang Oct 29, 2024
f5550ec
Update DG for Edit Expenses Feature
Chinorea Oct 29, 2024
eafa01b
Update DG for EditIncome Feature
Chinorea Oct 29, 2024
00da131
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
Chinorea Oct 29, 2024
b805682
Update UG with updated features
Chinorea Oct 29, 2024
82d0d61
Merge pull request #115 from Chinorea/branch-DeveloperGuide
Chinorea Oct 29, 2024
ab8b9e1
Merge branch 'branch-DeveloperGuide'
Chinorea Oct 29, 2024
633091d
Allow dates to be optional when adding or deducting budgets
ZiliaAJY Oct 29, 2024
08d9396
Update UG with Add, Deduct and List Budgets features
ZiliaAJY Oct 29, 2024
1985ab1
Fix UI display and update EXPECTED.TXT to include updated display for…
ZiliaAJY Oct 29, 2024
0b782e5
Merge pull request #116 from ZiliaAJY/branch-UG
ZiliaAJY Oct 29, 2024
009704b
Fix PNG links in DG
Alfred-Goh02 Oct 30, 2024
d64c4fb
Merge pull request #118 from Alfred-Goh02/branch-DG
Alfred-Goh02 Oct 30, 2024
0fbfc56
Update UG
Alfred-Goh02 Nov 1, 2024
4baf582
Fix Text-UI Test
Alfred-Goh02 Nov 1, 2024
4426d8d
Merge pull request #121 from Alfred-Goh02/branch-UG
Alfred-Goh02 Nov 1, 2024
885eca3
Update input.txt and EXPECTED.TXT for Budget display
ZiliaAJY Nov 1, 2024
e68eed4
Merge pull request #122 from ZiliaAJY/branch-bugfixes
ZiliaAJY Nov 1, 2024
70fd6c4
Remove deep nesting in SavingsManager displaySavingsByMonth method
Nov 2, 2024
b55c7d4
Fix indentation checkstyle error
Nov 2, 2024
aeacb12
Merge pull request #124 from ChuaCleon/branch_removeDeepNesting
ChuaCleon Nov 2, 2024
540e287
Update DisplaySavings and SearchExpense sequence diagrams.
Nov 2, 2024
fcbb521
Merge pull request #126 from ChuaCleon/branch_updateDGBreakdownExpense
ChuaCleon Nov 2, 2024
917b10a
Edit DG Sequence diagrams.
Nov 2, 2024
96585a3
Merge pull request #127 from ChuaCleon/branch_updateDGBreakdownExpense
ChuaCleon Nov 2, 2024
c45a356
Fix Coding Styles based on PR
Alfred-Goh02 Nov 4, 2024
56efc13
Add positive JUnit test for breakdownExpensesByCategory
Nov 4, 2024
4a1dd1c
Merge pull request #129 from Alfred-Goh02/branch-fixes
Alfred-Goh02 Nov 4, 2024
b26f8d2
Merge pull request #130 from ChuaCleon/branch-addMoreJUnitTests
ChuaCleon Nov 4, 2024
6af6acc
Add unit tests for Budget-related classes
ZiliaAJY Nov 4, 2024
517bd3f
Edit displayHelpMessage() method in Ui class
Nov 4, 2024
41b7f70
Merge pull request #131 from ZiliaAJY/branch-JUnit
ZiliaAJY Nov 4, 2024
fa534bd
Merge branch 'master' into branch-addMoreJUnitTests
Nov 4, 2024
2bf07b6
Merge pull request #132 from ChuaCleon/branch-addMoreJUnitTests
ChuaCleon Nov 4, 2024
3d6884b
Add Features to and Reformat DG
Alfred-Goh02 Nov 4, 2024
d787506
Merge pull request #133 from Alfred-Goh02/branch-DG
Alfred-Goh02 Nov 4, 2024
f6060b0
Modify Diagram based on PR Comments
Alfred-Goh02 Nov 4, 2024
336b825
Merge pull request #134 from Alfred-Goh02/branch-DG
Alfred-Goh02 Nov 4, 2024
8b8d350
Add sequence diagrams
ZiliaAJY Nov 4, 2024
b26af81
Update details for list budget and display income spent in DG
ZiliaAJY Nov 4, 2024
a2a998e
Merge remote-tracking branch 'upstream/master' into branch-DG
ZiliaAJY Nov 4, 2024
b592931
Merge pull request #135 from ZiliaAJY/branch-DG
ZiliaAJY Nov 4, 2024
1f8ae99
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Chinorea Nov 5, 2024
c540a88
Reformat DG to add parts relevant to different subsections
Nov 5, 2024
e00ab87
Merge pull request #136 from ChuaCleon/branch-reformatDG
ChuaCleon Nov 5, 2024
0774cac
Update developer guide
telferang Nov 5, 2024
f31526b
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
telferang Nov 5, 2024
1ba34ec
Merge pull request #137 from telferang/branch-DG-update
telferang Nov 5, 2024
f55640e
Update and Reformat Style on UG
Alfred-Goh02 Nov 5, 2024
a900f41
Merge pull request #138 from Alfred-Goh02/branch-UG
Alfred-Goh02 Nov 5, 2024
31ccad8
Add instructions for manual testing of features
Nov 5, 2024
c6411dd
Merge pull request #140 from ChuaCleon/branch-manualTesting
ChuaCleon Nov 5, 2024
2030978
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Chinorea Nov 5, 2024
444f922
Update details for budgets and display income spent in UG
ZiliaAJY Nov 5, 2024
11bd19f
Arrange order for budgets and display income spent
ZiliaAJY Nov 5, 2024
24a073d
Merge pull request #141 from ZiliaAJY/branch-UG
ZiliaAJY Nov 5, 2024
22e06c6
Update DG Contents (List and Edit Features)
Chinorea Nov 5, 2024
855f4dd
Merge branch 'branch-DeveloperGuide' into branch-Edit-Expense
Chinorea Nov 5, 2024
2ca2a09
Align EditCommands to validator style and Fix incorrect output for er…
Chinorea Nov 5, 2024
eb3a668
Merge branch 'branch-Edit-Expense' into branch-DeveloperGuide
Chinorea Nov 5, 2024
a5d3f2f
Update DG (Edit Features)
Chinorea Nov 5, 2024
485b8e4
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
Chinorea Nov 5, 2024
cb6557f
Fix checkstyles
Chinorea Nov 5, 2024
c5dcb30
Fix Checkstyle Errors
Chinorea Nov 5, 2024
cd0e0ee
Merge pull request #142 from Chinorea/branch-DeveloperGuide
Chinorea Nov 5, 2024
19bc15d
Complete Manual Testing Section in DG and Fix Bug
Alfred-Goh02 Nov 5, 2024
9ebde31
Merge pull request #144 from Alfred-Goh02/branch-DG
Alfred-Goh02 Nov 5, 2024
ae57f48
Update command to list expenses and list incomes
telferang Nov 6, 2024
8480c2c
Merge remote-tracking branch 'tpUpstream/master' into branch-standardize
telferang Nov 6, 2024
9d564ad
Update expected.txt
telferang Nov 6, 2024
bd19444
Merge pull request #146 from telferang/branch-standardize
telferang Nov 6, 2024
b8f33aa
Update DG
Chinorea Nov 6, 2024
0fffb57
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
Chinorea Nov 6, 2024
692eb8d
Merge pull request #147 from Chinorea/branch-DeveloperGuide
Chinorea Nov 6, 2024
10492a7
Edit DG sequence diagrams according to comments
Nov 6, 2024
6b391dc
Merge pull request #148 from ChuaCleon/branch-updateDGSequenceDiagram…
ChuaCleon Nov 6, 2024
c1d1ff9
Fix UML Diagrams for DG
Alfred-Goh02 Nov 6, 2024
1ec965a
Merge pull request #149 from Alfred-Goh02/branch-DG
Alfred-Goh02 Nov 6, 2024
6e14955
Update manual testing for budgets and display income spent in UG
ZiliaAJY Nov 6, 2024
61a98d5
Modify display of budget deletion
ZiliaAJY Nov 6, 2024
236dd59
Fix false deduction when specified category does not exist for budget
ZiliaAJY Nov 6, 2024
3996501
Add BeforeEach for JUnit Tests for DeductBudgetValidatorTest
ZiliaAJY Nov 6, 2024
ffa0712
Add Additional Test Cases for Manual Testing
Alfred-Goh02 Nov 6, 2024
2aec3bd
Merge pull request #150 from Alfred-Goh02/branch-DG
Alfred-Goh02 Nov 6, 2024
59b8fa8
Add JUnit Tests for Display Income Spent
ZiliaAJY Nov 6, 2024
564ab42
Merge conflicts with upstream/master and branch-JUnit
ZiliaAJY Nov 6, 2024
5ea94b5
Remove unused import
ZiliaAJY Nov 6, 2024
0f00d4f
Update EXPECTED.TXT to include updated display of budget deletion
ZiliaAJY Nov 6, 2024
13f1099
Merge pull request #151 from ZiliaAJY/branch-JUnit
ZiliaAJY Nov 6, 2024
a9b1875
Update JUnit Test
Chinorea Nov 7, 2024
0c165d9
Merge pull request #152 from Chinorea/master
Chinorea Nov 7, 2024
bff1c03
Add Activity Diagram and Edit DG
Alfred-Goh02 Nov 7, 2024
149f815
Merge pull request #153 from Alfred-Goh02/branch-DG
Alfred-Goh02 Nov 7, 2024
ec0234a
Bold text
ZiliaAJY Nov 7, 2024
9e7a61a
Fix saving duplicate budgets to storage
ZiliaAJY Nov 7, 2024
56ded1c
Merge pull request #154 from ZiliaAJY/branch-bugfixes
ZiliaAJY Nov 7, 2024
4d9a797
Fix Developer Guide alignment
ZiliaAJY Nov 7, 2024
e5d7d3c
Merge pull request #155 from ZiliaAJY/branch-DG
ZiliaAJY Nov 7, 2024
6b0ffc2
Add PPP
Chinorea Nov 8, 2024
69275ef
Merge pull request #157 from Chinorea/branch-PPP
Chinorea Nov 8, 2024
a960673
Update PPP
ZiliaAJY Nov 8, 2024
b1598e8
Merge pull request #158 from ZiliaAJY/branch-PPP
ZiliaAJY Nov 8, 2024
ac83e8f
Remove first income and first expense display for DisplaySavings feat…
Nov 9, 2024
0772390
Merge pull request #214 from ChuaCleon/branch-removeFirstExpenseAndIn…
ChuaCleon Nov 9, 2024
f9cf320
Display all savings numbers in 2 decimal places.
Nov 9, 2024
1376d27
Merge pull request #215 from ChuaCleon/branch-removeFirstExpenseAndIn…
ChuaCleon Nov 9, 2024
b5c9467
Edit SearchExpenseCommand and SearchExpenseValidator to search for co…
Nov 9, 2024
1a6058b
Merge pull request #216 from ChuaCleon/branch-searchExpensesInvalidCo…
ChuaCleon Nov 9, 2024
8e6f60b
Create PPP document
Nov 9, 2024
29ca1ca
Merge pull request #217 from ChuaCleon/branch-createPPP
ChuaCleon Nov 9, 2024
3ee9653
Edit displayHelpMessage method to display features to new user.
Nov 9, 2024
56cc6fc
Merge pull request #218 from ChuaCleon/branch-editDisplayHelpMessage
ChuaCleon Nov 9, 2024
bf19898
Edit isCommand() method of BreakdownExpensesCommand to validate comma…
Nov 10, 2024
66c46f4
Merge pull request #219 from ChuaCleon/branch-updateBreakdownExpenseBug
ChuaCleon Nov 10, 2024
68b5345
Add JUnit Tests to Improve Coverage
Alfred-Goh02 Nov 10, 2024
5431a6d
Edit Code to Pass CheckStyle Tests
Alfred-Goh02 Nov 10, 2024
3b08f03
Include Braces for If Statements in Storage Test
Alfred-Goh02 Nov 10, 2024
10fa8da
Merge pull request #220 from Alfred-Goh02/branch-J-Unit
Alfred-Goh02 Nov 10, 2024
b41e445
Change Frame Name for Display Charts
Alfred-Goh02 Nov 10, 2024
5922535
Merge pull request #221 from Alfred-Goh02/branch-J-Unit
Alfred-Goh02 Nov 10, 2024
081036e
Add JUnit test for Expense Manager to improve coverage
Nov 10, 2024
2784253
Merge pull request #222 from ChuaCleon/branch-AddJUnit
ChuaCleon Nov 10, 2024
a78d563
Update Project Portfolio Page.
Nov 10, 2024
b035e71
Merge pull request #223 from ChuaCleon/branch-updatePPP
ChuaCleon Nov 10, 2024
92f732a
Change "search expense" to "search expenses" in User Guide.
Nov 10, 2024
a0bf965
Merge pull request #224 from ChuaCleon/branch-editUserGuide
ChuaCleon Nov 10, 2024
aac65c1
Add Additional Explanation and fix bugs in UG for list and edit commands
Chinorea Nov 10, 2024
dec91cf
Align Parsing of date and month parsing
Chinorea Nov 10, 2024
c324827
Add PPP file
telferang Nov 10, 2024
7151c79
Fix formatting of UG information for Edit and List features
Chinorea Nov 10, 2024
a330464
Merge pull request #225 from telferang/branch-ppp
telferang Nov 10, 2024
54ca6c3
Fix Edge Cases output bug for Edit features
Chinorea Nov 10, 2024
6fd7fe5
Fix images not showing on UG
Chinorea Nov 10, 2024
6ab01e4
Merge pull request #226 from Chinorea/branch-PE-D-Issues
Chinorea Nov 10, 2024
a74ec3c
Update PPP and add placeholder image
Chinorea Nov 10, 2024
b08fa94
Update PPP and add placeholder image
Chinorea Nov 10, 2024
d2046d8
Edit deduct budget description to provide clarity
ZiliaAJY Nov 10, 2024
cb063bb
Make display of budget categories more organised
ZiliaAJY Nov 10, 2024
2d2500e
Add details to deduct budget
ZiliaAJY Nov 10, 2024
8356a3c
Stop tracking logs
ZiliaAJY Nov 10, 2024
be7ca4f
Handle unexpected inputs in commands
ZiliaAJY Nov 10, 2024
b39d3ad
Restrict input amount to 2dp only
ZiliaAJY Nov 10, 2024
6335a0c
Update listBudgets() to include case of no budgets recorded
ZiliaAJY Nov 10, 2024
6bda18d
Update list budgets display
ZiliaAJY Nov 10, 2024
6686524
Update EXPECTED.TXT to include new UI display
ZiliaAJY Nov 10, 2024
e8e02ea
Update JUnit Tests
ZiliaAJY Nov 10, 2024
22978da
Add images of expected outputs into UG
ZiliaAJY Nov 10, 2024
3a996ce
Update JUnit tests
ZiliaAJY Nov 10, 2024
3fd0aa4
Merge pull request #228 from ZiliaAJY/branch-PED-issues
ZiliaAJY Nov 10, 2024
971d085
Remove PPP sample file
ZiliaAJY Nov 11, 2024
f941510
Update PPP
ZiliaAJY Nov 11, 2024
0c43657
Merge pull request #229 from ZiliaAJY/branch-PPP
ZiliaAJY Nov 11, 2024
fa521fc
Add example usages of features into UG.
Nov 11, 2024
dcf0bee
Update PPP
telferang Nov 11, 2024
0a244aa
Update user guide
telferang Nov 11, 2024
1d2abe2
Merge pull request #230 from ChuaCleon/branch-updateUGExample
ChuaCleon Nov 11, 2024
69d61c0
Update parser to ignore storage entries with negative amount
telferang Nov 11, 2024
5ec4ae8
Update the code to show amount with only 2 decimal place
telferang Nov 11, 2024
70168cb
Update expected.txt
telferang Nov 11, 2024
f277d0d
Add screenshot for user guide
telferang Nov 11, 2024
e83835b
Merge pull request #231 from telferang/branch-bug
telferang Nov 11, 2024
fcbfdc8
Complete Personal Portfolio Page
Alfred-Goh02 Nov 11, 2024
e5e7bee
Merge pull request #232 from Alfred-Goh02/branch-PPP
Alfred-Goh02 Nov 11, 2024
2ec08e7
Edit Code to Adhere to Java Coding Standard
Alfred-Goh02 Nov 11, 2024
26d1bb4
Refactor amountValidator code
telferang Nov 11, 2024
e4cebfd
Merge remote-tracking branch 'tpUpstream/master' into branch-bug
telferang Nov 11, 2024
1c9d101
Fix Table on AboutUs Page
Alfred-Goh02 Nov 11, 2024
5788c47
Edit Code for CheckStyle Error
Alfred-Goh02 Nov 11, 2024
4467444
Merge pull request #233 from Alfred-Goh02/branch-BugFix
Alfred-Goh02 Nov 11, 2024
5578fee
Update PPP
telferang Nov 11, 2024
808b26a
Merge pull request #234 from telferang/branch-bug
telferang Nov 11, 2024
7e3b892
Update PPP
Chinorea Nov 11, 2024
e0026bc
Fix PE-D identified issues
Chinorea Nov 11, 2024
b103b32
Fix automated CLI test expected out
Chinorea Nov 11, 2024
153c3c2
Update PPP
ZiliaAJY Nov 11, 2024
fe5a502
Merge pull request #236 from ZiliaAJY/branch-PPP
ZiliaAJY Nov 11, 2024
5017aeb
Fix Text and JUnit test case values
Chinorea Nov 11, 2024
c0e6d48
Fix JUnit Test Cases
Chinorea Nov 11, 2024
ff71c10
Merge pull request #235 from Chinorea/branch-PE-D-Issues
Chinorea Nov 11, 2024
7dcd6be
Update PPP
ZiliaAJY Nov 11, 2024
86a3d26
Fix JUnit Tests Bugs and User Guide Bugs
Alfred-Goh02 Nov 11, 2024
3b79cc7
Merge pull request #237 from ZiliaAJY/branch-PPP
ZiliaAJY Nov 11, 2024
56a37c0
Merge pull request #238 from Alfred-Goh02/branch-BugFix
Alfred-Goh02 Nov 11, 2024
f5bb4ef
Update PPP with Relevant Pull Requests
Alfred-Goh02 Nov 11, 2024
dbfb15d
Merge pull request #239 from Alfred-Goh02/branch-PPP
Alfred-Goh02 Nov 11, 2024
9fe6951
Modify UML Diagram to Fix PED Issues
Alfred-Goh02 Nov 11, 2024
4e843f9
Merge pull request #240 from Alfred-Goh02/branch-DG
Alfred-Goh02 Nov 11, 2024
9248a4f
Refactor code according to coding standard
telferang Nov 12, 2024
ba16eea
Add DeleteIncomeValidator Junit test
telferang Nov 12, 2024
75bb41a
Remove wildcard import
telferang Nov 12, 2024
c66a0e3
Merge pull request #241 from telferang/branch-bug
telferang Nov 12, 2024
9f11888
Update UG
telferang Nov 12, 2024
1a99515
Merge pull request #242 from telferang/branch-bug
telferang Nov 12, 2024
8ce583f
Fix Bugs and Update UG
Alfred-Goh02 Nov 12, 2024
4d08707
Merge pull request #243 from Alfred-Goh02/branch-BugFix
Alfred-Goh02 Nov 12, 2024
5ccff9c
Revert "Fix Bugs and Update UG"
Alfred-Goh02 Nov 12, 2024
29d0560
Update PPP
telferang Nov 12, 2024
4de16ff
Merge pull request #244 from AY2425S1-CS2113-W10-1/revert-243-branch-…
Alfred-Goh02 Nov 12, 2024
f2b63c5
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
telferang Nov 12, 2024
d5e4e36
Merge pull request #245 from telferang/branch-updatePPP
telferang Nov 12, 2024
b6173b5
Update readme to display PPP
Nov 12, 2024
3dce375
Merge branch 'branch-updateReadme'
Nov 12, 2024
cb8f7a9
Update PPP and UG
Alfred-Goh02 Nov 12, 2024
03c96a5
Fix Validator Test
Alfred-Goh02 Nov 12, 2024
bf2ee6b
Merge pull request #246 from Alfred-Goh02/branch-PPP
Alfred-Goh02 Nov 12, 2024
47e8731
Update Edit feature naming
Chinorea Nov 12, 2024
352781a
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
Chinorea Nov 12, 2024
baaa8c9
Update JUnit Tests
Chinorea Nov 12, 2024
4893d9e
Update Home Page
ZiliaAJY Nov 12, 2024
1ce4965
Merge pull request #247 from Chinorea/branch-PE-D-Issues
Chinorea Nov 12, 2024
6e74982
Merge pull request #248 from ZiliaAJY/branch-Homepage
ZiliaAJY Nov 12, 2024
64c1b49
Fix naming convention in UG
Chinorea Nov 12, 2024
4858c11
Merge pull request #249 from Chinorea/branch-PE-D-Issues
Chinorea Nov 12, 2024
7758a95
Fix naming convention in DG Manual Testing
Chinorea Nov 12, 2024
9366ada
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Nov 12, 2024
f030076
Add s into search expenses in command summary of UG
Nov 12, 2024
a2ce7a3
Merge pull request #250 from Chinorea/branch-PE-D-Issues
Chinorea Nov 12, 2024
8b1bed3
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp
Nov 12, 2024
032d718
Merge branch 'master' into branch-addSInSearchExpense
Nov 12, 2024
720074f
Edit formatting errors in DG.
Nov 12, 2024
083792a
Merge pull request #251 from ChuaCleon/branch-addSInSearchExpense
ChuaCleon Nov 12, 2024
9497515
Refactor code to use more SLAP
telferang Nov 12, 2024
6a4ba6b
Update help command
telferang Nov 12, 2024
6e0e47c
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-1/tp …
telferang Nov 12, 2024
3f747a8
Merge pull request #252 from telferang/branch-updatePPP
telferang Nov 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT
/logs/
3 changes: 3 additions & 0 deletions META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: seedu.budgetbuddy.BudgetBuddy

27 changes: 12 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
# Duke project template
# BudgetBuddy

This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.
BudgetBuddy is a Command Line Interface (CLI) desktop application designed to help users manage their finances efficiently.
With BudgetBuddy, users can categorize expenses and income, add and deduct budgets, visualize income and expenses
through graphs, manage savings, and store data persistently. Given below are instructions on how to use it.

## Setting up in Intellij

Prerequisites: JDK 17 (use the exact version), update Intellij to the most recent version.

1. **Ensure Intellij JDK 17 is defined as an SDK**, as described [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk) -- this step is not needed if you have used JDK 17 in a previous Intellij project.
1. **Import the project _as a Gradle project_**, as described [here](https://se-education.org/guides/tutorials/intellijImportGradleProject.html).
1. **Verify the setup**: After the importing is complete, locate the `src/main/java/seedu/duke/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below:
1. **Verify the setup**: After the importing is complete, locate the `src/main/java/seedu/budgetbuddy/BudgetBuddy.java` file, right-click it, and choose `Run BudgetBuddy.main()`. If the setup is correct, you should see something like the below:
```
> Task :compileJava
> Task :processResources NO-SOURCE
> Task :classes

> Task :Duke.main()
Hello from
____ _
| _ \ _ _| | _____
| | | | | | | |/ / _ \
| |_| | |_| | < __/
|____/ \__,_|_|\_\___|

What is your name?

> Task :seedu.budgetbuddy.BudgetBuddy.main()
========================================================
Welcome to Budget Buddy!
========================================================
```
Type some word and press enter to let the execution proceed to the end.

Expand All @@ -39,7 +36,7 @@ Prerequisites: JDK 17 (use the exact version), update Intellij to the most recen

### JUnit tests

* A skeleton JUnit test (`src/test/java/seedu/duke/DukeTest.java`) is provided with this project template.
* A skeleton JUnit test (`src/test/java/seedu/budgetbuddy/BudgetBuddyTest.java`) is provided with this project template.
* If you are new to JUnit, refer to the [JUnit Tutorial at se-education.org/guides](https://se-education.org/guides/tutorials/junit.html).

## Checkstyle
Expand All @@ -55,7 +52,7 @@ The project uses [GitHub actions](https://github.com/features/actions) for CI. W

`/docs` folder contains a skeleton version of the project documentation.

Steps for publishing documentation to the public:
Steps for publishing documentation to the public:
1. If you are using this project template for an individual project, go your fork on GitHub.<br>
If you are using this project template for a team project, go to the team fork on GitHub.
1. Click on the `settings` tab.
Expand Down
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ repositories {
dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
implementation 'org.knowm.xchart:xchart:3.8.8'
}

test {
useJUnitPlatform()
jvmArgs '-ea'

testLogging {
events "passed", "skipped", "failed"
Expand All @@ -29,11 +31,11 @@ test {
}

application {
mainClass.set("seedu.duke.Duke")
mainClass.set("seedu.budgetbuddy.BudgetBuddy")
}

shadowJar {
archiveBaseName.set("duke")
archiveBaseName.set("budgetbuddy")
archiveClassifier.set("")
}

Expand All @@ -43,4 +45,6 @@ checkstyle {

run{
standardInput = System.in
jvmArgs '-ea'
enableAssertions = true
}
30 changes: 30 additions & 0 deletions data/BudgetBuddy.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
expense | plane | 1000.0 | 15/9/2024 | FOOD
expense | hello | 2.0 | 15/9/2024 | OTHERS
expense | go skiing | 100.0 | 15/10/2024 | FOOD
expense | plane tickets to korea | 1000.0 | 15/9/2024 | OTHERS
expense | zoo tickets | 20.0 | 15/9/2024 | FOOD
expense | plane tickets to japan | 1000.0 | 15/10/2024 | OTHERS
expense | plane tickets to europe | 1000.0 | 1/8/2024 | OTHERS
expense | wingstop | 20.0 | 15/10/2024 | OTHERS
expense | plane ticket to japan | 1000.0 | 10/10/2024 | TRANSPORT
expense | food | 5.5 | 10/10/2024 | FOOD
expense | test | 10.0 | 10/10/2024 | OTHERS
expense | popmart | 300.0 | 20/10/2023 | ENTERTAINMENT
expense | table | 123.0 | 1/10/2023 | OTHERS
expense | char | 2567.0 | 3/10/2023 | OTHERS
expense | fly kite | 50.0 | 9/10/2025 | ENTERTAINMENT
expense | go zoo | 300.0 | 10/10/2024 | OTHERS
expense | restaurant | 300.0 | 10/10/2025 | FOOD
income | tuition fees | 1000.0 | 15/9/2024
income | tuition | 2.0E8 | 15/9/2024
income | tuition fee | 10000.0 | 15/10/2024
income | Starbucks crew | 1000.0 | 1/10/2024
income | Mcdonald crew | 1000.0 | 15/10/2024
income | fries crew | 2000.0 | 15/10/2023
income | tuition fee | 1000.0 | 15/9/2024
budget | 3200.0 | 2024-11 | {ENTERTAINMENT=3000.0, FOOD=200.0}
budget | 2400.0 | 2024-10 | {TRANSPORT=1200.0, ENTERTAINMENT=1200.0}
budget | 2550.0 | 2024-08 | {OTHERS=1800.0, FOOD=750.0}
budget | 1700.0 | 2024-07 | {OTHERS=1700.0}
budget | 3900.0 | 2024-05 | {OTHERS=1300.0, ENTERTAINMENT=1300.0, FOOD=1300.0}
budget | 2600.0 | 2023-08 | {OTHERS=1900.0, UTILITIES=700.0}
14 changes: 7 additions & 7 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# About us

Display | Name | Github Profile | Portfolio
--------|:----:|:--------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
| Display | Name | Github Profile | Portfolio |
|--------------------------------------|--------------|-------------------------------------------|-----------------------------------|
| ![](images/Portrait_placeholder.png) | Kenneth Ang | [Github](https://github.com/Chinorea) | [Portfolio](team/chinorea.md) |
| ![](images/Portrait_placeholder.png) | Telfer Ang | [GitHub](https://github.com/telferang) | [Portfolio](team/telferang.md) |
| ![](images/Portrait_placeholder.png) | Cleon | [GitHub](https://github.com/chuacleon) | [Portfolio](team/chuacleon.md) |
| ![](images/Portrait_placeholder.png) | Zilia Ang | [Github](https://github.com/ZiliaAJY) | [Portfolio](team/ziliaajy.md) |
| ![](images/Portrait_placeholder.png) | Alfred Goh | [Github](https://github.com/Alfred-Goh02) | [Portfolio](team/alfred-goh02.md) |
Loading
Loading