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

SkillLevel constraint #94

Open
wants to merge 416 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
416 commits
Select commit Hold shift + click to select a range
ffc8c79
updated ParserUtil for BudgetCommand
sanjukta99 Oct 8, 2018
548ca5f
updated BudgetCommand and UserGuide to reflect changes made to the co…
sanjukta99 Oct 8, 2018
118a889
updated AddressBook
sanjukta99 Oct 8, 2018
2e58c37
updated Model
sanjukta99 Oct 8, 2018
50ace66
updated ModelManager
sanjukta99 Oct 8, 2018
6491775
Created UniqueClubsList
sanjukta99 Oct 8, 2018
6f4971b
Edited the ClubName class to allow users to enter club name with spaces
sanjukta99 Oct 8, 2018
cce9b7f
Edited the ExpectedTurnout and NumberOfEvents classes to allow users …
sanjukta99 Oct 8, 2018
30d3eb3
Created an exception to deal with duplicates of clubs
sanjukta99 Oct 8, 2018
9b26409
Updated UniqueClubsList with the new DuplicateClubException
sanjukta99 Oct 8, 2018
fb68a7a
Edited classes to correct style errors
sanjukta99 Oct 9, 2018
a62a905
List.java: List command now clears search history
Boon-Jun Oct 9, 2018
628031c
SearchHistoryManager is no longer a singleton class and is now instan…
Boon-Jun Oct 9, 2018
2fba31c
Updated tests for search by tags and Search Pruning feature
Boon-Jun Oct 9, 2018
c4b7cd4
Renaming test method
Boon-Jun Oct 9, 2018
0eac7f8
Edited AddCommandTest
sanjukta99 Oct 9, 2018
bd66e38
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/NUS…
Boon-Jun Oct 9, 2018
cf7a382
Update README.adoc
Boon-Jun Oct 10, 2018
48ffea8
Merge branch 'master' into master
sanjukta99 Oct 11, 2018
78ff809
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
sanjukta99 Oct 11, 2018
c36b043
Refactored some methods in SearchHistoryManager.java + minor changes …
Boon-Jun Oct 11, 2018
5d1cf42
Updated javadocs for SearchHistoryManager.java
Boon-Jun Oct 11, 2018
70213fb
Updated test files according to updated SearchHistoryManager
Boon-Jun Oct 11, 2018
507815a
Merge branch 'master' of https://github.com/sanjukta99/NUSSU-Connect
sanjukta99 Oct 11, 2018
4e8fa3b
Added EmptyHistoryException.java
Boon-Jun Oct 11, 2018
c3e6605
Relocate SearchHistoryManager.java to new package
Boon-Jun Oct 11, 2018
cf87b18
Minor changes to retrievePredicateAtTopOfStack() in SearchHistoryMana…
Boon-Jun Oct 11, 2018
d5f530e
Added undosearch command
Boon-Jun Oct 11, 2018
effc249
Revert wrong changes to MainWindow.java
Boon-Jun Oct 11, 2018
4b80468
Changes in import order.
Boon-Jun Oct 11, 2018
e705065
almost completed addskill command and various other checkstyle rectif…
derpyplops Oct 11, 2018
cb681d7
Revert "Revert "implemented Remark Logic""
derpyplops Oct 11, 2018
ed16aad
checkstyle edits
derpyplops Oct 11, 2018
204c165
Updated files for newly forked repo
melvintjc96 Oct 12, 2018
06b344b
Updated README.adoc
melvintjc96 Oct 12, 2018
6668e82
Removed some section of user stories in developer guide that does not…
Boon-Jun Oct 14, 2018
9a076fb
Removed clearsearch command
Boon-Jun Oct 15, 2018
b12371a
Created new folder for diagrams
melvintjc96 Oct 15, 2018
e88a240
Delete diagrams
melvintjc96 Oct 15, 2018
f479bf8
Created diagrams folder
melvintjc96 Oct 15, 2018
a8c4811
Added class diagrams for various components
melvintjc96 Oct 15, 2018
398e892
Delete diagram
melvintjc96 Oct 15, 2018
0918916
made changes to LogicManager and edited other classes to reflect the …
sanjukta99 Oct 15, 2018
145f81e
Added tests for TagContainsKeywordsPredicate
Boon-Jun Oct 15, 2018
b252f6b
Resolved some checkstyle errors in TagContainsKeywordsPredicateTest
Boon-Jun Oct 15, 2018
0e93a89
updated AddComandTest based on changes done to Model
sanjukta99 Oct 16, 2018
4b34b90
Merge branch 'master' of https://github.com/Chocological/main
sanjukta99 Oct 16, 2018
f9aa167
Updated UG/DG for v1.2
melvintjc96 Oct 16, 2018
befce78
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
derpyplops Oct 16, 2018
9dcd12a
Updated login functionality to reflect changes in search pruning feature
melvintjc96 Oct 16, 2018
3042b37
Delete LogicClassDiagram.xml
melvintjc96 Oct 16, 2018
bc2336b
Delete ModelClassDiagram.xml
melvintjc96 Oct 16, 2018
073b15e
Delete StorageClassDiagram.xml
melvintjc96 Oct 16, 2018
f048a0e
Delete UiClassDiagram.xml
melvintjc96 Oct 16, 2018
0c7fe38
Merge pull request #26 from ladderinc/SearchPruningFeature
melvintjc96 Oct 16, 2018
d6775ce
Added a dummy AddSkillLevelCommand that doesn't do anything + tests
derpyplops Oct 16, 2018
c7d619e
Added a dummy AddSkillLevelCommand that doesn't do anything + tests, …
derpyplops Oct 16, 2018
a3ea60d
Removed redundant LoginDialogBox class and updated class diagrams
melvintjc96 Oct 16, 2018
8b57385
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
melvintjc96 Oct 16, 2018
c534f7b
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
derpyplops Oct 16, 2018
ce1481d
Merge branch 'master' of https://github.com/derpyplops/NUSSU-Connect
derpyplops Oct 16, 2018
f1dc6c8
Added activity diagram in DG
melvintjc96 Oct 17, 2018
7dbcb44
First working multi user access level feature, without tests and WIP
melvintjc96 Oct 17, 2018
9e1e4c1
Updated tests to fix Travis error
melvintjc96 Oct 17, 2018
0554325
Merge pull request #40 from Chocological/LoginandCreateaccount
Boon-Jun Oct 17, 2018
e5bc3bf
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/NUS…
Boon-Jun Oct 17, 2018
7bd7999
Updated user docs
Boon-Jun Oct 17, 2018
8a82c00
Merge pull request #43 from ladderinc/SearchPruningFeature
melvintjc96 Oct 17, 2018
c4fedbd
Added exclude from search functionality
Boon-Jun Oct 17, 2018
996f6c7
Changes to several tests
Boon-Jun Oct 17, 2018
40b7d56
Updates userGuide for exclude search functionality
Boon-Jun Oct 17, 2018
a7cea00
Update Command summary in user guide with exclude search functionality
Boon-Jun Oct 17, 2018
e3382b4
Added pictures for DG
melvintjc96 Oct 17, 2018
2b0b929
Add files via upload
melvintjc96 Oct 17, 2018
e6f3831
Delete InitialLoginBook.JPG
melvintjc96 Oct 17, 2018
0b0aa3b
Update DeveloperGuide.adoc
melvintjc96 Oct 17, 2018
e59e429
Update DeveloperGuide.adoc
melvintjc96 Oct 17, 2018
18d5e6b
Update DeveloperGuide.adoc
melvintjc96 Oct 17, 2018
530ee24
Add files via upload
melvintjc96 Oct 17, 2018
3df5df8
Added pictures for DG
melvintjc96 Oct 17, 2018
ff7c62a
Taught program to accept multiple arguments
derpyplops Oct 17, 2018
063cea3
added SkillLevel class and edited surrounding classes
derpyplops Oct 17, 2018
569b70a
added tests for added commands
derpyplops Oct 18, 2018
e95b130
Add a placeholder for skill in PersonCard GUI
derpyplops Oct 18, 2018
9c463f0
commit that updates Person class. Breaks the XML but will be fixed in…
derpyplops Oct 18, 2018
03b4cd6
fix to placeholder
derpyplops Oct 18, 2018
d5d8e70
created the new BudgetCalculationCommand and ViewBudgetCommand
sanjukta99 Oct 18, 2018
58e4b95
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
sanjukta99 Oct 18, 2018
2ddbc2a
made style changes
sanjukta99 Oct 18, 2018
8b8bac1
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
derpyplops Oct 18, 2018
88e1e39
Merge branch 'master' into skill3
derpyplops Oct 18, 2018
95d1cb2
Merge branch 'skill2' into skill3
derpyplops Oct 18, 2018
40e16ff
Delete Ui.png
melvintjc96 Oct 18, 2018
744ca3c
Add files via upload
melvintjc96 Oct 18, 2018
8db46c2
Add Remark field to XmlAdaptedPerson class
derpyplops Oct 18, 2018
f81d79d
Add withSkill() and withSkillLevel for PersonBuilder
derpyplops Oct 18, 2018
8390a7d
Connect Remark field to PersonCard
derpyplops Oct 18, 2018
1a01db4
implementeed Logic and Tests for AddSkillLevelCommand
derpyplops Oct 18, 2018
c28cc5b
Merge pull request #45 from Chocological/LoginandCreateaccount
derpyplops Oct 18, 2018
c2a2a87
Merge pull request #46 from sanjukta99/v1.2budgetcalculationfeature
derpyplops Oct 18, 2018
ff69ce1
Merge pull request #44 from ladderinc/excludeFromSearchFeature
derpyplops Oct 18, 2018
3708ff2
Merge branch 'master' into skill3
derpyplops Oct 18, 2018
fccc7f4
Refactored certain parts of the code
melvintjc96 Oct 18, 2018
5fc05fc
updated dev guide
sanjukta99 Oct 18, 2018
fe9335a
dev guide added screenshots
sanjukta99 Oct 18, 2018
3915806
added sequence diagram
sanjukta99 Oct 18, 2018
63ba905
updated User Guide
sanjukta99 Oct 18, 2018
1143b86
Merge pull request #48 from derpyplops/skill3
sanjukta99 Oct 18, 2018
ebf83dd
Merge pull request #49 from sanjukta99/v1.2budgetcalculationfeature
sanjukta99 Oct 18, 2018
2084baf
some changes to documentation
derpyplops Oct 18, 2018
5705c64
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
derpyplops Oct 18, 2018
e7a6fa4
Added implementation of search pruning feature to dev guide
Boon-Jun Oct 18, 2018
df56533
Fixed trailing whitespace error at line 489 in Dev Guide
Boon-Jun Oct 18, 2018
581b623
Minor fixes in dev guide
Boon-Jun Oct 18, 2018
462079e
added implementation details for addSkillCommand
derpyplops Oct 18, 2018
92d9312
More changes to dev guide
Boon-Jun Oct 18, 2018
b15e61a
Changing "Stack" to "stack" in dev guide
Boon-Jun Oct 18, 2018
3131d45
Added screenshots to the developer guide
derpyplops Oct 18, 2018
882a38d
Merge pull request #51 from derpyplops/documentation
Boon-Jun Oct 18, 2018
05f6657
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/NUS…
Boon-Jun Oct 18, 2018
b98ece8
Merge pull request #50 from ladderinc/UpdatingDevGuide
melvintjc96 Oct 18, 2018
7bc06e7
formatted the images
sanjukta99 Oct 18, 2018
b4e19d5
edited Dev Guide
sanjukta99 Oct 18, 2018
4fe8f89
Merge pull request #55 from sanjukta99/v1.2budgetcalculationfeature
sanjukta99 Oct 18, 2018
3036f0e
edited Dev Guide
sanjukta99 Oct 18, 2018
f977a76
edited Dev Guide implementation
sanjukta99 Oct 18, 2018
f937428
Merge pull request #56 from sanjukta99/v1.2budgetcalculationfeature
sanjukta99 Oct 18, 2018
0d707e4
Merged
melvintjc96 Oct 18, 2018
4b9d392
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
melvintjc96 Oct 18, 2018
6468162
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
derpyplops Oct 19, 2018
3757c5b
Created LoginManager class to manage login related multi user access …
melvintjc96 Oct 19, 2018
d596c29
Refactored certain parts of the code
melvintjc96 Oct 21, 2018
09e7f99
Created CreateAccountCommandIntegrationTest class for testing create …
melvintjc96 Oct 21, 2018
6693213
Changed SearchHistoryManager to generic class
Boon-Jun Oct 22, 2018
010baec
Merge pull request #59 from ladderinc/generics_with_searchhistorymanager
melvintjc96 Oct 22, 2018
e22eaca
Created new tests for create account command
melvintjc96 Oct 22, 2018
9fc1067
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
melvintjc96 Oct 22, 2018
0061641
Updated UG and added more pictures
melvintjc96 Oct 22, 2018
81fe711
replaced SearchHistoryManager getter method with Facade Pattern in Model
Boon-Jun Oct 22, 2018
f29d5aa
edited the view command to only show the budget for the user entered …
sanjukta99 Oct 23, 2018
5498aa5
Merge pull request #60 from ladderinc/FacadePatternOnModel
melvintjc96 Oct 23, 2018
3dab776
Updated documents
melvintjc96 Oct 23, 2018
91f2f38
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
melvintjc96 Oct 23, 2018
0392583
edited the existing ViewClubBudgetsCommand to only display the budget…
sanjukta99 Oct 23, 2018
65fc7c0
attempted to modularise BudgetCalculationCommand to comply with SOC
sanjukta99 Oct 24, 2018
cbe954b
edited the AddressBookParser for the ViewClubBudgetsCommand
sanjukta99 Oct 24, 2018
3684833
made style changes
sanjukta99 Oct 24, 2018
a4b287c
made style changes in parser
sanjukta99 Oct 24, 2018
a119808
Minor changes to FindCommandParser and FindCommandParserTest
Boon-Jun Oct 24, 2018
2579e39
Updates FindCommandTest
Boon-Jun Oct 24, 2018
0309368
Added UndoSearchCommandTest
Boon-Jun Oct 24, 2018
d3ebcf7
Added test for EmptyHistoryException in ModelManagerTest
Boon-Jun Oct 24, 2018
fa77ba7
Added isEmpty() method for SearchHistoryManager
Boon-Jun Oct 24, 2018
f7197dc
Added SearchHistoryManagerUtil
Boon-Jun Oct 24, 2018
dbf36ea
Added SearchHistoryManagerTest
Boon-Jun Oct 24, 2018
72aacc1
Merge pull request #65 from ladderinc/CreatingTests
melvintjc96 Oct 24, 2018
8faddef
Updated tests for login and renamed certain files to fit an additiona…
melvintjc96 Oct 24, 2018
4753882
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
melvintjc96 Oct 24, 2018
6d487e4
Fixed checkstyle error
melvintjc96 Oct 24, 2018
6a4b253
edited the AddressBookParserTest in the context of the BudgetCommand
sanjukta99 Oct 25, 2018
7883811
edited to stop checkstyle errors
sanjukta99 Oct 25, 2018
88ed65a
Merge branch 'master' into v1.3
sanjukta99 Oct 25, 2018
5fb763b
Removed UserLoginException as it is causing headless exceptions in tr…
melvintjc96 Oct 25, 2018
58dd2b5
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
sanjukta99 Oct 25, 2018
3d232b0
edited parsertest
sanjukta99 Oct 25, 2018
e5ec7c1
Merge branch 'v1.3' of https://github.com/sanjukta99/NUSSU-Connect in…
sanjukta99 Oct 25, 2018
9935c66
Updated DG to reflect latest v1.3 feature
melvintjc96 Oct 25, 2018
298e9e1
Further updated DG
melvintjc96 Oct 25, 2018
5e74df9
created a new BudgetCommandParserTest
sanjukta99 Oct 25, 2018
30ad85b
Removed irrelevant information from README
Boon-Jun Oct 25, 2018
7394fc9
Removed isSensitiveInformation boolean
melvintjc96 Oct 25, 2018
f07d133
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
melvintjc96 Oct 25, 2018
77f81a8
Updated version number to 1.2.1
Boon-Jun Oct 25, 2018
28a3fe1
Merge pull request #70 from ladderinc/master
Boon-Jun Oct 25, 2018
d4d9c9b
Minor changes for shadowJar config in build.gradle
Boon-Jun Oct 25, 2018
6bce2d9
Merge pull request #71 from ladderinc/master
Boon-Jun Oct 25, 2018
516d33d
Added status badge for Appveyor
melvintjc96 Oct 25, 2018
17546b0
Merge pull request #64 from sanjukta99/v1.3
sanjukta99 Oct 25, 2018
ae23010
Fixed merge conflict
melvintjc96 Oct 25, 2018
390d0aa
Merge pull request #66 from Chocological/Multiuseraccesslevel
sanjukta99 Oct 26, 2018
499a659
Fixed checkstyle errors in test files
melvintjc96 Oct 26, 2018
9ec9036
First version of hashing
melvintjc96 Oct 26, 2018
dc3d92d
Hashing v2
melvintjc96 Oct 26, 2018
dfe4e0a
Added enum files containing the different keyword types
Boon-Jun Oct 26, 2018
e34da42
Added classes to keep track of keywords and its history
Boon-Jun Oct 26, 2018
ceee2c4
Corrected error in documentation in SearchHistoryManager + added full…
Boon-Jun Oct 26, 2018
e198538
Added KeywordsOutputFormatter
Boon-Jun Oct 26, 2018
e759227
Minor changes in KeywordsOutputFormatter
Boon-Jun Oct 26, 2018
92fa426
Minor changes to resolve checkstyle errors
Boon-Jun Oct 26, 2018
44ab3cb
Made the appropriate changes to several classes to accomodate Keyword…
Boon-Jun Oct 26, 2018
8208380
Updated Tests
Boon-Jun Oct 26, 2018
e7459bb
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/NUS…
Boon-Jun Oct 26, 2018
445a5eb
Updated CreateAccountCommandTest according to changes in Model
Boon-Jun Oct 26, 2018
544f4a5
Added badge for coveralls in README
Boon-Jun Oct 26, 2018
e30e985
Removed unused import from EditCommandSystemTest.java
Boon-Jun Oct 26, 2018
51f42a0
Updated tests after hashing and fixed hashing bugs
melvintjc96 Oct 27, 2018
e4073ec
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
melvintjc96 Oct 27, 2018
004a558
Fixed checkstyle errors
melvintjc96 Oct 27, 2018
ee63702
Updated the UG and DG
melvintjc96 Oct 27, 2018
d63994c
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
derpyplops Oct 28, 2018
502e004
Updated tests to fix some failing tests
melvintjc96 Oct 28, 2018
1f8c986
Merge pull request #74 from ladderinc/ShowingKeywordsInformation
derpyplops Oct 28, 2018
333e3d1
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/main
derpyplops Oct 28, 2018
affaa8b
Attempt to constrain SkillLevel adding
derpyplops Oct 28, 2018
16c11d4
Edited Project Proposal Page
melvintjc96 Oct 28, 2018
4713e74
made the error now display in user console
derpyplops Oct 28, 2018
e44faee
Updated userguide to reflect the change
derpyplops Oct 28, 2018
2243db8
Pulled changes from team repo
melvintjc96 Oct 28, 2018
0499036
commented out unused import
derpyplops Oct 28, 2018
5ba6085
attempted to add test. Not currently functioning.
derpyplops Oct 28, 2018
372ac43
fixed bug where SkillLevel was not being remembered by app
derpyplops Oct 28, 2018
0a928cb
fixed remnants from earlier merge
derpyplops Oct 28, 2018
48bef3e
fixed remnants from earlier merge
derpyplops Oct 28, 2018
feba947
Added skillPair class that integates information from Skill and Skill…
derpyplops Oct 29, 2018
e5751a6
temp fix
derpyplops Oct 29, 2018
6a85b43
Updated tests, UG, DG and Project Proposal Page
melvintjc96 Oct 29, 2018
1d00187
Minor changes to how KeywordsRecord works
Boon-Jun Oct 29, 2018
5011566
updated the test addressbooks
derpyplops Oct 30, 2018
2a22166
Update LoginManager.java
Boon-Jun Oct 30, 2018
489d34f
Merge pull request #77 from derpyplops/skillLevel_bugfix
Boon-Jun Oct 30, 2018
7dbcf0c
fixed test
derpyplops Oct 30, 2018
8d0f7d8
Merge branch 'master' into skillConstraint
derpyplops Oct 30, 2018
9a45d21
Merge branch 'master' into cleanify
derpyplops Oct 30, 2018
342eecd
edited UI to remove the unneeded Skill and SkillLevel Fields
derpyplops Oct 30, 2018
5794054
Removed redundant skillPair field in storage
derpyplops Oct 30, 2018
caaeccb
Renamed FindPersonSubCommand class to FindNameSubCommand
Boon-Jun Oct 30, 2018
3aaa633
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/NUS…
Boon-Jun Oct 30, 2018
76f429f
Updated Keywords related classes for equality checking
Boon-Jun Oct 30, 2018
e3f8abd
Updated tests for FindCommands and SearchHistoryManager
Boon-Jun Oct 30, 2018
255da23
Added tests for keywords related classes
Boon-Jun Oct 30, 2018
9e0d077
Updated PPP
melvintjc96 Oct 31, 2018
86bef81
Update LoginManager.java
Boon-Jun Oct 31, 2018
63bee87
corrected add
derpyplops Oct 31, 2018
845e411
Merge branch 'cleanify2' of https://github.com/derpyplops/NUSSU-Conne…
derpyplops Oct 31, 2018
f6f5043
Added personal portfolio
Boon-Jun Oct 31, 2018
33d8e45
Updated dev guide to include tags for portfolio
Boon-Jun Oct 31, 2018
f759973
Merge pull request #81 from derpyplops/cleanify2
Boon-Jun Oct 31, 2018
c68d508
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/NUS…
Boon-Jun Oct 31, 2018
7558397
Updated tests for LoginUserIdPasswordRoleCommand
melvintjc96 Oct 31, 2018
fcb5964
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-1/mai…
melvintjc96 Oct 31, 2018
518952e
Merge pull request #78 from ladderinc/ShowingKeywordsInformation
melvintjc96 Oct 31, 2018
1703963
Merge pull request #83 from ladderinc/PersonalPortfolio
melvintjc96 Oct 31, 2018
76cb32d
Renamed undosearch to undofind
Boon-Jun Oct 31, 2018
99055d8
Updated tests for LoginUserIdPasswordCommand and LoginUserIdPasswordC…
melvintjc96 Oct 31, 2018
438df06
Updated UserGuide for SearchPruningFeature
Boon-Jun Oct 31, 2018
625c961
Minor changes to userguide
Boon-Jun Oct 31, 2018
0eb3cd3
Merge pull request #79 from Chocological/Multiuseraccesslevel
Boon-Jun Oct 31, 2018
dbca5d3
Merge pull request #85 from ladderinc/UpdatingUserGuide
melvintjc96 Oct 31, 2018
54889fb
Merge pull request #84 from ladderinc/RenamingUndoSearch
melvintjc96 Oct 31, 2018
6a91694
Merge branch 'master' into skillConstraint
Boon-Jun Nov 1, 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
Empty file added Compilation
Empty file.
22 changes: 7 additions & 15 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
= Address Book (Level 4)
= NUSSU Connect
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/nusCS2113-AY1819S1/addressbook-level4[image:https://travis-ci.org/nusCS2113-AY1819S1/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/CS2113-AY1819S1-F09-1/main[image:https://travis-ci.org/CS2113-AY1819S1-F09-1/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/Chocological/main-64rse[image:https://ci.appveyor.com/api/projects/status/rge5q76v8xnskc7p/branch/master?svg=true[Build status]]
https://coveralls.io/github/CS2113-AY1819S1-F09-1/main?branch=master[image:https://coveralls.io/repos/github/CS2113-AY1819S1-F09-1/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,27 +13,21 @@ 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.
NUSSU-Connect is an application for executive committee (exco) members of the NUS Student Union (NUSSU) to help them perform their daily tasks including managing recruitment, contacts, budgets and projects efficiently.


== Site Map

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

== 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://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]
* The original source of the code is https://github.com/se-edu/[AddressBook-Level4] project created by SE-EDU initiative.

== Licence : link:LICENSE[MIT]

8 changes: 4 additions & 4 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 = 'NUSSU-Connect.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -126,7 +126,7 @@ nonGuiTests.dependsOn test
task(allTests)

// `allTests` implies both `guiTests` and `nonGuiTests`
allTests.dependsOn guiTests
//allTests.dependsOn guiTests
allTests.dependsOn nonGuiTests

test {
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': 'NUSSU Connect',
'site-githuburl': 'https://github.com/CS2113-AY1819S1-F09-1/NUSSU-Connect',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
55 changes: 25 additions & 30 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} +
image::NUSSU-ConnectPNGBanner.png[width="680", align=center"]
NUSSU-Connect is an application developed to help NUSSU manage people and
related functions relating to HR and Finance needs. It is currently a work in progress and is developed by
https://se-edu.github.io/docs/Team.html[F09-1] 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>>]

Role: Project Advisor

'''
=== Boon Jun
image::ladderinc.png[width="150", align="left"]
{empty}[http://github.com/ladderinc[github]][<<BoonJun#, portfolio>>]

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

Role: Team Lead +
Responsibilities: UI
Role: Scheduling and Tracking, Deliverables and deadlines +
Responsibilities: Search Pruning + Advanced Search and filter feature.

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Melvin Tan
image::chocological.png[width="150", align="left"]
{empty}[http://github.com/Chocological[github]]

Role: Developer +
Responsibilities: Data
Role: Integration and Testing +
Responsibilities: Login System

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Documentation and Team Lead +
Responsibilities: HR & Roles

'''

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

Role: Developer +
Responsibilities: UI
Role: Code Quality +
Responsibilities: Budgeting functionality for NUSSU and club treasurers

'''
Loading