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

Sort Command #123

Open
wants to merge 386 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
386 commits
Select commit Hold shift + click to select a range
5696c58
Merge pull request #61 from shanmu9898/DeveloperGuideUpdate
Sisyphus25 Mar 20, 2018
0d74ffa
Updated the Screenshot
shanmu9898 Mar 20, 2018
a4fbb7b
uploaded an edited ModelClassDiagram
randypx Mar 20, 2018
554f683
Update DeveloperGuide.adoc
randypx Mar 20, 2018
580ee1d
added class into diagram
randypx Mar 20, 2018
b41092a
replaced image
randypx Mar 20, 2018
95cd901
Merge pull request #62 from randypx/master
Sisyphus25 Mar 20, 2018
4a6afea
Add implementation of event management
Sisyphus25 Mar 20, 2018
2a85589
Changed names for UI image
shanmu9898 Mar 21, 2018
8b42bbd
fixed error
shanmu9898 Mar 21, 2018
83b2363
Merge pull request #65 from shanmu9898/master
shanmu9898 Mar 21, 2018
837c754
fix tag in developer guide
Sisyphus25 Mar 21, 2018
302e9b4
Merge pull request #64 from Sisyphus25/devguide_update
shanmu9898 Mar 21, 2018
646e1b1
update UserGuide
Sisyphus25 Mar 21, 2018
cc41d23
fix userguide
Sisyphus25 Mar 21, 2018
ec770ab
Merge pull request #66 from Sisyphus25/document_fix_update
Sisyphus25 Mar 21, 2018
f58b54b
add Set Appointment Command
Sisyphus25 Mar 21, 2018
b2e9f6a
More JUnit Test
Sisyphus25 Mar 15, 2018
cb5adc3
Modify test
Sisyphus25 Mar 20, 2018
3f75d16
Fix testing error
Sisyphus25 Mar 20, 2018
5cc015c
Fix Test
Sisyphus25 Mar 20, 2018
9a82896
Add JUnit Test
Sisyphus25 Mar 21, 2018
694c275
Fix Test
Sisyphus25 Mar 21, 2018
5b52b3a
More test
Sisyphus25 Mar 21, 2018
a865398
Add set task command
Sisyphus25 Mar 21, 2018
c653087
Add more JUnit tests
Sisyphus25 Mar 21, 2018
9d562dc
Add Collate
Sisyphus25 Mar 21, 2018
606a0d7
Merge branch 'master' into Add_appointment_command
Sisyphus25 Mar 21, 2018
4b988be
Add JUNit Test
Sisyphus25 Mar 21, 2018
c0e0a69
Add toString() for Appointment and Task
Sisyphus25 Mar 26, 2018
bae95af
Changed UI and added auto sort functionality with tests
shanmu9898 Mar 26, 2018
2c8880e
Parse personIndex for setappointmentcommandparse
Sisyphus25 Mar 27, 2018
a5d79ed
Merge branch 'modelAndLogicChangeForEventClasses' into Add_appointmen…
Sisyphus25 Mar 27, 2018
a2ccc47
Added Personalised Alias
shanmu9898 Mar 27, 2018
3cfa77a
Checkstyle fixings
shanmu9898 Mar 27, 2018
24256f1
Checkstyle Corrections
shanmu9898 Mar 27, 2018
9712c5b
Checkstyle fix
Sisyphus25 Mar 27, 2018
6a97320
Merge remote-tracking branch 'origin/Add_appointment_command' into Ad…
Sisyphus25 Mar 27, 2018
1aac1f1
created a student list to store students in and a contact list to com…
randypx Mar 27, 2018
c35aa77
added a listener to Person list that updates Contact list
randypx Mar 27, 2018
f9d8b0d
add, delete, update methods for student list
randypx Mar 27, 2018
24ee32f
updated methods in ReadOnlyAddressBook
randypx Mar 27, 2018
ed3b8c7
updated add command
randypx Mar 27, 2018
02386e4
updated delete command
randypx Mar 27, 2018
3b85484
updated edit command
randypx Mar 27, 2018
4a679e4
updated list command
randypx Mar 27, 2018
e365b7a
storage methods for student list added
randypx Mar 27, 2018
b4512f1
fixed test cases
randypx Mar 27, 2018
621eb0f
fixed checkstyle errors
randypx Mar 27, 2018
dd2f666
another fix to checkstyle
randypx Mar 27, 2018
f79a87b
Removed dataencryption tag in JohnDoe.adoc
randypx Mar 27, 2018
e6a95a4
Add CalendarFX module
Sisyphus25 Mar 27, 2018
5f652a5
Fix Checkstyle
Sisyphus25 Mar 27, 2018
ebd2d12
Include CalendarFx Libraries in build
Sisyphus25 Mar 27, 2018
432622a
Merge pull request #70 from Sisyphus25/Add_appointment_command
Sisyphus25 Mar 27, 2018
3ab940b
Checkstyle fix
Sisyphus25 Mar 27, 2018
2e47311
Checkstyle and Test fix
Sisyphus25 Mar 27, 2018
40ce954
Fix Checkstyle
Sisyphus25 Mar 27, 2018
112d222
Modify UI system test andremove BrowserPanel
Sisyphus25 Mar 27, 2018
c5d8808
Merge pull request #73 from shanmu9898/MinorAdditions
shanmu9898 Mar 28, 2018
d3ad8d5
Merge branch 'master' into modelAndLogicChangeForEventClasses
shanmu9898 Mar 28, 2018
c151752
Merge branch 'modelAndLogicChangeForEventClasses' into GUI
shanmu9898 Mar 28, 2018
015fe46
Update XmlSerializableAddressBook.java
shanmu9898 Mar 28, 2018
d30fb4c
Checkstyle fix
shanmu9898 Mar 28, 2018
8b33868
Checkstyle fix#2
shanmu9898 Mar 28, 2018
aa5bdca
- Fix bracket closing
Sisyphus25 Mar 28, 2018
932b644
Checkstyle fixed
shanmu9898 Mar 28, 2018
b7c9a3d
Merge branch 'modelAndLogicChangeForEventClasses' into GUI
shanmu9898 Mar 28, 2018
15a23b3
Update MainWindow.fxml
shanmu9898 Mar 28, 2018
04ba566
Update MainWindow.fxml
shanmu9898 Mar 28, 2018
12e91eb
Change default button colour for calendar
Sisyphus25 Mar 28, 2018
0fd7eba
Merge remote-tracking branch 'origin/GUI' into GUI
Sisyphus25 Mar 28, 2018
58963fc
Resolve conflict for modelstub
Sisyphus25 Mar 28, 2018
a414440
Merge branch 'modelAndLogicChangeForEventClasses' into GUI
Sisyphus25 Mar 28, 2018
c17b399
Add eof
Sisyphus25 Mar 28, 2018
34af848
Merge remote-tracking branch 'origin/GUI' into GUI
Sisyphus25 Mar 28, 2018
7d213f6
fix checkstyle
Sisyphus25 Mar 28, 2018
cbac39e
fix checkstyle
Sisyphus25 Mar 28, 2018
d6b0cd8
Merge pull request #80 from CS2103JAN2018-W14-B1/modelAndLogicChangeF…
shanmu9898 Mar 28, 2018
f21e383
Implemented Auto-Sort
LimShiMinJonathan Mar 28, 2018
33ddc47
Merge pull request #83 from Sisyphus25/GUI
shanmu9898 Mar 28, 2018
16d36a4
add toggle calendar command
Sisyphus25 Mar 28, 2018
84ecc39
add toggle calendar command
Sisyphus25 Mar 28, 2018
e974cb9
add test
Sisyphus25 Mar 28, 2018
9f4e130
add collate
Sisyphus25 Mar 28, 2018
c88c14f
Create ThemeChangeEvent and have mainwindow subscribed to it
Sisyphus25 Mar 28, 2018
ea32cff
Add Junit test
Sisyphus25 Mar 28, 2018
b5b4db8
Add Change Theme Command
Sisyphus25 Mar 28, 2018
99fe90a
Add JUnit test for ChangeThemeCommand and Parser
Sisyphus25 Mar 28, 2018
d14b76b
Add Test
Sisyphus25 Mar 29, 2018
e54020d
Add new themes
Sisyphus25 Mar 29, 2018
ac59025
add test
Sisyphus25 Mar 29, 2018
453a12d
collate
Sisyphus25 Mar 29, 2018
aa29100
collate
Sisyphus25 Mar 29, 2018
7a4e881
add background image
Sisyphus25 Mar 29, 2018
a9b9106
disable unnecessary buttons
Sisyphus25 Mar 29, 2018
1529d6f
disable year view mode
Sisyphus25 Mar 29, 2018
acec7c9
fix some theme colour issues
Sisyphus25 Mar 29, 2018
1e4ebb3
add logo to app
Sisyphus25 Mar 29, 2018
f907ff5
add style for app logo to new themes
Sisyphus25 Mar 29, 2018
0e216af
Merge pull request #87 from Sisyphus25/add_theme_command
shanmu9898 Mar 29, 2018
3cce295
change default theme
Sisyphus25 Mar 29, 2018
6695629
Merge branch 'master' into toggle_calendar_view
Sisyphus25 Mar 29, 2018
d4ee4e3
Merge pull request #84 from Sisyphus25/toggle_calendar_view
shanmu9898 Mar 29, 2018
d2a8e57
Refactor TagColour
Sisyphus25 Mar 29, 2018
8056828
Merge branch 'master' into Add_new_theme_css_stylesheet
Sisyphus25 Mar 29, 2018
4fc3af5
Fix checkstyle
Sisyphus25 Mar 29, 2018
954d6f2
Merge pull request #89 from Sisyphus25/Add_new_theme_css_stylesheet
shanmu9898 Mar 29, 2018
d780961
Fix css theme files
Sisyphus25 Mar 29, 2018
f0cb768
modify theme
Sisyphus25 Mar 29, 2018
44f1bfe
- delete event interface
Sisyphus25 Mar 29, 2018
e63ad15
- modify code to accommodate new TaskList in AddressBook
Sisyphus25 Mar 29, 2018
fefc5a4
- declare appointment variable final
Sisyphus25 Mar 29, 2018
7228e8b
- Add fxml files to support appointment and task List
Sisyphus25 Mar 29, 2018
052249a
- Modify list command to support list toggling
Sisyphus25 Mar 29, 2018
718ef5b
- Add Junit Test
Sisyphus25 Mar 29, 2018
5460b32
- Add a new variable CurrentActiveListType in Model to indicate the c…
Sisyphus25 Mar 30, 2018
91b6367
Remove local setting for gradle properties file
Sisyphus25 Mar 30, 2018
667af83
Some change to dogetheme
Sisyphus25 Mar 30, 2018
b0b577f
Merge pull request #91 from Sisyphus25/handling_task_and_appointment
shanmu9898 Mar 30, 2018
bce5460
Add remove command
Sisyphus25 Mar 30, 2018
d0b369a
Add JUnit Test
Sisyphus25 Mar 30, 2018
d0ef451
Added functionality to export command to recognise already present co…
shanmu9898 Mar 30, 2018
982e5b0
Fixed model stub
shanmu9898 Mar 30, 2018
08b6503
Modify test
Sisyphus25 Mar 30, 2018
6ba5c2b
updated tests for changes in list command
randypx Mar 30, 2018
9b6d589
fixed bugs regarding reseting data in contact list and removing of un…
randypx Mar 30, 2018
533fa9d
Ensure the appointment is deleted on CalendarFX calendar as well as t…
Sisyphus25 Mar 30, 2018
ca2b3d5
Add RemoveCommand and RemoveCommandParser test
Sisyphus25 Mar 30, 2018
aa2532f
Merge branch 'master' into student_list
randypx Mar 30, 2018
dbd75a9
Resolve integrated test conflict
Sisyphus25 Mar 30, 2018
fd232d8
fixed bugs from merge
randypx Mar 30, 2018
ba7cf61
fixed checkstyles
randypx Mar 30, 2018
1eb4f22
fixed checkstyle
randypx Mar 30, 2018
d16f853
fixed checkstyle
randypx Mar 30, 2018
702fc25
fixed checkstyle
randypx Mar 30, 2018
a5c15af
fixing checkstyle
randypx Mar 30, 2018
18bc46d
fixed checkstyle
randypx Mar 30, 2018
28beaa4
fixed checkstyle (+6 squashed commit)
randypx Mar 30, 2018
caf7fbc
Merge branch 'student_list' of https://github.com/randypx/main into s…
randypx Mar 30, 2018
3735196
Update AddressBook.java
Sisyphus25 Mar 31, 2018
5c3c0c9
Added tests and Delete Shortcut Command
shanmu9898 Mar 31, 2018
e16a8a4
Fixed Model Stub
shanmu9898 Mar 31, 2018
b63be6f
Merge branch 'master' into master
shanmu9898 Mar 31, 2018
65df094
Update AddressBook.java
shanmu9898 Mar 31, 2018
7aa0bb0
removed a line that was unnecessary
randypx Mar 31, 2018
232f49a
Updated the java doc comments
shanmu9898 Mar 31, 2018
9cbad74
Updated JavaDoc Comments 2
shanmu9898 Mar 31, 2018
9fb1ffc
Updated Java docs 3
shanmu9898 Mar 31, 2018
b27e902
Update comment and remove unnecessary const
Sisyphus25 Mar 31, 2018
d3d93a1
Merge pull request #107 from shanmu9898/master
Sisyphus25 Mar 31, 2018
d2b89bc
Merge branch 'master' into add_remove_appointment&task_command
Sisyphus25 Mar 31, 2018
4638fc3
Merge pull request #101 from Sisyphus25/add_remove_appointment&task_c…
shanmu9898 Apr 1, 2018
e708064
fix some variable name and comment errors
Sisyphus25 Apr 1, 2018
0e712cd
Modify JUnit test for SetAppointmentCommand
Sisyphus25 Apr 1, 2018
5c3fa6e
add test for model manager
Sisyphus25 Apr 1, 2018
65249e5
equals() test for XmlAdaptedObj
Sisyphus25 Apr 1, 2018
aa1056e
Add tag to expired Task
Sisyphus25 Apr 1, 2018
68ba6d3
Merge pull request #112 from Sisyphus25/add_test
shanmu9898 Apr 1, 2018
b61d9f6
Add new theme: galaxy
Sisyphus25 Apr 1, 2018
7aefff7
Merge branch 'master' into student_list
randypx Apr 1, 2018
f96730f
fixed missing bracket
randypx Apr 1, 2018
eb27d4a
fixed bugs and moved Event Exceptions to their own folder
randypx Apr 1, 2018
65b82b8
deleted unused imports
randypx Apr 1, 2018
12f1999
Merge pull request #78 from randypx/student_list
Sisyphus25 Apr 1, 2018
b958f65
Revert "Creating Student list"
shanmu9898 Apr 1, 2018
0fca52d
Merge pull request #114 from CS2103JAN2018-W14-B1/revert-78-student_list
shanmu9898 Apr 1, 2018
26fc2eb
fixed bug where list did not toggle back to contact or students
randypx Apr 1, 2018
8c0240c
edited command usage messages
randypx Apr 1, 2018
4a1e771
delete testingNames.xml
randypx Apr 1, 2018
d091080
delete testingName.xml
randypx Apr 1, 2018
e349452
Merge pull request #118 from randypx/student-list2
Sisyphus25 Apr 1, 2018
991ca8e
add background image
Sisyphus25 Apr 2, 2018
d62f2cf
Merge pull request #113 from Sisyphus25/ui_improvement
shanmu9898 Apr 2, 2018
35eb83c
Fixed bug where command success feedback for delete showed null when …
randypx Apr 2, 2018
3103fd0
User Guide Update
Sisyphus25 Apr 2, 2018
c502f71
Change ReadMe UI Image
Sisyphus25 Apr 2, 2018
4142382
Minor fix for UG
Sisyphus25 Apr 2, 2018
92ea735
fix format error
Sisyphus25 Apr 2, 2018
0a07e79
minor fix
Sisyphus25 Apr 2, 2018
8cef366
more fix
Sisyphus25 Apr 2, 2018
171402b
more fix
Sisyphus25 Apr 2, 2018
1e38a9f
Merge pull request #121 from randypx/student-list2
shanmu9898 Apr 3, 2018
6758a87
Merge pull request #122 from Sisyphus25/ugdg_update
shanmu9898 Apr 3, 2018
13ca13c
Fixed a bug wherein the shortcut command could be a command word
shanmu9898 Apr 3, 2018
0a2a051
refactor+collate code
Sisyphus25 Apr 3, 2018
4628be2
- Refactor code
Sisyphus25 Apr 3, 2018
9d6d70e
Remove Mukesh's collate files
Sisyphus25 Apr 3, 2018
816a6f8
Export functionality to excel
shanmu9898 Apr 3, 2018
f78c697
Checkstyle 1
shanmu9898 Apr 3, 2018
1c5930b
Errors
shanmu9898 Apr 3, 2018
3b24ab4
List Shortcuts with tests
shanmu9898 Apr 3, 2018
d1a4f8a
Updated user guide
shanmu9898 Apr 3, 2018
c9a0b0b
Collated Part Added
shanmu9898 Apr 3, 2018
6b8700b
Corrected Errors
shanmu9898 Apr 3, 2018
36afe46
Merge pull request #123 from Sisyphus25/refactor_collate
Sisyphus25 Apr 4, 2018
01a6207
Merge branch 'master' of https://github.com/CS2103JAN2018-W14-B1/main
LimShiMinJonathan Apr 4, 2018
6b06d89
Update UserGuide.adoc
Sisyphus25 Apr 4, 2018
600c6f9
Implemented Sort Command
LimShiMinJonathan Apr 4, 2018
6e9516b
Add tasks and appointments to sample AddressBook
Sisyphus25 Apr 4, 2018
086d084
Merge pull request #125 from Sisyphus25/master
Sisyphus25 Apr 4, 2018
336667e
Updated User Guide with Sort Command
LimShiMinJonathan Apr 4, 2018
d26dc08
Remove Github mergeconflict header
Sisyphus25 Apr 4, 2018
7ed93fb
Updated User guide
shanmu9898 Apr 4, 2018
671250a
Merge branch 'master' of https://github.com/shanmu9898/main
shanmu9898 Apr 4, 2018
bf5a926
Added the unused part collate statement
shanmu9898 Apr 4, 2018
4dfb30d
Fixed formatting
shanmu9898 Apr 4, 2018
c5d09e3
Added the collated code of everyone
shanmu9898 Apr 4, 2018
d7656c6
removed collated code
shanmu9898 Apr 4, 2018
1a3b4d3
Merge branch 'master' into master
shanmu9898 Apr 4, 2018
4702917
Updating collated code
shanmu9898 Apr 4, 2018
a7d4d01
Updated collate
shanmu9898 Apr 4, 2018
f2a401f
Merge branch 'master' of https://github.com/shanmu9898/main
shanmu9898 Apr 4, 2018
26f0236
Update UserGuide.adoc
Sisyphus25 Apr 4, 2018
8b5d505
Update UserGuide.adoc
Sisyphus25 Apr 4, 2018
6409fac
Merge pull request #124 from shanmu9898/master
Sisyphus25 Apr 4, 2018
223d8cc
Fix date format for events
Sisyphus25 Apr 10, 2018
376e461
Fix format for some examples
Sisyphus25 Apr 10, 2018
dc28cb4
Fixed Export Bug and Added JUnit Test cases
shanmu9898 Apr 10, 2018
9a47072
Merge branch 'master' of https://github.com/shanmu9898/main into Expo…
shanmu9898 Apr 10, 2018
ca194e7
Merge branch 'master' of https://github.com/CS2103JAN2018-W14-B1/main…
shanmu9898 Apr 10, 2018
e05afc8
Added Library Files
shanmu9898 Apr 10, 2018
9052da8
Add regex to disqualify invalid time stamp and prevents time overflow
Sisyphus25 Apr 10, 2018
3ea8dc4
Deleted Style.xsl
shanmu9898 Apr 10, 2018
8373277
Fixed Tests
shanmu9898 Apr 10, 2018
615b4f8
Remove unnecessary methods
Sisyphus25 Apr 10, 2018
3181970
Checkstyle fix
Sisyphus25 Apr 10, 2018
50b5053
Updating docs
shanmu9898 Apr 10, 2018
eee7ad8
Updated Docs
shanmu9898 Apr 10, 2018
dc4950c
Updated Docs 2
shanmu9898 Apr 10, 2018
414ad37
Updated Mukesh.adoc
shanmu9898 Apr 10, 2018
6f7a55b
Updated Portfolio link
shanmu9898 Apr 10, 2018
769b8d9
Merge pull request #144 from shanmu9898/ExportBugFix
Sisyphus25 Apr 10, 2018
cf75148
Merge pull request #142 from Sisyphus25/documentation_update
Sisyphus25 Apr 10, 2018
2a5b324
added checks to prevent duplicates
randypx Apr 10, 2018
d337f66
Merge pull request #143 from Sisyphus25/EventTimeParserfix
shanmu9898 Apr 11, 2018
c2ce75c
Merge branch 'master' into DocsUpdate
shanmu9898 Apr 11, 2018
2d802d5
Checkstyle fix
Sisyphus25 Apr 11, 2018
f35df0a
Merge pull request #145 from shanmu9898/DocsUpdate
Sisyphus25 Apr 11, 2018
fe4cd6f
Merge pull request #148 from Sisyphus25/documentation_update
Sisyphus25 Apr 11, 2018
ec1bc60
Rename project portfolio file & fix description
Sisyphus25 Apr 11, 2018
10a463c
Merge pull request #147 from randypx/fixing-duplicate-bug
Sisyphus25 Apr 11, 2018
97de2d3
Shortcut command fixed
shanmu9898 Apr 11, 2018
90be07a
Checkstyle fix and some modification
Sisyphus25 Apr 11, 2018
7ba0c4a
consistency fix
Sisyphus25 Apr 11, 2018
3b5e791
Merge pull request #150 from Sisyphus25/doc_update
shanmu9898 Apr 11, 2018
02b48c8
Merge pull request #149 from shanmu9898/ShortcutBugFix
Sisyphus25 Apr 11, 2018
80a8332
UserGuideUpdate
shanmu9898 Apr 11, 2018
75d3332
Merge pull request #151 from shanmu9898/UserguideUpdate
Sisyphus25 Apr 11, 2018
f1dab86
Merge branch 'master' into master
Sisyphus25 Apr 11, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lib/*
*.log.*
*.csv
config.json
src/test/data/sandbox/
src/test/data/sandbox
preferences.json
.DS_Store
./screenshot*.png
Expand Down
Binary file added Collate-TUI.jar
Binary file not shown.
24 changes: 10 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
= Address Book (Level 4)
= TeachConnect
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-W14-B1/main[image:https://travis-ci.org/CS2103JAN2018-W14-B1/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]]
https://coveralls.io/github/CS2103JAN2018-W14-B1/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-W14-B1/main/badge.svg?branch=master[Coverage Status]]
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"]
image::docs/images/StartupUI.jpg[width="600"]
endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
image::images/StartupUI.jpg[width="600"]
endif::[]
__TeachConnect - The only management application you'll ever need
__

* 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.
* TeachConnect is a contact and schedule management application designed for teachers and educational professionals.
* TeachConnect provides an intuitive and efficient solution for managing students and parents' contact details, recording appointments, setting up reminders, and many more.
* The majority of user interaction is through a CLI (Command Line Interface), however a GUI is provided with many optimization options.

== Site Map

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

Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jacocoTestReport {

dependencies {
String testFxVersion = '4.0.7-alpha'
compile fileTree(dir: 'libs', include: '*.jar')

compile group: 'org.fxmisc.easybind', name: 'easybind', version: '1.0.3'
compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
Expand Down
192 changes: 192 additions & 0 deletions collated/functional/Sisyphus25-reused.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
# Sisyphus25-reused
###### /resources/view/TagColour.css
``` css
Reused from https://github.com/se-edu/addressbook-level4/pull/798/commits/167b3d0b4f7ad34296d2fbf505f9ae71f983f53c
*/
#tags .teal {
-fx-text-fill: white;
-fx-background-color: #3e7b91;
}

#tags .red {
-fx-text-fill: black;
-fx-background-color: red;
}

#tags .yellow {
-fx-background-color: yellow;
-fx-text-fill: black;
}

#tags .blue {
-fx-text-fill: white;
-fx-background-color: blue;
}

#tags .orange {
-fx-text-fill: black;
-fx-background-color: orange;
}

#tags .brown {
-fx-text-fill: white;
-fx-background-color: brown;
}

#tags .green {
-fx-text-fill: black;
-fx-background-color: green;
}

#tags .pink {
-fx-text-fill: black;
-fx-background-color: pink;
}

#tags .black {
-fx-text-fill: white;
-fx-background-color: black;
}

#tags .grey {
-fx-text-fill: black;
-fx-background-color: grey;
}
```
###### /java/seedu/address/ui/CalendarPanel.java
``` java
//Reused from https://github.com/CS2103AUG2017-T17-B2/main with modifications
private void setTime() {
calendarView.setToday(LocalDate.now());
calendarView.setTime(LocalTime.now());
}

@Subscribe
private void handleToggleCalendarViewEvent(ToggleCalendarViewEvent event) {
Character c = event.viewMode;
Platform.runLater(() -> toggleView(c));
}

public CalendarView getRoot() {
return this.calendarView;
}

/**
* Remove clutter from interface
*/
private void disableViews() {
calendarView.setShowAddCalendarButton(false);
calendarView.setShowSearchField(false);
calendarView.setShowSearchResultsTray(false);
calendarView.setShowPrintButton(false);
calendarView.setShowPageSwitcher(false);
calendarView.setShowSourceTrayButton(false);
calendarView.setShowPageToolBarControls(false);
calendarView.setShowToolBar(false);
calendarView.setShowSourceTray(false);

calendarView.showDayPage();
}

/**
* Changes calendar view accordingly
*/
private void toggleView(Character c) {
switch(c) {
case ('d'):
calendarView.showDayPage();
return;
case ('w'):
calendarView.showWeekPage();
return;
case ('m'):
calendarView.showMonthPage();
return;
default:
//should not reach here
assert (false);
}
}
```
###### /java/seedu/address/ui/TaskListPanel.java
``` java
//Reuse from PersonListPanel class with modification
/**
* Panel containing the list of tasks.
*/
public class TaskListPanel extends UiPart<Region> {
private static final String FXML = "TaskListPanel.fxml";
private final Logger logger = LogsCenter.getLogger(TaskListPanel.class);

@FXML
private ListView<TaskCard> taskListView;

public TaskListPanel(ObservableList<Task> taskList) {
super(FXML);
setConnections(taskList);
registerAsAnEventHandler(this);
}

private void setConnections(ObservableList<Task> taskList) {
ObservableList<TaskCard> mappedList = EasyBind.map(taskList, (task) ->
new TaskCard(task, taskList.indexOf(task) + 1));
taskListView.setItems(mappedList);
taskListView.setCellFactory(listView -> new TaskListViewCell());
}

/**
* Custom {@code ListCell} that displays the graphics of a {@code TaskCard}.
*/
class TaskListViewCell extends ListCell<TaskCard> {

@Override
protected void updateItem(TaskCard task, boolean empty) {
super.updateItem(task, empty);

if (empty || task == null) {
setGraphic(null);
setText(null);
} else {
setGraphic(task.getRoot());
}
}
}

}
```
###### /java/seedu/address/ui/PersonCard.java
``` java
//Reused from https://github.com/se-edu/addressbook-level4/pull/798/commits/167b3d0b4f7ad34296d2fbf505f9ae71f983f53c
/**
* Returns the color style for {@code tagName}'s label.
*/
private void initTags(Person person) {
person.getTags().forEach(tag -> {
Label tagLabel = new Label(tag.tagName);
tagLabel.getStyleClass().add(tag.tagColorStyle);
tags.getChildren().add(tagLabel);
});
}

```
###### /java/seedu/address/model/tag/Tag.java
``` java
//Reused from https://github.com/se-edu/addressbook-level4/pull/798/commits/167b3d0b4f7ad34296d2fbf505f9ae71f983f53c
private static final String[] TAG_COLOR_STYLES = {"teal", "red", "yellow", "blue", "orange", "brown",
"green", "pink", "black", "grey"};
```
###### /java/seedu/address/model/tag/Tag.java
``` java
//Reused from https://github.com/se-edu/addressbook-level4/pull/798/commits/167b3d0b4f7ad34296d2fbf505f9ae71f983f53c
/**
* Returns a color style for {@code tagName}
*/
private String getTagColorStyle(String tagName) {
// we use the hash code of the tag name to generate a random color, so that the color remain consistent
// between different runs of the program while still making it random enough between tags.
return TAG_COLOR_STYLES[Math.abs(tagName.hashCode()) % TAG_COLOR_STYLES.length];
}


}
```
Loading