Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
ec65000
"Further commits to gitignore"
Feb 28, 2020
6568de1
Point travis build status to right link
Feb 28, 2020
ccb9f26
update userguide and readme
Yujian-Fu Mar 7, 2020
4d5367b
Modifications to aboutus page
Mar 12, 2020
384aa02
Modified homepage and github
Mar 12, 2020
2fded60
Editing contact us details
Mar 12, 2020
21de630
modifications to developer guide
Mar 14, 2020
878cddb
minor bug fix
Mar 14, 2020
6a9d24b
Addition of Architecture diagram + class definitions
Mar 14, 2020
3e7a7ee
Merge pull request #19 from AY1920S2-CS2103-W15-1/tp-v1.1
JKOK005 Mar 15, 2020
da8c02f
Working on defining timestamp class for bluetooth pings
Mar 16, 2020
e50ef04
Fixed bug with class
Mar 16, 2020
a8dc7ce
Added Persons class
Mar 16, 2020
abdfd3c
Creating bluetooth ping panel and bluetooth ping card classes
Mar 16, 2020
4c712f4
AppLogic interface definitions
Mar 17, 2020
5e139f1
Generic types for AppLogics and Conditions
Mar 17, 2020
8388b7b
AppLogicManager and AppStorage implementation
Mar 17, 2020
887cfdd
Massive commit ... I lost track of what this commit contains
Mar 17, 2020
f765a7f
Major update:
Mar 17, 2020
3aeedd3
Modified AppMainWindow to add command box and panel display functiona…
Mar 18, 2020
92316d9
Partial implementation of filter commands
Mar 18, 2020
54ea20f
Merge pull request #20 from AY1920S2-CS2103-W15-1/feat-signin-page
JKOK005 Mar 18, 2020
76533c1
Modifications to AppCommandResults
Mar 19, 2020
f37586f
Command parsing refractoring
Mar 24, 2020
b76b8cc
Doc string for AppCommand interface
Mar 24, 2020
3522555
Filter by timestamp condition
Mar 24, 2020
8498989
Fixed label alignment issue with bluetoothping card display
Mar 29, 2020
a7ed5c7
Added filter by user id condition
Mar 29, 2020
f978a3c
Moved contact tracing main app out of package
Mar 29, 2020
865f3e2
Merge pull request #23 from AY1920S2-CS2103-W15-1/feat-filter-by-command
JKOK005 Mar 29, 2020
37a14a3
UBER commit
Mar 29, 2020
cbd652b
Merge pull request #24 from AY1920S2-CS2103-W15-1/uber-deletion
JKOK005 Mar 29, 2020
85c5f42
Updating user guide for latest features
Apr 3, 2020
53182d1
Added filter by user pairs command and condition
Apr 3, 2020
f2ea6e3
Partial implementation of Aggregator logic
Apr 3, 2020
d6c4647
Partial commit
Apr 4, 2020
fb70eb6
Refractored display to toggle between different message types
Apr 4, 2020
f3dc314
Uber commit
Apr 4, 2020
e793ac6
Merge pull request #35 from AY1920S2-CS2103-W15-1/user-guide-mod
JKOK005 Apr 4, 2020
85714b9
Partial major refractoring
Apr 5, 2020
3ebc924
Removed dependency on central dao for AppLogicManager
Apr 5, 2020
5659d1c
Completed implementation of UserSummary display
Apr 5, 2020
805d313
Used command word "users" to list all users
Apr 5, 2020
9ab204f
Added filter by Person id feature
Apr 5, 2020
d0f5502
Switched the term user to person
Apr 5, 2020
b335f1d
Merge pull request #36 from AY1920S2-CS2103-W15-1/add-users
JKOK005 Apr 5, 2020
1009e95
Added person addition support
Apr 8, 2020
e20d71f
Support spacing in name addition of person
Apr 8, 2020
43e66a4
Assert mobile numbers have to be integers
Apr 8, 2020
dc5f7f2
Support for deletion of person by userid
Apr 8, 2020
cf81083
Merge pull request #38 from AY1920S2-CS2103-W15-1/feat-add-person
JKOK005 Apr 8, 2020
f285e4a
Updated user guide doc
Apr 8, 2020
57ef45b
Parital completion of developer guide
Apr 8, 2020
efc7ec6
Documentation for class diagram explaination
Apr 9, 2020
7e3b65c
Added diagrams and model class explaination
Apr 9, 2020
ddd94dd
Further developments to developer guide
Apr 9, 2020
8ddca01
Modifications to user guide
Apr 9, 2020
d88aac2
bug fix in documentation
Apr 9, 2020
6171b81
Merge pull request #39 from AY1920S2-CS2103-W15-1/more-documentation
JKOK005 Apr 9, 2020
ff2cf3a
merge report generation to master
Yujian-Fu Apr 9, 2020
89176c7
Make changes for PR
Yujian-Fu Apr 10, 2020
9a419ad
make changes for PQ
Yujian-Fu Apr 10, 2020
90ec3a4
Partially completing PPP
Apr 10, 2020
cd08c1a
Continue writeup
Apr 10, 2020
afddb8f
make changes for PR
Yujian-Fu Apr 10, 2020
a126784
make changes for PR
Yujian-Fu Apr 10, 2020
5971786
make changes for PR
Yujian-Fu Apr 10, 2020
dedee0f
make changes for PR
Yujian-Fu Apr 10, 2020
c3784b1
make changes for PR
Yujian-Fu Apr 10, 2020
39f9e83
make changes for PR
Yujian-Fu Apr 10, 2020
294c0a2
Merge pull request #41 from AY1920S2-CS2103-W15-1/final-version-with-…
Yujian-Fu Apr 10, 2020
0d4d08f
Partial completion of PPP
Apr 10, 2020
b22c9d5
Partially completing PPP
Apr 10, 2020
1d52fea
Continue writeup
Apr 10, 2020
aa19a88
Partial completion of PPP
Apr 10, 2020
a8d8c11
Completed PPP
Apr 10, 2020
7685ec4
Merge branch 'johan-ppp' of https://github.com/AY1920S2-CS2103T-W15-1…
Apr 10, 2020
0e09799
Added RepoSense code tracker
Apr 10, 2020
a851e04
Merge pull request #42 from AY1920S2-CS2103-W15-1/johan-ppp
Yujian-Fu Apr 10, 2020
bd14186
added data points and fix some bugs
Yujian-Fu Apr 10, 2020
dafc5e2
Merge branch 'final-version-with-report' of https://github.com/AY1920…
Yujian-Fu Apr 10, 2020
ed0b4ad
Merge branch 'final-version-with-report' of https://github.com/AY1920…
Yujian-Fu Apr 10, 2020
3c79004
Add data points and fix a bug
Yujian-Fu Apr 10, 2020
6a3d5fa
Merge pull request #43 from AY1920S2-CS2103-W15-1/final-version-with-…
Yujian-Fu Apr 11, 2020
c72206c
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W15-1/main
Yujian-Fu Apr 11, 2020
9d6dd0c
add report person and help feature
Yujian-Fu Apr 11, 2020
9ee0545
modify UG, DG, PPP and about_us
Yujian-Fu Apr 11, 2020
16b9c92
modify UG, DG, PPP and about_us
Yujian-Fu Apr 11, 2020
4100295
modifications on document
Yujian-Fu Apr 11, 2020
21b2047
modify help feature
Yujian-Fu Apr 11, 2020
a56a228
Added help command support
Apr 12, 2020
c1543a9
Modified synthetic data for realistic Epoch timing
Apr 12, 2020
579aeb2
Bug fix
Apr 12, 2020
1b82bb6
Removed duplicate NRIC constraint from user guide
Apr 12, 2020
27d3451
Added in help command usage to user guide
Apr 12, 2020
e84d43e
Merge pull request #46 from AY1920S2-CS2103-W15-1/help-command-display
Yujian-Fu Apr 12, 2020
e15525b
add report commands to help command list
Yujian-Fu Apr 12, 2020
5592253
modify UG and DG
Yujian-Fu Apr 12, 2020
5371924
modify Readme
Yujian-Fu Apr 12, 2020
c82b23d
Merge pull request #45 from AY1920S2-CS2103-W15-1/final-version-with-…
Yujian-Fu Apr 12, 2020
0ee35f9
Added use case diagram and dao router sequence diagram
Apr 12, 2020
3c4be44
make some modifications
Yujian-Fu Apr 12, 2020
feb65d0
Merge branch 'master' into final-version-with-report
Yujian-Fu Apr 12, 2020
38cb2f0
Merge pull request #48 from AY1920S2-CS2103-W15-1/final-version-with-…
JKOK005 Apr 12, 2020
b3fce67
Fixing broken epoch url
Apr 12, 2020
38e38ae
Merge pull request #49 from AY1920S2-CS2103-W15-1/fix-epoch
JKOK005 Apr 12, 2020
d07e91b
Added use case diagram and dao router sequence diagram
Apr 12, 2020
d708528
Merge branch 'use-case-diagram' of https://github.com/AY1920S2-CS2103…
Apr 12, 2020
f926855
Merge pull request #47 from AY1920S2-CS2103-W15-1/use-case-diagram
Yujian-Fu Apr 12, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store

# Do not add docs folder
36 changes: 27 additions & 9 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
= Address Book (Level 3)
= Contact Tracing App
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/se-edu/addressbook-level3[image:https://travis-ci.org/AY1920S2-CS2103T-W15-1/main.svg?branch=master[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,9 +14,28 @@ 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.
*Contact Tracing App*
****
Contact Tracing APP is a efficient and lightweight tool for contact tracing for government managers and individual users.
This will help you save countless hours by collecting contact data and generate report automatically. Besides, this application provides a great privacy protect system to prevent privacy leak.
Worring about your health and want to know whether the area you live is safe now? Don't hesitate and start to try this app now!
****

*Who is it for?*
*****
- The government managers who want to get informantion about epidemic situation for their decision making.
- All citizens who want to know the situation of the spread of virus.
- Database developers who are working for collecting and managing the information about virus spreeading.
*****

*Features*
****
- Generate detailed reports from the app with several clicks.
- Identify anonymous individuals who are highly connected within the society for senior government officer.
- Identify hotpots where people tend to grather within the society.
- Individual users can get access with their personal information including citizenship ID, name, etc.
****


== Site Map

Expand All @@ -29,8 +47,8 @@ endif::[]

== Acknowledgements

* 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]

== Licence : link:LICENSE[MIT]



3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ dependencies {

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
implementation group: 'com.itextpdf', name: 'kernel', version: '7.0.4'
implementation group: 'com.itextpdf', name: 'layout', version: '7.1.9'
implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.1'

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

Expand Down
52 changes: 13 additions & 39 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,27 @@
: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} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
Covid-19 contact tracing App - 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>>]
This app was developed as an extension to AddressBook Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team.

Role: Team Lead +
Responsibilities: UI

'''
== Project Team

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Johan Kok
image::johankok.png[width="150", align="left"]
{empty}[http://www.johankzk.com/[homepage]] [https://github.com/JKOK005[github]]

Role: Developer +
Responsibilities: Data
Role: Minion
Responsibilities: UI + Backend

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Fu Yujian
image::yujian.jpeg[width="150", align="left"]
{empty}[https://github.com/Yujian-Fu[github]]

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Minion
Responsibilities: UI + Backend

'''

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

Role: Developer +
Responsibilities: UI

'''
4 changes: 2 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
: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/AY1920S2-CS2103-W15-1/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`
* *Email us* : You can also reach us at `johan.kok@u.nus.edu`
Loading