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

[CS2103-F13-1] SpleetWaise #1

Open
wants to merge 651 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
651 commits
Select commit Hold shift + click to select a range
e10d9da
Remove CommonModel reference dependency
rollingpencil Nov 4, 2024
203ff25
Remove unused imports in AddressBook
rollingpencil Nov 4, 2024
a6877d1
Update UserGuide with updated filterTxn usage
rollingpencil Nov 4, 2024
5ec50c0
Update FilterCommandParserTest with no param check
rollingpencil Nov 4, 2024
7636f6d
Update Date constraint message
rollingpencil Nov 4, 2024
2b297bb
Merge pull request #244 from AY2425S1-CS2103-F13-1/208-feb-dates
SeeYangZhi Nov 4, 2024
897c417
Merge pull request #242 from AY2425S1-CS2103-F13-1/241-abstract-excep…
rollingpencil Nov 4, 2024
8e1e042
Merge pull request #245 from AY2425S1-CS2103-F13-1/212-filter-index
SeeYangZhi Nov 4, 2024
074d81c
Add deleteTxn UG
SeeYangZhi Nov 4, 2024
51022c5
Move editTxn details to after edit command
SeeYangZhi Nov 4, 2024
79a8fa5
Add missing remark UG
SeeYangZhi Nov 4, 2024
59894cc
Merge pull request #251 from AY2425S1-CS2103-F13-1/243-add-deleteTxn-UG
GavinSin Nov 4, 2024
0ad46e1
Abstract storage to commons
SeeYangZhi Nov 4, 2024
efaebb4
Update addTxn UG description
Dino-Nuggies Nov 4, 2024
fdb4205
Merge branch 'master' into 252-UpdateUG-addTxn
Dino-Nuggies Nov 4, 2024
db01b41
Update remark related validation
SeeYangZhi Nov 4, 2024
7084609
Update Status to handle validation
rollingpencil Nov 4, 2024
39327d7
Implement filter by status in filterTxn
rollingpencil Nov 4, 2024
a65e0b0
Refactor appparameters and utils to common package
SeeYangZhi Nov 4, 2024
bb98c2f
Update filterTxn user guide
rollingpencil Nov 4, 2024
3a05e3b
Move index to commons
SeeYangZhi Nov 4, 2024
ec0a0a5
Update DG for addTxn
Dino-Nuggies Nov 4, 2024
20654d8
Move version to commons
SeeYangZhi Nov 4, 2024
356e320
Move GuiSettings.java to commons
SeeYangZhi Nov 4, 2024
22f9abc
Add more description to CATEGORY field
Dino-Nuggies Nov 4, 2024
6de1017
Update log file name to spleetwaise
SeeYangZhi Nov 4, 2024
d33d8df
Move IdUtil to commons.util
SeeYangZhi Nov 4, 2024
b3b902a
Merge pull request #256 from AY2425S1-CS2103-F13-1/247-filter-by-status
GavinSin Nov 4, 2024
ea16199
Move Logic and LogicManager to commons.logic
SeeYangZhi Nov 4, 2024
e2ea4a1
Abstract storage to commons
SeeYangZhi Nov 4, 2024
53d56ee
Refactor appparameters and utils to common package
SeeYangZhi Nov 4, 2024
bf63f59
Move index to commons
SeeYangZhi Nov 4, 2024
912746d
Move version to commons
SeeYangZhi Nov 4, 2024
da06e31
Move GuiSettings.java to commons
SeeYangZhi Nov 4, 2024
c945399
Update log file name to spleetwaise
SeeYangZhi Nov 4, 2024
25e372b
Move IdUtil to commons.util
SeeYangZhi Nov 4, 2024
1d504c5
Move Logic and LogicManager to commons.logic
SeeYangZhi Nov 4, 2024
e499c37
Merge branch '253-abstract-storage-to-commons' of https://github.com/…
SeeYangZhi Nov 4, 2024
0dd8bc7
Update UG
seanlim Nov 4, 2024
59b7863
Merge pull request #254 from AY2425S1-CS2103-F13-1/253-abstract-stora…
rollingpencil Nov 4, 2024
1efab06
Merge pull request #259 from AY2425S1-CS2103-F13-1/258-update-ug
rollingpencil Nov 4, 2024
6bd1dee
Merge pull request #255 from AY2425S1-CS2103-F13-1/252-UpdateUG-addTxn
SeeYangZhi Nov 5, 2024
939468d
Move Main and MainApp to commons
SeeYangZhi Nov 5, 2024
e77a5a6
Move ui to commons
SeeYangZhi Nov 5, 2024
12a83ca
Update DG for commons package details
SeeYangZhi Nov 5, 2024
7dff23e
Merge pull request #261 from AY2425S1-CS2103-F13-1/253-main-ui-refactor
rollingpencil Nov 5, 2024
3279cdd
Refactor `userPrefs` to common model
seanlim Nov 5, 2024
4aaeefb
Add constructor tests
seanlim Nov 5, 2024
0c3f7fc
Update DG comment
seanlim Nov 5, 2024
57205b8
Add missing categories in Transaction Pane
GavinSin Nov 5, 2024
97ee687
Merge pull request #264 from AY2425S1-CS2103-F13-1/262-userprefs-refa…
SeeYangZhi Nov 5, 2024
a90c5e3
Merge pull request #249 from AY2425S1-CS2103-F13-1/248-relax-remark-v…
SeeYangZhi Nov 5, 2024
fe6bdd7
Add Light theme instead of dark theme
GavinSin Nov 5, 2024
bf08321
Merge branch 'master' into 250-add-missing-cat-in-txnpane
GavinSin Nov 5, 2024
2a2c517
Deduplicate parseIndex
SeeYangZhi Nov 5, 2024
3dc3dbf
Merge branch 'master' into 181-custom-filter-ui-and-interactions
GavinSin Nov 5, 2024
e5493ca
Chanegs related to assertThrows moving to commons
SeeYangZhi Nov 5, 2024
6b11a22
Introduce getPersonByFilteredPersonListIndex to deduplicate code
SeeYangZhi Nov 5, 2024
ec926fa
Removed redundant code and refactor ParserUtil
SeeYangZhi Nov 5, 2024
292e041
Merge pull request #257 from AY2425S1-CS2103-F13-1/238-UpdateDG-addTxn
SeeYangZhi Nov 5, 2024
c0b055d
Rename app title
SeeYangZhi Nov 5, 2024
2303369
Move storage docs to `_includes`
seanlim Nov 5, 2024
4017d36
Update architecture explanation
seanlim Nov 5, 2024
4460eef
Update architecture diagram
seanlim Nov 5, 2024
f0b5850
Improve architecture diagram
seanlim Nov 5, 2024
f938093
Split filter conditions into sub-predicates
rollingpencil Nov 5, 2024
7c549eb
Update FilterCommand to use sub-predicates
rollingpencil Nov 5, 2024
f468b2b
Implement Amount Sign filter
rollingpencil Nov 5, 2024
9833a44
Fix typo in AmountSignFilterPredicate
rollingpencil Nov 5, 2024
a50577f
Update user guide with amount sign info
rollingpencil Nov 5, 2024
5e7f688
Add parseAmountSign tests
rollingpencil Nov 5, 2024
169b5e8
Merge pull request #269 from AY2425S1-CS2103-F13-1/239-rename-app-title
rollingpencil Nov 5, 2024
0c40426
Merge pull request #271 from AY2425S1-CS2103-F13-1/263-update-dg
SeeYangZhi Nov 5, 2024
984855c
Merge pull request #267 from AY2425S1-CS2103-F13-1/266-deduplicate-pa…
rollingpencil Nov 5, 2024
5e59dc8
Fix typo in ParserUtilTest
rollingpencil Nov 5, 2024
949beb4
Merge branch 'master' into 204-filter-refactor
rollingpencil Nov 5, 2024
d5c8b59
Merge branch '204-filter-refactor' into 204-amtsign-filter
rollingpencil Nov 5, 2024
de750da
Fix import order in ParserUtilTest
rollingpencil Nov 5, 2024
0c371be
Add isStopped condition to prevent double invocation
SeeYangZhi Nov 5, 2024
8c539e2
Clarify the implied behaviour of inputing phone number
SeeYangZhi Nov 5, 2024
4336fd9
Correct behaviour of editing categories
SeeYangZhi Nov 5, 2024
4ea9935
Correct index reference
SeeYangZhi Nov 5, 2024
9857eb6
Merge pull request #236 from AY2425S1-CS2103-F13-1/181-custom-filter-…
rollingpencil Nov 5, 2024
9dfd2d8
Merge pull request #279 from AY2425S1-CS2103-F13-1/278-fix-double-stop
rollingpencil Nov 5, 2024
bc55880
Merge branch 'master' into 250-add-missing-cat-in-txnpane
GavinSin Nov 5, 2024
e822a22
Merge pull request #265 from AY2425S1-CS2103-F13-1/250-add-missing-ca…
rollingpencil Nov 5, 2024
c29f44b
Merge pull request #276 from AY2425S1-CS2103-F13-1/204-filter-refactor
GavinSin Nov 5, 2024
f5cd88d
Merge pull request #281 from AY2425S1-CS2103-F13-1/280-clarify-editTx…
rollingpencil Nov 5, 2024
095f540
Fix typo in User guide
rollingpencil Nov 5, 2024
4f4ac5d
Merge pull request #283 from AY2425S1-CS2103-F13-1/204-amtsign-filter
GavinSin Nov 5, 2024
ac1fd6c
Trim input before valid description testing
rollingpencil Nov 5, 2024
b006039
Move address UI components to address package
GavinSin Nov 5, 2024
d026dbc
Merge pull request #285 from AY2425S1-CS2103-F13-1/260-desc-validatio…
GavinSin Nov 5, 2024
b746bae
Update FilterCommandPredicate equal logic
rollingpencil Nov 5, 2024
273885b
Merge pull request #286 from AY2425S1-CS2103-F13-1/268-UI-component-i…
rollingpencil Nov 5, 2024
d3ebfcb
Merge pull request #287 from AY2425S1-CS2103-F13-1/204-equal-check
GavinSin Nov 5, 2024
3105bc7
Update model description
seanlim Nov 5, 2024
26f9679
Update class diagrams
seanlim Nov 5, 2024
2d64ce2
Merge pull request #288 from AY2425S1-CS2103-F13-1/100-update-dg-model
rollingpencil Nov 5, 2024
3157967
allow status field for `addTxn` command, refactor Transaction
GavinSin Nov 5, 2024
6e50d79
Add invalid status parser command test
GavinSin Nov 5, 2024
819e06f
Update TxnModel CD to contain Status and Category
rollingpencil Nov 6, 2024
2bb812c
Merge pull request #293 from AY2425S1-CS2103-F13-1/289-txn-model-upd
SeeYangZhi Nov 6, 2024
1399732
Add UG guide for `addTxn` command
GavinSin Nov 6, 2024
c385e27
Revert "Add UG guide for `addTxn` command"
GavinSin Nov 6, 2024
82a3239
Add UG guide for `addTxn` command
GavinSin Nov 6, 2024
39f188f
Merge pull request #290 from AY2425S1-CS2103-F13-1/229-addTxn-with-st…
SeeYangZhi Nov 6, 2024
13ac47b
Update hyperlink for main and mainapp.java
SeeYangZhi Nov 6, 2024
008c343
Update hyperlinks in DG UI
SeeYangZhi Nov 6, 2024
7d8b25d
Update hyperlinks in DG Logic
SeeYangZhi Nov 6, 2024
7f5aa4a
Update hyperlink in DG Devops
SeeYangZhi Nov 6, 2024
30a11a3
Merge pull request #295 from AY2425S1-CS2103-F13-1/275-fix-DG-hyperlinks
rollingpencil Nov 6, 2024
5289768
Merge branch 'master' into 291-refactor-right-panel-filter
GavinSin Nov 6, 2024
02c0a52
Refactor right panel filter and bugfix
GavinSin Nov 6, 2024
0441925
Add UML class diagram for common model
seanlim Nov 6, 2024
879381b
Merge pull request #296 from AY2425S1-CS2103-F13-1/168-update-model-dg
rollingpencil Nov 6, 2024
c550bbf
Remove escape sequence
SeeYangZhi Nov 6, 2024
01507fd
Add test case for common indian names
SeeYangZhi Nov 6, 2024
74c237f
Merge pull request #298 from AY2425S1-CS2103-F13-1/297-remove-escape-…
rollingpencil Nov 6, 2024
6b90ee4
Update UG to reflect changes
SeeYangZhi Nov 6, 2024
592c2b0
Merge pull request #299 from AY2425S1-CS2103-F13-1/297-remove-escape-…
rollingpencil Nov 6, 2024
51c3a69
Update user guide with tips
rollingpencil Nov 6, 2024
752a4d0
Update wording of reset filter
rollingpencil Nov 6, 2024
3c7d10c
Merge pull request #301 from AY2425S1-CS2103-F13-1/300-fix-ug
SeeYangZhi Nov 6, 2024
1641302
Move common package disclaimer
rollingpencil Nov 6, 2024
5dd8980
Update UG
SeeYangZhi Nov 6, 2024
735fa21
Merge pull request #302 from AY2425S1-CS2103-F13-1/300-fix-ug
SeeYangZhi Nov 6, 2024
c29dadd
Merge pull request #304 from AY2425S1-CS2103-F13-1/UG-FIX
rollingpencil Nov 6, 2024
bef4a6e
Update whitespace behaviour for aB
SeeYangZhi Nov 6, 2024
7f1985b
Fix GUI test
GavinSin Nov 6, 2024
0a94f17
Merge branch 'master' into 291-refactor-right-panel-filter
GavinSin Nov 6, 2024
6996518
Update whitespace behaviour for tB
SeeYangZhi Nov 6, 2024
eef1013
Fix check style issue
GavinSin Nov 6, 2024
d9db366
Add bug fix during edit person name
GavinSin Nov 6, 2024
5e44aed
Remove unused import
GavinSin Nov 6, 2024
32b0afe
Merge pull request #308 from AY2425S1-CS2103-F13-1/bugfix-on-edit-per…
SeeYangZhi Nov 6, 2024
1627762
Merge pull request #307 from AY2425S1-CS2103-F13-1/fix-data-file-edit…
GavinSin Nov 6, 2024
8acee5d
Merge branch 'master' into bugfix-label-in-txnpane-too-long
GavinSin Nov 6, 2024
3c9e656
Merge pull request #306 from AY2425S1-CS2103-F13-1/291-refactor-right…
rollingpencil Nov 6, 2024
cffc346
Update Class diagram of Parser Classes
rollingpencil Nov 6, 2024
90dbc52
Fix typo in naming
rollingpencil Nov 6, 2024
48f10e4
Update images of AB and Txn Model CD
rollingpencil Nov 6, 2024
b46ddbc
Fix id errors when editing from json
SeeYangZhi Nov 6, 2024
9804833
Add test cases
SeeYangZhi Nov 6, 2024
c6fbe18
Update UserGuide.md
SeeYangZhi Nov 6, 2024
0b87685
Add Command Summary for markDone and markUndone
rollingpencil Nov 6, 2024
6d1402f
Merge pull request #309 from AY2425S1-CS2103-F13-1/300-fix-ug
SeeYangZhi Nov 6, 2024
f0a4a31
Merge pull request #310 from AY2425S1-CS2103-F13-1/fix-ID
rollingpencil Nov 6, 2024
09a99fe
Add bugfix on desc/name/remark too long in UI
GavinSin Nov 6, 2024
c115007
Merge branch 'master' into bugfix-label-in-txnpane-too-long
GavinSin Nov 6, 2024
dcc23fd
Merge pull request #311 from AY2425S1-CS2103-F13-1/bugfix-label-in-tx…
rollingpencil Nov 6, 2024
988519a
Merge branch 'master' into 312-add-year-on-UI
GavinSin Nov 6, 2024
f537426
Add year on txn list
GavinSin Nov 6, 2024
6f86c73
Remove not implemented use cases
rollingpencil Nov 6, 2024
83b992d
Change year format to uuuu
GavinSin Nov 6, 2024
0983fd9
Merge pull request #313 from AY2425S1-CS2103-F13-1/312-add-year-on-UI
rollingpencil Nov 6, 2024
b7787a8
Update local testing guide for editTxn and filterTxn
rollingpencil Nov 6, 2024
07a1f93
Track balance based on txn list dynamically
GavinSin Nov 6, 2024
a390add
Refactor `CommonModel`
seanlim Nov 6, 2024
b66195a
Remove unused codes
GavinSin Nov 6, 2024
8b9a191
Refactor `TransactionBookParser`
seanlim Nov 6, 2024
a3b48e6
Remove trailing space
GavinSin Nov 6, 2024
f9b7447
Update DG
seanlim Nov 6, 2024
f81bc59
Update JsonAdaptedTransaction.java
SeeYangZhi Nov 6, 2024
b63b1e6
Merge pull request #317 from AY2425S1-CS2103-F13-1/314-track-dynamic-…
rollingpencil Nov 6, 2024
1072bb0
Merge pull request #315 from AY2425S1-CS2103-F13-1/223-remove-uc
GavinSin Nov 6, 2024
8fb7514
Change filter menu to initialize once and hide/show
GavinSin Nov 6, 2024
4275fea
Testing UI test
SeeYangZhi Nov 6, 2024
376ea13
Merge pull request #319 from AY2425S1-CS2103-F13-1/318-refactor-varia…
GavinSin Nov 6, 2024
7657337
Update docs/_includes/DeveloperGuide/Design/model.md
GavinSin Nov 6, 2024
ff7a520
Update src/main/java/spleetwaise/address/model/AddressBookModel.java
GavinSin Nov 6, 2024
f8e565f
Update src/main/java/spleetwaise/address/model/AddressBookModelManage…
GavinSin Nov 6, 2024
ed9b285
Update src/main/java/spleetwaise/transaction/model/TransactionBookMod…
GavinSin Nov 6, 2024
50562c2
Update src/main/java/spleetwaise/commons/MainApp.java
GavinSin Nov 6, 2024
3a9ef32
Update src/main/java/spleetwaise/transaction/model/TransactionBookMod…
GavinSin Nov 6, 2024
3dc7e2f
Update src/test/java/spleetwaise/address/logic/commands/AddCommandTes…
GavinSin Nov 6, 2024
3b84d0d
Update src/test/java/spleetwaise/address/logic/commands/AddCommandTes…
GavinSin Nov 6, 2024
42b10a1
Update src/test/java/systemtests/TestApp.java
GavinSin Nov 6, 2024
7f299ea
Merge pull request #323 from AY2425S1-CS2103-F13-1/321-bugfix-multipl…
SeeYangZhi Nov 6, 2024
424c798
Merge pull request #324 from AY2425S1-CS2103-F13-1/test-ui-test
rollingpencil Nov 6, 2024
d008129
Merge pull request #316 from AY2425S1-CS2103-F13-1/305-refactor
GavinSin Nov 6, 2024
bba0023
Remove CommonModel reference
rollingpencil Nov 6, 2024
a530555
Merge pull request #325 from AY2425S1-CS2103-F13-1/fix-dg-typo
SeeYangZhi Nov 6, 2024
6104b72
Add acknowledgements
SeeYangZhi Nov 7, 2024
9d4a42e
Update JsonAdaptedTransaction.java
SeeYangZhi Nov 7, 2024
0d48408
Merge pull request #329 from AY2425S1-CS2103-F13-1/318-refactor-varia…
rollingpencil Nov 7, 2024
65eb734
Merge pull request #328 from AY2425S1-CS2103-F13-1/270-acknowledgements
rollingpencil Nov 7, 2024
45a0e1f
Fix links
SeeYangZhi Nov 7, 2024
08e2a51
Merge pull request #330 from AY2425S1-CS2103-F13-1/270-acknowledgements
rollingpencil Nov 7, 2024
fd18894
Add additional lines related to categories in addTxn
Dino-Nuggies Nov 7, 2024
1bbe345
Ignore ui codecov and add better error message for editTxn
SeeYangZhi Nov 7, 2024
de9f6fe
Merge pull request #333 from AY2425S1-CS2103-F13-1/331-addTxn-category
seanlim Nov 7, 2024
a6df261
Merge pull request #332 from AY2425S1-CS2103-F13-1/ignore-ui-codecov
rollingpencil Nov 7, 2024
35d0141
Update UG and DG documentation
Dino-Nuggies Nov 7, 2024
f4df9c9
Merge branch 'master' into 334-duplicatedTxn-UG&DG
Dino-Nuggies Nov 7, 2024
d962e4f
Extract methods in FilterCommandParser
rollingpencil Nov 7, 2024
4580207
Merge pull request #337 from AY2425S1-CS2103-F13-1/336-filter-refactor
SeeYangZhi Nov 7, 2024
28401a3
Add option to track undone balance
GavinSin Nov 7, 2024
e6d99c4
Refactor variable naming for clarity
GavinSin Nov 7, 2024
3f0cc99
Merge pull request #339 from AY2425S1-CS2103-F13-1/322-add-option-tra…
SeeYangZhi Nov 7, 2024
4b867b9
Change update to be more concise
Dino-Nuggies Nov 7, 2024
fa4b35e
Further description to duplicated description
Dino-Nuggies Nov 7, 2024
3bc8796
Reset toggle info in `resetFilter` method
GavinSin Nov 7, 2024
e557c06
Merge branch 'master' into 334-duplicatedTxn-UG&DG
Dino-Nuggies Nov 7, 2024
c2f838d
Update `RightPanelTest`
GavinSin Nov 7, 2024
7b3a944
Reset toggle info is `POSITIVE_SIGN` instead
GavinSin Nov 7, 2024
6e3a90b
Fix GUI issue and make local GUI testing faster
GavinSin Nov 7, 2024
ddcc19c
Merge pull request #335 from AY2425S1-CS2103-F13-1/334-duplicatedTxn-…
SeeYangZhi Nov 7, 2024
ff95941
Refactor PrefixesPresent methods
SeeYangZhi Nov 7, 2024
8d19eae
Add specificity for manual testing
SeeYangZhi Nov 7, 2024
a8e353b
Merge pull request #340 from AY2425S1-CS2103-F13-1/320-resetFilter-to…
SeeYangZhi Nov 7, 2024
fc35409
Update formatting and rectify command prefix
SeeYangZhi Nov 7, 2024
e61f95b
Update UI images on UG,DG and readme
GavinSin Nov 7, 2024
119dae5
Add authorship
rollingpencil Nov 7, 2024
2978bfa
touch up DG
GavinSin Nov 7, 2024
e0b78fc
Merge pull request #344 from AY2425S1-CS2103-F13-1/327-update-ui-images
SeeYangZhi Nov 7, 2024
9917cd9
Add wrap text to amount field
GavinSin Nov 7, 2024
0d10170
Merge pull request #342 from AY2425S1-CS2103-F13-1/reafactoring
rollingpencil Nov 7, 2024
97b6b33
Add comma support for name
SeeYangZhi Nov 7, 2024
9ac3fa5
Merge pull request #349 from AY2425S1-CS2103-F13-1/348-comma-support
rollingpencil Nov 7, 2024
1e6229a
Update _base.scss
SeeYangZhi Nov 7, 2024
5bf1064
Fix storage desync issue
seanlim Nov 7, 2024
c3bfa20
Merge pull request #350 from AY2425S1-CS2103-F13-1/change-docs-header
GavinSin Nov 7, 2024
513fd9c
Nit logs
seanlim Nov 7, 2024
39a7748
Fix typo
seanlim Nov 7, 2024
ab07550
Merge pull request #347 from AY2425S1-CS2103-F13-1/346-bugfix-amount-…
rollingpencil Nov 7, 2024
a2f6897
Add `clear` command should empty transaction book
GavinSin Nov 7, 2024
5fe1eda
Merge pull request #352 from AY2425S1-CS2103-F13-1/343-storage-bug
SeeYangZhi Nov 7, 2024
8c284a4
Add test case that test for non empty txnlist
GavinSin Nov 7, 2024
b90c39c
Add filter to support categories
Dino-Nuggies Nov 7, 2024
1804035
Merge pull request #353 from AY2425S1-CS2103-F13-1/clearCommand-shoul…
seanlim Nov 7, 2024
e88c8e0
Update Version string to 1.5
rollingpencil Nov 7, 2024
3612834
Merge pull request #356 from AY2425S1-CS2103-F13-1/240-ver-inc-15
SeeYangZhi Nov 7, 2024
4cae8c6
Test code for CategoryFilterPredicate
Dino-Nuggies Nov 7, 2024
79da9f6
Test code for methods in FilterCommand and parser
Dino-Nuggies Nov 7, 2024
3bb6c15
Update Javadoc
Dino-Nuggies Nov 7, 2024
96d3206
Removal of execute_categoryDifferentCase_success()
Dino-Nuggies Nov 7, 2024
558de8e
Update UG to include the filtering of category
Dino-Nuggies Nov 7, 2024
5191336
Fix filterTxn typo in DG
Dino-Nuggies Nov 7, 2024
77e6e1e
Add missing spacing in filterTxn message
Dino-Nuggies Nov 7, 2024
ddb085f
Merge pull request #355 from AY2425S1-CS2103-F13-1/351-filter-cat
Dino-Nuggies Nov 7, 2024
8016b18
Remove status and category for equality check
rollingpencil Nov 7, 2024
6e5ff26
Updated UG with specified fields
rollingpencil Nov 7, 2024
ee40015
Merge pull request #359 from AY2425S1-CS2103-F13-1/345-equal-check
SeeYangZhi Nov 7, 2024
954e813
Increment ver to 1.5.1
rollingpencil Nov 7, 2024
8a227aa
Fix typo in UG
rollingpencil Nov 7, 2024
9ad5519
Update Code Cov ignore
rollingpencil Nov 7, 2024
514677d
Merge pull request #360 from AY2425S1-CS2103-F13-1/240-ver-inc-151
SeeYangZhi Nov 7, 2024
f52856c
Update name of app in log
rollingpencil Nov 7, 2024
3c75388
Merge pull request #361 from AY2425S1-CS2103-F13-1/240-ver-inc-151
SeeYangZhi Nov 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ignore:
- "src/main/java/spleetwaise/commons/ui/*"
- "src/main/java/spleetwaise/address/ui/*"
- "src/main/java/spleetwaise/transaction/ui/*"
- "src/main/java/spleetwaise/commons/MainApp.java"
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @seeyangzhi @seanlim @rollingpencil @gavinsin @Dino-Nuggies
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Java CI

on: [push, pull_request]
on: [ push, pull_request, workflow_dispatch ]

jobs:
build:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
platform: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.platform }}

steps:
Expand All @@ -23,7 +23,7 @@ jobs:

- name: Run repository-wide tests
if: runner.os == 'Linux'
working-directory: ${{ github.workspace }}/.github
working-directory: ${{ github.workspace }}/.github
run: ./run-checks.sh

- name: Validate Gradle Wrapper
Expand Down
42 changes: 31 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,34 @@
[![CI Status](https://github.com/se-edu/addressbook-level3/workflows/Java%20CI/badge.svg)](https://github.com/se-edu/addressbook-level3/actions)
[![CI Status](https://github.com/AY2425S1-CS2103-F13-1/tp/actions/workflows/gradle.yml/badge.svg?branch=master)](https://github.com/AY2425S1-CS2103-F13-1/tp/actions?query=branch%3Amaster)

[![codecov](https://codecov.io/gh/AY2425S1-CS2103-F13-1/tp/graph/badge.svg?token=91MOH0UZHU)](https://codecov.io/gh/AY2425S1-CS2103-F13-1/tp)

![Ui](docs/images/Ui.png)

* This is **a sample project for Software Engineering (SE) students**.<br>
Example usages:
* as a starting point of a course project (as opposed to writing everything from scratch)
* as a case study
* The project simulates an ongoing software project for a desktop application (called _AddressBook_) used for managing contact details.
* It is **written in OOP fashion**. It provides a **reasonably well-written** code base **bigger** (around 6 KLoC) than what students usually write in beginner-level SE modules, without being overwhelmingly big.
* It comes with a **reasonable level of user and developer documentation**.
* It is named `AddressBook Level 3` (`AB3` for short) because it was initially created as a part of a series of `AddressBook` projects (`Level 1`, `Level 2`, `Level 3` ...).
* For the detailed documentation of this project, see the **[Address Book Product Website](https://se-education.org/addressbook-level3)**.
* This project is a **part of the se-education.org** initiative. If you would like to contribute code to this project, see [se-education.org](https://se-education.org/#contributing-to-se-edu) for more info.
---
# [CS2103-F13-1] SpleetWaise

> SpleetWaise builds on [AddressBook Level 3 (AB3)](https://se-education.org/addressbook-level3/), **a desktop app for managing contacts, optimized for use via a Command Line Interface** (CLI) while still offering the benefits of a Graphical User Interface (GUI). _Designed to streamline expense tracking for students_, SpleetWaise makes it easy to record and monitor both personal and shared expenses with contacts saved in the address book. With features to keep track of balances with friends, it eliminates the confusion often associated with managing shared costs, providing a clear, organised view of who has owes what. If you can type fast, SpleetWaise lets you handle your contact and expense management tasks more efficiently than traditional GUI apps, offering students a stress-free way to manage their expenses and shared balances with contacts.

> **Target User**: Tech-savvy students looking to track shared expenses and manage who owes what.

---

* For the detailed documentation of this project, see
the [SpleetWaise Product Website](https://ay2425s1-cs2103-f13-1.github.io/tp/).

---

## Git Workflow

This project uses the [Feature Branch Flow](https://nus-cs2103-ay2425s1.github.io/website/se-book-adapted/chapters/revisionControl.html#feature-branch-flow) with rules set to protect the `master` branch. PRs are mandatory and at least 1 member requires review.

> Feature branches are branches being used to develop an individual story. They should be named "{issue-number}-{summary}" where "{issue-number}" is the issue number corresponding to the feature you are implementing and "{summary}" is a brief summary of the feature `formatted-like-this`.

## Acknowledgement

This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).

- Libraries
used: [JavaFX](https://openjfx.io/), [Jackson](https://github.com/FasterXML/jackson), [JUnit5](https://github.com/junit-team/junit5), [Mockito](https://github.com/mockito/mockito), [TestFX](https://github.com/TestFX/TestFX)
- References
used: [SE-EDU initiative](https://se-education.org/), [AB4](https://github.com/se-edu/addressbook-level4)
56 changes: 47 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id 'jacoco'
}

mainClassName = 'seedu.address.Main'
mainClassName = 'spleetwaise.commons.Main'

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
Expand All @@ -20,20 +20,44 @@ checkstyle {
toolVersion = '10.2'
}

tasks.register('guiTests', Test) {
useJUnitPlatform()
include 'systemtests/**'
enableAssertions = true
}

tasks.register('nonGuiTests', Test) {
useJUnitPlatform()
include 'spleetwaise/address/**'
include 'spleetwaise/common/**'
include 'spleetwaise/transaction/**'
enableAssertions = true
}

tasks.register('allTests') {
dependsOn nonGuiTests, guiTests
}

test {
useJUnitPlatform()
finalizedBy jacocoTestReport

systemProperty 'testfx.setup.timeout', '60000'
systemProperty 'java.awt.headless', 'true'
systemProperty 'prism.order', 'sw'
systemProperty 'prism.text', 't2k'
enableAssertions = true

exclude 'systemtests/**'
}

task coverage(type: JacocoReport) {
tasks.register('coverage', JacocoReport) {
sourceDirectories.from files(sourceSets.main.allSource.srcDirs)
classDirectories.from files(sourceSets.main.output)
executionData.from files(jacocoTestReport.executionData)
afterEvaluate {
classDirectories.from files(classDirectories.files.collect {
fileTree(dir: it, exclude: ['**/*.jar'])
})
}
classDirectories.setFrom(files(classDirectories.files.collect {
fileTree(dir: it, exclude: ['**/*.jar'])
}))
reports {
html.required = true
xml.required = true
Expand Down Expand Up @@ -63,10 +87,24 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion

testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion

testImplementation "org.testfx:testfx-core:4.0.18"
testImplementation "org.testfx:testfx-junit5:4.0.18"
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.13.2'

testImplementation "org.mockito:mockito-core:5.14.2"
testImplementation 'org.mockito:mockito-junit-jupiter:5.14.2' // Add Mockito JUnit 5 integration
}

shadowJar {
archiveFileName = 'addressbook.jar'
archiveBaseName = "spleetwaise"
archiveVersion = "1.5.1"
archiveClassifier = null
}

run {
enableAssertions = true
}

defaultTasks 'clean', 'test'
defaultTasks 'clean', 'nonGuiTests', 'coverage'
Loading