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

Fix edit command #234

Draft
wants to merge 458 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
458 commits
Select commit Hold shift + click to select a range
4ba1182
added tests for algorithm
podocarp Oct 19, 2019
ad3681c
Update invite/disinvite method for Activity class
daekoon Oct 19, 2019
6fd18bf
added test for inviting people
podocarp Oct 19, 2019
ab8c8bb
Merge branch 'master' into add-invite-disinvite-method-for-activity
daekoon Oct 19, 2019
799f31f
Modify InviteCommand class
JohnNzj Oct 19, 2019
43b76be
Merge branch 'master' into add-invite-command
JohnNzj Oct 19, 2019
3a1104f
Completed InviteCommand class
JohnNzj Oct 19, 2019
b508d11
Add InviteCommandTest
JohnNzj Oct 19, 2019
bf8837e
Add new line to InviteCommandTest
JohnNzj Oct 19, 2019
f55a8aa
Use assert in InviteCommand
JohnNzj Oct 19, 2019
1a675eb
Improve checkstyle
JohnNzj Oct 19, 2019
7cb4c8d
Modify InviteCommand to handle duplicate entries
JohnNzj Oct 19, 2019
1a56d84
Remove Person class dependency from Activity class, and fix merge issues
daekoon Oct 19, 2019
22672dd
Add test for Activity class
daekoon Oct 19, 2019
18b6f67
Merge pull request #102 from AY1920S1-CS2103T-W11-2/add-invite-disinv…
JohnNzj Oct 19, 2019
946a18e
Merge branch 'master' into add-invite-command
JohnNzj Oct 19, 2019
ea55cde
Update README.adoc
podocarp Oct 20, 2019
7773400
add pri key to activity
podocarp Oct 20, 2019
3efd1e7
Merge branch 'master' into activity-pri-key
podocarp Oct 20, 2019
4448909
add check for duplicate pri keys
podocarp Oct 20, 2019
d3a2f66
update tests
podocarp Oct 20, 2019
cfa53c4
fix style
podocarp Oct 20, 2019
e8b2756
Merge branch 'master' into add-invite-command
podocarp Oct 20, 2019
6334e6b
Merge pull request #104 from AY1920S1-CS2103T-W11-2/activity-pri-key
liakify Oct 21, 2019
92b557d
Merge branch 'master' into algorithmic
podocarp Oct 21, 2019
f4d1df3
Merge branch 'master' into add-invite-command
daekoon Oct 21, 2019
10b4eae
Merge pull request #103 from AY1920S1-CS2103T-W11-2/add-invite-command
daekoon Oct 21, 2019
abbc391
Update user guide for Activity command
daekoon Oct 21, 2019
af7a472
Improve activity command description
daekoon Oct 21, 2019
4d1a32c
Merge branch 'master' into algorithmic
podocarp Oct 21, 2019
b624e87
Revert "Add invite command"
podocarp Oct 21, 2019
c9a8be4
Merge pull request #107 from AY1920S1-CS2103T-W11-2/revert-103-add-in…
daekoon Oct 21, 2019
2f3681a
Merge branch 'master' into algorithmic
podocarp Oct 21, 2019
e25b342
fix poor web interface merge, also changed activity add persons to us…
podocarp Oct 21, 2019
3371957
prettier fixes
podocarp Oct 21, 2019
4f13e46
Merge branch 'master' into user-guide-developer-guide-update-for-acti…
podocarp Oct 21, 2019
28e5c8e
Merge branch 'master' into add-git-hooks
podocarp Oct 21, 2019
5020b28
Add more test for InviteCommandTest
JohnNzj Oct 21, 2019
b88857e
Remove changed files
JohnNzj Oct 21, 2019
2f8776a
Add back relevant changed files
JohnNzj Oct 21, 2019
d5934e2
Merge branch 'master' into add-invite-command
podocarp Oct 21, 2019
cc6b1a3
Abstract method to updateContextAndView in PR #105
JohnNzj Oct 21, 2019
88ea638
Amend Model, ModelMgr, ActivityBook to execute ListCommand contextually
Aulud Oct 21, 2019
3d95ab4
Fix activity book not being written to JSON file
Aulud Oct 21, 2019
b1650db
Employ defensive coding in ActivityBook; add tests for untested methods
Aulud Oct 21, 2019
f2899aa
Refactor Context; extract ContextType; edit ListCommand to set context
Aulud Oct 21, 2019
24c3b8b
refactor a little, we do not use exceptions for flow control.
podocarp Oct 22, 2019
0d88632
Make Expense command able to specify people involved, and also update…
podocarp Oct 22, 2019
4f32631
added simple test
podocarp Oct 22, 2019
b905765
minor tweaks
podocarp Oct 22, 2019
cdae484
Merge pull request #101 from AY1920S1-CS2103T-W11-2/algorithmic
daekoon Oct 22, 2019
5a59a67
Merge branch 'add-invite-command' of https://github.com/AY1920S1-CS21…
JohnNzj Oct 22, 2019
9f10d17
Remove exceptions so that if encounter invalid person, skips the curr…
JohnNzj Oct 22, 2019
a9ad533
Fix errors due to empty name or name with white spaces
JohnNzj Oct 22, 2019
29d9acf
Add InviteSequenceDiagram
JohnNzj Oct 22, 2019
7fdd51e
Merge remote-tracking branch 'origin/master' into mixed-expenses
podocarp Oct 22, 2019
eee75db
minor cleaning
podocarp Oct 22, 2019
2fb4ad9
Merge branch 'master' into extend-list-command
Aulud Oct 22, 2019
4ca2a38
Update UI of PersonCard; fix broken ActivityCommand integration tests
Aulud Oct 22, 2019
13db885
Convert PersonListPanel to a generic ListPanel class
Aulud Oct 22, 2019
dc009b1
Extend CommandResult to pass changes in Context to MainWindow in UI
Aulud Oct 22, 2019
e071830
Update DeveloperGuide.adoc for invite/disinvite feature
JohnNzj Oct 22, 2019
1512978
Merge pull request #110 from AY1920S1-CS2103T-W11-2/mixed-expenses
podocarp Oct 22, 2019
675de59
Merge branch 'master' into add-invite-command
podocarp Oct 22, 2019
295d439
Merge branch 'master' into user-guide-developer-guide-update-for-acti…
podocarp Oct 22, 2019
19674fb
Remove undo.png
JohnNzj Oct 22, 2019
fea2b12
Fix DeveloperGuide.adoc for invite/disinvite feature
JohnNzj Oct 22, 2019
148e581
Fix sequence diagram images
JohnNzj Oct 22, 2019
520b025
Merge branch 'master' into dev-guide-invite-uninvite
podocarp Oct 22, 2019
72a4543
Merge pull request #111 from AY1920S1-CS2103T-W11-2/dev-guide-invite-…
podocarp Oct 22, 2019
633a6e4
Add PersonCard class and FXML files; update stylesheet
Aulud Oct 22, 2019
7eec08c
Enable MainWindow class to switch UI view based on current Context
Aulud Oct 22, 2019
c16e1bd
Repair failing tests for ListCommand
Aulud Oct 22, 2019
dd71248
Merge branch 'master' into extend-list-command
Aulud Oct 22, 2019
e152b21
Add missing trailing newline to Git hook scripts
Aulud Oct 22, 2019
3ad17c6
Merge branch 'master' into add-git-hooks
Aulud Oct 22, 2019
283fdd4
Merge remote-tracking branch 'origin/add-git-hooks' into add-git-hooks
Aulud Oct 22, 2019
a21c1d5
Reduce column constraints in Cards to avoid horizontal overflow
Aulud Oct 22, 2019
f1922bc
Add additional tests to improve coverage of new methods
Aulud Oct 22, 2019
ccd26cb
Merge pull request #87 from AY1920S1-CS2103T-W11-2/add-git-hooks
Aulud Oct 22, 2019
196b067
Merge branch 'master' into extend-list-command
Aulud Oct 22, 2019
c3b86d8
Update Model description in DeveloperGuide.adoc
liakify Oct 22, 2019
cb738e6
Remove duplicate of ModeClassDiagram
liakify Oct 22, 2019
cf66aea
Fix InternalState not updating during sample SplitWiser initialisation
Aulud Oct 22, 2019
d98a675
Merge branch 'master' into update-dev-guide
liakify Oct 22, 2019
742d24a
Add sequence diagram for implementation of List command
Aulud Oct 22, 2019
de75de0
Update developer guide with implementation details of ListCommand
Aulud Oct 22, 2019
47dde4a
Update description of List command in user guide
Aulud Oct 22, 2019
791482b
Merge pull request #115 from AY1920S1-CS2103T-W11-2/update-dev-guide
Aulud Oct 23, 2019
a5cf57d
Merge branch 'master' into add-list-command-dev-guide
Aulud Oct 23, 2019
0add222
Merge pull request #116 from AY1920S1-CS2103T-W11-2/add-list-command-…
JohnNzj Oct 23, 2019
e2bc1c9
Merge branch 'master' into extend-list-command
Aulud Oct 23, 2019
2659901
Merge branch 'master' into user-guide-developer-guide-update-for-acti…
daekoon Oct 23, 2019
b9bd7c5
Update UserGuide.adoc for expense command
liakify Oct 23, 2019
7ffebc6
Improve description of activity command
daekoon Oct 23, 2019
e6fd454
Minor phrasing improvement
daekoon Oct 23, 2019
03f9d72
Update developer guide
daekoon Oct 23, 2019
6c4d328
Remove trailing whitespace
daekoon Oct 23, 2019
1374580
Merge pull request #106 from AY1920S1-CS2103T-W11-2/user-guide-develo…
JohnNzj Oct 23, 2019
cb0815c
Merge branch 'master' into fix-sample-data-internal-state
podocarp Oct 24, 2019
82afc0c
Merge branch 'master' into extend-list-command
podocarp Oct 24, 2019
86a1f3d
Merge pull request #117 from AY1920S1-CS2103T-W11-2/fix-sample-data-i…
podocarp Oct 24, 2019
c9961f4
add bindings for soft delete that updates the algo
podocarp Oct 24, 2019
1db3e76
Merge branch 'master' into update-user-guide-expense-command
podocarp Oct 24, 2019
f2d1404
updated test
podocarp Oct 24, 2019
52ecbba
Merge pull request #118 from AY1920S1-CS2103T-W11-2/update-user-guide…
podocarp Oct 24, 2019
65e0445
Merge branch 'master' into soft-delete-expense
podocarp Oct 24, 2019
ec4d518
added some tests
podocarp Oct 24, 2019
03e5f16
add test
podocarp Oct 24, 2019
f4cf141
added logic for deleting people from activities
podocarp Oct 24, 2019
8c7c42d
Merge branch 'master' into extend-list-command
Aulud Oct 25, 2019
5031faa
Merge pull request #112 from AY1920S1-CS2103T-W11-2/extend-list-command
liakify Oct 26, 2019
d02db35
Merge branch 'master' into add-invite-command
podocarp Oct 27, 2019
c1286c6
Merge branch 'master' into add-invite-command
JohnNzj Oct 27, 2019
71b77b1
Merge branch 'add-invite-command' of https://github.com/AY1920S1-CS21…
JohnNzj Oct 27, 2019
0124b4f
Updated InviteCommand with the newer version of ContextType
JohnNzj Oct 27, 2019
399fdf9
Add DisinviteCommand, DisinviteCommandParser and modify AddressBookPa…
JohnNzj Oct 27, 2019
9008a52
Modify DisInviteCommand
JohnNzj Oct 27, 2019
06af15e
Modify DisinviteCommand
JohnNzj Oct 27, 2019
0f6c86a
Modify disinvitecommand
JohnNzj Oct 27, 2019
f39c98d
Merge branch 'master' into active-participants
JohnNzj Oct 27, 2019
2d852ca
Merge pull request #120 from AY1920S1-CS2103T-W11-2/active-participants
JohnNzj Oct 27, 2019
af1f7ae
Merge branch 'master' into add-invite-command
JohnNzj Oct 27, 2019
18f444c
Merge branch 'master' into add-disinvite-command
JohnNzj Oct 27, 2019
aa4a2c8
Change disinvitecommand
JohnNzj Oct 27, 2019
a6e8dd2
Update DisinviteCommand to print Text to users
JohnNzj Oct 27, 2019
fa01fb7
Update InviteCommand to remove printing of empty line
JohnNzj Oct 27, 2019
246fe00
Fix expense command behaviour
liakify Oct 27, 2019
5d694e2
Update UserGuide.adoc to match changes
liakify Oct 27, 2019
9b3128d
Add DisinviteCommandParserTest
JohnNzj Oct 28, 2019
47e6bc6
Add extra test cases to InviteCommandTest
JohnNzj Oct 28, 2019
2d7849d
Add DisinviteCommandTest and fix checkstyle
JohnNzj Oct 28, 2019
1aeb1f1
Fix checkstyle errors
JohnNzj Oct 28, 2019
6c751ce
Fix wrong order of output string params
liakify Oct 28, 2019
2111a6a
Fix JsonAdaptedExpense to include involved participants
liakify Oct 28, 2019
50e7ef5
Fix tests
liakify Oct 28, 2019
5033fee
Fix tests
liakify Oct 28, 2019
69d0feb
Merge pull request #108 from AY1920S1-CS2103T-W11-2/add-invite-command
liakify Oct 28, 2019
ecea3bf
Update ActivityCommand to find by exact match first, and update all r…
daekoon Oct 28, 2019
f963f8a
Add extra validation for AddCommand to check for duplicate name
daekoon Oct 28, 2019
6a8a803
Update documentation
daekoon Oct 28, 2019
f75c07f
Merge branch 'master' into update-expense-command
daekoon Oct 29, 2019
0e02851
Merge pull request #123 from AY1920S1-CS2103T-W11-2/activity-command-…
liakify Oct 29, 2019
3530a64
Merge branch 'master' into update-expense-command
liakify Oct 29, 2019
b623ea7
Add ViewCommandParser and ViewCommand; update Messages and Context
Aulud Oct 28, 2019
50e95f9
Amend CommandResult to pass full Context instead of just ContextType
Aulud Oct 28, 2019
bbb11f4
Split generic ListPanel class into ActivityListPanel and PersonListPanel
Aulud Oct 28, 2019
796348f
Add tests for ViewCommandParser; rename static Indexes in TypicalIndexes
Aulud Oct 28, 2019
eb21038
Add equals method and tests for ViewCommand; update ListCommand tests
Aulud Oct 28, 2019
ee1c315
Add PersonDetailsPanel to display full details of a contact; add icons
Aulud Oct 28, 2019
5d4d101
Add ActivityDetailsPanel to display full details of an activity
Aulud Oct 28, 2019
880337a
Add methods for UI to lookup associations between Persons and Activities
Aulud Oct 28, 2019
d19a79a
Update ActivityDetailsPanel to display all participants of an Activity
Aulud Oct 28, 2019
b65f4d6
Edit PersonDetailsPanel to show activity history with net transfers
Aulud Oct 29, 2019
0d793d3
Edit ActivityDetailsPanel to show expenses; clean up UI classes and FXML
Aulud Oct 29, 2019
86d4afd
Fix trailing whitespace in CSS file
Aulud Oct 29, 2019
4e25b57
Update name searching logic and tests for ExpenseCommand
liakify Oct 29, 2019
8caf2eb
Merge branch 'master' into soft-delete-expense
podocarp Oct 29, 2019
f553e02
Fix bug that allows duplicate person to be added to a single expense
liakify Oct 29, 2019
b1b329f
Fix accidental adding of paying person to involved IDs
liakify Oct 29, 2019
397ec89
Merge branch 'master' into add-disinvite-command
liakify Oct 29, 2019
e7af833
Merge pull request #122 from AY1920S1-CS2103T-W11-2/update-expense-co…
liakify Oct 29, 2019
53bde6a
Merge branch 'master' into add-disinvite-command
liakify Oct 29, 2019
b225893
Merge branch 'master' into add-disinvite-command
JohnNzj Oct 29, 2019
ca80021
Merge branch 'add-disinvite-command' of https://github.com/AY1920S1-C…
JohnNzj Oct 29, 2019
60272e8
Merge pull request #121 from AY1920S1-CS2103T-W11-2/add-disinvite-com…
liakify Oct 29, 2019
5553251
Merge branch 'master' into add-view-command
Aulud Oct 29, 2019
08a23db
Fix trailing whitespace errors in ActivityTest
Aulud Oct 29, 2019
52481e9
Merge branch 'master' into soft-delete-expense
Aulud Oct 29, 2019
7e1f7e0
Merge pull request #119 from AY1920S1-CS2103T-W11-2/soft-delete-expense
Aulud Oct 29, 2019
12a07b4
Merge branch 'master' into add-view-command
Aulud Oct 29, 2019
fa46eec
Update DeveloperGuide.adoc
podocarp Oct 29, 2019
378e8e9
Merge branch 'master' into algo-dg
podocarp Oct 29, 2019
ff555ea
Update DeveloperGuide.adoc
podocarp Oct 29, 2019
19f1436
Update DeveloperGuide.adoc
podocarp Oct 29, 2019
31149c6
Merge pull request #125 from AY1920S1-CS2103T-W11-2/algo-dg
liakify Oct 29, 2019
ceb07c5
Edit ActivityDetailsPanel to show transfers needed between participants
Aulud Oct 29, 2019
b1bdbb1
Merge branch 'master' into add-view-command
Aulud Oct 29, 2019
584781e
Merge pull request #124 from AY1920S1-CS2103T-W11-2/add-view-command
liakify Oct 29, 2019
bec4669
Update context switching behaviour for activity, expense, invite, dis…
liakify Oct 29, 2019
2471598
Add test when nobody else is specified in expense and nobody can be d…
JohnNzj Oct 30, 2019
4166cef
Modify InviteCommand for substring names
JohnNzj Oct 30, 2019
36add6d
Fix case whereby a name is substring of another in DisinviteCommand
JohnNzj Oct 30, 2019
eef6246
Fix errors due to not able to invite/disinvite name with a substring …
JohnNzj Oct 30, 2019
8a0418d
Update UserGuide
JohnNzj Oct 30, 2019
4e25c31
Fix some errors in userguide
JohnNzj Oct 30, 2019
cc1f17b
Change some grammar errors
JohnNzj Oct 30, 2019
b24c89b
Fix userguide
JohnNzj Oct 30, 2019
e0d2434
Add activity diagram for Invite operation
JohnNzj Oct 30, 2019
8c9a948
Resize activity diagram for invite operation
JohnNzj Oct 30, 2019
493c7df
Fix checkstyle error for disinvitecommand
JohnNzj Oct 30, 2019
dc51211
Rephrase some sentence in developer and user guide
JohnNzj Oct 30, 2019
04fdd61
Enable assertions by default in gradle
liakify Oct 30, 2019
3071581
Limit name, phone and tag length
liakify Oct 30, 2019
c0f11a3
Update tests
liakify Oct 30, 2019
0a84658
Update constraints and tests for Amount
liakify Oct 30, 2019
6c3e29c
Fix no new line and EOF
liakify Oct 30, 2019
931883b
Update UserGuide.adoc to reflect restrictions
liakify Oct 31, 2019
33fae23
Context switch for contact command
liakify Oct 31, 2019
452683f
Fix DisinviteCommand checkstyle failure
JohnNzj Oct 31, 2019
85fe429
Update developer guide and disinvitecommand
JohnNzj Oct 31, 2019
9a37411
Update UserGuide.adoc
podocarp Oct 31, 2019
2dd3196
Update messages and slight bugs
liakify Oct 31, 2019
4a90bed
Merge pull request #136 from AY1920S1-CS2103T-W11-2/fix-invite-disinv…
liakify Oct 31, 2019
d2bd154
Merge branch 'master' into limit-fields
daekoon Oct 31, 2019
2d88145
Merge pull request #137 from AY1920S1-CS2103T-W11-2/limit-fields
daekoon Oct 31, 2019
0d4978d
Fix primary key changing after edit person
liakify Oct 31, 2019
223409c
Merge pull request #141 from AY1920S1-CS2103T-W11-2/edit-personid
Aulud Oct 31, 2019
2aaec9f
Update invite and disinvite context switching
liakify Oct 31, 2019
c830859
Merge branch 'master' into commands-context-switch
liakify Oct 31, 2019
19dd783
Fix bug where command with empty participant prefix will result in un…
daekoon Oct 31, 2019
67d3664
Merge pull request #129 from AY1920S1-CS2103T-W11-2/commands-context-…
Aulud Oct 31, 2019
5e694c9
Merge branch 'master' into activity-command-fix-empty-person-prefix
liakify Oct 31, 2019
1695407
Fix Activity list not updating when participants of an Activity changes
Aulud Oct 31, 2019
0dc76d0
Merge pull request #142 from AY1920S1-CS2103T-W11-2/activity-command-…
liakify Oct 31, 2019
1944477
Update UserGuide for bug hunt
liakify Oct 31, 2019
f82a521
Merge branch 'master' into fix-static-activity-list-view
Aulud Oct 31, 2019
a1242bf
Merge branch 'master' into fix-static-activity-list-view
Aulud Oct 31, 2019
7297e05
Merge pull request #143 from AY1920S1-CS2103T-W11-2/fix-static-activi…
Aulud Nov 1, 2019
329358b
fix typo
podocarp Nov 1, 2019
d978f5a
Merge branch 'master' into possibilities
podocarp Nov 1, 2019
96bf1c0
Merge pull request #140 from AY1920S1-CS2103T-W11-2/possibilities
podocarp Nov 1, 2019
4b2508c
Update edit command to only work in view_contact
liakify Nov 1, 2019
2a08610
Update UserGuide.adoc
liakify Nov 1, 2019
1b175be
Update edit to allow activity title to be edited
liakify Nov 2, 2019
cac41ce
Update test for EditCommand
liakify Nov 2, 2019
dd3c006
Update UserGuide.adoc and error messages
liakify Nov 2, 2019
00dfcdc
Simple userdoc updates
podocarp Nov 2, 2019
7c3445b
Update UserGuide.adoc
podocarp Nov 2, 2019
14140c9
Merge branch 'master' into fix-edit
podocarp Nov 2, 2019
62cc6d4
make warning msg disappear when there is none, fix #147
podocarp Nov 2, 2019
6e89d68
fix styling
podocarp Nov 2, 2019
f716166
Merge branch 'master' into smart-warning-msg
podocarp Nov 2, 2019
0f73688
Update UserGuide.adoc
podocarp Nov 2, 2019
60d4829
Merge branch 'master' into smart-warning-msg
podocarp Nov 2, 2019
6fec072
Update UserGuide.adoc
podocarp Nov 3, 2019
f3d504f
updates for expense command as well
podocarp Nov 3, 2019
e61c66f
Update UserGuide.adoc
podocarp Nov 3, 2019
7591ac9
Update DeveloperGuide.adoc
podocarp Nov 3, 2019
ac1fd5b
Merge branch 'master' into smart-warning-msg
liakify Nov 3, 2019
38653be
Merge branch 'master' into ug-fixes
liakify Nov 3, 2019
2b84599
Merge pull request #187 from AY1920S1-CS2103T-W11-2/smart-warning-msg
liakify Nov 3, 2019
fd4fdf0
Merge branch 'master' into ug-fixes
liakify Nov 3, 2019
2bdcbe5
Merge branch 'master' into fix-edit
liakify Nov 3, 2019
3c2839f
Update UG and build.gradle
liakify Nov 3, 2019
38340f5
Merge pull request #188 from AY1920S1-CS2103T-W11-2/ug-fixes
liakify Nov 3, 2019
22d9f7e
Merge branch 'master' into fix-edit
liakify Nov 3, 2019
b2c04ce
Update UserGuide.adoc
liakify Nov 3, 2019
43db25c
Update UserGuide.adoc
liakify Nov 3, 2019
1a77bab
Restrict to non-empty preamble and other updates
liakify Nov 3, 2019
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
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,14 @@ src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store

# Temporary files
*.swp

# IntelliJ build folders
/bin

# VSCode local config files
.classpath
.project
.settings
49 changes: 35 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,36 +1,57 @@
= Address Book (Level 3)
ifdef::env-github,env-browser[:relfileprefix: docs/]
:toc: macro
:toc-title:
:toclevels: 9

# SplitWiser

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
toc::[]

ifdef::env-github,env-browser[:relfileprefix: docs/]

image:https://travis-ci.org/AY1920S1-CS2103T-W11-2/main.svg?branch=master["Build Status", link="https://travis-ci.org/AY1920S1-CS2103T-W11-2/main"]
image:https://coveralls.io/repos/github/AY1920S1-CS2103T-W11-2/main/badge.svg?branch=master["Coverage Status"), link="https://coveralls.io/github/AY1920S1-CS2103T-W11-2/main?branch=master"]
image:https://img.shields.io/github/commit-activity/w/AY1920S1-CS2103T-W11-2/main[GitHub commit activity]
image:https://img.shields.io/github/v/tag/AY1920S1-CS2103T-W11-2/main[GitHub tag (latest by date)]
ifdef::env-github[]

image::docs/images/Ui.png[width="600"]
endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
## About

== Site Map
Ever did group activities where everyone paid different amounts, and it became
so troublesome and confusing to figure out how to redistribute costs evenly?
Fret no more because with SplitWiser is here! SplitWiser is a free tool for
friends and roommates to track bills and other shared expenses, so that
everyone gets paid back, and everyone is happy.

## Features

* It just works!
* Add contacts and tags so you know who you owe and who owes you!
* View your activities and regret your monthly expenses!
* Aggregate and simplify debts between a group of friends!

## Helpful Links

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== Acknowledgements
## Acknowledgements

* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
* SplitWiser is built on AddressBook-Level3 project created by https://se-education.org[SE-EDU] initiative.

## Licence
link:LICENSE[MIT]

== Licence : link:LICENSE[MIT]
## Donate
You can donate to us by emailing us a picture of your credit card.
56 changes: 52 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// For more details take a look at the Java Quickstart chapter in the Gradle
// user guide available at http://gradle.org/docs/5.2.1/userguide/tutorial_java_projects.html

import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent

plugins {
Expand All @@ -25,6 +26,13 @@ repositories {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}

task hooks(type: Copy) {
from "./config/hooks/"
into "./.git/hooks/"
fileMode 0777
}
build.dependsOn hooks

checkstyle {
toolVersion = '8.1'
}
Expand All @@ -41,6 +49,42 @@ test {
useJUnitPlatform()
}

tasks.withType(Test) {
testLogging {
// set options for log level LIFECYCLE
events TestLogEvent.FAILED,
TestLogEvent.PASSED,
TestLogEvent.SKIPPED,
TestLogEvent.STANDARD_OUT
exceptionFormat TestExceptionFormat.FULL
showExceptions true
showCauses true
showStackTraces true

// set options for log level DEBUG and INFO
debug {
events TestLogEvent.STARTED,
TestLogEvent.FAILED,
TestLogEvent.PASSED,
TestLogEvent.SKIPPED,
TestLogEvent.STANDARD_ERROR,
TestLogEvent.STANDARD_OUT
exceptionFormat TestExceptionFormat.FULL
}
info.events = debug.events
info.exceptionFormat = debug.exceptionFormat

afterSuite { desc, result ->
if (!desc.parent) { // will match the outermost suite
def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)"
def startItem = '| ', endItem = ' |'
def repeatLength = startItem.length() + output.length() + endItem.length()
println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength))
}
}
}
}

dependencies {
String jUnitVersion = '5.4.0'
String javaFxVersion = '11'
Expand All @@ -67,7 +111,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'splitwiser.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -133,8 +177,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level3',
'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
'site-name': 'SplitWiser',
'site-githuburl': 'https://github.com/AY1920S1-CS2103T-W11-2/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand All @@ -152,4 +196,8 @@ task copyStylesheets(type: Copy) {
}
asciidoctor.dependsOn copyStylesheets

defaultTasks 'clean', 'test', 'coverage', 'asciidoctor'
defaultTasks 'hooks', 'clean', 'test', 'coverage', 'asciidoctor'

run {
enableAssertions = true
}
19 changes: 19 additions & 0 deletions config/hooks/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

echo -e "\n================ Running pre-commit checks ================"

# Update hooks and run checkstyle on all code and AsciiDocs
./gradlew hooks checkstyleMain checkstyleTest asciidoctor

# Store the last exit code in a variable
RESULT=$?

if [ $RESULT -eq 0 ]
then
echo -e "\n================ Pre-commit checks: PASSED ================\n"
else
echo -e "\n================ Pre-commit checks: FAILED ================\n"
fi

# Return exit code to determine if commit passes
exit $RESULT
19 changes: 19 additions & 0 deletions config/hooks/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

echo -e "\n================ Running pre-push checks ================"

# Update hooks, clear /build, run checkstyle on code and AsciiDocs then run tests
./gradlew hooks clean checkstyleMain checkstyleTest asciidoctor test

# Store the last exit code in a variable
RESULT=$?

if [ $RESULT -eq 0 ]
then
echo -e "\n================ Pre-push checks: PASSED ================\n"
else
echo -e "\n================ Pre-push checks: FAILED ================\n"
fi

# Return exit code to determine if push passes
exit $RESULT
35 changes: 16 additions & 19 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,48 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
Splitwiser is developed by https://github.com/orgs/AY1920S1-CS2103T-W11-2/teams/developers[Vortex] team, based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Lim Daekoon
image::daekoon.png[width="150", align="left"]
{empty}[https://github.com/daekoon[github]]

Role: Project Advisor

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Lee Liak Ghee
image::liakify.png[width="150", align="left"]
{empty}[https://github.com/liakify[github]]

Role: Team Lead +
Responsibilities: UI

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Keven Loo
image::aulud.png[width="150", align="left"]
{empty}[https://github.com/Aulud[github]]

Role: Developer +
Responsibilities: Data

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Xiaodong Jia
image::podocarp.png[width="150", align="left"]
{empty}[https://github.com/podocarp[github]]

Role: Developer +
Responsibilities: Dev Ops + Threading

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== John Ng
image::johnnzj.png[width="150", align="left"]
{empty}[https://github.com/johnnzj[github]]

Role: Developer +
Responsibilities: UI
Expand Down
3 changes: 1 addition & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2103T-W11-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
Loading