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

Quickfix #171, #173 #165

Open
wants to merge 609 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
609 commits
Select commit Hold shift + click to select a range
c7e2940
Ensure exercise list is sorted after reading from storage
AaronCQL Mar 30, 2020
76a0091
Revert "Ensure exercise list is sorted after reading from storage"
AaronCQL Mar 30, 2020
25f35fa
Merge branch 'YJPlaysWithGUI' of github.com:AY1920S2-CS2103T-F11-2/ma…
AaronCQL Mar 30, 2020
e903e5b
Ensure exercise list is sorted after reading from storage
AaronCQL Mar 30, 2020
8054c01
Add insertion sort to add new exercise
AaronCQL Mar 30, 2020
f512161
Add javadocs to addToSorted method
AaronCQL Mar 30, 2020
8d26ed1
remove unnecessary border in ViewClientDisplay
Yonggiee Mar 30, 2020
f66a954
fix checkstyle
Yonggiee Mar 30, 2020
bb9aa5e
Merge branch 'schedule-branch' into YJPlaysWithGUI
Dban1 Mar 30, 2020
d53d3ae
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
Dban1 Mar 30, 2020
ba910f7
Merge branch 'master' into AddExerciseClass
AaronCQL Mar 30, 2020
f6999fd
change valid regrex for exerciseName
Yonggiee Mar 30, 2020
96ac050
Merge branch 'master' into YJPlaysWithGUI
AaronCQL Mar 30, 2020
3ac3f41
Increase font size
AaronCQL Mar 30, 2020
1a174a4
Merge branch 'YJPlaysWithGUI' of github.com:AY1920S2-CS2103T-F11-2/ma…
AaronCQL Mar 30, 2020
b8ef906
Merge branch 'AddExerciseClass' of github.com:AY1920S2-CS2103T-F11-2/…
AaronCQL Mar 30, 2020
59ff349
Merge commit 'dd5771bb9f1585df603725aef186b2cf4984d5e1' into AddExerc…
Yonggiee Mar 30, 2020
e21359b
add ExerciseNameTest
Yonggiee Mar 30, 2020
a0216ee
Merge branch 'AddExerciseClass' of https://github.com/AY1920S2-CS2103…
Yonggiee Mar 30, 2020
f8a2522
Made the merge between Exercise and Schedule runnable.
Dban1 Mar 30, 2020
e333111
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
Dban1 Mar 30, 2020
f7c373b
fix CliSyntax for addExerciseCommand
Yonggiee Mar 30, 2020
d73bda8
Add conditional update for client in view
AaronCQL Mar 30, 2020
9aeeba0
Remove paddings
AaronCQL Mar 30, 2020
20c5bdf
add ExerciseRepsTest
Yonggiee Mar 30, 2020
eacee8c
add ExerciseWeightTest
Yonggiee Mar 30, 2020
b900be9
Tweak layouts
AaronCQL Mar 30, 2020
77bfdd4
add ExerciseSetsTest
Yonggiee Mar 30, 2020
3755b83
Tweak card background colours
AaronCQL Mar 30, 2020
cb89ebb
Fix requireAllNonNull to include all parameters
AaronCQL Mar 30, 2020
500cb07
Merge branch 'master' of github.com:AY1920S2-CS2103T-F11-2/main
AaronCQL Mar 30, 2020
ed18495
Add working trie data structure
AaronCQL Mar 31, 2020
95612a1
Able to get longest prefix of word
AaronCQL Mar 31, 2020
d5f3c5f
Hook autocomplete feature to GUI
AaronCQL Mar 31, 2020
6d481ef
Minor code/comment cleanup
AaronCQL Mar 31, 2020
6f42f7d
fix javadocs for Exercise
Yonggiee Mar 31, 2020
b6a3841
Tweak implementation of Trie
AaronCQL Mar 31, 2020
ace6f80
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
Dban1 Mar 31, 2020
8691671
Add prototype implementation for auto complete
AaronCQL Mar 31, 2020
13728c1
add ExerciseTest: ExerciseTest, ExerciseDateTest, UniqueExerciseListTest
Yonggiee Mar 31, 2020
4db698c
Rework implementation
AaronCQL Mar 31, 2020
f5e4c6a
Add javadocs
AaronCQL Mar 31, 2020
a0b9839
Merge pull request #117 from AY1920S2-CS2103T-F11-2/fix-client-constr…
AaronCQL Mar 31, 2020
fd4a080
fix checkstyle
Yonggiee Mar 31, 2020
b73f5ff
Merge branch 'master' into AddExerciseClass
Yonggiee Mar 31, 2020
dd86120
Merge branch 'YJPlaysWithGUI' into AddExerciseClass
Yonggiee Mar 31, 2020
ea55b2e
Fix style
AaronCQL Mar 31, 2020
b7110d4
Merge branch 'YJPlaysWithGUI' into AddExerciseClass
AaronCQL Mar 31, 2020
cd88a9e
Fix more styles
AaronCQL Mar 31, 2020
3aa5f5d
remove trailing whitespace
Yonggiee Mar 31, 2020
8d152b9
Merge branch 'AddExerciseClass' of https://github.com/AY1920S2-CS2103…
Yonggiee Mar 31, 2020
6e1c9b5
Add Trie test
AaronCQL Mar 31, 2020
cf8868a
Add Node tests
AaronCQL Mar 31, 2020
8f925d1
Add tests for auto complete
AaronCQL Mar 31, 2020
a153786
remove index from AddExerciseCommand
Yonggiee Mar 31, 2020
0880168
Merge pull request #119 from AY1920S2-CS2103T-F11-2/feature-auto-comp…
AaronCQL Mar 31, 2020
57d17e8
fix find-c -> view-c -> add-e
Yonggiee Mar 31, 2020
978f152
fix message usage
Yonggiee Mar 31, 2020
8d2fbec
add DeleteExerciseCommand
Yonggiee Mar 31, 2020
2eb7191
Wip: pb implementation
ziyingli Mar 31, 2020
2b1d83f
Merge remote-tracking branch 'origin' into exercise-pb
ziyingli Mar 31, 2020
ddf8507
Update pb method
ziyingli Mar 31, 2020
06be8e7
Test exclude ui coverage
AaronCQL Mar 31, 2020
e0ecc43
Exclude ui and model util classes from tests
AaronCQL Mar 31, 2020
63fea46
Merge pull request #83 from AY1920S2-CS2103T-F11-2/AddExerciseClass
AaronCQL Mar 31, 2020
933650f
add Index of exercise in table
Yonggiee Mar 31, 2020
47dfb78
fix checkstyle
Yonggiee Mar 31, 2020
f9f31ed
Merge branch 'DeleteExerciseCommand' into YJPlaysWithGUI
Yonggiee Mar 31, 2020
a18d5c0
Add add-e command to autocomplete
AaronCQL Mar 31, 2020
77afbec
rearrange UI
Yonggiee Mar 31, 2020
46aaa45
Continued work on Schedule GUI.
Dban1 Mar 31, 2020
8a51e9e
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
Dban1 Mar 31, 2020
93aa74c
change index to #
Yonggiee Mar 31, 2020
493d800
Fixed wrong constructor for an example case
Dban1 Mar 31, 2020
1e603a6
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
Dban1 Mar 31, 2020
f655a5f
Updated ScheduleCard and SchedulePanel to have barebones functions
Dban1 Mar 31, 2020
1b07bfa
Change font of the app
AaronCQL Apr 1, 2020
39b6ff5
Merge branch 'YJPlaysWithGUI' into css-gui
AaronCQL Apr 1, 2020
5810916
Increase GTK scaling to 1.3
AaronCQL Apr 1, 2020
f30991a
Remove unnecessary css
AaronCQL Apr 1, 2020
03789df
Tweak css
AaronCQL Apr 1, 2020
995ccf2
Fix view client as card
AaronCQL Apr 1, 2020
0336eb4
Tweak scrollbar
AaronCQL Apr 1, 2020
a0cd420
Add padding to table column line
AaronCQL Apr 1, 2020
57da22b
Fix table column border
AaronCQL Apr 1, 2020
3efdd68
Can display pb
ziyingli Apr 1, 2020
16d85a9
Tweak menu bar background
AaronCQL Apr 1, 2020
3a64f5b
Tweak menu and status bars
AaronCQL Apr 1, 2020
77bfc08
add tests
Yonggiee Apr 1, 2020
b8358b5
Merge branch 'css-gui' into YJPlaysWithGUI
Yonggiee Apr 1, 2020
1377f27
Remove errors
AaronCQL Apr 1, 2020
36d2d32
change to ScrollPane and fix text wrapping
Yonggiee Apr 1, 2020
ead81f0
fix text wrap too short
Yonggiee Apr 1, 2020
55d5e8c
reduce exercise column min length
Yonggiee Apr 1, 2020
001086f
Merge branch 'master' into FixDG
Yonggiee Apr 1, 2020
e925dd3
Abstracted Time
charrizard47 Apr 1, 2020
4764033
Merge branch 'schedule-branch' of https://github.com/tohkerwei/main i…
charrizard47 Apr 1, 2020
6c99a80
Merge branch 'schedule-branch' into schedule-branch
charrizard47 Apr 1, 2020
e734363
Merge pull request #111 from tohkerwei/schedule-branch
charrizard47 Apr 1, 2020
1d2e4c0
Change pbfinder logic
ziyingli Apr 1, 2020
571cabe
Put Pbfinder under statistics
ziyingli Apr 1, 2020
9a7aa48
SchedulePanel refresh on any command
Dban1 Apr 1, 2020
cf0794a
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
Dban1 Apr 1, 2020
16e49db
Fixed checkstyle for Main
Dban1 Apr 1, 2020
8c1912e
Merge branch 'schedule-branch' of https://github.com/AY1920S2-CS2103T…
Dban1 Apr 1, 2020
00c4eb9
Merge pull request #122 from AY1920S2-CS2103T-F11-2/autocomplete-add-e
AaronCQL Apr 1, 2020
ce19d42
Merge pull request #121 from AY1920S2-CS2103T-F11-2/DeleteExerciseCom…
AaronCQL Apr 1, 2020
0c3e3a5
Merge branch 'YJPlaysWithGUI' into css-gui
AaronCQL Apr 1, 2020
5fa86ec
Add styles for client view
AaronCQL Apr 1, 2020
4051913
DG in process
Yonggiee Apr 1, 2020
f835cad
Merge branch 'css-gui' into YJPlaysWithGUI
Yonggiee Apr 1, 2020
e9f2c2a
Merge pull request #11 from AY1920S2-CS2103T-F11-2/master
charrizard47 Apr 1, 2020
0af23b5
Refactor PB into Client
ziyingli Apr 1, 2020
e5e2eb7
Slight changes
Dban1 Apr 1, 2020
239e589
Put convertToInt in model
ziyingli Apr 1, 2020
7ff08a4
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
Dban1 Apr 1, 2020
6e5c60d
Change data structure to ObservableList
ziyingli Apr 1, 2020
f312af9
Fix checkstyle
ziyingli Apr 1, 2020
8d6d9f6
Merge branch 'exercise-and-schedule-gui' into YJPlaysWithGUI
charrizard47 Apr 1, 2020
200255f
fix merge issues
Yonggiee Apr 1, 2020
c57c2a5
Slight checkstyle changes
Dban1 Apr 2, 2020
074895e
Merge branch 'ONLYYJPlaysWithGUI' into YJPlaysWithGUI
Dban1 Apr 2, 2020
06d2663
Allow for removal of Schedule via empty command eg. "schedule 1"
Dban1 Apr 2, 2020
2aed975
Merge branch 'schedule-branch' into YJPlaysWithGUI
Dban1 Apr 2, 2020
622b762
Travis fix attempt EOF for ClientView.fxml
Dban1 Apr 2, 2020
8257fae
Continued efforts on this wanky EOF
Dban1 Apr 2, 2020
d737470
Add javadocs and fix checkstyle
ziyingli Apr 2, 2020
5c0150f
Merge remote-tracking branch 'origin' into exercise-pb
ziyingli Apr 2, 2020
6c00c33
Initial refactor to a CommandHistory logic class
AaronCQL Apr 2, 2020
45568f1
Fix build error
ziyingli Apr 2, 2020
b8c9882
Shift storage path to CommandHistory
AaronCQL Apr 2, 2020
b6a7107
Add tests for command history storage
AaronCQL Apr 2, 2020
349cbb9
Add pb for delete-e
ziyingli Apr 2, 2020
f611c47
Add command history test
AaronCQL Apr 2, 2020
e4dc223
Merge pull request #128 from AY1920S2-CS2103T-F11-2/refactor-command-…
ziyingli Apr 2, 2020
a27effe
Make code more OOP
ziyingli Apr 2, 2020
872e9be
Merge remote-tracking branch 'origin' into exercise-pb
ziyingli Apr 2, 2020
87da365
hook personal bests to GUI
Yonggiee Apr 2, 2020
eac7d91
Fix checkstyle
ziyingli Apr 2, 2020
26b850d
Merge pull request #127 from AY1920S2-CS2103T-F11-2/YJPlaysWithGUI
AaronCQL Apr 2, 2020
9069901
Updated example usage for schedule from d/ to day/
Dban1 Apr 2, 2020
f9c789f
Add command autocomplete for delete-e and schedule
AaronCQL Apr 2, 2020
a7f0482
Merge with master
ziyingli Apr 2, 2020
fe2a528
DG Storage implementation for exercise and client
Yonggiee Apr 2, 2020
b78b795
Fix checkstyle
ziyingli Apr 2, 2020
c555021
Add tests for ViewCommandParser
ziyingli Apr 2, 2020
dd0bd2b
Merge pull request #132 from AY1920S2-CS2103T-F11-2/view-command-pars…
AaronCQL Apr 2, 2020
1e83276
Merge pull request #131 from AY1920S2-CS2103T-F11-2/add-autocomplete-…
ziyingli Apr 2, 2020
8b25d3c
Add AddExerciseCommandTest
AaronCQL Apr 2, 2020
72bef4f
Add AddExerciseCommandParser test
AaronCQL Apr 2, 2020
9d355a8
fix size of personal best table in GUI
Yonggiee Apr 2, 2020
662f3a9
Merge pull request #133 from AY1920S2-CS2103T-F11-2/add-exercise-tests
AaronCQL Apr 2, 2020
bc83ff1
Hotfix gradle clean test errors
AaronCQL Apr 2, 2020
8532d73
Merge pull request #134 from AY1920S2-CS2103T-F11-2/hotfix-addExercis…
AaronCQL Apr 2, 2020
ec65e03
add tests for DeleteExerciseCommandParser
Yonggiee Apr 2, 2020
a3e482f
Started work on ScheduleCommandTest
Dban1 Apr 2, 2020
2c1b315
Merge branch 'master' into schedule-branch-2.0
Dban1 Apr 2, 2020
65bbf2d
[UG] Update user guide for v1.3
AaronCQL Apr 2, 2020
d989f13
Merge pull request #120 from AY1920S2-CS2103T-F11-2/exercise-pb
AaronCQL Apr 2, 2020
253840c
Remove trailing whitespace
AaronCQL Apr 2, 2020
ef4281f
add class diagram
Yonggiee Apr 2, 2020
5ce3fac
Fix Client constructor
AaronCQL Apr 2, 2020
61f32e5
Add proper padding between view and pb
AaronCQL Apr 2, 2020
9742942
Remove trailing whitespace
AaronCQL Apr 2, 2020
ac9a498
fix checkstyle
Yonggiee Apr 2, 2020
0de4a13
Increase min width of exercise column in pb
AaronCQL Apr 2, 2020
9ae49f2
Update Userguide
ziyingli Apr 2, 2020
f6f90e3
fix checkstyle 2
Yonggiee Apr 2, 2020
3689b31
Added a basic ScheduleBuilder
Dban1 Apr 2, 2020
71d88bd
Fix checkstyle
ziyingli Apr 2, 2020
b812a1f
Update UI
AaronCQL Apr 2, 2020
6b60505
Further work on ScheduleCommandTest
Dban1 Apr 2, 2020
87646a8
fix clear command
Yonggiee Apr 2, 2020
8840a9b
Updated UG to include first half of Schedule.
Dban1 Apr 2, 2020
0874978
Merge branch 'userguide-v1.3' of https://github.com/AY1920S2-CS2103T-…
Dban1 Apr 2, 2020
4795de4
Merge branch 'master' into schedule-branch-2.0
Dban1 Apr 2, 2020
4f42e9c
Merge pull request #13 from AY1920S2-CS2103T-F11-2/schedule-branch-2.0
charrizard47 Apr 2, 2020
ca444de
Merge pull request #14 from AY1920S2-CS2103T-F11-2/master
charrizard47 Apr 2, 2020
f2cd38a
pull master
charrizard47 Apr 2, 2020
7a30594
old files
charrizard47 Apr 2, 2020
a9dc967
Merge branch 'master' of https://github.com/tohkerwei/main
charrizard47 Apr 2, 2020
2af2d3e
Merge branch 'schedule-branch-2.0' of https://github.com/tohkerwei/ma…
charrizard47 Apr 2, 2020
d5638a0
move column heading to fxml
Yonggiee Apr 2, 2020
8ddb143
fix checkstyle
Yonggiee Apr 2, 2020
a0d629c
Added test for ScheduleCommandParser
charrizard47 Apr 2, 2020
bc16bdb
Fixed build error
charrizard47 Apr 2, 2020
1451d14
Made tests for Day.java
Dban1 Apr 2, 2020
6c10f33
Fixed more build errors
charrizard47 Apr 2, 2020
d7b2401
Implemented more tests
Dban1 Apr 2, 2020
477fd04
Merge pull request #137 from AY1920S2-CS2103T-F11-2/hotfix-v1.3
AaronCQL Apr 2, 2020
289e5cf
Merge pull request #141 from tohkerwei/schedule-branch-2.0
charrizard47 Apr 2, 2020
62f573c
Fix travis errors
AaronCQL Apr 2, 2020
5d1a251
Merge pull request #135 from AY1920S2-CS2103T-F11-2/deletecommandpars…
AaronCQL Apr 2, 2020
328a196
Fixed Checkstyle errors
Dban1 Apr 2, 2020
2cbbcf4
Merge branch 'schedule-branch-2.0' of https://github.com/AY1920S2-CS2…
Dban1 Apr 2, 2020
e286820
Merge branch 'master' into schedule-branch-2.0
Dban1 Apr 2, 2020
975945c
Merge pull request #90 from AY1920S2-CS2103T-F11-2/FixDG
AaronCQL Apr 2, 2020
5c10e43
Merge pull request #140 from AY1920S2-CS2103T-F11-2/fix-clearcommand
AaronCQL Apr 2, 2020
f53c884
Merge pull request #136 from AY1920S2-CS2103T-F11-2/userguide-v1.3
AaronCQL Apr 2, 2020
716f859
fix clientInView
Yonggiee Apr 2, 2020
d3b8446
Update app version to v1.3
AaronCQL Apr 2, 2020
56624ed
Merge pull request #145 from AY1920S2-CS2103T-F11-2/hotfix-v1.3
AaronCQL Apr 2, 2020
d4aac5d
Merge pull request #146 from AY1920S2-CS2103T-F11-2/update-version-v1.3
AaronCQL Apr 2, 2020
61b8a58
Fix
charrizard47 Apr 2, 2020
bfcf219
Working on JsonSchedule
Dban1 Apr 2, 2020
3c019e9
no message
Dban1 Apr 2, 2020
97870a8
Emergency commit
Dban1 Apr 2, 2020
bbf07c1
Merge pull request #142 from AY1920S2-CS2103T-F11-2/schedule-branch-2.0
AaronCQL Apr 2, 2020
bbc281b
Reinstated previously disabled.
Dban1 Apr 2, 2020
4df3c24
Merge branch 'schedule-branch-2.0' of https://github.com/AY1920S2-CS2…
charrizard47 Apr 2, 2020
23c2f57
Fixed erroneuous description for Schedule denomination.
Dban1 Apr 2, 2020
7b31c0d
Update User Guide
ziyingli Apr 2, 2020
d672050
Fixed ScheduleCommandParserTest
charrizard47 Apr 2, 2020
7ccbe77
Set up groundwork test for JsonAdaptedSchedule
Dban1 Apr 2, 2020
ee0cbac
Merge branch 'schedule-branch-2.0' of https://github.com/AY1920S2-CS2…
Dban1 Apr 2, 2020
1bca219
Fixed checkstyle
Dban1 Apr 2, 2020
5e6921f
Merge branch 'master' into schedule-branch-2.0
Dban1 Apr 2, 2020
dd42f3e
Merge pull request #150 from AY1920S2-CS2103T-F11-2/update-userguide
AaronCQL Apr 3, 2020
5464482
Complete command history for DG
AaronCQL Apr 3, 2020
5776a7c
update DG 1
Yonggiee Apr 3, 2020
7fc32c5
Fix class diagram
AaronCQL Apr 3, 2020
70f1b71
Enable kbd:[] macro
AaronCQL Apr 3, 2020
0fe0851
fix dg 2
Yonggiee Apr 3, 2020
4feb57d
add colours for activation bar
Yonggiee Apr 3, 2020
553f0db
Update DG
ziyingli Apr 3, 2020
45ddee9
fix colour of arrow
Yonggiee Apr 3, 2020
4563177
Fix checkstyle
ziyingli Apr 3, 2020
ac2110e
Add autocomplete
AaronCQL Apr 3, 2020
d25c56e
Fix wording
AaronCQL Apr 3, 2020
79a62b1
Include name in headers
AaronCQL Apr 3, 2020
4d8cea0
Rework wording
AaronCQL Apr 3, 2020
7ec9fc8
Merge pull request #201 from AY1920S2-CS2103T-F11-2/dg-command-history
AaronCQL Apr 3, 2020
db49f44
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-F11-2/ma…
ziyingli Apr 3, 2020
1e0f2d2
Add class diagram
ziyingli Apr 3, 2020
1c66ce3
Edit class diagram
ziyingli Apr 3, 2020
bf3a099
Add sequence diagram
ziyingli Apr 3, 2020
617bc18
Merge pull request #151 from AY1920S2-CS2103T-F11-2/quickfix-issue#148
AaronCQL Apr 4, 2020
70e216d
Merge branch 'master' into storageImpDG
Yonggiee Apr 4, 2020
25ffe13
fix england
Yonggiee Apr 4, 2020
abc5b8e
Merge pull request #202 from AY1920S2-CS2103T-F11-2/storageImpDG
Yonggiee Apr 4, 2020
c634c1a
Added Schedule DG
Dban1 Apr 4, 2020
d2abdb6
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-F11-2/main
Dban1 Apr 4, 2020
6a744cf
Fixed trailing WhiteSpace
Dban1 Apr 4, 2020
cc74594
Merge pull request #203 from AY1920S2-CS2103T-F11-2/dg-personalbest
Yonggiee Apr 4, 2020
2418d24
Removed extra line
Dban1 Apr 4, 2020
8503e25
Merge pull request #206 from AY1920S2-CS2103T-F11-2/Schedule-DG
Yonggiee Apr 4, 2020
2bf02c1
Merge branch 'master' into schedule-branch-2.0
Dban1 Apr 4, 2020
1d5e649
Merge branch 'master' into schedule-branch-2.0
Dban1 Apr 4, 2020
757e8df
Updated Schedule command to be of format `schedule INDEX sch/DAY-STAR…
Dban1 Apr 4, 2020
aea7b23
Corrected erroneous error message
Dban1 Apr 4, 2020
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
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,10 @@ src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store

# VSC files
.classpath
.project
.settings
.vscode
/bin
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ MIT License

Copyright (c) 2016 Software Engineering Education - FOSS Resources

Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any client obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Software, and to permit clients to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
Expand Down
20 changes: 10 additions & 10 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
= Address Book (Level 3)
= FitBiz
ifdef::env-github,env-browser[:relfileprefix: docs/]

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://travis-ci.com/AY1920S2-CS2103T-F11-2/main[image:https://travis-ci.com/AY1920S2-CS2103T-F11-2/main.svg?branch=master[Build Status]]
https://coveralls.io/github/AY1920S2-CS2103T-F11-2/main[image:https://coveralls.io/repos/github/AY1920S2-CS2103T-F11-2/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,20 +12,23 @@ 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.
* The Fitness Business Management App you never knew you needed
* Tailored made for fitness coaches to manage their clients without the hassle of traditional pen and paper
* Here are some things you can do:
** Track your client's exercises and training schedules
** Display detailed graphs and charts of your client's training data
** Export a client's training data in `csv` format, allowing clients to easily store or view their own data on Excel

== Site Map

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

== Acknowledgements

* Adapted from the https://se-education.org/[AddressBook-Level3 project] created by SE-EDU initiative
* 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]
Expand Down
16 changes: 11 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ mainClassName = 'seedu.address.Main'
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

application {
applicationDefaultJvmArgs = ['-Dglass.gtk.uiScale=1.35']
}

repositories {
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
Expand All @@ -39,6 +43,8 @@ jacocoTestReport {

test {
useJUnitPlatform()
// uncomment this to enable printing to stdout in tests
// testLogging.showStandardStreams = true
}

dependencies {
Expand Down Expand Up @@ -67,7 +73,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand All @@ -77,8 +83,8 @@ task coverage(type: JacocoReport) {
classDirectories.from files(sourceSets.main.output)
executionData.from files(jacocoTestReport.executionData)
afterEvaluate {
classDirectories.from files(classDirectories.files.collect {
fileTree(dir: it, exclude: ['**/*.jar'])
classDirectories = files(classDirectories.files.collect {
fileTree(dir: it, exclude: ['seedu/address/ui', 'seedu/address/model/util'])
})
}
reports {
Expand Down Expand Up @@ -133,8 +139,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': 'FitBiz',
'site-githuburl': 'https://github.com/AY1920S2-CS2103T-F11-2/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
49 changes: 22 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +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} +
FitBiz is developed by 5 passionate software engineering students who aim to help fitness coaches manage their clients in a dynamic and innovative way.

We are a 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>>]
=== Choo Qi Le Aaron
image::aaroncql.png[width="150", align="left"]
{empty}[https://github.com/AaronCQL[github]]

Role: Project Advisor
Role: Team Leader + Developer

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Fong Yong Jie
image::yonggiee.png[width="150", align="left"]
{empty}[https://github.com/Yonggiee[github]]

Role: Team Lead +
Responsibilities: UI
Role: Developer

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Li Zi Ying
image::ziyingli.png[width="150", align="left"]
{empty}[https://github.com/ziyingli[github]]

Role: Developer +
Responsibilities: Data
Role: Developer

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Ng Ming Liang
image::dban1.png[width="150", align="left"]
{empty}[https://github.com/Dban1[github]]

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Developer

'''

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

Role: Developer +
Responsibilities: UI
Role: Developer

'''
4 changes: 2 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
: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/AY1920S2-CS2103T-F11-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`
* *Email us* : You can also reach us at `e0310119[at]u.nus.edu.sg`
2 changes: 1 addition & 1 deletion docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= FitBiz Level 3 - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand Down
Loading