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