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

[v1.1][F09-B1]Your TA #80

Open
wants to merge 506 commits into
base: master
Choose a base branch
from
Open
Changes from 11 commits
Commits
Show all changes
506 commits
Select commit Hold shift + click to select a range
369c192
Fixed minor todo-card bug: removed date label
JoonKai1995 Apr 11, 2018
705749b
Login v2.0 working
Pearlissa Apr 11, 2018
7dfc016
Login v2.0 working
Pearlissa Apr 11, 2018
055dce4
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa Apr 11, 2018
0999d31
Update backslashes to forward
Alaru Apr 11, 2018
20a5e8e
Update logic to save Display Picture
Alaru Apr 11, 2018
345fae5
Add MarkCommand integration test
Alaru Apr 11, 2018
9065cd5
add deleteTaskCommandTest and its parser test
WoodySIN Apr 11, 2018
d80e392
add EditTaskCommandTest
WoodySIN Apr 11, 2018
785de63
update collate
WoodySIN Apr 11, 2018
98e15bd
Add integration tests for Participation
Alaru Apr 11, 2018
2c4538e
Add Integration tests
Alaru Apr 12, 2018
1328dd7
Collated files
Alaru Apr 12, 2018
0077a70
Recollate unused files
Alaru Apr 12, 2018
95641bf
Update documentation
Alaru Apr 12, 2018
79f10c1
Updated:
JoonKai1995 Apr 12, 2018
82683db
Updated:
JoonKai1995 Apr 12, 2018
885ba29
Updated:
JoonKai1995 Apr 12, 2018
c3e86b8
Login UGDG
Pearlissa Apr 12, 2018
7e2492b
fix list Command does not show Person List
WoodySIN Apr 12, 2018
aef5a72
Updated:
JoonKai1995 Apr 12, 2018
eda312d
Update DG
Alaru Apr 12, 2018
b6064a4
Updated:
JoonKai1995 Apr 12, 2018
af15008
Updated:
JoonKai1995 Apr 12, 2018
42dea4a
Updated:
JoonKai1995 Apr 12, 2018
02697a0
fix bugs in list command test
WoodySIN Apr 12, 2018
3da2bbb
Login UGDG added user class
Pearlissa Apr 12, 2018
73a9a93
remove unused imports
WoodySIN Apr 12, 2018
f63161f
remove unused imports in commandtasktestutil and taskbuilder
WoodySIN Apr 12, 2018
2be58ce
PPP_v1
Pearlissa Apr 12, 2018
09e4c7d
remove inconsistent System Test
WoodySIN Apr 12, 2018
741c700
inconsistent system test
WoodySIN Apr 12, 2018
bb0a04d
Finished implementation of DisplayPic in DG
Alaru Apr 12, 2018
8b3779f
Finished implementation portion for DisplayPic and Participation in DG
Alaru Apr 12, 2018
1fd7c38
Upload pictures for DG
Alaru Apr 12, 2018
83daf6e
Update DeveloperGuide.adoc
Alaru Apr 12, 2018
06ac2a2
Update PPP
Alaru Apr 12, 2018
c541a4f
Merge remote-tracking branch 'origin/v1.5rcdocumentation' into v1.5rc…
Alaru Apr 12, 2018
5147fb4
Update UG
Alaru Apr 12, 2018
675f9b7
update ug and ppp
Alaru Apr 12, 2018
f421a55
fix a bug of reload to do list
WoodySIN Apr 12, 2018
e55b860
Merge branch 'master' into master
WoodySIN Apr 12, 2018
7d66707
add task related methods in system tests
WoodySIN Apr 12, 2018
8b7628d
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 12, 2018
bce48de
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN Apr 12, 2018
d3a39bc
Merge pull request #100 from Pearlissa/Login_v2
Alaru Apr 12, 2018
f25a147
Merge pull request #103 from JoonKai1995/UG_DG_FInal
Alaru Apr 12, 2018
10c5c25
Merge branch 'master' into UGDG_login
Alaru Apr 12, 2018
3f1e26a
Merge pull request #104 from Pearlissa/UGDG_login
Alaru Apr 12, 2018
645131f
Merge pull request #106 from JoonKai1995/PPP
Alaru Apr 12, 2018
e16e28e
Merge branch 'master' into PPP
Alaru Apr 12, 2018
4f06dec
Merge pull request #107 from Pearlissa/PPP
Alaru Apr 12, 2018
5a9492f
fix some bugs in system test
WoodySIN Apr 12, 2018
f7c2db3
remove incompatiable system tests
WoodySIN Apr 12, 2018
e7330b4
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 12, 2018
c339318
Merge branch 'master' into 1.4bugfixes
WoodySIN Apr 12, 2018
9400852
Merge pull request #84 from Alaru/1.4bugfixes
WoodySIN Apr 12, 2018
6b4b432
Documentation: update application icon and default display picture
Alaru Apr 12, 2018
7791c0e
Merge branch 'v1.5rctest' into v1.5rcdocumentation
Alaru Apr 12, 2018
e52349f
remove collate
WoodySIN Apr 12, 2018
86c0850
Merge branch 'master' into v1.5rcdocumentation
WoodySIN Apr 12, 2018
8120314
Merge pull request #108 from Alaru/v1.5rcdocumentation
WoodySIN Apr 12, 2018
a4a9625
Delete Wu.md
WoodySIN Apr 12, 2018
56020fb
Delete Wu.md
WoodySIN Apr 12, 2018
bb903d7
update collate
WoodySIN Apr 12, 2018
9284912
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 12, 2018
b0a7d33
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN Apr 12, 2018
80b70d8
Revert "Add login feature: v1.5rc"
Alaru Apr 12, 2018
a24ccde
Merge pull request #110 from CS2103JAN2018-F09-B1/revert-100-Login_v2
WoodySIN Apr 12, 2018
40a3049
fix no eof
WoodySIN Apr 12, 2018
aaaeaa5
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 12, 2018
bf53275
Logic: Add support to delete display pictures
Alaru Apr 12, 2018
8cd0120
update PPP
WoodySIN Apr 12, 2018
36ada65
add javadocmethod to Participation isValidParticipation method
WoodySIN Apr 12, 2018
32a714b
remove systemtests
WoodySIN Apr 12, 2018
b27eb83
no message
WoodySIN Apr 12, 2018
efd3733
no message
WoodySIN Apr 12, 2018
c9b6a3f
fix style errors
WoodySIN Apr 12, 2018
d5c8b83
Merge pull request #109 from WoodySIN/master
WoodySIN Apr 12, 2018
8aff6a2
Merge pull request #111 from Alaru/v1.5rcdocumentation
WoodySIN Apr 12, 2018
5edca32
Issues fixes.
JoonKai1995 Apr 13, 2018
03914d6
fix edittask and deleteTask bugs
WoodySIN Apr 13, 2018
14fea03
fix deleteTaskcommand bug
WoodySIN Apr 13, 2018
7db1751
Issues fixes.
JoonKai1995 Apr 13, 2018
f12007c
Issues fixes.
JoonKai1995 Apr 13, 2018
56818e2
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 Apr 13, 2018
b340316
login fix, .xml file can now be created and new accounts start with s…
Pearlissa Apr 13, 2018
3211749
login fix, .xml file can now be created and new accounts start with s…
Pearlissa Apr 13, 2018
c8e87ff
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
Pearlissa Apr 13, 2018
43f6a5b
Login Bug fix
Pearlissa Apr 13, 2018
d10df78
Issues fixes.
JoonKai1995 Apr 13, 2018
148a493
fixed checkstyles
Pearlissa Apr 13, 2018
91181cb
STORAGE: Fix deletion of display pictures
Alaru Apr 13, 2018
5fd12fa
Merge branch 'Bug_fixes'
JoonKai1995 Apr 14, 2018
eb21c02
#1 add list task command
WoodySIN Apr 14, 2018
2dd5163
removed an unused import in CommandTestUtil
WoodySIN Apr 14, 2018
be3dc01
Fixed storage bug for task deadline.
JoonKai1995 Apr 14, 2018
435670f
revert
WoodySIN Apr 14, 2018
365a695
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN Apr 14, 2018
271b43a
add task list commands
WoodySIN Apr 14, 2018
e6c63b4
update UG
WoodySIN Apr 14, 2018
6f3f6c8
remove unused import
WoodySIN Apr 14, 2018
a66d6f5
Storage: Add logging to DisplayPicStorage
Alaru Apr 14, 2018
7d0b65e
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 14, 2018
c488773
Merge pull request #118 from WoodySIN/master
Alaru Apr 14, 2018
c7296c9
Logic: Update logging when deleting image files/display pictures
Alaru Apr 14, 2018
0b130ab
Logic: Update logging when deleting image files/display pictures
Alaru Apr 14, 2018
fb2635d
Documentation: Update DG
Alaru Apr 14, 2018
5fb8e2c
Documentation: Fix DG english. Change use cases.
Alaru Apr 14, 2018
90d3434
Documentation: Fix DG english.
Alaru Apr 14, 2018
4c08098
reverted tasklist back to UniqueTaskList
JoonKai1995 Apr 14, 2018
fe2d842
Merge pull request #114 from Pearlissa/login_fix
JoonKai1995 Apr 14, 2018
f9884bc
reverted tasklist back to UniqueTaskList
JoonKai1995 Apr 14, 2018
d2e8a63
reverted tasklist back to UniqueTaskList
JoonKai1995 Apr 14, 2018
a29bb10
Documentation: Fix comments and update some typos.
Alaru Apr 14, 2018
290242e
login testing
Pearlissa Apr 14, 2018
bfd9af6
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa Apr 14, 2018
3ce0562
Code: Checkstyle fixes
Alaru Apr 14, 2018
03dec4c
Tests: Fix application name change
Alaru Apr 14, 2018
161d886
Fixed minor bug:
JoonKai1995 Apr 14, 2018
8a756c3
Removed collated file
JoonKai1995 Apr 14, 2018
ce47e73
Merge branch 'master' into Test_cases
JoonKai1995 Apr 14, 2018
ab44de2
login testing
Pearlissa Apr 14, 2018
468c8b7
Documentation: DG fixes
Alaru Apr 14, 2018
af7d20b
Merge pull request #121 from JoonKai1995/Test_cases
JoonKai1995 Apr 14, 2018
a633d09
Added support to access username and changed filepaths.
JoonKai1995 Apr 14, 2018
ed18237
Added support to access username and changed filepaths.
JoonKai1995 Apr 14, 2018
b533de7
Storage: Removed check if duplicate image when creating filename
Alaru Apr 14, 2018
8a7d75e
Storage: Removed check if duplicate image when creating filename
Alaru Apr 14, 2018
7fd6a0e
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 14, 2018
b372dd1
Documentation: Collated Alaru code
Alaru Apr 14, 2018
7abea23
Code: Fix missing newline
Alaru Apr 14, 2018
5ecf671
Codestyle: Removed unused import
Alaru Apr 14, 2018
1bfa720
Documentation: Update UG and added screenshots
Alaru Apr 14, 2018
37ed9d9
update DG
WoodySIN Apr 14, 2018
a2977a9
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 14, 2018
7afd073
Merge pull request #123 from Alaru/v1.5allChanges
WoodySIN Apr 14, 2018
feef68c
update ppp
WoodySIN Apr 14, 2018
1d704ef
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 14, 2018
5466f87
update UGDG and add sample data
WoodySIN Apr 15, 2018
19ec455
Merge pull request #124 from WoodySIN/master
WoodySIN Apr 15, 2018
22520bb
update PPP
WoodySIN Apr 15, 2018
e99a77f
add user tests in DG
WoodySIN Apr 15, 2018
f979d7c
Made Login page display prompt text on errors
JoonKai1995 Apr 15, 2018
0979311
Made Login page display promot text on errors
JoonKai1995 Apr 15, 2018
5e5b18f
Merge branch 'Login_user_text'
JoonKai1995 Apr 15, 2018
3bd919d
Made Login page display promot text on errors
JoonKai1995 Apr 15, 2018
5f0c32a
Update Login.java
JoonKai1995 Apr 15, 2018
d1a8b41
Update Login.java
JoonKai1995 Apr 15, 2018
203704f
login testing
Pearlissa Apr 15, 2018
387e3aa
login testing
Pearlissa Apr 15, 2018
cb0959b
login testing
Pearlissa Apr 15, 2018
89ca9e5
Documentation: Update Alaru PPP, UGDG
Alaru Apr 15, 2018
2d575e8
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa Apr 15, 2018
d64c68a
Updated DG for calendar and matriculation number
JoonKai1995 Apr 15, 2018
5ef2f5a
Merge remote-tracking branch 'origin/UGDG_FINAL' into UGDG_FINAL
JoonKai1995 Apr 15, 2018
de9a2c7
Merge pull request #127 from Pearlissa/login_testing
JoonKai1995 Apr 15, 2018
e6375fc
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 Apr 15, 2018
bb0ccb3
Documentation: Merged Wudi changes
Alaru Apr 15, 2018
81bcf95
Documentation: Add unused code
Alaru Apr 15, 2018
f05eee7
Merge branch 'UGDG_FINAL' of https://github.com/JoonKai1995/main into…
Alaru Apr 15, 2018
1a8d9d7
Updated login tests, all works now.
JoonKai1995 Apr 15, 2018
a36d892
Merge pull request #128 from JoonKai1995/UGDG_FINAL
JoonKai1995 Apr 15, 2018
998d82b
Merge branch 'master' into LoginStorage_test
JoonKai1995 Apr 15, 2018
0c4aeab
Update LoginManager.java
JoonKai1995 Apr 15, 2018
18c5e33
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 15, 2018
4b737c7
Merge branch 'LoginStorage_test' of https://github.com/JoonKai1995/ma…
Alaru Apr 15, 2018
567ea79
Update LoginManager.java
JoonKai1995 Apr 15, 2018
0a87790
Merge pull request #129 from JoonKai1995/LoginStorage_test
JoonKai1995 Apr 15, 2018
591ac17
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 15, 2018
a8eb823
Documentation:
Alaru Apr 15, 2018
ed513b1
Documentation:
Alaru Apr 15, 2018
3f0c8f2
Checkstye: Fixed EOF errors
Alaru Apr 15, 2018
ea3aec1
Merge pull request #125 from WoodySIN/master
Alaru Apr 15, 2018
45633ba
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 15, 2018
3af6cbd
Documentation: Rename UIInitial to UI
Alaru Apr 15, 2018
081cb26
collated_pearlissa
Pearlissa Apr 15, 2018
4f405e5
collated_pearlissa
Pearlissa Apr 15, 2018
380420f
Merge branch 'master' into login_testing
Pearlissa Apr 15, 2018
939da56
Merge pull request #130 from Alaru/v1.5allChanges
JoonKai1995 Apr 15, 2018
401afd0
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
Pearlissa Apr 15, 2018
13ff1ff
Updated PPP, slight bit on UG and collated code for JoonKai1995.
JoonKai1995 Apr 15, 2018
2747801
Found small typo in DG
JoonKai1995 Apr 15, 2018
7a50428
Documentation: Recollated files
Alaru Apr 15, 2018
5824c56
Merge branch 'LoginStorage_test' of https://github.com/JoonKai1995/ma…
Alaru Apr 15, 2018
2a2fd1e
Documentation: UserGuide fixed broken switchTab link
Alaru Apr 15, 2018
6e28e42
Fixed naming issue causing jar file to hang.
JoonKai1995 Apr 15, 2018
b4d0c51
Merge pull request #133 from Alaru/v1.5allChanges
JoonKai1995 Apr 15, 2018
d9a9059
Merge branch 'Jar_fix' of https://github.com/JoonKai1995/main into v1…
Alaru Apr 15, 2018
8227468
Fixed naming issue causing jar file to hang.
JoonKai1995 Apr 15, 2018
364998a
Merge branch 'master' into Jar_fix
JoonKai1995 Apr 15, 2018
fd89703
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 Apr 15, 2018
1049c76
Updated PPP.
JoonKai1995 Apr 15, 2018
19b5f64
Merge remote-tracking branch 'origin/Jar_fix' into Jar_fix
JoonKai1995 Apr 15, 2018
7709a1f
changed fxml file names in java controllers to lower case.
JoonKai1995 Apr 15, 2018
787c4d1
Update invalidUserLogin.xml
JoonKai1995 Apr 15, 2018
1633d42
Update Login.fxml
JoonKai1995 Apr 15, 2018
b722ebb
Merge branch 'Jar_fix' of https://github.com/JoonKai1995/main into v1…
Alaru Apr 15, 2018
be420be
Merge pull request #135 from JoonKai1995/Jar_fix
WoodySIN Apr 15, 2018
72b102f
Merge pull request #131 from Pearlissa/login_testing
WoodySIN Apr 15, 2018
a697367
change it to String FXML name to lower case
WoodySIN Apr 15, 2018
3decd39
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 15, 2018
69d2523
Version: Changed version to 1.5.0 non early access
Alaru Apr 15, 2018
c975d29
UG_final
Pearlissa Apr 15, 2018
07ad367
UG_final
Pearlissa Apr 15, 2018
accbae3
UG_final
Pearlissa Apr 15, 2018
ccf8870
Merge branch 'master' into UGDG_final
JoonKai1995 Apr 15, 2018
efadaba
Merge pull request #136 from Pearlissa/UGDG_final
JoonKai1995 Apr 15, 2018
004e015
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
a68e9bb
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru Apr 15, 2018
cde3b67
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
77ade58
Corrected UG link
JoonKai1995 Apr 15, 2018
48f2fd1
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
ae8e698
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
790e19c
update PPP
WoodySIN Apr 15, 2018
22bb08f
Update JoonKai1995.adoc
JoonKai1995 Apr 15, 2018
fbbe862
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
JoonKai1995 Apr 15, 2018
fe58087
Corrected UG link
JoonKai1995 Apr 15, 2018
88cd863
Corrected PPP
JoonKai1995 Apr 15, 2018
aa91201
DG_final
Pearlissa Apr 15, 2018
51819b4
Documentation: UG - fix case sensitive images
Alaru Apr 15, 2018
600c909
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa Apr 15, 2018
6da295d
collated_final
Pearlissa Apr 15, 2018
038ea85
collated_final
Pearlissa Apr 15, 2018
f0d020d
Update UserGuide.adoc
JoonKai1995 Apr 15, 2018
4083fd2
Update AddressBookParserTest.java
JoonKai1995 Apr 15, 2018
b16be19
Merge pull request #140 from Pearlissa/UGDG_final
JoonKai1995 Apr 15, 2018
568a55f
Merge pull request #139 from JoonKai1995/master
JoonKai1995 Apr 15, 2018
8f45128
Merge pull request #138 from WoodySIN/master
JoonKai1995 Apr 15, 2018
d7cc7f7
Merge branch 'master' into added_collate
JoonKai1995 Apr 15, 2018
6799cfb
Merge pull request #141 from Pearlissa/added_collate
JoonKai1995 Apr 15, 2018
7a33b08
Documentation: UGDG fixes
Alaru Apr 15, 2018
43af59a
Corrected PPP, and collated final.
JoonKai1995 Apr 15, 2018
7da27ff
Merge pull request #142 from JoonKai1995/PPP_and_finalcollate
JoonKai1995 Apr 15, 2018
f93a2e0
Logic: markPart now can only add 1 to 100
Alaru Apr 15, 2018
c96c5f8
Logic: markPart now can only add 1 to 100
Alaru Apr 15, 2018
a508e8c
Documentation: Fix typo in UG
Alaru Apr 15, 2018
7f1e3ac
Reverted Logic: markPart now can only add 1 to 100
Alaru Apr 15, 2018
ab7a0e8
Merge pull request #143 from Alaru/v1.5allChanges
Alaru Apr 15, 2018
ed5f601
PPP_final
Pearlissa Apr 15, 2018
a8d6fac
Update MarkCommand.java
Alaru Apr 15, 2018
ce87bfd
Merge branch 'master' into PPP_final
JoonKai1995 Apr 15, 2018
b735add
Merge pull request #144 from Pearlissa/PPP_final
JoonKai1995 Apr 15, 2018
eb60156
Update MarkCommand.java
Alaru Apr 15, 2018
892fe3a
remove collate
WoodySIN Apr 15, 2018
f56a7b1
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Apr 15, 2018
aec191d
update collate
WoodySIN Apr 15, 2018
d1f5838
update collate name
WoodySIN Apr 16, 2018
aa64d13
update collate name
WoodySIN Apr 16, 2018
4b653a3
Rename wudi.adoc to WoodySIN.adoc
WoodySIN Apr 21, 2018
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ dependencies {
}

shadowJar {
archiveName = "addressbook.jar"
archiveName = "yourta.jar"

destinationDir = file("${buildDir}/jar/")
}
12 changes: 6 additions & 6 deletions docs/DeveloperGuide.adoc
Original file line number Diff line number Diff line change
@@ -647,7 +647,7 @@ This utilizes the `MarkCommand` command to update the participation marks of a `

The user will input a command, `markPart INDEX marks/DIGITS`, to the application to update the marks.

The following figure 12 and paragraph below shows the sequence of how the `MarkCommand` command functions:
The following figure 13 and paragraph below shows the sequence of how the `MarkCommand` command functions:

.MarkCommand Sequence Diagram
image::MarkCommandSequenceDiagram.png[width="700"]
@@ -691,14 +691,14 @@ image::MarkCommandSequenceDiagram.png[width="700"]
=== Display picture

Users are able to add a display picture for any person within the application. The user can utilise 3 different commands (`add`, `edit` and `updateDP`) to create and specify a display image for the person.
It fully supports the `undo` and `redo` commands. It adds a drop shadow around the frame to indicate the level of participation (see above section 5.3) of the person.
It fully supports the `undo` and `redo` commands. It adds a drop shadow around the frame to indicate the level of participation (see above <<Participation, section 5.4 Participation>>) of the person.

This feature allows the user to enter a path to their selected image file when entering any of the above 3 commands and copies the image into the `data/displayPic` folder.

It utilises the `DisplayPicStorage` class to handle all image storage related operations.

It also makes use of the `Participation` feature to display a colored shadow around the display picture.
This image will be shown in the application next to the details of the person as seen in figure 13 below.
This image will be shown in the application next to the details of the person as seen in figure 14 below.

.Display Picture example
image::displaypic_personcard.PNG[width="250"]
@@ -725,7 +725,7 @@ For persons that were not specified a `dp/` during the `add` command, the `Displ
The display picture can also be changed by using the `edit` or `updateDP` commands.
The implementation of the UpdateDisplayCommand (`updateDP`) command closely follows the `edit` command, hence we will only showcase the implementation of the `UpdateDP` command.

The following figure 14 is the sequence diagram of the `updateDP` command to show how it functions:
The following figure 15 is the sequence diagram of the `updateDP` command to show how it functions:

.UpdateDisplayCommand Sequence Diagram
image::UpdateDisplayCommandSequenceDiagram.png[width="800"]
@@ -739,7 +739,7 @@ image::UpdateDisplayCommandSequenceDiagram.png[width="800"]

To fully support the `undo` and `redo` commands, image files cannot be immediately deleted when it is not in use by the `UI`.

To work around this, a new class `UniqueItemList` was added to the model of the `AddressBook` as seen below in Figure 15.
To work around this, a new class `UniqueItemList` was added to the model of the `AddressBook` as seen below in Figure 16.

.AddressBook Class Diagram
image::AddressBookClass.png[width="600"]
@@ -780,7 +780,7 @@ which is stored in `src/resources/images/displayPic` as `default.png`.
If a valid path to an image is provided, the image will be processed and copied over to the `data` folder where the `addressbook.xml` is stored as well.

The filename of the image copied over will be a <<sha-256,SHA-256>> hash. This hash is calculated over the `Person` object's details (i.e Name, Phone and Email) to ensure a unique filename.
The following activity diagram in Figure 16 shows how the files are saved:
The following activity diagram in Figure 17 shows how the files are saved:

.Activity diagram for storing image files
image::StoreDisplayPictureActivityDiagram.png[width="800"]
14 changes: 7 additions & 7 deletions docs/UserGuide.adoc
Original file line number Diff line number Diff line change
@@ -301,7 +301,7 @@ Command entered: `edit` `2` `p/91234567` `e/johndoe@example.com` `dp/C:\Users\Na

Result: This changes the details of the person with index 2 (Betsy Crowe) and writes over her original saved details (Figure 14).

.Phone and Email of 2nd Person (Betsy Crowe) Edited +
.Phone, Email and Display Picture of 2nd Person (Betsy Crowe) Edited +
image::FirstEdit.png[width="300"]

If you find that you've added someone with incorrect details, you can change the entry.
@@ -310,7 +310,7 @@ Command entered: `edit` `1` `n/John Doeser` +

Result: This changes the details of the person with index 1 (originally John Doe) and updates his details (see Figure 15).

.Name Changed to "John Doser" +
.Name Changed to "John Doeser" +
image::SecondEdit.png[width="300"]

=== Sorting all entries: `sort`
@@ -327,13 +327,13 @@ Adds to the participation marks of a person (student). The maximum limit for par
and the maximum amount that can be added per execution of the command is 100. +
i.e. if someone has 90 marks and you add 20, the participation marks will be capped at 100.

If the marks is below 50, there will be a red frame surrounding the person's profile picture. If the person has 50 or more marks, the colored frame around the user will change to green.
If the marks are below 50, there will be a red frame surrounding the person's profile picture. If the person has 50 or more marks, the colored frame around the user will change to green.

Format: `markPart` `INDEX` `marks/DIGITS`

****
* The `INDEX` refers to the index number shown in the most recent listing.
* The marks to be added must be a *positive integer* between 0 and 100 inclusive.
* The marks to be added must be a *integer* between 0 and 100 inclusive.
****

Examples:
@@ -356,7 +356,7 @@ Command entered: `find` `David` +

Result: Returns David as a result (see Figure 18). +

.Find command returns David
.`find` Command returns David
image::markPart2David.png[width="300"]

Command entered: `markPart` `1` `marks/70` +
@@ -380,13 +380,13 @@ Format: `updateDP` `INDEX` `dp/[IMAGE PATH]`
****
* The `INDEX` refers to the index number shown in the most recent listing.
* The index must be a *positive integer* 1, 2, 3, ...
* Do note that unused display pictures will be deleted upon the next application startup when logging in to the same account.
* Do note that unused display pictures will be deleted upon the next application startup when logging in to the same account that updated the display picture.
* You can reset a person's display picture to default by typing `dp/` with no [IMAGE PATH] written after it.
* The aspect ratio of the image will be used to fill a circle for the display picture, thus using an image with an aspect ratio close to 1:1 pixels would be optimal.
****

[NOTE]
Do refrain from using high resolution images as display pictures, the optimum resolution is 300 x 300 pixels.
Do refrain from using high resolution images as display pictures, the optimum resolution is 500 x 500 pixels.

Examples:

3 changes: 2 additions & 1 deletion docs/team/Alaru.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
= Chia Kah Sheng Ellery - Project Portfolio
:imagesDir: ../images
:stylesDir: ../stylesheets
:repoURL: https://github.com/CS2103JAN2018-F09-B1/main

== PROJECT: Your TA

@@ -44,7 +45,7 @@ The existing commands (add, edit, delete and clear) were also updated to support
** Documentation:
*** Help update README (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/66[#66]), changed application icon (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/108[#108]) and name (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/123[#123]).
*** Updated screenshots used in the User Guide: (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/57[#57], PR https://github.com/CS2103JAN2018-F09-B1/main/pull/130[#130])
*** Edited the developer guide for English usage, added prefaces, updated images, made explanations clearer (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/123[#123]) and added manual testing cases.
*** Edited the developer guide for English usage, added prefaces, updated images, made explanations clearer (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/123[#123]) and added manual testing cases (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/130[#130]).
*** Sequence diagram was added (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/108[#108]) and was edited and used by teammate (PR https://github.com/CS2103JAN2018-F09-B1/main/pull/124[#124]).
** Community:
*** Reported bugs and suggestions for another team in the class (examples: https://github.com/CS2103JAN2018-F12-B2/main/issues/83[1], https://github.com/CS2103JAN2018-F12-B2/main/issues/80[2], https://github.com/CS2103JAN2018-F12-B2/main/issues/76[3])
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/MainApp.java
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@
*/
public class MainApp extends Application {

public static final Version VERSION = new Version(1, 4, 0, true);
public static final Version VERSION = new Version(1, 5, 0, false);
private static boolean isTest = true;
private static final Logger logger = LogsCenter.getLogger(MainApp.class);
private static final String LOGIN_FILEPATH = "data/login.xml";
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
public class Participation {

public static final String MESSAGE_PARTICIPATION_CONSTRAINTS =
"Participation marks cannot be negative or over 100!";
"Participation marks must be between 0 to 100 inclusive!";
public static final String UI_DISPLAY_HEADER = "Participation marks: ";

public final Integer threshold;