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

[T13-2] SSENISUB #110

Open
wants to merge 508 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
508 commits
Select commit Hold shift + click to select a range
e305609
Merge branch 'master' into v1.2privacyCommand
abtyx Oct 29, 2018
47c9f00
remove unused import statements
abtyx Oct 29, 2018
9844f71
edit PrivacyCommand to take in the new fields Feedback, Salary etc
abtyx Oct 29, 2018
44e0978
edit Phone equals method to check privacy
abtyx Oct 30, 2018
caffad3
change major bug in PrivacyCommand
abtyx Oct 30, 2018
4e7abd1
edit equals method for Address and Email to include checking for privacy
abtyx Oct 30, 2018
54e8ad4
make private information show up as private on staff panel
abtyx Oct 30, 2018
ac9fb6b
edit tests to accomodate for changes
abtyx Oct 30, 2018
3aa47e5
add junit testing for coveralls
abtyx Oct 30, 2018
b97a231
fix checkstyle
abtyx Oct 30, 2018
7ee803c
Merge pull request #56 from abtyx/v1.3PrivacyInUI
NgeowXiuQi Oct 30, 2018
114a985
Merge branch 'master' into wip/favourite
valensia0711 Oct 30, 2018
b2f879e
fix conflict resolve problem
Oct 30, 2018
8d68119
fix conflict resolve problem
Oct 30, 2018
fabac11
fix tests
Oct 30, 2018
4bf674e
AddressBookParserTest: add test for favourite command
Oct 30, 2018
d570530
Merge pull request #5 from CS2103-AY1819S1-T13-2/master
IamRENCE Oct 30, 2018
7d4cf47
RateCommandParser: Add check if rating entered fulfils regex
IamRENCE Oct 30, 2018
99e7ed0
RateCommandParser: Check for negative index
IamRENCE Oct 30, 2018
ea5fc9a
FeedbackCommandParser: Add check if feedback fulfils feedback regex
IamRENCE Oct 30, 2018
4987591
fix for checkstyle
Oct 30, 2018
3946b78
fix for checkstyle
Oct 30, 2018
20cc7bf
add test for unfavourite
Oct 30, 2018
cca699f
Add RateCommandSystemTest
IamRENCE Oct 30, 2018
4a85702
Add tests for RateCommandSystemTest
IamRENCE Oct 30, 2018
42e8784
RateCommandSystemTest: Fix test comment
IamRENCE Oct 30, 2018
2fab75c
Add FeedbackCommandSystemTest
IamRENCE Oct 30, 2018
a6879d6
Merge pull request #54 from CS2103-AY1819S1-T13-2/wip/favourite
IamRENCE Oct 30, 2018
7357cc9
RateCommandParser: Fix comment issue
IamRENCE Oct 30, 2018
65dbe14
FeedbackCommandParser: Fix tests to properly check for the correct pa…
IamRENCE Oct 30, 2018
dd405e7
RateCommandParser: Fix tests to properly check for the correct parse …
IamRENCE Oct 30, 2018
f0d0a33
RateCommandParser: Coveralls check
IamRENCE Oct 30, 2018
02ddb6f
Fix Coveralls Check
IamRENCE Oct 30, 2018
5b10b49
Merge pull request #58 from IamRENCE/master
valensia0711 Oct 30, 2018
988b5c6
update userdoc for privacy command
abtyx Oct 31, 2018
4ceaf6f
Merge pull request #62 from abtyx/v1.3UserDocAsh
NgeowXiuQi Oct 31, 2018
23c9a72
Update XMLAdaptedPerson.java : Commented out unnecessary checks
NgeowXiuQi Oct 31, 2018
b5aeabd
Updated XmlAdaptedPerson.java : Removed unnecessary checks
NgeowXiuQi Oct 31, 2018
08f88af
Update Salary.java : Removed unnecessary function
NgeowXiuQi Oct 31, 2018
99aecfe
Merge pull request #63 from NgeowXiuQi/Coveralls_Fix
DanKhoo Oct 31, 2018
787c35c
user guide: add favourite command, remove lock-unlock command
Oct 31, 2018
a84def7
wip: add unfavourite command
Oct 31, 2018
70f56be
user guide: add coming soon to lock-unlock feature
Oct 31, 2018
806a1da
Merge pull request #64 from CS2103-AY1819S1-T13-2/documentation
DanKhoo Oct 31, 2018
9b83d94
Update UserGuide.adoc
DanKhoo Oct 31, 2018
ca72668
add unfavourite command
Oct 31, 2018
bf8c49f
Merge pull request #65 from DanKhoo/master
valensia0711 Oct 31, 2018
0b83894
update user guide and dev guide to include unfavourite command
Oct 31, 2018
7272850
removed unused method for coveralls
Oct 31, 2018
591ae31
Merge pull request #67 from CS2103-AY1819S1-T13-2/documentation
NgeowXiuQi Oct 31, 2018
f9b5f22
fix for coveralls
Oct 31, 2018
367957b
Merge pull request #66 from CS2103-AY1819S1-T13-2/wip/unfavourite
DanKhoo Oct 31, 2018
72817fe
Merge pull request #6 from CS2103-AY1819S1-T13-2/master
IamRENCE Oct 31, 2018
3e7dd3d
Feedback: Add check for Profanity
IamRENCE Oct 31, 2018
4bc5d18
FeedbackTest: Add tests to check if profanities get rejected
IamRENCE Oct 31, 2018
a7a115b
FeedbackCommandParser & RateCommandParser: Update minor bug where wro…
IamRENCE Oct 31, 2018
1bf9761
FeedbackCommandParserTest & RateCommandParserTest: Update tests to fo…
IamRENCE Oct 31, 2018
8f64efd
RateCommandSystemTest: Update test to display correct error message
IamRENCE Oct 31, 2018
2706130
FeedbackCommandSystemTest: Add test to check if profanity in input is…
IamRENCE Oct 31, 2018
6f7fee3
README: Update Acknowledgements for Profanity Filter code
IamRENCE Oct 31, 2018
bc62622
Revert "README: Update Acknowledgements for Profanity Filter code"
IamRENCE Oct 31, 2018
26394c8
Update UserGuide on feedback and rate command
IamRENCE Oct 31, 2018
d1096e0
Create Bad_Words_List
IamRENCE Oct 31, 2018
d226afc
Update Bad_Words_List
IamRENCE Oct 31, 2018
e72a6a9
Delete dummy Bad_Words_List
IamRENCE Oct 31, 2018
4979600
Update input file to be txt instead of csv
IamRENCE Oct 31, 2018
ff85110
Feedback: Improve code quality
IamRENCE Oct 31, 2018
81eff0c
Improve code coverage
IamRENCE Oct 31, 2018
4475b4d
UserGuide: Fix typos
IamRENCE Nov 1, 2018
9bcacb0
Merge pull request #75 from IamRENCE/master
DanKhoo Nov 1, 2018
52a69ea
add UI for favourite command
Nov 1, 2018
612e883
edit UI for favourite command
Nov 1, 2018
5d3cbab
fix for checkstyle
Nov 1, 2018
105d22a
add sort command
Nov 1, 2018
5303487
fix bug when sorting with favourited persons
Nov 1, 2018
55645b8
add tests for sort command
Nov 1, 2018
f9bc93c
Update UserGuide : Added Net Salary note in Edit Command
NgeowXiuQi Nov 1, 2018
3b39c89
Edited UserGuide : Removed formula
NgeowXiuQi Nov 1, 2018
c6eee1d
update userdoc for privacy
abtyx Nov 1, 2018
b6ad0ec
Update Feedback profanity Filter to work for jar file
IamRENCE Nov 1, 2018
8d4337c
Feedback: Fix checkstyle
IamRENCE Nov 1, 2018
cf2bab9
Test fix NoClassDefFoundError in travis
IamRENCE Nov 1, 2018
d22214b
Merge pull request #79 from abtyx/v1.3UserDocAsh
NgeowXiuQi Nov 1, 2018
006ab14
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-2/mai…
NgeowXiuQi Nov 1, 2018
cdd2716
Update UserGuide : Shifted Salary, OT Hours, OT Rate and Pay Deductib…
NgeowXiuQi Nov 1, 2018
f957c30
Merge pull request #78 from NgeowXiuQi/UserGuide_Update
abtyx Nov 1, 2018
03ef5f2
Create dummy file
IamRENCE Nov 1, 2018
3ca54aa
Add Bad_Words_List.txt
IamRENCE Nov 1, 2018
afc3822
Delete dummy file
IamRENCE Nov 1, 2018
e0381d2
Feedback: Edit bad words text source
IamRENCE Nov 1, 2018
3e1540f
Merge branch 'master' of https://github.com/IamRENCE/main
IamRENCE Nov 1, 2018
86f29fa
Delete wrong Bad_Words_List.txt
IamRENCE Nov 1, 2018
4e1f6da
Create Dummy File
IamRENCE Nov 1, 2018
338598a
Add Bad_Words_List.txt
IamRENCE Nov 1, 2018
a12cd66
Delete Dummy File
IamRENCE Nov 1, 2018
411d165
Update Bad_Words_List.txt
IamRENCE Nov 1, 2018
bc50231
Merge pull request #76 from CS2103-AY1819S1-T13-2/wip/favourite
DanKhoo Nov 1, 2018
9eddbfa
Merge pull request #80 from IamRENCE/master
DanKhoo Nov 1, 2018
a445805
fix for checkstyle
Nov 2, 2018
89a198c
fix tests
Nov 2, 2018
7d2561f
fix tests
Nov 2, 2018
0f29d65
resolve issue: undo and redo did not work properly in regards to favo…
Nov 4, 2018
ead3bba
Update UserGuide.adoc
IamRENCE Nov 5, 2018
1101c90
Update UserGuide.adoc
IamRENCE Nov 6, 2018
2b7b0e5
Merge pull request #100 from CS2103-AY1819S1-T13-2/resolve_issue
IamRENCE Nov 6, 2018
6c9cbce
Phone.java: Update VALIDATION_REGEX
DanKhoo Nov 6, 2018
dbe1d6e
Update UserGuide.adoc
DanKhoo Nov 6, 2018
86de25c
Update all phone numbers according to the validation regex
DanKhoo Nov 6, 2018
57f88eb
Merge pull request #101 from CS2103-AY1819S1-T13-2/IamRENCE-patch-1
DanKhoo Nov 6, 2018
4328331
Merge pull request #7 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 6, 2018
56cc972
Test Validation Phone Regex
IamRENCE Nov 6, 2018
866c139
Merge pull request #103 from DanKhoo/master
IamRENCE Nov 6, 2018
38a07d0
Merge pull request #8 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 6, 2018
d372244
Merge branch 'DanKhoo-master'
IamRENCE Nov 6, 2018
d549540
Add HideStaffPanelEvent.java for Undo/Redo Command
DanKhoo Nov 6, 2018
d866034
DeleteCommand.java: Add event trigger when list is empty
DanKhoo Nov 6, 2018
13b633a
MainWindow.java: Add handleHideStaffPanelEvent method
DanKhoo Nov 6, 2018
dd2de96
Add event trigger when edit, feedback, privacy, rate, redo, undo comm…
DanKhoo Nov 6, 2018
0b44bbd
Merge pull request #102 from CS2103-AY1819S1-T13-2/update-userguide
DanKhoo Nov 6, 2018
ea06c21
Update VALIDATION_REGEX & message to only allow alphabetical characters
DanKhoo Nov 7, 2018
7c02198
Update relevant tests according to the validation regex for Name and …
DanKhoo Nov 7, 2018
439536d
StaffPanel.fxml:Wrap label text for name, department and email
DanKhoo Nov 7, 2018
92e7785
Merge pull request #104 from DanKhoo/fix_UI_bug
IamRENCE Nov 7, 2018
dac6d97
Merge pull request #81 from CS2103-AY1819S1-T13-2/wip/sort
IamRENCE Nov 8, 2018
97d9376
Add find features
DanKhoo Nov 9, 2018
5c32939
Implement find feature for department + tests
DanKhoo Nov 9, 2018
5967245
Implement find feature for manager name + tests
DanKhoo Nov 9, 2018
a90127c
Implement find feature for email + tests
DanKhoo Nov 9, 2018
79e1fda
Implement find feature for email + tests
DanKhoo Nov 9, 2018
a2c0eda
update
DanKhoo Nov 9, 2018
36aecd4
AddressBookParser.java: Add find commands
DanKhoo Nov 9, 2018
62706aa
FindCommand: update find command word to find-n
DanKhoo Nov 9, 2018
6ce6434
Update typicalPerson.java & .xml
DanKhoo Nov 9, 2018
6197808
Merge pull request #106 from DanKhoo/findCommands
IamRENCE Nov 10, 2018
8679cd2
Merge pull request #9 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 10, 2018
73b6c98
Replace "Address Book" elements to "SSENISUB" in documentations and "…
IamRENCE Nov 10, 2018
9aa183e
Fox checkstyle issues
IamRENCE Nov 10, 2018
9fe63ba
Fix missed checkstyle
IamRENCE Nov 10, 2018
f471230
Fix more checkstyle with regards to import ordering and variable naming
IamRENCE Nov 10, 2018
94b1f40
SortCommandTest: Fix checkstyle
IamRENCE Nov 10, 2018
f5c5cd7
Merge pull request #107 from IamRENCE/master
DanKhoo Nov 10, 2018
f7c6906
StaffPanel.fxml:Set vgrow and wrap text
DanKhoo Nov 10, 2018
b0c46ef
Set character limit for each attributes
DanKhoo Nov 10, 2018
34f46b1
Update Ui.png
DanKhoo Nov 10, 2018
a3b9f1f
Update Ui.png
DanKhoo Nov 10, 2018
35143f5
Fix validation regex
DanKhoo Nov 10, 2018
76a5a3e
UserPrefs: Rename data output file to "ssenisub.xml"
IamRENCE Nov 11, 2018
e1268ea
Add Sequence Diagrams
IamRENCE Nov 11, 2018
d8015f8
Update DeveloperGuide with Feedback command features
IamRENCE Nov 11, 2018
9edf0d4
Update UserGuide with Feedback features
IamRENCE Nov 11, 2018
ead5f31
Merge pull request #108 from DanKhoo/fix_ui_bug
IamRENCE Nov 11, 2018
9d4b03a
Merge pull request #109 from IamRENCE/master
valensia0711 Nov 11, 2018
5d47cdf
SampleDataUtil: Make 1st person favourited
IamRENCE Nov 11, 2018
7e20581
Merge pull request #10 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 11, 2018
7392f77
Merge branch 'master' of https://github.com/IamRENCE/main
IamRENCE Nov 11, 2018
83b7006
SampleDataUtil: Undo "favourite 1st person by default"
IamRENCE Nov 11, 2018
c1afa02
add sortByDept, sortByRatingUp, sortByRatingDown commands
Nov 11, 2018
4f9dacb
Add PPP for IamRENCE
IamRENCE Nov 11, 2018
c575895
Update IamRENCE PPP
IamRENCE Nov 11, 2018
348f108
Merge pull request #111 from IamRENCE/master
DanKhoo Nov 11, 2018
d8b575f
Merge pull request #11 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 11, 2018
713362c
Fix tag typo in UserGuide
IamRENCE Nov 11, 2018
2fc432c
Update UserGuide.adoc
DanKhoo Nov 11, 2018
c8cf220
Merge pull request #112 from IamRENCE/master
DanKhoo Nov 11, 2018
f4897df
add command is now unable to add a person with existing phone or email
abtyx Nov 11, 2018
5e9d655
Merge pull request #12 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 11, 2018
a7ca34b
Update DeveloperGuide
IamRENCE Nov 11, 2018
002a8d9
Merge pull request #113 from DanKhoo/updateDocs
IamRENCE Nov 11, 2018
ba32b6b
Merge pull request #115 from IamRENCE/master
DanKhoo Nov 11, 2018
9822bb1
fix tests
abtyx Nov 11, 2018
1c8d902
PPP created
abtyx Nov 11, 2018
4c350f5
fix checkstyle
abtyx Nov 11, 2018
e43f041
Update Ssenisub.java
abtyx Nov 11, 2018
1219393
Update EditCommand.java
abtyx Nov 11, 2018
2f83dd0
Merge pull request #114 from abtyx/v1.4finalAsh
DanKhoo Nov 11, 2018
7d52056
update userguide, devguide and PPP
abtyx Nov 11, 2018
6f21227
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-2/mai…
abtyx Nov 11, 2018
0ebba30
Merge pull request #117 from abtyx/PPP
DanKhoo Nov 11, 2018
a83db82
Update all diagrams for Dev Guide
DanKhoo Nov 11, 2018
8cd63e6
Update DeveloperGuide
DanKhoo Nov 11, 2018
18b643e
Update UserGuide.adoc
DanKhoo Nov 11, 2018
008f231
Merge pull request #118 from DanKhoo/updateDocs
DanKhoo Nov 11, 2018
cfde5c3
add tests for the different sort commands
Nov 11, 2018
6b0443d
add valensia0711.adoc
Nov 11, 2018
6b2a520
add parser tests for new commands to increase coverage
Nov 11, 2018
5638fe1
Merge pull request #119 from CS2103-AY1819S1-T13-2/wip/sort_withparam
NgeowXiuQi Nov 11, 2018
f6dc75a
minor changes in User Guide
Nov 11, 2018
3739964
Added NgeowXiuQi.adoc : For PPP
NgeowXiuQi Nov 11, 2018
c66749a
minor changes to user guide: grammar fix
Nov 11, 2018
46cf246
Merge pull request #120 from NgeowXiuQi/master
valensia0711 Nov 11, 2018
9ff0c4a
Edited AboutUs.adoc to link to team members' PPP
NgeowXiuQi Nov 11, 2018
d7770aa
Updated my PPP (NgeowXiuQi.adoc)
NgeowXiuQi Nov 11, 2018
72ca4f4
Corrected Spelling error in Ashburn's PPP
NgeowXiuQi Nov 11, 2018
519fd5e
Merge pull request #121 from NgeowXiuQi/NgeowXiuQi_PPP
valensia0711 Nov 11, 2018
43213c9
fix typos and grammar errors
Nov 11, 2018
d9503d5
reorder command list in user guide
Nov 11, 2018
57df1c6
add sort commands to user guide
Nov 11, 2018
ad48b89
fix typo
Nov 11, 2018
f6219cd
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-2/mai…
Nov 11, 2018
8a43b9d
fix for checkstyle: add newline at EOF
Nov 11, 2018
f4d95ef
add PPP for valensia0711
Nov 11, 2018
b6e8980
fix: sortRatingDown should be sortRatingUp
Nov 11, 2018
3d26c33
Merge pull request #123 from CS2103-AY1819S1-T13-2/documentation
NgeowXiuQi Nov 12, 2018
435abe3
Merge pull request #124 from CS2103-AY1819S1-T13-2/ppp
NgeowXiuQi Nov 12, 2018
cd72bb4
Add dankhoo.adoc ppp and AboutUs.adoc
DanKhoo Nov 12, 2018
f136426
Merge pull request #125 from DanKhoo/updateDocs
abtyx Nov 12, 2018
79d1990
add Activity Diagram to dev guide
abtyx Nov 12, 2018
5a45378
Edited ngeowxiuqi.adoc to include changes
NgeowXiuQi Nov 12, 2018
cf6f30c
Merge pull request #126 from abtyx/PPP
IamRENCE Nov 12, 2018
f2a9001
Rename NgeowXiuQi.adoc to ngeowxiuqi.adoc
NgeowXiuQi Nov 12, 2018
e6e28a5
Update asciidoctor.css
DanKhoo Nov 12, 2018
3e05937
Merge pull request #128 from CS2103-AY1819S1-T13-2/NgeowXiuQi-patch-1
NgeowXiuQi Nov 12, 2018
a387132
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-2/mai…
NgeowXiuQi Nov 12, 2018
88226ea
Removed ngeowxiuqi.adoc PPP
NgeowXiuQi Nov 12, 2018
fda6186
Merge pull request #129 from CS2103-AY1819S1-T13-2/updateCSS
DanKhoo Nov 12, 2018
c7263c4
Merge pull request #130 from NgeowXiuQi/NgeowXiuQi_PPP
DanKhoo Nov 12, 2018
3b68bc8
Re-added ngeowxiuqi.adoc
NgeowXiuQi Nov 12, 2018
3e46a95
Merge pull request #132 from NgeowXiuQi/NgeowXiuQi_PPP
DanKhoo Nov 12, 2018
46e2548
Edited AboutUs to accomodate for my PPP
NgeowXiuQi Nov 12, 2018
1268307
DeveloperGuide.adoc: Add manual test cases for add, select and find-n
DanKhoo Nov 12, 2018
7f5c9c9
Merge pull request #133 from NgeowXiuQi/NgeowXiuQi_PPP
valensia0711 Nov 12, 2018
6cabfae
Edited DeveloperGuide and my PPP
NgeowXiuQi Nov 12, 2018
11b78e3
Merge pull request #134 from DanKhoo/updateDocs
NgeowXiuQi Nov 12, 2018
c1732eb
Update dankhoo.adoc PPP
DanKhoo Nov 12, 2018
613000e
Merge pull request #135 from NgeowXiuQi/NgeowXiuQi_PPP
DanKhoo Nov 12, 2018
717aec1
Merge pull request #13 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 12, 2018
1fb0778
Merge pull request #136 from DanKhoo/updateDocs
IamRENCE Nov 12, 2018
67eb2b5
Merge pull request #14 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 12, 2018
edf0cf8
Update Rate Command Sequence Diagrams
IamRENCE Nov 12, 2018
b9f064a
Update Feedback Command Sequence Diagram
IamRENCE Nov 12, 2018
13ba9db
Add Feedback Profanity Filter Sequence Diagram
IamRENCE Nov 12, 2018
a09ba8b
Update DeveloperGuide with Profanity Filter Sequence Diagram
IamRENCE Nov 12, 2018
abf8e09
Merge pull request #137 from IamRENCE/master
DanKhoo Nov 12, 2018
b9dff84
edit developer guide to include sort commands and favourite/unfavouri…
Nov 12, 2018
ab69192
fix typo in developer guide for feedback command
Nov 12, 2018
375f66a
reorder contents in command implementation
Nov 12, 2018
0a6b008
reorder contents in use cases
Nov 12, 2018
6206177
reorder contents in manual testing guide
Nov 12, 2018
8ce5374
add manual test for favourite command
Nov 12, 2018
58a2d02
add manual test for unfavourite command
Nov 12, 2018
532520c
Merge pull request #138 from CS2103-AY1819S1-T13-2/documentation
DanKhoo Nov 12, 2018
4bb8ee3
edit PPP: valensia0711.adoc
Nov 12, 2018
1e5d8d3
Merge pull request #15 from CS2103-AY1819S1-T13-2/master
IamRENCE Nov 12, 2018
8e16bdb
Fix typo in DeveloperGuide
IamRENCE Nov 12, 2018
83385b9
Fix typo in PPP
IamRENCE Nov 12, 2018
494eac1
Merge pull request #139 from CS2103-AY1819S1-T13-2/documentation
IamRENCE Nov 12, 2018
9f74fec
Merge pull request #140 from IamRENCE/master
DanKhoo Nov 12, 2018
3ea89d6
Update README.adoc
DanKhoo Nov 12, 2018
06874cd
Merge pull request #141 from CS2103-AY1819S1-T13-2/updateDocs
NgeowXiuQi Nov 12, 2018
a38b0d1
Update AboutUs.adoc
DanKhoo Nov 12, 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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lib/*
*.log
*.log.*
*.csv
config.json
/config.json
src/test/data/sandbox/
preferences.json
.DS_Store
Expand Down
27 changes: 13 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
= Address Book (Level 4)
= SSENISUB
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&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]]
https://travis-ci.org/CS2103-AY1819S1-T13-2/main[image:https://travis-ci.org/CS2103-AY1819S1-T13-2/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/DanKhoo/main/branch/master[image:https://ci.appveyor.com/api/projects/status/pw5iprwm6q97wbo0/branch/master?svg=true[Build status]]
https://coveralls.io/github/CS2103-AY1819S1-T13-2/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-T13-2/main/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/DanKhoo/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103-AY1819S1-T13-2/main&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/f88a4818748d488192c6ab654eb1caba[Codacy Badge]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,19 +14,18 @@ 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.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* SSENISUB is a desktop application to assist the HR department of a company to manage its staff. On top of just assisting HR, this application also allows the staff themselves to view their workplace performance and improve themselves.
* It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* SSENISUB also doubles as a contacts manager to allow staff to easily find the contact information of their superior or colleagues.
* Features of SSENISUB:
** Allows a staff to view contact information of their superiors and coworkers.
** Allow managers to rate and feedback on their staff's performance.
** Allows a HR staff to upload/edit contact information.

== Site Map

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

Expand All @@ -36,5 +34,6 @@ endif::[]
* 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://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
* Original source code was adopted from https://github.com/se-edu/ (addressbook-level4)

== Licence : link:LICENSE[MIT]
30 changes: 30 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"authors":
[
{
"githubId": "DanKhoo",
"displayName": "Daniel Khoo",
"authorNames": ["DanKhoo", "Daniel Khoo"]
},
{
"githubId": "IamRENCE",
"displayName": "Terence Goh",
"authorNames": ["Terence Goh"]
},
{
"githubId": "valensia0711",
"displayName": "Valensia Sebastiani",
"authorNames": ["Valensia Sebastiani"]
},
{
"githubId": "NgeowXiuQi",
"displayName": "Ngeow Xiu Qi",
"authorNames": ["NgeowXiuQi", "Xiu Qi"]
},
{
"githubId": "abtyx",
"displayName": "Ashburn Tan",
"authorNames": ["abtyx"]
}
]
}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ dependencies {
}

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

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

Expand Down
1 change: 0 additions & 1 deletion copyright.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Some code adapted from http://code.makery.ch/library/javafx-8-tutorial/ by Marco Jakob

Copyright by Susumu Yoshida - http://www.mcdodesign.com/
- address_book_32.png
- AddressApp.ico

Copyright by Jan Jan Kovařík - http://glyphicons.com/
Expand Down
43 changes: 19 additions & 24 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 4 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} +
SSENISUB was developed by Team https://github.com/CS2103-AY1819S1-T13-2[T13-2] team. +

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>>]
=== Khoo Jin Zheng Daniel
image::dankhoo.png[width="150", align="left"]
{empty}[https://github.com/DanKhoo[github]] [<<dankhoo#, portfolio>>]

Role: Project Advisor
Role: Developer

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Developer +

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Goh Yang Yu, Terence
image::iamrence.png[width="150", align="left"]
{empty}[https://github.com/IamRENCE[github]] [<<iamrence#, portfolio>>]

Role: Developer +
Responsibilities: Data

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Ngeow Xiu Qi
image::ngeowxiuqi.png[width="150", align="left"]
{empty}[https://github.com/NgeowXiuQi[github]] [<<ngeowxiuqi#, portfolio>>]

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>>]
=== Tan Yuxuan
image::abtyx.png[width="150", align="left"]
{empty}[https://github.com/abtyx[github]] [<<abtyx#, portfolio>>]

Role: Developer +
Responsibilities: UI

'''
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-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/CS2103-AY1819S1-T13-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 `e0254012 [at] comp.nus.edu.sg`
Loading