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

[CS2103T-W12-2] TeaPet #5

Open
wants to merge 894 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 199 commits
Commits
Show all changes
894 commits
Select commit Hold shift + click to select a range
c167b0e
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 11, 2020
08715d3
resolved merge conflict
Apr 11, 2020
c9ebdd8
Checkstyle
tingalinga Apr 11, 2020
ddf70c5
Added Notes manual testing in DG
Apr 11, 2020
19a086d
Merge pull request #268 from jerrenss/jerrenss-feature-branch
jerrenss Apr 11, 2020
e52e12d
Edited Website Header
Apr 11, 2020
45f099e
Merge pull request #271 from jerrenss/jerrenss-feature-branch
jerrenss Apr 11, 2020
3390e80
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 11, 2020
3ae2b49
DG image changes
TheElectricBlender Apr 11, 2020
68b47de
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
TheElectricBlender Apr 11, 2020
a1a06db
travis fix
TheElectricBlender Apr 11, 2020
4cf091a
Merge pull request #266 from TheElectricBlender/working_branch
TheElectricBlender Apr 11, 2020
ec0730c
Travis test
TheElectricBlender Apr 11, 2020
0a22e32
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
TheElectricBlender Apr 11, 2020
5687b1c
Minor Changes to Diagrams
Apr 11, 2020
c4e66ab
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 11, 2020
6213a0e
edits
TheElectricBlender Apr 11, 2020
af30118
Merge pull request #272 from TheElectricBlender/working_branch
TheElectricBlender Apr 11, 2020
fdc6fc9
checkstyle
tingalinga Apr 11, 2020
6f1a585
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 11, 2020
3ba7876
Added admin storage tests and editede DG.
Yuanyu97 Apr 11, 2020
0d0dd59
Merge pull request #270 from tingalinga/documentation
tingalinga Apr 11, 2020
76f6350
Edited UG
Apr 11, 2020
dbc1905
Fixed merger conflict.
Yuanyu97 Apr 11, 2020
7c7846c
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
Yuanyu97 Apr 11, 2020
aebf06e
Did more stuff
Yuanyu97 Apr 11, 2020
e03c317
PR test for travis
TheElectricBlender Apr 11, 2020
3ac9f7a
One big commit...
Yuanyu97 Apr 11, 2020
535da6b
Fixed checkstyle.
Yuanyu97 Apr 11, 2020
4877784
Merge pull request #274 from Yuanyu97/edit-DG
Yuanyu97 Apr 11, 2020
227ea59
Merge branch 'master' into jerrenss-feature-branch
Apr 12, 2020
341be49
Edited Architecture Diagrams
Apr 12, 2020
ea2532e
DG edits
tingalinga Apr 12, 2020
fc18409
Edited Checkstyle
Apr 12, 2020
a311591
checkstyle
tingalinga Apr 12, 2020
e94b9c6
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 12, 2020
6c8da74
Edited Website Headers
Apr 12, 2020
900e4c0
Merge pull request #276 from tingalinga/documentation
tingalinga Apr 12, 2020
37a099b
Merge pull request #275 from jerrenss/jerrenss-feature-branch
jerrenss Apr 12, 2020
edceb96
Edited Website Header
Apr 12, 2020
b1c4089
Revert "Edited Website Header"
Apr 12, 2020
bef762b
Merge branch 'master' into jerrenss-feature-branch
Apr 12, 2020
17a8525
Edited DG
Apr 12, 2020
f49ab17
Merge pull request #273 from TheElectricBlender/travis
TheElectricBlender Apr 12, 2020
02eb4e5
Edited UG
Apr 12, 2020
fda4fab
Minor Edits to UG
Apr 12, 2020
50e3fd5
Merge pull request #277 from jerrenss/jerrenss-feature-branch
jerrenss Apr 12, 2020
6eb60d6
Academics Model Test
tingalinga Apr 12, 2020
8c8aef5
Minor fixes and DG changes
TheElectricBlender Apr 12, 2020
ecc8ef0
Completed some test for event storage
TheElectricBlender Apr 12, 2020
ddfd487
added new line at EOF
TheElectricBlender Apr 12, 2020
7867885
Merge pull request #278 from TheElectricBlender/abc
TheElectricBlender Apr 12, 2020
ec95f40
added tests for event
Apr 12, 2020
b57d847
Academcis storage test
tingalinga Apr 12, 2020
032b1b9
checkstyle
tingalinga Apr 12, 2020
761b2f1
complied with travis
Apr 12, 2020
be12184
trying to fix this test file
tingalinga Apr 12, 2020
833d2c2
Merge branch 'schedule-test'
Apr 12, 2020
5143e63
pull request from upstream
Apr 12, 2020
c9e1277
Fix test file
tingalinga Apr 12, 2020
e2f6e32
Edit test case
tingalinga Apr 12, 2020
0eb092c
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 12, 2020
1c51518
testcase please work
tingalinga Apr 12, 2020
3b846a5
Merge pull request #279 from tingalinga/testing
tingalinga Apr 12, 2020
fdaddc5
Touched up a bit on DG.
Yuanyu97 Apr 12, 2020
a25d351
Edited PPP
Yuanyu97 Apr 12, 2020
3677a51
Merge pull request #282 from Yuanyu97/touch-up
Yuanyu97 Apr 12, 2020
4107951
edited ppp
Apr 12, 2020
fd0ad0d
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Apr 12, 2020
c24e5d7
Merge pull request #281 from garysyndromes/master
gsyndromes Apr 12, 2020
26cbe6d
Academics Command Parser Test: add, edit and delete commands
tingalinga Apr 12, 2020
cde90e5
checkstyle
tingalinga Apr 12, 2020
724990a
Added academics add command test
tingalinga Apr 12, 2020
12bae52
modified ppp
Apr 12, 2020
d112c1d
More Test Cases
Apr 12, 2020
4793bd2
Added Academics Add Command Integration Test and Academics Edit Comma…
tingalinga Apr 12, 2020
56c2b7a
PPPPPP
TheElectricBlender Apr 12, 2020
229e3b5
Edits to DG
Apr 12, 2020
aab07fa
Edited DG and PPP
Yuanyu97 Apr 12, 2020
15caa18
Merge pull request #284 from jerrenss/jerrenss-feature-branch
jerrenss Apr 12, 2020
52324d5
updated ug for schedule
Apr 12, 2020
7478aba
checkstyle
tingalinga Apr 12, 2020
99e5a44
Merge pull request #285 from garysyndromes/master
gsyndromes Apr 12, 2020
82736bf
pull from upstream
Yuanyu97 Apr 12, 2020
def3a77
minor edits
TheElectricBlender Apr 12, 2020
e67a722
Minor Edits to Documents
Apr 12, 2020
987413e
Touched up on UG and DG.
Yuanyu97 Apr 12, 2020
0be0814
Fixed tests.
Yuanyu97 Apr 12, 2020
db42aaa
Added NOK tests.
Yuanyu97 Apr 12, 2020
20f99fc
Fixed checkstyle.
Yuanyu97 Apr 12, 2020
e577a25
dg updates
TheElectricBlender Apr 12, 2020
b06df02
Edit model diagram and PPP
tingalinga Apr 12, 2020
957ef4e
Checkstyle
tingalinga Apr 12, 2020
e85df18
Added academics display test.
Yuanyu97 Apr 12, 2020
3ecc1af
Fixed checkstyle.
Yuanyu97 Apr 12, 2020
bc8b329
Fixed checkstyle.
Yuanyu97 Apr 12, 2020
d427d06
Merge pull request #287 from Yuanyu97/edit-PPP
Yuanyu97 Apr 12, 2020
ed0d0c9
Merge pull request #286 from jerrenss/jerrenss-feature-branch
jerrenss Apr 12, 2020
093e8b0
Edit DG
Apr 12, 2020
36fcc0e
Edited academics add command test
tingalinga Apr 12, 2020
e4fd3d9
updated images
TheElectricBlender Apr 12, 2020
7757b3c
Merge branch 'master' into jerrenss-feature-branch
Apr 12, 2020
0bc9612
edit add command test
tingalinga Apr 12, 2020
17df590
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 12, 2020
176c01e
Edited Academics Add Command Test
tingalinga Apr 12, 2020
3ee7cf3
Changed pics for admin ug.
Yuanyu97 Apr 12, 2020
7b42442
Changed Diagrams
Apr 12, 2020
a11c2ca
Changed pics for admin ug.
Yuanyu97 Apr 12, 2020
e8a26fa
Added academics delete and export command test
tingalinga Apr 12, 2020
ae64a5e
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
TheElectricBlender Apr 12, 2020
46c4858
Merge pull request #289 from Yuanyu97/edit-DG
Yuanyu97 Apr 12, 2020
e9536ad
EOF
TheElectricBlender Apr 12, 2020
6e4584c
deleted unwanted html file
TheElectricBlender Apr 12, 2020
8d63ca3
Added some UGDG edits
tingalinga Apr 12, 2020
ad511d4
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 12, 2020
7322f21
Merge pull request #290 from TheElectricBlender/PPP
TheElectricBlender Apr 12, 2020
90c7fa7
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 12, 2020
e2eb587
Edited image.
Yuanyu97 Apr 12, 2020
822f81f
added dg for schedule
Apr 12, 2020
a7f8d01
Merge pull request #291 from Yuanyu97/edit-pic
Yuanyu97 Apr 12, 2020
002ac89
more UGDG edits
tingalinga Apr 12, 2020
77aa312
Added AcademicsSubmitCommandTest and test cases for submit and displa…
tingalinga Apr 12, 2020
b27c9e1
Added AcademicsMarkCommandTest and test cases for mark command in Aca…
tingalinga Apr 12, 2020
d3f162e
Merge pull request #283 from tingalinga/testing
tingalinga Apr 12, 2020
7598f3d
Edited UG
Apr 13, 2020
23b4b80
Merge branch 'master' into jerrenss-feature-branch
Apr 13, 2020
9e53d77
Finalised UG
Apr 13, 2020
83d2d9e
Minor changes to UG
Apr 13, 2020
069b8d3
Finalise DG
Apr 13, 2020
7a42e0c
added dg edits
Apr 13, 2020
d50a0db
Did testings for modelmanager, logicmanger and storagemanager
TheElectricBlender Apr 13, 2020
cc8d5ec
resolved merge conflict
Apr 13, 2020
e79bdae
Added display images
tingalinga Apr 13, 2020
305707e
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 13, 2020
983855f
checkstyle
TheElectricBlender Apr 13, 2020
4375b87
Merge pull request #292 from TheElectricBlender/PPP
TheElectricBlender Apr 13, 2020
275ea19
Edited PPP
tingalinga Apr 13, 2020
3425e96
Added reposense
Yuanyu97 Apr 13, 2020
5a7cc93
Added test cases to TeaPetParserTest
tingalinga Apr 13, 2020
8f1d25c
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 13, 2020
c92dfcd
Edit PPP
tingalinga Apr 13, 2020
2873619
Merge pull request #293 from tingalinga/testing
tingalinga Apr 13, 2020
1928474
Finalise PPP
Apr 13, 2020
6032e23
Slight Edits
Apr 13, 2020
c85cb74
more tests to improve coverall
TheElectricBlender Apr 13, 2020
a881255
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
TheElectricBlender Apr 13, 2020
a04e25a
updated dg for schedule manual testing
Apr 13, 2020
9feab3e
Deconflicted
Apr 13, 2020
5438b00
Merge pull request #288 from jerrenss/jerrenss-feature-branch
jerrenss Apr 13, 2020
6e55070
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
Yuanyu97 Apr 13, 2020
b2cfffe
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
TheElectricBlender Apr 13, 2020
601c00d
weird stuff here
TheElectricBlender Apr 13, 2020
a861a70
CHECKSTYE
TheElectricBlender Apr 13, 2020
7d6b808
resolved merge conflict
Apr 13, 2020
7d185cd
Merge pull request #294 from TheElectricBlender/PPP
TheElectricBlender Apr 13, 2020
2987111
removed dg.html
Apr 13, 2020
e33bbf6
Edited AcademicsModelClassDiagram
tingalinga Apr 13, 2020
d9ca3c7
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 13, 2020
5a48f48
Merge pull request #296 from tingalinga/testing
tingalinga Apr 13, 2020
706a9c0
minor changes
TheElectricBlender Apr 13, 2020
1b20fab
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
TheElectricBlender Apr 13, 2020
ed037a3
Merge pull request #297 from TheElectricBlender/PPP
TheElectricBlender Apr 13, 2020
3011391
Edited PPP
Apr 13, 2020
7ce257b
Minor Edits
Apr 13, 2020
9b46fda
Fixed images.
Yuanyu97 Apr 13, 2020
24ac95e
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
Yuanyu97 Apr 13, 2020
4f35ec0
Merge pull request #298 from jerrenss/jerrenss-feature-branch
jerrenss Apr 13, 2020
42f40b6
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
Yuanyu97 Apr 13, 2020
613f380
Pulled from upstream.
Yuanyu97 Apr 13, 2020
3a920fb
Merge pull request #299 from Yuanyu97/touch-up
Yuanyu97 Apr 13, 2020
bafa108
Edited UG
Apr 13, 2020
1056631
Edited Pic in UG
Apr 13, 2020
eab4583
Added test cases to Academics model tests
tingalinga Apr 13, 2020
3d5b085
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 13, 2020
fa6b5f1
Merge pull request #300 from jerrenss/jerrenss-feature-branch
jerrenss Apr 13, 2020
c9ac314
checkstyle
tingalinga Apr 13, 2020
b334cb4
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 13, 2020
92091b7
Merge pull request #301 from tingalinga/testing
tingalinga Apr 13, 2020
baf978f
Add some test cases and edited academics-view.png
tingalinga Apr 13, 2020
5cf4096
Edited adocs
tingalinga Apr 13, 2020
fcf9bf1
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 13, 2020
4fc4209
Merge pull request #302 from tingalinga/testing
tingalinga Apr 13, 2020
e6656cb
updated ug and dg
Apr 13, 2020
b15530b
resolve merge conflict
Apr 13, 2020
9ebebd0
change image
TheElectricBlender Apr 13, 2020
251bcfe
updated ug
Apr 13, 2020
59af6e2
Update UserGuide.adoc
tingalinga Apr 13, 2020
c264145
Merge pull request #303 from TheElectricBlender/PPP
TheElectricBlender Apr 13, 2020
0151c92
Update UserGuide.adoc
tingalinga Apr 13, 2020
d5707db
DG Edits
Apr 13, 2020
198b803
pulled from upstream
Yuanyu97 Apr 13, 2020
e63b752
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Yuanyu97 Apr 13, 2020
f3f9df2
Merge pull request #304 from jerrenss/jerrenss-feature-branch
jerrenss Apr 13, 2020
1529604
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Yuanyu97 Apr 13, 2020
69bc745
updated ug
Apr 13, 2020
d4bb882
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Apr 13, 2020
fed7017
Update UserGuide.adoc
tingalinga Apr 13, 2020
f5178d7
Update UserGuide.adoc
tingalinga Apr 13, 2020
484d0a5
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Apr 13, 2020
e6ba3d7
Update UserGuide.adoc
tingalinga Apr 13, 2020
e32c36c
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Apr 13, 2020
f9451b5
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Yuanyu97 Apr 13, 2020
2c54d49
fixed eof
Apr 13, 2020
b39ce98
Merge pull request #305 from garysyndromes/master
gsyndromes Apr 13, 2020
d0d94b9
update image
TheElectricBlender Apr 13, 2020
1983510
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
TheElectricBlender Apr 13, 2020
10ca2b0
fixed bug in dg
Apr 13, 2020
adcafd2
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Apr 13, 2020
3031c14
fixed conflict
Yuanyu97 Apr 13, 2020
fefb973
Merge pull request #306 from TheElectricBlender/PPP
TheElectricBlender Apr 13, 2020
6da2cbb
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Yuanyu97 Apr 13, 2020
dc7b473
Merge pull request #307 from garysyndromes/master
gsyndromes Apr 13, 2020
864ef70
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Yuanyu97 Apr 13, 2020
d59000f
deleted photos to reduce size
Apr 13, 2020
c53da06
minor edit
tingalinga Apr 13, 2020
24f2ef2
Merge pull request #308 from garysyndromes/master
gsyndromes Apr 13, 2020
d53ef4b
Edited pic
Yuanyu97 Apr 13, 2020
9416dc1
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
Yuanyu97 Apr 13, 2020
0de1720
Merge pull request #309 from Yuanyu97/final-touch
Yuanyu97 Apr 13, 2020
3fecaeb
Update UserGuide.adoc
tingalinga Apr 13, 2020
d661c4d
fix bug
TheElectricBlender Apr 13, 2020
3a59112
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
TheElectricBlender Apr 13, 2020
05d817f
updated ug and dg
Apr 13, 2020
f5095e0
test
TheElectricBlender Apr 13, 2020
842106c
checkstyle
TheElectricBlender Apr 13, 2020
f3270a2
fixed ppp
Apr 13, 2020
de1d26f
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Apr 13, 2020
e5557d6
dg effort
TheElectricBlender Apr 13, 2020
d4395be
Merge pull request #311 from garysyndromes/master
gsyndromes Apr 13, 2020
be4d48b
finishing touches
TheElectricBlender Apr 13, 2020
352f411
dg
TheElectricBlender Apr 13, 2020
448962f
Merge pull request #310 from TheElectricBlender/bug
TheElectricBlender Apr 13, 2020
ba826fa
fix ppp
Apr 13, 2020
47940fc
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/main
Apr 13, 2020
70d9ac6
Merge pull request #312 from garysyndromes/master
jerrenss Apr 13, 2020
8fc4338
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 13, 2020
d400c7b
donezo
TheElectricBlender Apr 13, 2020
3adfe25
he also donezo
TheElectricBlender Apr 13, 2020
5bfa727
very last done
TheElectricBlender Apr 14, 2020
b4f7a4c
Merge pull request #313 from TheElectricBlender/im_done
TheElectricBlender Apr 14, 2020
4fce26f
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-2/ma…
tingalinga Apr 14, 2020
254ce2d
Fix StudentEditCommand bug
tingalinga Apr 14, 2020
31c8a4f
Edits
tingalinga Apr 14, 2020
2102bd8
Edit test case
tingalinga Apr 14, 2020
9bc05d9
Fixed student names order in academics and notes export command
tingalinga Apr 15, 2020
9742281
Fix display commands
tingalinga Apr 15, 2020
e08097a
Checkstyle
tingalinga Apr 15, 2020
a9c4406
Student names are not case sensitive (in UniqueStudentList)
tingalinga Apr 15, 2020
cc121be
Correct AcademicsParser for indexes
tingalinga Apr 15, 2020
704004c
Merge pull request #316 from tingalinga/edit-command
tingalinga Apr 15, 2020
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
15 changes: 9 additions & 6 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
= Address Book (Level 3)
= TeaPet
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://travis-ci.org/AY1920S2-CS2103T-W12-2/main?utm_medium=notification&utm_source=github_status[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]]

Expand All @@ -15,15 +15,17 @@ 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.
* TeaPet is an all-in-one desktop program for primary school form teachers to *manage their classroom effectively*.
It manages your *personal curriculum schedule*, *student particulars*, and can also *track your class progress* all in
one simple program.
* TeaPet flexes its simple and clean Graphical User Interface (GUI)
* TeaPet is optimized for those who prefer to work with a *Command Line Interface (CLI)* while still having a simple
and clean Graphical User Interface (GUI).

== Site Map

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

Expand All @@ -32,5 +34,6 @@ endif::[]
* 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]
* Morphed original source code from AddressBook-Level3 project created by SE-EDU initiative at https://se-education.org

== Licence : link:LICENSE[MIT]
2 changes: 2 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
theme: jekyll-theme-cayman
title: Teapet
description: TeaPet is an all-in-one desktop program for primary school form teachers to manage their classroom effectively. It manages your personal curriculum schedule, student particulars, and can also track your class progress all in one simple program.
56 changes: 29 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,55 @@
: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} +
TeaPet - TeaPet was developed by us. +

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>>]
=== Simon Lam
image::theelectricblender.png[width="150", align="left"]
{empty}[https://github.com/TheElectricBlender[github]] [<<theelectricblender#, portfolio>>]

Role: Project Advisor
Role: Team Leader +
Responsibility: In charge of overall progress and direction of project.

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Git master +
Responsibility: Help team members to get familiar with git tools.

'''

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

Role: Developer +
Responsibilities: Data
Role: Integration +
Responsibilities: In charge of versioning of the code, maintaining the code repository, integrating various parts of the
software to create a whole.

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Gerren Seow
image::jerrenss.png[width="150", align="left"]
{empty}[http://github.com/jerrenss[github]] [<<jerrenss#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Scheduling and Tracking +
Responsibilities: In charge of defining, assigning and tracking project tasks.

'''

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

Role: Developer +
Responsibilities: UI
Role: Code quality and Documentation +
Responsibilities: Looks after the code, ensures adherence to coding standard. Also responsible of the quality of various
project documents.

'''
10 changes: 8 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
: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.
* *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`

* *Email us* : You can also reach us at +
** `[email protected]`
** `[email protected]`
** `[email protected]`
** `[email protected]`
** `[email protected]`

Loading