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.4][F11-B2] TuitionCor #64

Open
wants to merge 396 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 71 commits
Commits
Show all changes
396 commits
Select commit Hold shift + click to select a range
5b6e42a
Merge pull request #34 from olimhc/SplitListV1.1
destinnsy Mar 22, 2018
05bd2a8
Update sort implementation
olimhc Mar 23, 2018
6d5fefd
Merge branch 'master' into DeveloperGuide
olimhc Mar 23, 2018
9480296
Merge pull request #56 from olimhc/DeveloperGuide
olimhc Mar 23, 2018
ff0c39a
DeveloperGuide: Update format
olimhc Mar 23, 2018
6335898
DeveloperGuide: Minor update
olimhc Mar 23, 2018
3400c34
Merge pull request #57 from olimhc/DeveloperGuide
olimhc Mar 23, 2018
1921b0e
Included diagrams for DeveloperGuide: Sort Implementation
olimhc Mar 23, 2018
f01c843
Merge pull request #58 from olimhc/DeveloperGuide
olimhc Mar 23, 2018
a39427e
Merge branch 'master' into Sort
olimhc Mar 24, 2018
8881379
Edit variables naming and updated methods
olimhc Mar 26, 2018
1bfff25
Allowed for tutors to be saved into storage
destinnsy Mar 26, 2018
e567bd9
Revert "Allowed for tutors to be saved into storage"
destinnsy Mar 26, 2018
4d719ed
Revert "Revert "Allowed for tutors to be saved into storage""
destinnsy Mar 26, 2018
68c198d
XmlSerializableAddressBook; edited to record only student and tutor list
destinnsy Mar 26, 2018
8f14551
ReadOnlyAddressBook; edited to only handle client
destinnsy Mar 26, 2018
35f537f
Edited TuitionCor to saven and display only student and tutor list
destinnsy Mar 26, 2018
90b0919
Checkstyle Fixes
destinnsy Mar 26, 2018
77537e7
Changes to Test to fit UI changes
destinnsy Mar 27, 2018
65d7298
Merge pull request #64 from shookshire/UIComplete
Zhu-Jiahui Mar 27, 2018
405ec70
Delete command changed to client
destinnsy Mar 27, 2018
832e142
Merge branch 'WC1.3' of https://github.com/CS2103JAN2018-F11-B2/main …
olimhc Mar 27, 2018
7ca8f7a
Changed edit to work on client
destinnsy Mar 27, 2018
6d0cee9
Changed ListCommand to work on clients
destinnsy Mar 27, 2018
85772fb
Changed find to work on clients
destinnsy Mar 27, 2018
905c4c1
Integrate sort by name command
olimhc Mar 27, 2018
8d3c903
Edit Match to work on clients
destinnsy Mar 27, 2018
5ea78ad
Removed Person related commands
destinnsy Mar 28, 2018
153ca61
Fix most junit test
destinnsy Mar 28, 2018
7ad1283
Sort functions are all working for both tutor and student list
olimhc Mar 28, 2018
2a40c97
Merge pull request #65 from shookshire/Changing_all_commands_to_Client
olimhc Mar 28, 2018
e38f5bc
TypcialPersons: Update their grade
olimhc Mar 28, 2018
189bc5f
Update PersonListPanelHandle
olimhc Mar 28, 2018
7b4be4d
Remove Catergory from PersonCardHandle and remove assertEquals for ca…
olimhc Mar 29, 2018
d03b9ff
Add dummy switchcommand
olimhc Mar 29, 2018
d695039
Merge branch 'WC1.3' of https://github.com/CS2103JAN2018-F11-B2/main …
olimhc Mar 29, 2018
0665dd2
Merge pull request #71 from olimhc/JunitTest
olimhc Mar 29, 2018
84b24dc
minor update on match function: if the match client is a student, stu…
Zhu-Jiahui Mar 29, 2018
fcfe9bf
Tidy up
Zhu-Jiahui Mar 29, 2018
e9c57cc
Close function is able to close tutors and students
olimhc Mar 29, 2018
75c9c0f
Work in progress to rank the client lists
Zhu-Jiahui Mar 30, 2018
7088457
Update user stories
Zhu-Jiahui Mar 30, 2018
0b870a8
Corrections for V1.2
olimhc Mar 30, 2018
86ccc87
Update developer guide
Zhu-Jiahui Mar 30, 2018
a9fc836
Edit CheckStyles and replaced 'Junior College' with 'Tertiary'
olimhc Mar 30, 2018
73513c3
Fix checkStyle error
Zhu-Jiahui Mar 30, 2018
d74a49d
Edit ListCommand, FindCommand, ModelManager
olimhc Mar 30, 2018
c7dad24
Update display image for User Guide
Zhu-Jiahui Mar 30, 2018
cb2ba3e
Merge branch 'WC1.3' of https://github.com/CS2103JAN2018-F11-B2/main …
olimhc Mar 30, 2018
12f5c20
Merge pull request #72 from Zhu-Jiahui/Enhance-find-function
olimhc Mar 30, 2018
357aedf
Merge pull request #75 from olimhc/Corrections
olimhc Mar 30, 2018
cae9d19
Merge branch 'WC1.3' into Sort
olimhc Mar 30, 2018
dfdcd7a
Merge pull request #76 from olimhc/Sort
olimhc Mar 30, 2018
b18834a
Removed AddCommand, cleared XMLSerializableAddressBook
olimhc Mar 30, 2018
d60474d
Image changed
destinnsy Mar 30, 2018
005d1f9
Continuation for Destin's DeveloperGuide update
destinnsy Mar 30, 2018
d73672f
Merge pull request #77 from olimhc/Integration
olimhc Mar 30, 2018
74bb990
Edit SampleDataUtil file and typicalPersonsAddressBook.xml
olimhc Mar 30, 2018
11c9195
Merge pull request #78 from shookshire/DeveloperGuide
olimhc Mar 30, 2018
63138f0
Merge pull request #79 from olimhc/Integration
olimhc Mar 30, 2018
57f6554
Fix some Junit
destinnsy Mar 30, 2018
b5e3d5b
Checkstyle fixes
olimhc Mar 30, 2018
37ff12f
Merge branch 'WC1.3' of https://github.com/CS2103JAN2018-F11-B2/main …
olimhc Mar 30, 2018
06689f4
Merge pull request #80 from olimhc/Integration
olimhc Mar 30, 2018
4e003ce
More Fixes
destinnsy Mar 30, 2018
3f8a30e
Fix all Junit fails
destinnsy Mar 30, 2018
0cf8c0c
Checkstyle fixes
destinnsy Mar 30, 2018
212ba38
Merge pull request #81 from shookshire/WC1.3
destinnsy Mar 30, 2018
675ac66
Merge branch 'master' of https://github.com/CS2103JAN2018-F11-B2/main…
olimhc Apr 1, 2018
c96a25d
Switch function works and results will be displayed
olimhc Apr 1, 2018
8c124a3
Add restore command
olimhc Apr 1, 2018
986ffa2
Disabled commands which are not available in closed/active view
olimhc Apr 1, 2018
3955d3c
Addressbook checks for duplicate in ClosedList & ActiveList
olimhc Apr 1, 2018
bfaacdf
Update commands to work with ClosedList
olimhc Apr 1, 2018
cd3fb1b
CheckStyle Fixes and minor Junit test update
olimhc Apr 2, 2018
86c4244
Added Junit test for sorting commands. Fixes #87
olimhc Apr 2, 2018
27ab2b5
Edit minor naming errors
olimhc Apr 2, 2018
a31d036
Implement Ranking function to rank the matched clients from the most …
Zhu-Jiahui Apr 3, 2018
3710e57
Update sortcommand
olimhc Apr 3, 2018
b47c148
Move phone, address and email attributes higher up on the displace si…
Zhu-Jiahui Apr 3, 2018
b773c8d
implement dummy highlight feature to highlight the matched attributes
Zhu-Jiahui Apr 3, 2018
ff3c4f8
Added RemoveCommand
destinnsy Apr 3, 2018
47ad569
CheckStyle Fixes
olimhc Apr 3, 2018
756fe24
Edited client related fields to automatically remove multiple spaces …
destinnsy Apr 3, 2018
50fc156
Update SortCommand
olimhc Apr 3, 2018
19aea49
UserGuide & DeveloperGuide: Updated according to the new sortcommand …
olimhc Apr 3, 2018
8c0fb0b
UserGuide: Slight minor format changes
olimhc Apr 3, 2018
5202812
Include CommmadAlias for switch, close and restore
olimhc Apr 3, 2018
3a8ac14
Implement working highlight feature to highlight the matched attributes
Zhu-Jiahui Apr 4, 2018
a748219
Merge pull request #88 from olimhc/Sort
olimhc Apr 4, 2018
d7ccc6a
minor changes to the code
Zhu-Jiahui Apr 4, 2018
733b289
Added Remove Junit test and fixed broken tests
destinnsy Apr 4, 2018
298c3f5
UserGuide & DeveloperGuide: Update relevant parts for switch, restore…
olimhc Apr 4, 2018
8ae1107
Merge branch 'WC1.4' of https://github.com/CS2103JAN2018-F11-B2/main …
olimhc Apr 4, 2018
4f6338b
checkstyle fixes
destinnsy Apr 4, 2018
dbc7af3
Updated RemoveCommand in UserGuide
destinnsy Apr 4, 2018
a3a9c52
checkstyle fixes
destinnsy Apr 4, 2018
81ed867
Add Junit test for switch, restore and close.
olimhc Apr 4, 2018
7aa2850
Merge pull request #89 from shookshire/WC1.4
olimhc Apr 4, 2018
472c888
Fixes Junit test and minor UserGuide update
olimhc Apr 4, 2018
b228761
Merge branch 'WC1.4' of https://github.com/CS2103JAN2018-F11-B2/main …
olimhc Apr 4, 2018
84b83e5
Merge pull request #90 from olimhc/Sort
olimhc Apr 4, 2018
5c8dd38
Merge branch 'WC1.4' of https://github.com/CS2103JAN2018-F11-B2/main …
olimhc Apr 4, 2018
b319e92
Minor update to TypicalClients. Fixes #35
olimhc Apr 4, 2018
2dc6629
Fixes Checkstyle
olimhc Apr 4, 2018
fbdbf47
Bugs fixes.
olimhc Apr 4, 2018
a16d0c6
Checkstyle fixes and minor test case updates
olimhc Apr 5, 2018
88ceb36
update code to pass all test cases
Zhu-Jiahui Apr 5, 2018
93c9ce5
fix travis fail
Zhu-Jiahui Apr 5, 2018
339b6d2
fix checkstyle error
Zhu-Jiahui Apr 5, 2018
60a3cee
Merge pull request #92 from Zhu-Jiahui/Ranking
Zhu-Jiahui Apr 5, 2018
3c6ff98
Include status for current display and update junit
olimhc Apr 5, 2018
b8914f7
Merge branch 'WC1.4' of https://github.com/CS2103JAN2018-F11-B2/main …
olimhc Apr 5, 2018
8bd7e50
Merge pull request #91 from olimhc/CloseFunc
olimhc Apr 5, 2018
5c46bb7
Collate code
olimhc Apr 5, 2018
4497fb0
Collate code
Zhu-Jiahui Apr 5, 2018
b3aada3
Merge pull request #94 from olimhc/Integration
olimhc Apr 5, 2018
bf30cfc
Merge pull request #95 from Zhu-Jiahui/Ranking
olimhc Apr 5, 2018
80692c9
UserGuide: Update
olimhc Apr 5, 2018
71a4436
Merge pull request #96 from olimhc/Integration
olimhc Apr 5, 2018
d968d17
Update UserGuide
Zhu-Jiahui Apr 5, 2018
8a93c36
Update SampleDataUtil
olimhc Apr 5, 2018
77ad85f
Merge branch 'WC1.4' into Ranking
Zhu-Jiahui Apr 5, 2018
9adaeb1
Fixes Travis fail
olimhc Apr 5, 2018
5c401d7
Merge pull request #98 from Zhu-Jiahui/Ranking
olimhc Apr 5, 2018
2ba4531
Merge pull request #97 from olimhc/Integration
olimhc Apr 5, 2018
1cf8a2d
Code Collate
destinnsy Apr 5, 2018
0f342ba
Junit Collate
destinnsy Apr 5, 2018
a66b7b2
Fixed merge conflicts
destinnsy Apr 5, 2018
a678541
Merge pull request #99 from shookshire/Collate
olimhc Apr 5, 2018
7ca1fb1
UserGuide: Updates
olimhc Apr 5, 2018
eefef62
Update stories
destinnsy Apr 5, 2018
f38e472
Merge pull request #100 from olimhc/Integration
olimhc Apr 5, 2018
857d059
UserGuide: Minor change
olimhc Apr 5, 2018
3dd54a9
Merge pull request #102 from shookshire/master
olimhc Apr 5, 2018
50d4727
Merge pull request #103 from olimhc/Integration
olimhc Apr 5, 2018
0808864
Create collated folder
olimhc Apr 5, 2018
97a8bfe
Delete collated
Zhu-Jiahui Apr 5, 2018
c7204a8
Collate files
olimhc Apr 5, 2018
8cfc3fb
Merge pull request #104 from olimhc/Integration
olimhc Apr 5, 2018
29d376a
Merge pull request #105 from CS2103JAN2018-F11-B2/WC1.4
olimhc Apr 5, 2018
1117cb5
ReadMe: Removed Learning Outcomes
olimhc Apr 5, 2018
ea63726
ContactUs: Update with our info
olimhc Apr 5, 2018
22b62e1
UserGuide: Spelling error
olimhc Apr 5, 2018
825d79d
Merge pull request #106 from olimhc/Integration
olimhc Apr 5, 2018
bbe22b6
UserGuide: Update
olimhc Apr 6, 2018
583942f
Merge pull request #107 from olimhc/Integration
olimhc Apr 6, 2018
1f2eedd
UserGuide: Minor change
olimhc Apr 6, 2018
ee35cad
Merge pull request #108 from olimhc/Integration
olimhc Apr 6, 2018
c3bab25
Fixes #109, #112, #113, #118, #119
olimhc Apr 9, 2018
bdbde4e
Partially fixes #120
olimhc Apr 9, 2018
f4efcef
Now match function matches attributes case insensitively
Zhu-Jiahui Apr 10, 2018
5548ca8
Fixes find command not able to search mutiple grade fields
olimhc Apr 10, 2018
af2f07f
Fixes bugs in grades and change app title to "TuitionCor"
olimhc Apr 10, 2018
2546065
Merge pull request #121 from olimhc/Integration
olimhc Apr 10, 2018
ee389b4
Merge branch 'WC1.5' of https://github.com/CS2103JAN2018-F11-B2/main …
Zhu-Jiahui Apr 10, 2018
219a6e0
ListPanelController: Add logger
olimhc Apr 10, 2018
89a841d
Fixes bugs and add test cases for match related classes
Zhu-Jiahui Apr 11, 2018
0342ac1
Fix travis fail
Zhu-Jiahui Apr 11, 2018
03e2c6a
Fix travis fail
Zhu-Jiahui Apr 11, 2018
fcfeb12
Edit code comments
olimhc Apr 12, 2018
cfb599d
Minor codefix
olimhc Apr 12, 2018
da17e45
Fix checkstyle error
Zhu-Jiahui Apr 12, 2018
bfcb3eb
Fixes #114 and minor code edit
olimhc Apr 12, 2018
2a404fc
Merge branch 'Integration' of https://github.com/olimhc/main into Int…
olimhc Apr 12, 2018
83bee92
SampleData: Added more clients
olimhc Apr 12, 2018
58014cc
Edit comments
olimhc Apr 12, 2018
77e83b6
UserGuide, DeveloperGuide: Minor changes
olimhc Apr 12, 2018
7851bb0
WC1.5 Editing reported bugs and Updating of destin's portfolio
destinnsy Apr 12, 2018
9204fc2
Merge branch 'master' of https://github.com/CS2103JAN2018-F11-B2/main
destinnsy Apr 12, 2018
8504549
Add Jiahui Portfolio
Zhu-Jiahui Apr 12, 2018
4eb56f6
Project Portfolio for hong cho
olimhc Apr 12, 2018
b3a786a
Fixes checkstyle errors
olimhc Apr 12, 2018
787613c
Merge pull request #122 from Zhu-Jiahui/V1.5
olimhc Apr 12, 2018
a573d49
Merge pull request #123 from shookshire/master
olimhc Apr 12, 2018
b30dbac
Merge pull request #124 from olimhc/Integration
olimhc Apr 12, 2018
93ddaee
Collated codes
olimhc Apr 12, 2018
7e3559e
Merge pull request #125 from olimhc/Integration
olimhc Apr 12, 2018
43f9247
Merge pull request #126 from CS2103JAN2018-F11-B2/WC1.5
olimhc Apr 12, 2018
0b21ee6
Fix Ui not displaying properly
olimhc Apr 12, 2018
92a8de1
Merge pull request #127 from olimhc/Integration
olimhc Apr 12, 2018
f961b90
Fixes Ui not displaying correctly
olimhc Apr 12, 2018
658efb9
Merge pull request #128 from olimhc/Integration
olimhc Apr 12, 2018
3a48b2c
Fixes Ui not displaying correctly
olimhc Apr 12, 2018
b43c7a9
Merge pull request #129 from olimhc/Integration
olimhc Apr 12, 2018
748432e
Fixes bug of PPP not displaying properly
olimhc Apr 13, 2018
89676db
Remove irrelevant badges
olimhc Apr 13, 2018
bceff9b
Merge pull request #130 from olimhc/Integration
olimhc Apr 13, 2018
e9df61c
Update developer guide and portfolio
Zhu-Jiahui Apr 14, 2018
c95143c
update developer guide
Zhu-Jiahui Apr 14, 2018
245d0c1
Update DeveloperGuide and UserGuide
olimhc Apr 14, 2018
10edba0
Update README, AboutUs and PPP
olimhc Apr 14, 2018
eae7794
Merge pull request #131 from Zhu-Jiahui/V1.5
olimhc Apr 14, 2018
3afcb6b
Merge branch 'WC1.5F' into Integration
olimhc Apr 14, 2018
bc3ddc7
Merge pull request #132 from olimhc/Integration
olimhc Apr 14, 2018
16b50ef
Updates to junit and PPP
destinnsy Apr 14, 2018
38b6551
Update portfolio
Zhu-Jiahui Apr 14, 2018
d0cec42
Merge branch 'master' of https://github.com/CS2103JAN2018-F11-B2/main
destinnsy Apr 14, 2018
bafdcaf
Merge pull request #133 from Zhu-Jiahui/V1.5
Zhu-Jiahui Apr 14, 2018
981685e
update PPP
destinnsy Apr 14, 2018
4f81295
Merge pull request #137 from shookshire/master
destinnsy Apr 14, 2018
10d1efa
Revision of code for Sort Commands
olimhc Apr 14, 2018
c1dc3ea
Added Junit test: SortCommandParserTest
olimhc Apr 14, 2018
dec7296
Adds Junit for CloseCommandParserTest and RestoreCommandParserTest. M…
olimhc Apr 14, 2018
cb59e76
update to developerguide and PPP
destinnsy Apr 14, 2018
c8a1781
Merge pull request #138 from shookshire/master
destinnsy Apr 14, 2018
819850b
Updated PPP
destinnsy Apr 14, 2018
5602f8f
Merge pull request #139 from shookshire/master
destinnsy Apr 14, 2018
584a5a3
Merge branch 'master' into WC1.5F
olimhc Apr 15, 2018
9e8501f
Merge pull request #140 from CS2103JAN2018-F11-B2/WC1.5F
olimhc Apr 15, 2018
d12df95
Merge branch 'master' of https://github.com/CS2103JAN2018-F11-B2/main…
olimhc Apr 15, 2018
1d7d2b2
Adds some minor Junit test
olimhc Apr 15, 2018
712439b
Updates collated files
olimhc Apr 15, 2018
d1b7a85
Merge pull request #141 from olimhc/Integration
olimhc Apr 15, 2018
78f7360
update sequence diagram
Zhu-Jiahui Apr 15, 2018
a45616c
Update PPP
Zhu-Jiahui Apr 15, 2018
a6e5509
ReadME & DeveloperGuide: Revision
olimhc Apr 15, 2018
ec01dd0
Merge pull request #142 from Zhu-Jiahui/V1.5
Zhu-Jiahui Apr 15, 2018
16cd7bc
UserGuide, DeveloperGuide and PPP minor edits
olimhc Apr 15, 2018
c3ee1b5
Merge branch 'master' of https://github.com/CS2103JAN2018-F11-B2/main…
olimhc Apr 15, 2018
d92a41a
Merge pull request #143 from olimhc/Integration
olimhc Apr 15, 2018
4254e11
Removed sorting form PPP
olimhc Apr 15, 2018
6135761
Merge pull request #144 from olimhc/Integration
olimhc Apr 15, 2018
a7f780f
Update DeveloperGuide
destinnsy Apr 15, 2018
fa216eb
Merge branch 'master' of https://github.com/CS2103JAN2018-F11-B2/main
destinnsy Apr 15, 2018
c1698aa
Update userGuide
destinnsy Apr 15, 2018
14ca32c
Update UI image
olimhc Apr 15, 2018
10cf67c
Merge pull request #146 from shookshire/master
destinnsy Apr 15, 2018
4a35411
Updates UserGuide & README
olimhc Apr 15, 2018
ffed91a
Merge pull request #147 from olimhc/Integration
olimhc Apr 15, 2018
5429c1b
Update remove manual testing
destinnsy Apr 15, 2018
42968ae
minor updates to developerGuide
destinnsy Apr 15, 2018
22e83ff
fix errors in UGDG
destinnsy Apr 15, 2018
fbd58de
Merge pull request #148 from shookshire/master
destinnsy Apr 15, 2018
c1a8960
update PPP
destinnsy Apr 15, 2018
b8611e1
Merge pull request #150 from shookshire/master
olimhc Apr 15, 2018
c41329b
DeveloperGuide: Updates Instructions for manual testing
olimhc Apr 15, 2018
46a71d6
Merge branch 'master' of https://github.com/CS2103JAN2018-F11-B2/main…
olimhc Apr 15, 2018
d13e508
DeveloperGuide: Added one user story
olimhc Apr 15, 2018
98ca2a1
Merge pull request #151 from olimhc/Integration
olimhc Apr 15, 2018
091e062
Fixes Ui.png not displaying properly
olimhc Apr 15, 2018
71db9fa
Merge pull request #152 from olimhc/Integration
olimhc Apr 15, 2018
00cbff2
DeveloperGuide: Minor formatting edit
olimhc Apr 15, 2018
9e9b30d
Merge pull request #153 from olimhc/Integration
olimhc Apr 15, 2018
b71d4ae
final update to ppp
destinnsy Apr 15, 2018
53d60d1
Merge pull request #154 from shookshire/master
olimhc Apr 15, 2018
262619c
ReadMe: Fixes Rendering Error
olimhc Apr 15, 2018
8b986b9
Merge branch 'master' of https://github.com/CS2103JAN2018-F11-B2/main…
olimhc Apr 15, 2018
8c07530
ReadMe: Minor change
olimhc Apr 15, 2018
df6c232
Merge pull request #155 from olimhc/Integration
olimhc Apr 15, 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
18 changes: 9 additions & 9 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Address Book (Level 4)
= TuitionCor
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://travis-ci.org/CS2103JAN2018-F11-B2/main[image:https://travis-ci.org/CS2103JAN2018-F11-B2/main.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]]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove/ replace these badges with your team's repo instead -- they are not badges for your updated application anymore

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit

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]]
Expand All @@ -15,13 +15,13 @@ 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.
* This is a desktop TuitionCor application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not tell me anything about the application. What is TuitionCor?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit

* TuitionCor is targeted at tuition coordinators who have to manage a large amount of contacts.
* The daily job-scope of a tuition coordinator involves the need to manage large amount of contacts and match the students to tutors according to their credentials, needs and location.
* Therefore, TuitionCor aims to facilitate this process and make the job of a tuition coordinator easier.
*In addition, users are also able to
** find and filter contacts easily
** add and edit contacts

== Site Map

Expand Down
44 changes: 13 additions & 31 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,35 @@
: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.}_ +
TuitionCor was developed by the https://github.com/CS2103JAN2018-F11-B2[CS2103JAN2018-F11-B2] team. +
{empty} +
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

'''

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

Role: Team Lead +
Responsibilities: UI

'''

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

Role: Developer +
Responsibilities: Data
Responsibilities: Model

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Lim Hong Cho
image::hongCho.jpg[width="150", align="left"]
{empty}[https://github.com/olimhc[github]] [<<johndoe#, portfolio>>]

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

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Logic

'''
132 changes: 120 additions & 12 deletions docs/DeveloperGuide.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 4 - Developer Guide
= TuitionCor - Developer Guide
:toc:
:toc-title:
:toc-placement: preamble
Expand All @@ -10,7 +10,7 @@ ifdef::env-github[]
:tip-caption: :bulb:
:note-caption: :information_source:
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level4/tree/master
:repoURL: https://github.com/CS2103JAN2018-F11-B2/main forked from Team SE-EDU
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Provide link to the Team SE-EDU repo too

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit


By: `Team SE-EDU`      Since: `Jun 2016`      Licence: `MIT`
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update this line! Preferably XXX forked from Team SE-EDU

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update this line too

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit


Expand Down Expand Up @@ -160,7 +160,7 @@ image::UiClassDiagram.png[width="800"]

*API* : link:{repoURL}/src/main/java/seedu/address/ui/Ui.java[`Ui.java`]

The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `PersonListPanel`, `StatusBarFooter`, `BrowserPanel` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class.
The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `PersonListPanel`, `StatusBarFooter` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing documentation for new features, please remember to add them every week.


The `UI` component uses JavaFx UI framework. The layout of these UI parts are defined in matching `.fxml` files that are in the `src/main/resources/view` folder. For example, the layout of the link:{repoURL}/src/main/java/seedu/address/ui/MainWindow.java[`MainWindow`] is specified in link:{repoURL}/src/main/resources/view/MainWindow.fxml[`MainWindow.fxml`]

Expand Down Expand Up @@ -782,13 +782,25 @@ See this https://github.com/se-edu/addressbook-level4/pull/599[PR] for the step-

*Target user profile*:

* has a need to manage a significant number of contacts
<<<<<<< Updated upstream
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove merge conflict arrows

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit

* Tuition coordinators who are comfortable with CLI applications
=======
* A tuition service agent that receive calls from both tutor and students asking for assignments.
* has a need to manage a significant number of clients.
* prefer desktop apps over other types
* can type fast
* prefers typing over mouse input
* is reasonably comfortable using CLI apps
>>>>>>> Stashed changes

*Value proposition*: manage contacts faster than a typical mouse/GUI driven app
*Value proposition*:
TuitionCor is targeted at tuition coordinators who have to manage a large amount of contacts.
The daily job-scope of a tuition coordinator involves the need to manage large amount of contacts and match the students to tutors according to their credentials, needs and location.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good!

Therefore, TuitionCor aims to facilitate this process and make the job of a tuition coordinator easier.

In addition, users are able to
* find and filter contacts easily
* add and edit contacts

[appendix]
== User Stories
Expand All @@ -800,18 +812,63 @@ Priorities: High (must have) - `* * \*`, Medium (nice to have) - `* \*`, Low (un
|Priority |As a ... |I want to ... |So that I can...
|`* * *` |new user |see usage instructions |refer to instructions when I forget how to use the App

|`* * *` |user |add a new person |
|`* * *` |user |add a new person (tutor or student) |expand user's addressbook for future tuition coordination

|`* * *` |user |delete a person |remove entries that I no longer need
|`* * *` |user |delete a person |remove entries that the user no longer need

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The target user profile is not updated. Please update it so I can assess its viability or make suggestions for improvements.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit

|`* * *` |user |find a person by name |locate details of persons without having to go through the entire list

|`* * *` |user |sort contacts based on the clients' location (North, South, East, West, Central |better match students and tutors that are staying near each other.

|`* * *` |user |edit the information stored |keep the information up to date

|`* * *` |user |tag tutors and students with multiple fields |do multi-layer searching to better match tutors and students

|`* * *` |user |categorise contacts between students and tutors |reduce the number of tagging required and make searching more convenience
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo here. Should be convenient

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit


|`* * *` |user |group clients based on the subject they wish to study/teach (Math, Eng, Phy, Chem...) |find and match client easily by the subjects registered

|`* * *` |user |record the gender preference the students/tutors have (male/female) |find and match client easily by the gender preference registered

|`* * *` |user |see and compare the price that students/tutors are willing to pay/accept|match them based on pricing

|`* * *` |user |have an auto-save function |changes will be saved once user exit the application
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not seem to fit into a user story - this seems to be out of the control of the user (since it's automatic after all) and would be more suited as a NFR

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit


|`* * *` |user |search by tags added to client |generate a list of clients that have the same tags

|`* *` |user |hide <<private-contact-detail,private contact details>> by default |minimize chance of someone else seeing them by accident

|`*` |user with many persons in the address book |sort persons by name |locate a person easily
|`* *` |user |search multiple tags |narrow down the search to clients that fit all the different tags searched.

|`* *` |user |easily delete all students/tutors |save time manually deleting

|`* *` |user |get a list of all tutors that corresponds to a students requirements |give students more choices on which tutor they want

|`* *` |user |get a list of all students that corresponds to a tutor's requirements |give tutors more choices on which students they want

|`* *` |user |automatically update the year of all students |need not manually change all the information during new year

|`* *` |user |update which time slot the tutor is already working |plan their timetable without any clash in timing

|`* *` |user |have a ranking on how good the tutor is |understand which tutor the user should recommend more

|`* *` |user |highlight urgent tuition requests |set reminder to place more attention on these assignments

|`* *` |user |blacklist certain tutors or students |make sure the user will not accept their assignments

|`* *` |user |have the option to customise the font size and colour |make changes to the appearance to suit the user's preference

|`* *` |user |have the option to customise the user's background |make the application more appealing to the user

|`* *` |user |email the contacts in the application |save the trouble from opening another web-browser or email application

|`* *` |user |keep track of whether the tutors have paid their agent fee |keep track and remind those who have not paid.

|`*` |user |directly navigate between contacts |save the trouble from returning to the main page every time

|`*` |user |keep a record of how much the students improve |keep track of how good the tutor is
|=======================================================================

_{More to be added}_

[appendix]
== Use Cases
Expand Down Expand Up @@ -844,16 +901,67 @@ Use case ends.
+
Use case resumes at step 2.

_{More to be added}_
[discrete]
=== Use case: Sort by locality

*MSS*

1. User types “/sortl” in to the command line.
2. Addressbook will prompt user to select whether they would like to view the list for students or tutors.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer Addressbook, remember to change all other use cases too

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit

3. User will enter either “s” for students or “t” for tutors.
4. Addressbook will return a list of students or tutors based sorted by their locality.
+
Use case ends.

*Extensions*

[none]
* 3a. System detects an invalid input.
+
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there also be an extension for if the user wants to escape from the command input? (Such as if the user changes his mind after typing /sortl

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update in my commit

[none]
** 3a1. Addressbook request for either "s" or "t" to be inputted.
** 3a2. User enter required information.
** 3a3. Steps 3a1 and 3a2 are repeated until valid input is entered.
+
Use case resumes at step 4.

[discrete]
=== Use case: Match

*MSS*

1. User enter match followed by a person name.
2. Addressbook displays information of client in the respective list (either tutor list or student list)
4. Addressbook returns a list of potential matches in the respective list.
+
Use case ends.

*Extensions*

[none]
* 1a. Client cannot be found.
+
Use case ends.

* 3a. There is no match found.
+
[none]
** 3a1. Addressbook returns an empty list.
+
Use case ends.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are the other use cases for your enhancements? This is also part of documentation. @Zhu-Jiahui @shookshire @olimhc


[appendix]
== Non Functional Requirements

. Should work on any <<mainstream-os,mainstream OS>> as long as it has Java `1.8.0_60` or higher installed.
. Should be able to hold up to 1000 persons without a noticeable sluggishness in performance for typical usage.
. Should be able to hold up to 5000 persons without a noticeable sluggishness in performance for typical usage.
. A user with above average typing speed for regular English text (i.e. not code, not system admin commands) should be able to accomplish most of the tasks faster using commands than using the mouse.
. Application should be able execute any command within 3 seconds.
. Application should have a self-explanatory installation process.
. Application should be less than 5mb in size.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very ambitious 😛

. Application is expected to allow printing.

_{More to be added}_

[appendix]
== Glossary
Expand Down
Loading