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.2][T11-B1] TuitionConnect #45
Open
raymond511
wants to merge
791
commits into
nus-cs2103-AY1718S2:master
Choose a base branch
from
CS2103JAN2018-T11-B1: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 148 commits
Commits
Show all changes
791 commits
Select commit
Hold shift + click to select a range
8a71ccc
update message and test
yungyung04 b944d2a
Merge branch 'v1.5' into master
yungyung04 2c84231
Merge pull request #27 from CS2103JAN2018-T11-B1/master
yungyung04 853a31b
resolve conflict
yungyung04 fe0ccf7
update user guide
yungyung04 b775cdd
user guide
yungyung04 6a7d56b
remove browser panel
yungyung04 764f4ea
clean up
yungyung04 30dc6d8
Further changes to test
a-shakra d80dbc0
Collations for ashakra
a-shakra a36898c
Further Collations
a-shakra 8db1473
Merge pull request #129 from yungyung04/v1.5
ctchozzz ca6cabf
User guide updated
a-shakra b4df70d
Merge pull request #130 from a-shakra/master
ctchozzz 2e4961b
Updates to Developer guide + Portfolio + codebase
a-shakra b049803
restored john doe file
a-shakra 2263fc4
update find task. able to understand natural language
yungyung04 fb9026b
rename
yungyung04 809a9dd
update test
yungyung04 50a7c55
collate
yungyung04 3e2cc19
user guide + example
yungyung04 0301830
admin stuff
yungyung04 3d8d5bf
checkstyle
yungyung04 94a4af4
typo error
yungyung04 3a1bd1b
try fixing portfolio
yungyung04 ea3dcd8
delete
yungyung04 a994ef8
Encryption of data
raymond511 5ceaf84
Update Encryption
raymond511 07b4c52
Merge pull request #7 from CS2103JAN2018-T11-B1/master
raymond511 88df66f
Developer Guide + Portfolio + removed clashes
a-shakra 42fbd46
Merge pull request #9 from CS2103JAN2018-T11-B1/master
a-shakra ed7a4fc
Updated
raymond511 2b86e9e
Initiated aliases for the new sort tasks
a-shakra 149122e
Updated
raymond511 2dbae65
Further modifications
a-shakra 441dd94
Further changes
a-shakra 0967f6b
More modifications to dev guide
a-shakra e29653b
Merge pull request #132 from yungyung04/v1.5
ctchozzz c12e134
Merge branch 'master' into master
ctchozzz 50b0850
Update DeveloperGuide.adoc
ctchozzz 2e97335
Update a-shakra.adoc
ctchozzz 6b8b788
Merge pull request #134 from raymond511/master
ctchozzz d863e76
Merge pull request #135 from a-shakra/master
ctchozzz 79cdbb4
Merge pull request #26 from CS2103JAN2018-T11-B1/master
ctchozzz 1042bc0
Update
ctchozzz 3db9736
Collated files
ctchozzz 98ad1f1
Merge pull request #136 from ChoChihTun/master
ctchozzz 961fdff
Updated encryption
raymond511 2f63c15
doc update
yungyung04 e739bac
code standd
yungyung04 da42f9b
Updated encryption
raymond511 1eb9597
fixing a bug
yungyung04 39107da
Merge pull request #28 from CS2103JAN2018-T11-B1/master
yungyung04 d6e98f9
Eof
ctchozzz f6a0ccf
remove robert
yungyung04 900fd74
Merge pull request #10 from CS2103JAN2018-T11-B1/master
a-shakra 7f3b846
collate
yungyung04 cb33468
edu lv predicate test
yungyung04 30c9e6d
Addition of edited Portfolio
a-shakra a92c4cd
whatever
a-shakra 3c9c132
portfolio update
yungyung04 17432e5
grade test
yungyung04 a2e8bbd
school pred test
yungyung04 4923152
predicate test and collate
yungyung04 9bd0566
fix bug
yungyung04 7138d20
admin
yungyung04 7904135
collate
yungyung04 4719ff4
user guide update
yungyung04 5708b6d
checkstyle
yungyung04 66e7625
convert into static
yungyung04 d3c86ee
Merge pull request #137 from yungyung04/v1.5
ctchozzz 615165f
Merge pull request #27 from CS2103JAN2018-T11-B1/master
ctchozzz cbf44f2
add person sort util name test
yungyung04 cd340b0
Added find task command test
ctchozzz e2ea7cd
Refine some test cases
ctchozzz dad983e
Update user guide
ctchozzz 20c5d22
Edit messages and trying to resolve edit bug
ctchozzz 0e8ea49
Merge pull request #138 from ChoChihTun/master
yungyung04 1d10b7f
checkstyle
yungyung04 e2355a1
Merge pull request #29 from CS2103JAN2018-T11-B1/master
yungyung04 d36005e
chihtun's pr
yungyung04 4eb4981
dev g typo
yungyung04 85202e3
sort util comment
yungyung04 2b4dec7
Fix bug in edit tutee's tag
ctchozzz 08b86ce
Create test and method to edit tutee field
ctchozzz 6072ce2
more tests
yungyung04 179628f
convert to static
yungyung04 588a5ef
Updated Portfolio + Updated Test Cases + Fixed merge conflicts
a-shakra c2f4166
Merge pull request #11 from CS2103JAN2018-T11-B1/master
a-shakra cf76f88
Updates to code
a-shakra 616d0d7
Update parser for person, tutee tag
ctchozzz 91b5ddb
Update addcommand parser tag
ctchozzz b9734cf
Fixed: only edit tutee field for tutee and not for person
ctchozzz a7e3faa
Add relevant test cases for edit and tag parser methods
ctchozzz 1923a82
Refine comment
ctchozzz ed0e0bb
Fix mismatch in tutee detail
ctchozzz 8b721b1
Add test cases for edit tutee detail
ctchozzz 48ea8c9
Added polymorphism behaviour
ctchozzz 2ef4265
Fixing merge conflicts
a-shakra c0123f9
Merge branch 'master' of https://github.com/a-shakra/addressbook-level4
a-shakra 57ebb37
Merge branch 'mergetester'
a-shakra 2500768
Updates to portfolio
a-shakra 8b5f68b
Change primary to secondary
ctchozzz ab1d40a
Decrypt files
ctchozzz c2ac3c0
Modified Portfolio
a-shakra 126cddc
Update non tutee to person
ctchozzz 02dd8c7
Attempts to pass travis
a-shakra 09d71a0
Merge pull request #139 from ChoChihTun/master
yungyung04 c751e86
Updating sampledatautil
a-shakra cab5cae
Merge pull request #12 from CS2103JAN2018-T11-B1/master
a-shakra 82b1acc
bye encryption hue hue
yungyung04 f101983
Solving encryption problems
a-shakra 874d5d6
Update user guide and about us
ctchozzz ae6c235
test and debug, so much bug
yungyung04 89cf19b
add ui overview
yungyung04 54800cc
my bad, collated your code
yungyung04 26bf900
disable encryption
yungyung04 ae8dda4
add logging
yungyung04 2c084b9
typo error
yungyung04 a3f1823
update for consistency
yungyung04 9701780
user guide and portfolio
yungyung04 d499001
Merge branch 'v1.5' into master
yungyung04 3d8583a
Refractor exception classes into the correct directory
ctchozzz a56a8ef
Merge branch 'master' into master
yungyung04 35f8f46
Fix checkstyle
ctchozzz 5d2c7b0
Updates test cases
a-shakra 49e124e
Updates to test cases
a-shakra 69998ef
Fixed merge conflicts
a-shakra edb71bc
Collation complete
a-shakra 705f724
Fixed some checkstyle errors
a-shakra 1f123c4
Further commits
a-shakra fc0ee5e
Changes to sampledatautil
a-shakra c6dc875
Merge pull request #140 from a-shakra/master
yungyung04 b858d01
docs and user guide
yungyung04 b1d6caa
remove
yungyung04 9320ac8
Merge pull request #31 from CS2103JAN2018-T11-B1/master
yungyung04 4f9c839
Anas' commit
yungyung04 a2a1880
try adding new linews
yungyung04 b6bd4c4
Update userguide
ctchozzz 2b73232
will this work?
yungyung04 58c6df7
Update userguide
ctchozzz ddb6f8d
create new
yungyung04 663e7b9
new version
yungyung04 4e55f6f
EOF
ctchozzz 9a639d1
EOF
ctchozzz b7761e9
EOF
ctchozzz c96e04a
EOF
ctchozzz 7ca33c0
EOF
ctchozzz eb2305e
EOF
ctchozzz a8a6680
remove warning
yungyung04 f304121
Merge pull request #13 from CS2103JAN2018-T11-B1/master
a-shakra 01c4a06
link to portfolio
yungyung04 5a58351
revert
yungyung04 6f88802
Revert "new version"
yungyung04 3fac78a
Revert "create new"
yungyung04 a1e1306
push revert
yungyung04 b9e3306
Merge branch 'v1.5' into master
yungyung04 7c6245d
Merge pull request #32 from CS2103JAN2018-T11-B1/master
yungyung04 84897fb
Merge pull request #144 from ChoChihTun/Final
ctchozzz d909cd9
Update Userguide and developer guide
ctchozzz 5303ed5
Merge pull request #146 from ChoChihTun/Final
ctchozzz 222cd8c
remove exception
yungyung04 bbeedd9
dev guide
yungyung04 00c8dd5
collate and remove whitespaces
yungyung04 29fd82d
Userguide updated
a-shakra e1e0348
user guide
yungyung04 1b7b631
Update developer guide
ctchozzz dbc0e39
Merge pull request #147 from yungyung04/v1.5
ctchozzz ddb42a7
Merge pull request #148 from ChoChihTun/Final
ctchozzz 6846073
Merge branch 'master' of https://github.com/ChoChihTun/addressbook-le…
ctchozzz 758ee72
Update
ctchozzz 694c665
Merge pull request #28 from CS2103JAN2018-T11-B1/master
ctchozzz d485ad3
Merge pull request #33 from CS2103JAN2018-T11-B1/master
yungyung04 6df0383
update dev guide
yungyung04 3ab770c
user guide
yungyung04 30a359c
message
yungyung04 071a9cb
remove message usage
yungyung04 70b4b76
Refractor exception classes out
ctchozzz d7de5a6
Merge pull request #150 from ChoChihTun/master
ctchozzz 449a5fa
bug fix
yungyung04 4fad3f7
checkstyle
yungyung04 eca1d89
Updates to dev guide + portfolio + sampleTasks
a-shakra a07b3c2
fix bug
yungyung04 d394a00
remove unused
yungyung04 a4beecb
Increased amount of sample tasks
a-shakra 27e1013
typo
yungyung04 f097037
typo
yungyung04 20ab833
Merge pull request #14 from CS2103JAN2018-T11-B1/master
a-shakra f402899
remove comment
yungyung04 287f4e6
Updated about us to link to my portfolio
a-shakra 7a536f3
remove comment
yungyung04 eaff633
unnecessary space
yungyung04 0b37645
remove comment
yungyung04 80e4985
Removed exceptions from sampleutil
a-shakra dc8efaa
dev guide
yungyung04 2c7be4a
Merge pull request #143 from a-shakra/master
ctchozzz 1cf1f40
Minor edit of test cases
ctchozzz 9efca51
Minor edit
ctchozzz 9745d90
Remove redundant methods and comments
ctchozzz dc35cc9
Connection to Portfolio
a-shakra c4fa014
Minor edit
ctchozzz 67615d2
fix bug
yungyung04 6b914ea
message update
yungyung04 a020795
Merge pull request #151 from ChoChihTun/master
ctchozzz 809df42
Merge pull request #152 from a-shakra/master
a-shakra 46b6f41
magic number
yungyung04 7df6835
checkstyle
yungyung04 2bf3ece
My portfolio
ctchozzz fbafd7b
Merge pull request #153 from ChoChihTun/master
ctchozzz 151bc9d
Merge branch 'master' into v1.5
yungyung04 e01c773
Varied the sample tasks
a-shakra df78e58
Update userguide
ctchozzz 7dc095d
Further variation to sample tasks
a-shakra 78cd15c
Update userguide
ctchozzz a0f7428
Remove select
ctchozzz de7643c
Fix checkstyle
ctchozzz 88dfb82
Further updates to sample tutees and tasks
a-shakra 123d8a2
Updates
a-shakra 67ab4ce
Update tuition task's tutee name
ctchozzz c8ce606
Merge pull request #154 from ChoChihTun/master
ctchozzz 1e69726
Merge pull request #155 from a-shakra/master
ctchozzz f80578f
Merge pull request #29 from CS2103JAN2018-T11-B1/master
ctchozzz 63aa1a1
fix
yungyung04 718ef7b
chih tun's pr
yungyung04 37bcaf2
remove exception
yungyung04 9dfd0e4
Edited some default date and time
ctchozzz 5efb9a0
Updated encryption
raymond511 71826eb
Update user guide
ctchozzz 6d0f40a
update collated
raymond511 0c24d28
Merge pull request #149 from yungyung04/v1.5
ctchozzz 0a8ec14
Merge pull request #157 from ChoChihTun/master
ctchozzz a59eb93
Merge pull request #30 from CS2103JAN2018-T11-B1/master
ctchozzz cb30ce4
Collated
ctchozzz 4db7c1c
Merge branch 'master' into master
raymond511 90e43c5
Merge pull request #159 from ChoChihTun/master
ctchozzz cbcf579
updated portfolio
raymond511 3759b1f
updated portfolio
raymond511 f76153a
Updating Portfolio to point to the correct code
a-shakra 8165132
updated checkstyle
raymond511 f84748c
updated checkstyle
raymond511 3325271
updated checkstyle
raymond511 0f5db83
Minor edit and collate
ctchozzz 00f1c37
returned portfolio to previous state (pointing to a-shakra.md)
a-shakra a396084
updated checkstyle
raymond511 7f12a7d
Merge pull request #160 from ChoChihTun/master
a-shakra 4025517
Merge pull request #158 from raymond511/master
raymond511 81f7d65
Revert "[v1.5] Raymond Zheng Update encryption"
yungyung04 9290d37
Merge pull request #161 from CS2103JAN2018-T11-B1/revert-158-master
ctchozzz 9f5e06c
Revert "Revert "[v1.5]"
raymond511 6ef3226
Merge pull request #162 from CS2103JAN2018-T11-B1/revert-161-revert-1…
raymond511 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,40 +1,34 @@ | ||
= Address Book (Level 4) | ||
= TuitionConnect (TC) | ||
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]] | ||
|
||
ifdef::env-github[] | ||
image::docs/images/Ui.png[width="600"] | ||
endif::[] | ||
https://travis-ci.org/CS2103JAN2018-T11-B1/main[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]] | ||
https://coveralls.io/github/CS2103JAN2018-T11-B1/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-T11-B1/main/badge.svg?branch=master[Coverage Status]] | ||
https://www.codacy.com/app/raymond511/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103JAN2018-T11-B1/main&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/33b29d9ef2d3479c9b6bce03289421b1[Codacy Badge]] | ||
|
||
ifndef::env-github[] | ||
image::images/Ui.png[width="600"] | ||
image::images/ui-mockup.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 application for private tutors. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface). | ||
* For Tutors: | ||
. Provides easy management of task with the aid of a schedule. | ||
. Has a calendar that makes viewing of task easier. | ||
. Able to add, delete, edit any tuition or personal task into the schedule. | ||
. Easily sort and group students by certain information. | ||
. Has a log book that summarises the week for you. | ||
|
||
== 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 | ||
* Some parts of this 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/TomasMikula/EasyBind[EasyBind], 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/junit4[JUnit4] | ||
* This application is a morphed of the AddressBook-Level4 project created by SE-EDU initiative at https://github.com/se-edu/ | ||
|
||
== Licence : link:LICENSE[MIT] |
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 |
---|---|---|
|
@@ -3,53 +3,44 @@ | |
: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} + | ||
TuitionConnect was developed by the MarvelousBook 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 | ||
|
||
''' | ||
|
||
=== John Roe | ||
image::lejolly.jpg[width="150", align="left"] | ||
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>] | ||
=== Eka Buyung Lienadi | ||
image::yungyung04.jpg[width="150", align="left"] | ||
{empty}[http://github.com/yungyung04[github]] | ||
|
||
Role: Team Lead + | ||
Responsibilities: UI | ||
Responsibilities: Storage + Scheduling and Tracking | ||
|
||
''' | ||
|
||
=== Johnny Doe | ||
image::yijinl.jpg[width="150", align="left"] | ||
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>] | ||
=== Cho Chih Tun | ||
image::chochihtun.jpg[width="150", align="left"] | ||
{empty}[http://github.com/ChoChihTun[github]] [https://chochihtun.github.io/Profile/[portfolio]] | ||
|
||
Role: Developer + | ||
Responsibilities: Data | ||
Responsibilities: UI + Code Quality | ||
|
||
''' | ||
|
||
=== Johnny Roe | ||
image::m133225.jpg[width="150", align="left"] | ||
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>] | ||
=== Raymond Zheng | ||
image::raymond511.jpg[width="150", align="left"] | ||
{empty}[http://github.com/raymond511[github]] [<<johndoe#, portfolio>>] | ||
|
||
Role: Developer + | ||
Responsibilities: Dev Ops + Threading | ||
Responsibilities: Model + Testing | ||
|
||
''' | ||
|
||
=== Benson Meier | ||
=== Shakra Anas | ||
image::yl_coder.jpg[width="150", align="left"] | ||
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 image seems to be broken. |
||
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>] | ||
{empty}[http://github.com/a-shakra[github]] [<<johndoe#, portfolio>>] | ||
|
||
Role: Developer + | ||
Responsibilities: UI | ||
Responsibilities: Logic + Integration | ||
|
||
''' |
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.
Good to see that the Travis link has been updated.