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

[CS2103-T14-2] T.A.rence #167

Open
wants to merge 210 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
210 commits
Select commit Hold shift + click to select a range
df635a3
Update README.adoc
Ellieyee Sep 12, 2019
3927c27
Update README.adoc
Ellieyee Sep 12, 2019
7136a60
Update documentation
lumos309 Sep 18, 2019
5b98dc8
Initial commit
AhmadHatziq Sep 18, 2019
9f9db51
Commit to salvage Address code into main
AhmadHatziq Sep 18, 2019
fa27a67
Merge branch 'master' of https://github.com/AhmadHatziq/main
AhmadHatziq Sep 18, 2019
5c9bdee
All tests passed on main branch
AhmadHatziq Sep 18, 2019
74b7974
Remove Address Field in AddressBook (#2)
Ellieyee Sep 19, 2019
d7aae7a
Remove Tags subsystem
Ellieyee Sep 20, 2019
00a26d3
Remove Phone subsystem
Ellieyee Sep 20, 2019
1b82162
Update T.Arence UI icon
Ellieyee Sep 20, 2019
1a015ba
Merge pull request #10 from Ellieyee/initial-refactoring
ZiHawkEye Sep 20, 2019
3b831ec
Added Student and Matric classes with tests
ZiHawkEye Sep 21, 2019
f0710bc
Rename package to tarence and addressbook to studentbook (#11)
Ellieyee Sep 21, 2019
da5c1ca
Merge https://github.com/AY1920S1-CS2103-T14-2/main
lumos309 Sep 22, 2019
c5ed3b0
Refactor *StudentBook* to *Application* and remove Clear Command Logi…
Ellieyee Sep 22, 2019
fa6024d
Add "addStudent" command
lumos309 Sep 22, 2019
fea4e38
Fix code formatting
lumos309 Sep 22, 2019
2063f6c
Fix merge conflict
lumos309 Sep 22, 2019
50e041b
Merge branch 'lumos309-master'
lumos309 Sep 22, 2019
67dfd48
Added Module, Tutorial and associated classes and tests
ZiHawkEye Sep 22, 2019
2adc5fb
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Sep 22, 2019
f4f84c2
Merge latest upstream repo
lumos309 Sep 23, 2019
f20b461
Fix formatting - max line length
lumos309 Sep 23, 2019
4eb41c9
Fix formatting - max line length
lumos309 Sep 23, 2019
0e2fb1f
Fix for parse_invalidValue_failure test failing
lumos309 Sep 23, 2019
a079801
Merge pull request #14 from lumos309/master
lumos309 Sep 23, 2019
26c0b30
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Sep 23, 2019
ccdf895
Merge pull request #15 from ZiHawkEye/master
ZiHawkEye Sep 23, 2019
448d5c5
Add test for parsing MatricNum and NusnetId
lumos309 Sep 24, 2019
49c0685
Remove unused imports
lumos309 Sep 24, 2019
fd7eb79
Change delete to deleteStudent; allow command synonyms
lumos309 Sep 24, 2019
119bc89
Fix checkstyle errors
lumos309 Sep 24, 2019
8d562dc
Merge pull request #16 from lumos309/master
lumos309 Sep 24, 2019
c20213c
Merge branch 'master' of git://github.com/AY1920S1-CS2103-T14-2/main …
AhmadHatziq Sep 25, 2019
9981c4e
Merge branch 'AY1920S1-CS2103-T14-2-master'
AhmadHatziq Sep 25, 2019
a62d55e
Add sample tutorial, module, timetable & student to SampleDataUtil
AhmadHatziq Sep 25, 2019
3a4fb37
Fix typo in javadoc of MatricNum constructor
AhmadHatziq Sep 25, 2019
46e95f9
Add "addModule" with skeleton functionality.
AhmadHatziq Sep 25, 2019
db8f52a
Hook up "addModule" to UI
AhmadHatziq Sep 25, 2019
6df1fe3
Fix import statement in Address.java
AhmadHatziq Sep 26, 2019
0fa9d37
Add MESSAGE_USAGE to AddModuleCommand
AhmadHatziq Sep 26, 2019
7c83e68
Fix comment in AddStudentCommandParser
AhmadHatziq Sep 26, 2019
0784023
Add parser for AddModuleCommand
AhmadHatziq Sep 26, 2019
027d43d
Add Boolean isSameModule to Module class
AhmadHatziq Sep 26, 2019
5e83617
Add incomplete implementation of UniqueModuleList
AhmadHatziq Sep 26, 2019
4e3eeef
Add AddTutorialCommand class & hooked up to ApplicationParser
AhmadHatziq Sep 26, 2019
48c0c87
Change Module attribute from 'final' no 'not final'
AhmadHatziq Sep 26, 2019
57471b7
Edit checkStyle
AhmadHatziq Sep 26, 2019
5f59d56
Add parsing of addTutorial command.
AhmadHatziq Sep 26, 2019
55ddbf8
Change AddModuleCommand to use user-String instead of sample Module f…
AhmadHatziq Sep 26, 2019
262f37c
Update Commands & Parsers
AhmadHatziq Sep 26, 2019
43fe997
Add a Module list to the application model
AhmadHatziq Sep 26, 2019
89a3427
Update checkStyle
AhmadHatziq Sep 26, 2019
526e7be
Fix invalid comment in Module class
AhmadHatziq Sep 26, 2019
c3ce1ec
Add incomplete test methods
AhmadHatziq Sep 26, 2019
7ed2003
Add functionality to "addTutorial" command.
AhmadHatziq Sep 26, 2019
114ecb7
Fix incomplete comment in AddTutorialCommanParser
AhmadHatziq Sep 26, 2019
97b7774
Remove aeedu.address files
AhmadHatziq Sep 26, 2019
3a928ab
Merge pull request #18 from AhmadHatziq/master
AhmadHatziq Sep 27, 2019
5f52a55
Modify add commands to link Student/Tutorial/Module
lumos309 Sep 29, 2019
5adb4a9
Fix checkstyle violations
lumos309 Sep 29, 2019
77d7fe2
Fix checkstyle violations
lumos309 Sep 29, 2019
4600471
Modify UI to display student and tutorial lists (#21)
Ellieyee Sep 29, 2019
f980295
Merge pull request #22 from lumos309/master
lumos309 Sep 29, 2019
8192218
Update ContactUs page (#23)
Ellieyee Sep 30, 2019
6faa139
Update README.adoc and AboutUs.adoc (#24)
Ellieyee Sep 30, 2019
82c7213
Fix Coveralls badge link (#25)
Ellieyee Sep 30, 2019
ca66c9e
Fix Travis Badge link (#26)
Ellieyee Sep 30, 2019
21a1400
Update User Guide & Developer Guide (NFR, Use Case, Stories, Glossary…
AhmadHatziq Sep 30, 2019
b57afd8
Update UniqueModule/TutorialList methods, fix tests (#28)
lumos309 Sep 30, 2019
9506242
Set GH token in travis.yml (#29)
Ellieyee Oct 1, 2019
84dd8d7
Add tests for AddTutorialCommand (#30)
lumos309 Oct 1, 2019
3ef6271
Link ui to display students and tutorials (#33)
Ellieyee Oct 1, 2019
59cf54b
Update AboutUs.adoc (#34)
Ellieyee Oct 2, 2019
5e0b575
Update Developer Guide (#35)
AhmadHatziq Oct 2, 2019
8fad9de
Add commands for deleting tutorials and modules (#36)
lumos309 Oct 2, 2019
6479e06
Include index shortcut for AddStudentCommand (#49)
Ellieyee Oct 7, 2019
af70209
Added Attendance, missing tests for Tutorial and associated subclasses.
ZiHawkEye Oct 6, 2019
643f63a
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 7, 2019
d0fcb18
Merge pull request #51 from ZiHawkEye/master
ZiHawkEye Oct 7, 2019
8253fd3
Allow multiple input formats for addTutorial weeks (#52)
lumos309 Oct 8, 2019
1a11dd0
Update list command (#53)
Ellieyee Oct 8, 2019
b4ab336
Added ability to mark attendance
ZiHawkEye Oct 8, 2019
beb18b7
Add user prompt when deleting non-empty module/tutorial (#54)
lumos309 Oct 9, 2019
eaf0292
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/mai…
ZiHawkEye Oct 9, 2019
36b5cc2
Added stub tests for MarkAttendanceCommand and MarkAttendanceCommandP…
ZiHawkEye Oct 9, 2019
b291878
Added ability to mark attendance (#55)
ZiHawkEye Oct 9, 2019
277f63e
Added ability to add multiple pending commands
ZiHawkEye Oct 9, 2019
2a849de
Added ability to mark attendance of all students in a tutorial
ZiHawkEye Oct 9, 2019
4ee5954
Added ability for user to input multiple commands
ZiHawkEye Oct 9, 2019
81aa855
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 10, 2019
3144998
Added ability to mark attendance of entire tutorial, process user inp…
ZiHawkEye Oct 10, 2019
796c246
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 10, 2019
f29a509
Update ui link (#58)
Ellieyee Oct 11, 2019
b17fb31
Added storage functionality. (#59)
AhmadHatziq Oct 12, 2019
4b7045e
Add suggested commands for AddTutorialCommand (#60)
lumos309 Oct 13, 2019
704b000
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 13, 2019
8c21c6f
Added ability to export attendance
ZiHawkEye Oct 14, 2019
3d52873
Fixed bug where attendance marking is cancelled after no command is i…
ZiHawkEye Oct 14, 2019
a0393de
Added index functionality for MarkAttendanceCommand, ExportAttendance…
ZiHawkEye Oct 14, 2019
80f4726
Added ability to remove Student from Attendance
ZiHawkEye Oct 15, 2019
01e680c
Add suggested corrections for three command types (#62)
lumos309 Oct 15, 2019
84ef70b
Added ability to export Attendance, index support for MarkAttendance …
ZiHawkEye Oct 15, 2019
e027f9c
Attendance display (#65)
Ellieyee Oct 16, 2019
650c054
Display attendance command (#66)
Ellieyee Oct 16, 2019
cab3854
Minor GUI support (#69)
Ellieyee Oct 17, 2019
a568e68
Add suggested corrections, test for attendance marking (#67)
lumos309 Oct 17, 2019
4063d0e
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 18, 2019
c2822e3
Add find command support and displayAttendance shortcut (#81)
Ellieyee Oct 20, 2019
7a13a65
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 20, 2019
10e6203
Added Assignment, ability to add/delete Assignments
ZiHawkEye Oct 20, 2019
fc14304
Add autocomplete feature (#82)
lumos309 Oct 20, 2019
02cec34
Fixed model.setStudent(), EditCommandTest
ZiHawkEye Oct 20, 2019
542cc17
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 20, 2019
4f61794
Add tab GUI and supporting command (#83)
Ellieyee Oct 20, 2019
ddf7afc
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 20, 2019
0f8db74
Added Assignment, ability to add/delete Assignment and bug fixes (#84)
ZiHawkEye Oct 21, 2019
2b54ad4
Add saving & reading of Attendance objects (#85)
AhmadHatziq Oct 21, 2019
d15894a
Added ability to add/delete/edit Events, hourly tracking
ZiHawkEye Oct 21, 2019
3969258
Added ability to add/delete/edit Events, hourly tracking
ZiHawkEye Oct 21, 2019
4915ea5
Add dev docs for autocorrect (#86)
lumos309 Oct 22, 2019
3494685
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 21, 2019
bc64785
Merge branch 'master' of https://github.com/ZiHawkEye/main
ZiHawkEye Oct 22, 2019
5771f99
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 22, 2019
4c9de33
Added Event, hourly tracking (#88)
ZiHawkEye Oct 22, 2019
e82ecd1
Add dev docs for and streamline autocomplete (#91)
lumos309 Oct 23, 2019
9277349
Update developer's Guide (#92)
Ellieyee Oct 23, 2019
456d757
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 23, 2019
2db8041
Add devdocs for Mark Attendance feature
ZiHawkEye Oct 23, 2019
f1e38e2
Update developer guide (#93)
AhmadHatziq Oct 23, 2019
09e8144
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 23, 2019
666fb74
Add documentation for Mark Attendance feature (#94)
ZiHawkEye Oct 23, 2019
1d7f4ce
Update dev docs for Logic component (#96)
lumos309 Oct 23, 2019
f925201
Add autocomplete for command words (#97)
lumos309 Oct 24, 2019
7230bd2
Add command history feature (#98)
lumos309 Oct 25, 2019
319dec4
Added stub tests for AssignmentCommands, Assignment
ZiHawkEye Oct 27, 2019
b358886
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 27, 2019
b5efe16
Added ability to set Assignment score and stub tests for AssignmentCo…
ZiHawkEye Oct 27, 2019
80cd3ff
Add tests for command history (#100)
lumos309 Oct 27, 2019
dd26b82
Added ability to import Tutorials via NUSMods url
ZiHawkEye Oct 28, 2019
5c3d006
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 28, 2019
4c3b86f
Added ability to import Tutorials via NUSMods url, fixed bugs (#101)
ZiHawkEye Oct 28, 2019
6cb11c5
Update dev docs (#102)
lumos309 Oct 28, 2019
d3f4e3d
Add Assignment GUI (#103)
Ellieyee Oct 29, 2019
17f1201
Updated NUSMods data source to API v2, fixed JSON parsing errors
ZiHawkEye Oct 29, 2019
c13724b
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 29, 2019
0efa3a8
Updated NUSMods data source to API v2, fixed JSON parsing bugs (#104)
ZiHawkEye Oct 29, 2019
a83cd72
Add Undo Command (without tests) (#106)
AhmadHatziq Oct 29, 2019
1728d61
Add missing tests & update existing ones (#105)
lumos309 Oct 30, 2019
d82ac25
Add enhanced autocomplete (#107)
lumos309 Oct 30, 2019
477d284
Update histogram and userguide (#108)
Ellieyee Oct 30, 2019
c5e549f
Minor edits
ZiHawkEye Oct 30, 2019
dccaec9
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 30, 2019
a196a23
Update user guide
ZiHawkEye Oct 30, 2019
ce61a96
Minor edits (#110)
ZiHawkEye Oct 30, 2019
c58fc3b
Improved importing of Tutorials
ZiHawkEye Oct 30, 2019
47be7d9
Last minute bug fixing (#113)
ZiHawkEye Oct 31, 2019
52f4f5f
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 31, 2019
549f0d4
Fix command text field bugs (#114)
lumos309 Oct 31, 2019
fcaa260
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 31, 2019
19be88a
Fix unclickable text input field (#115)
lumos309 Oct 31, 2019
c4c6fdb
Merge branch 'master' of https://github.com/AY1920S1-CS2103-T14-2/main
ZiHawkEye Oct 31, 2019
2ef1cdb
Minor bug fixes
ZiHawkEye Oct 31, 2019
6fb57fa
Fixed Tutorial.setStudent() and EditCommandTest (#119)
ZiHawkEye Oct 31, 2019
4683efd
Update user guide (#120)
ZiHawkEye Nov 1, 2019
d476a36
Update Autocomplete in User Guide
lumos309 Nov 1, 2019
0f6301f
Update User Guide
lumos309 Nov 1, 2019
3eec5ca
Fix attendance and assignment bugs (#121)
Ellieyee Nov 1, 2019
fd5ae38
Updated user guide (#162)
ZiHawkEye Nov 1, 2019
ee0d12c
setStudent() v5.0, fixed bugs, standardised message usage format (#166)
ZiHawkEye Nov 3, 2019
3b67b7a
Update userguide (#173)
Ellieyee Nov 3, 2019
c716306
Add storage for Assignments (#174)
AhmadHatziq Nov 4, 2019
2e54b6a
Add Assignment display GUI and command (#175)
Ellieyee Nov 4, 2019
4372997
Fix #144, #148, #170 (#176)
lumos309 Nov 6, 2019
89714ca
Project Portfolio Page update (#177)
Ellieyee Nov 6, 2019
1924636
Minor changes (#179)
ZiHawkEye Nov 6, 2019
a95501f
Fix issue #154 and Storage bug #178 (#180)
AhmadHatziq Nov 6, 2019
ab2c567
Partial fix for text input field jumping around (#181)
lumos309 Nov 6, 2019
0722c0c
Fixed listEvents bug, etc. (#182)
ZiHawkEye Nov 6, 2019
6e7664a
Updated PPP (#184)
ZiHawkEye Nov 6, 2019
6afd72e
Add PPP (#185)
lumos309 Nov 6, 2019
038a1e7
Allow scrolling of list panel via PageUp/Down (#187)
lumos309 Nov 6, 2019
1c291d1
Update docs & checking of same date for setSemStart command (#188)
AhmadHatziq Nov 7, 2019
18a5081
Undo command, storage for events & other bug fixes (#189)
AhmadHatziq Nov 8, 2019
3d4932a
Update PPP, dev guide (#190)
lumos309 Nov 9, 2019
c88a234
Added ability to add students to multiple tutorials (#191)
ZiHawkEye Nov 9, 2019
84f1b29
Refactor AssignmentTableDisplay and update Userguide (#197)
Ellieyee Nov 9, 2019
17e805b
Replaced usage of org.apache.commons.io.FileUtils & fix bug where can…
AhmadHatziq Nov 9, 2019
359d8d5
Patched application.setStudents() (#198)
ZiHawkEye Nov 9, 2019
cf2479d
Fix bug for undoing Assignments (#199)
AhmadHatziq Nov 9, 2019
39ed28a
Fixed #122: Time slot overflow bug, semStart storage (#200)
ZiHawkEye Nov 10, 2019
24b4143
Add tests (#196)
lumos309 Nov 10, 2019
702459f
Added Tests (#201)
AhmadHatziq Nov 10, 2019
997f6b0
Bug fixes (#202)
ZiHawkEye Nov 10, 2019
446b21a
Fix test failing (#203)
lumos309 Nov 10, 2019
ec14969
Fix bugs & add tests (#204)
AhmadHatziq Nov 10, 2019
c76b9b0
Updated docs (#205)
ZiHawkEye Nov 10, 2019
e4fe35a
Update docs and DG (#206)
AhmadHatziq Nov 11, 2019
ef523f7
Add more tags to docs (#207)
lumos309 Nov 11, 2019
bf789af
Update developer guide and PPP (#208)
Ellieyee Nov 11, 2019
8db493b
Update tag for everyone (#209)
Ellieyee Nov 11, 2019
6948bf8
Add Tests & Documentation (#210)
AhmadHatziq Nov 11, 2019
9d4a712
Fix command text field bug (#211)
lumos309 Nov 11, 2019
430908d
Fix documentation typos & add some minor stuff (#212)
AhmadHatziq Nov 11, 2019
90e23e4
Updated docs (#214)
ZiHawkEye Nov 11, 2019
7618a5b
Add test & docs (#213)
AhmadHatziq Nov 11, 2019
2b69df8
Shorten PPP (#215)
Ellieyee Nov 11, 2019
2cd4191
Edited PPP (#216)
ZiHawkEye Nov 11, 2019
0bf0527
Yet another PPP update (#217)
ZiHawkEye Nov 11, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin/main" path="src/main/java">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/main" path="src/main/resources">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/java">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/resources">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ src/main/resources/docs/
/config.json
/preferences.json
/*.log.*
/data\\states\\state*

# Test sandbox files
src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store

/bin
/.vscode/
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>main</name>
<comment>Project main created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=
eclipse.preferences.version=1
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: java
language: generic
matrix:
include:
- jdk: openjdk11
Expand All @@ -9,6 +9,7 @@ script: >-

deploy:
skip_cleanup: true
github_token: $GITHUB_TOKEN
provider: script
script: ./config/travis/deploy_github_pages.sh
on:
Expand Down
16 changes: 8 additions & 8 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
= Address Book (Level 3)
= T.A.rence
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://travis-ci.org/AY1920S1-CS2103-T14-2/main[image:https://travis-ci.org/AY1920S1-CS2103-T14-2/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/Ellieyee/main[image:https://ci.appveyor.com/api/projects/status/7p2l4yoxhbvguwkt?svg=true[Build status]]
https://coveralls.io/github/AY1920S1-CS2103-T14-2/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2103-T14-2/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[]
Expand All @@ -15,9 +14,9 @@ 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.
* This is T.A.rence, a class management system for NUS Teaching Assistants. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* T.A.rence allows NUS Teaching Assistants to organize their various classes and manage each student's information.
* This application is optimized for those who prefer using the Command Line interface.

== Site Map

Expand All @@ -29,6 +28,7 @@ endif::[]

== Acknowledgements

* Original source: https://github.com/nus-cs2103-AY1920S1/addressbook-level3[AddressBook Level 3] created by https://se-education.org[SE-EDU initiative]
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
Expand Down
20 changes: 14 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,19 @@ plugins {
id 'application'
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.Main'
application {
// Specifies the entry point of the application
mainClassName = 'seedu.tarence.Main'
}


sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

repositories {
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
jcenter() // for fuzzywuzzy string matching
}

checkstyle {
Expand Down Expand Up @@ -62,12 +66,16 @@ dependencies {
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion

testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
implementation 'me.xdrop:fuzzywuzzy:1.2.0'
compile "com.opencsv:opencsv:4.0"
compile group: 'com.google.code.gson', name: 'gson', version:'2.7'
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
compile group: 'commons-io', name: 'commons-io', version: '2.6'
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'TArence.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -133,8 +141,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level3',
'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
'site-name': 'T.A.rence',
'site-githuburl': 'https://github.com/AY1920S1-CS2103-T14-2/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
4 changes: 0 additions & 4 deletions copyright.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
Some code adapted from http://code.makery.ch/library/javafx-8-tutorial/ by Marco Jakob

Copyright by Susumu Yoshida - http://www.mcdodesign.com/
- address_book_32.png
- AddressApp.ico

Copyright by Jan Jan Kovařík - http://glyphicons.com/
- calendar.png
- edit.png
44 changes: 17 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,43 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 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} +
T.A.rence was developed by the https://github.com/AY1920S1-CS2103-T14-2[AY1920S1-CS2103-T14-2] 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>>]
=== Ellie Yee
image::ellieyee.png[width="150", align="left"]
{empty}[https://github.com/Ellieyee[github]] [<<ellieyee#, portfolio>>]

Role: Project Advisor

'''

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

Role: Team Lead +
Role: Developer +
Responsibilities: UI

'''

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

Role: Developer +
Responsibilities: Data
Responsibilities: Model

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Ahmad Hatziq Bin Mohamad
image::ahmadhatziq.png[width="150", align="left"]
{empty}[https://github.com/AhmadHatziq[github]] [<<ahmadhatziq#, portfolio>>]

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

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Logic

'''
3 changes: 1 addition & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2103-T14-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
Loading