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

V1.2 #80

Open
wants to merge 299 commits into
base: master
Choose a base branch
from
Open

V1.2 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
299 commits
Select commit Hold shift + click to select a range
296add0
Merge pull request #19 from brandonccm1996/timetable
brandonccm1996 Sep 19, 2018
4921934
Xinyan W6.10
chokxy Sep 19, 2018
da07817
Test Commit for v1.1 branch
xShaivan Sep 20, 2018
59ea6d2
Added empty Command: addhist
xShaivan Sep 20, 2018
510696d
addhist Command accepts arguments
xShaivan Sep 20, 2018
db20113
Model: Created MedHistory Class
xShaivan Sep 22, 2018
179ce8b
UI: Added placeholder for medhistory in GUI
xShaivan Sep 22, 2018
e509b82
Model: Modify Person Class to support MedHistory Field
xShaivan Sep 22, 2018
d8cebbe
Storage: Added MedHistory field to XmlAdaptedPerson class
xShaivan Sep 22, 2018
e2cc31a
Test: Added withMedHistory() command in PersonBuilder
xShaivan Sep 22, 2018
fcc10d3
UI: Connect MedHistory field to PersonCard
xShaivan Sep 22, 2018
60ac69b
Logic: Implement AddHistCommand execute() logic
xShaivan Sep 22, 2018
1e91964
Merge branch 'v1.1' into v1.1
xShaivan Sep 22, 2018
4ecb410
Cleared trailing whitespaces
xShaivan Sep 22, 2018
7ef13e6
Corrected Travis Errors part 1
xShaivan Sep 23, 2018
ce4dc7c
Corrected Travis Errors part 1
xShaivan Sep 23, 2018
f145e6b
Corrected Travis Errors part 3
xShaivan Sep 23, 2018
35e72e0
Corrected Travis Errors part 4
xShaivan Sep 23, 2018
c9e0704
Corrected Travis Errors part 5
xShaivan Sep 23, 2018
7afd724
Add Codacy badge
codacy-badger Sep 23, 2018
fb28645
Merge pull request #24 from codacy-badger/codacy-badge
xhxh96 Sep 23, 2018
4cd8dad
Updated README.adoc
xhxh96 Sep 23, 2018
7934ae0
Added AddMedicalReportCommand
chewkahmeng Sep 23, 2018
9f87122
Edited Travis errors
chokxy Sep 23, 2018
9a53789
Merge branch 'v1.1' into IndividualFeature
chewkahmeng Sep 23, 2018
1ea604b
Rectified some style mistakes
chewkahmeng Sep 23, 2018
44e0cc4
Merge remote-tracking branch 'origin/IndividualFeature' into Individu…
chewkahmeng Sep 23, 2018
346fd8d
Rectified some style mistakes
chewkahmeng Sep 23, 2018
d5f32d1
Model: Add Appt class (currently only contains 1 String of ApptInfo)
brandonccm1996 Sep 23, 2018
8ce9857
Rectified some style mistakes
chewkahmeng Sep 23, 2018
e0d4cfe
Rectified some style mistakes
chewkahmeng Sep 23, 2018
b796472
Rectified some style mistakes
chewkahmeng Sep 23, 2018
7bf3974
Ui: Add a placeholder for appt in PersonCard GUI
brandonccm1996 Sep 23, 2018
decc4a0
Rectified some style mistakes in test
chewkahmeng Sep 23, 2018
60dc927
Rectified some style mistakes in test
chewkahmeng Sep 23, 2018
3ace462
Rectified some styling errors
chewkahmeng Sep 23, 2018
2595066
Minor changes in variable name in tests
brandonccm1996 Sep 24, 2018
79e5b04
Model: Modify Person to support an Appt field
brandonccm1996 Sep 24, 2018
ae15a18
Storage: Add Appt field to XmlAdaptedPerson class
brandonccm1996 Sep 24, 2018
f96f345
Test: Add withAppt() for PersonBuilder
brandonccm1996 Sep 24, 2018
b25292a
Ui: Connect Appt field to PersonCard
brandonccm1996 Sep 24, 2018
2141a98
Logic: Implement AddApptCommand execute() logic
brandonccm1996 Sep 24, 2018
f277e06
Rectified style errors
brandonccm1996 Sep 25, 2018
9147753
Corrected Travis Errors part 6
xShaivan Sep 25, 2018
0a064e6
Corrected Travis Errors part 7
xShaivan Sep 25, 2018
db8b53a
Corrected Travis Errors part 8
xShaivan Sep 25, 2018
e13410d
Corrected Travis Errors part 9
xShaivan Sep 25, 2018
c69a493
Codacy style changes: Removed underscores.
xShaivan Sep 25, 2018
0c9d193
Added classes for fields in Appt
brandonccm1996 Sep 25, 2018
69b20f2
Made Appt String value private and edited other classes correspoondingly
brandonccm1996 Sep 25, 2018
b43bfe0
Edited Appt class to contain subfields and edited Appt tests and eg
brandonccm1996 Sep 25, 2018
aba31ea
Edited AddApptCommand and some Parser and ParserUtil classes
brandonccm1996 Sep 25, 2018
a3d6828
Edited some Command tests and Parser tests
brandonccm1996 Sep 25, 2018
cd31038
Minor changes in Appt and XmlAdaptedPerson, commented out AddApptTest
brandonccm1996 Sep 26, 2018
7c32ff0
Modified XmlAdaptedPerson to take in subfields of Appt instead of Appt
brandonccm1996 Sep 26, 2018
e7f469c
Added XmlAdaptedAppt class but not integrated it in yet
brandonccm1996 Sep 26, 2018
89bb05b
Merge pull request #3 from CS2113-AY1819S1-T12-2/master
xhxh96 Sep 27, 2018
711b78c
Merge pull request #4 from xhxh96/master
xhxh96 Sep 27, 2018
78fc2a7
Created addinfo command
xhxh96 Sep 29, 2018
a2adbf6
Fixed Styling Issues
xhxh96 Sep 29, 2018
12cafae
Fixed Styling Issues
xhxh96 Sep 29, 2018
0c67c2e
Codacy style changes: Removed underscores.
xShaivan Sep 25, 2018
961b7ea
Merge remote-tracking branch 'origin/v1.1' into v1.1
xShaivan Sep 30, 2018
6cec17b
Implemented Adding of NRIC via addinfo
xhxh96 Oct 1, 2018
6c2ca52
Fixed styling issues
xhxh96 Oct 1, 2018
fd7d50b
Merge pull request #26 from chokxy/master
brandonccm1996 Oct 1, 2018
77c7323
Merge pull request #27 from brandonccm1996/timetable
brandonccm1996 Oct 1, 2018
ae37cab
Fixed Failure of Test Cases
xhxh96 Oct 1, 2018
3fe6494
Merge branch 'v1.1' into v1.1
xhxh96 Oct 1, 2018
3d1d7b3
Update EditCommand.java
xhxh96 Oct 1, 2018
e9da634
Merge branch 'v1.1' into v1.1
brandonccm1996 Oct 1, 2018
4e79fad
Update AddInfoCommand.java
xhxh96 Oct 1, 2018
5daa821
Forgot a closing curly bracket
brandonccm1996 Oct 1, 2018
9dc3967
Made some changes to areas where Person class is called
brandonccm1996 Oct 1, 2018
c78ba27
Resolved Conflict
xhxh96 Oct 1, 2018
aa493f4
Fixed Styling Issues
xhxh96 Oct 1, 2018
8fef991
Resolved style errors
brandonccm1996 Oct 1, 2018
d35bf32
Merge pull request #23 from xShaivan/v1.1
brandonccm1996 Oct 1, 2018
2690411
Fixed Styling Issues
xhxh96 Oct 1, 2018
9cb2cdc
Merge branch 'v1.1' into IndividualFeature
brandonccm1996 Oct 1, 2018
0449b2f
Made some changes to areas where Person class is called
brandonccm1996 Oct 1, 2018
2021a39
Rectified style errors
brandonccm1996 Oct 1, 2018
b838475
Merge pull request #25 from chewkahmeng/IndividualFeature
brandonccm1996 Oct 1, 2018
faa9e89
Merge upstream repo v1.1 branch
xhxh96 Oct 2, 2018
d173a76
Fixed compiling error
xhxh96 Oct 2, 2018
f9cb15f
Fixed Styling Issues
xhxh96 Oct 2, 2018
6924a2e
Merge pull request #29 from xhxh96/v1.1
xhxh96 Oct 2, 2018
4c1b373
Merge branch 'v1.1'
brandonccm1996 Oct 3, 2018
2d70570
Merge branch 'master' into master
xhxh96 Oct 3, 2018
57d947c
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/master'
brandonccm1996 Oct 3, 2018
adf0320
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/master' into Indi…
chewkahmeng Oct 4, 2018
7a8faf3
Merge remote-tracking branch 'HealthBook_ORG/master'
xShaivan Oct 4, 2018
31f37e7
Changed all AboutUs profile photos to png format
brandonccm1996 Oct 4, 2018
8745675
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/master' into time…
brandonccm1996 Oct 4, 2018
3119219
Merge remote-tracking branch 'HealthBook_ORG/master'
xShaivan Oct 4, 2018
16da889
Model: Created medhistory class
xShaivan Oct 4, 2018
6471e6e
Modified some xml files to pass xml tests
brandonccm1996 Oct 4, 2018
12554b0
Fixed AddApptCommandParserTest error by standardising all constants
brandonccm1996 Oct 4, 2018
5488b0c
Fixed PersonListPanelTest and AddCommandSystemTest errors
brandonccm1996 Oct 4, 2018
39d029c
Made AddMedicalReport Command take in 3 fields
chewkahmeng Oct 4, 2018
78b3297
Rectified style errors
chewkahmeng Oct 4, 2018
d6e0ee7
Rectified style errors
chewkahmeng Oct 4, 2018
7224d94
Rectified style errors in tests
chewkahmeng Oct 4, 2018
345c3ef
Rectified style errors in tests
chewkahmeng Oct 4, 2018
7679fce
Merge pull request #1 from CS2113-AY1819S1-T12-2/master
chokxy Oct 5, 2018
2792209
Deleted AddApptCommandTest for now
brandonccm1996 Oct 9, 2018
c5b0637
Rectified style errors
brandonccm1996 Oct 9, 2018
75b653e
Updated Parser
xShaivan Oct 10, 2018
fc47c6c
Update AboutUs.adoc
brandonccm1996 Oct 10, 2018
24e5b89
Updated XmlAdaptedPerson/XmlAdaptedMedHistory
xShaivan Oct 10, 2018
3574a52
Merge pull request #34 from brandonccm1996/timetable_v1.2
brandonccm1996 Oct 10, 2018
bc33d7b
Corrected imports and files
xShaivan Oct 10, 2018
316aa2a
Merge branch 'v1.2' into IndividualFeature
brandonccm1996 Oct 10, 2018
e7c7913
Corrected sample addhist command in GUI
xShaivan Oct 10, 2018
e971a7c
Rectified style errors
brandonccm1996 Oct 10, 2018
1279fc3
Rectified style errors
brandonccm1996 Oct 10, 2018
8815f76
Rectified style errors
brandonccm1996 Oct 10, 2018
50a539d
Merge pull request #32 from chewkahmeng/IndividualFeature
brandonccm1996 Oct 10, 2018
e54d9c8
Ui: Attempted to fix display on PersonCard
xShaivan Oct 10, 2018
1b07305
Merge branch 'v1.2' into v1.2
xShaivan Oct 10, 2018
0ff15d7
Replaced all instances of Date with MedHistDate
xShaivan Oct 10, 2018
26c3daa
Corrected Travis Errors 1
xShaivan Oct 10, 2018
f3994b1
Optimized all imports using Intellij IDE
xShaivan Oct 10, 2018
bf2b94d
Corrected Travis Errors 2
xShaivan Oct 10, 2018
cffde2f
Corrected Travis Errors 3
xShaivan Oct 10, 2018
13a1096
Implemented NRIC validity checker and DOB class
xhxh96 Oct 10, 2018
77fa931
Added MedHistoryBuilder in test files
xShaivan Oct 10, 2018
92419e8
Code optimization
xhxh96 Oct 10, 2018
e39f28f
Optimized imports and updated AddHistTest.java
xShaivan Oct 10, 2018
9ac47f6
Optimized 1 import
xShaivan Oct 10, 2018
226acea
Merge pull request #35 from xhxh96/v1.2
brandonccm1996 Oct 10, 2018
43b9cd1
Merge pull request #33 from xShaivan/v1.2
brandonccm1996 Oct 10, 2018
95db3c6
Merge pull request #36 from CS2113-AY1819S1-T12-2/v1.2
brandonccm1996 Oct 10, 2018
c312693
Parse find by static attributes (Name, Phone, Email, Address)
chokxy Oct 10, 2018
21aba0b
Parse find by static attributes (Name, Phone, Email, Address)
chokxy Oct 10, 2018
b520f0a
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/midv1.2_branch_to…
chewkahmeng Oct 11, 2018
3af87d0
Merge branch 'CS2113-AY1819S1-T12-2/midv1.2_branch_to_merge_from(neve…
brandonccm1996 Oct 11, 2018
714e013
Merge remote-tracking branch 'HealthBook_ORG/v1.2' into v1.2
xShaivan Oct 12, 2018
258436b
Deleted AddressBook.xml
xShaivan Oct 12, 2018
74986d8
Removed Trailing whitespace.
xShaivan Oct 12, 2018
930dea0
Changed date to medHistDate for MedHistory
xShaivan Oct 12, 2018
c0f5a90
Corrected AddHistCommandParserTest.java
xShaivan Oct 12, 2018
70e22a1
modified TypicalMedHistory.java
xShaivan Oct 12, 2018
a39fc3d
Optimized imports
xShaivan Oct 12, 2018
e844509
modified MEDHISTORY2 in TypicalMedHistory.java
xShaivan Oct 12, 2018
692e7c4
Corrected typo error in AddHistTest.java
xShaivan Oct 12, 2018
ece6868
Changed variables in MedHistoryBuilder.java
xShaivan Oct 12, 2018
9c98b4f
modified typicalPersonsAddressBook.xml
xShaivan Oct 12, 2018
6c3eca6
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/midv1.2_branch_to…
brandonccm1996 Oct 12, 2018
d945ff4
modified PersonCard.java
xShaivan Oct 12, 2018
aa0a4ef
Modified MedHistory.Java to show on GUI
xShaivan Oct 12, 2018
e3e0759
Merge pull request #39 from xShaivan/v1.2
brandonccm1996 Oct 12, 2018
31c97e1
Merge pull request #40 from CS2113-AY1819S1-T12-2/v1.2
brandonccm1996 Oct 12, 2018
164bb36
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/master'
brandonccm1996 Oct 12, 2018
05a0401
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/master' into time…
brandonccm1996 Oct 12, 2018
0cba5aa
Some minor re-ordering and comments for clarity
brandonccm1996 Oct 12, 2018
c61c3e4
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/master'
brandonccm1996 Oct 12, 2018
b9ccad9
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/master' into time…
brandonccm1996 Oct 12, 2018
0541465
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/v1.2' into Indivi…
chewkahmeng Oct 12, 2018
b833cf6
Modified Person to accept a list of Appts
brandonccm1996 Oct 12, 2018
af7bff9
Modified non-test code to fit Person having a list of Appts
brandonccm1996 Oct 13, 2018
f7525f4
Modified test code to fit Person having a list of Appts
brandonccm1996 Oct 13, 2018
d303120
Modified ui for Person to have a List of Appts (feature now works)
brandonccm1996 Oct 13, 2018
d39f4a4
Fixed EditCommandSystemTestError
brandonccm1996 Oct 13, 2018
838c883
Minor changes for clarity
brandonccm1996 Oct 13, 2018
5fad2a3
Rectified checkstyle errors
brandonccm1996 Oct 13, 2018
5abea27
Added AddApptCommandTest (but may add more tests to it in future)
brandonccm1996 Oct 14, 2018
46ccb14
Made addreport command able to add a list of reports
chewkahmeng Oct 15, 2018
7c4e16d
Modified test code to pass headless tests
chewkahmeng Oct 15, 2018
59b6cba
Rectified style errors
chewkahmeng Oct 15, 2018
b90abc7
Merge remote-tracking branch 'HealthBook_ORG/v1.2' into v1.2
xShaivan Oct 16, 2018
789c15d
Merge branch 'v1.2'
xShaivan Oct 16, 2018
9f9795a
Changed medHistory to Set of medHistories (WIP)
xShaivan Oct 16, 2018
64ef99f
Merge branch 'v1.3' into v1.3
xShaivan Oct 16, 2018
9ea06a2
Minor changes
brandonccm1996 Oct 16, 2018
53a5d3d
Additional Info Multiple Argument and Date of Birth
xhxh96 Oct 16, 2018
fea9d72
Updated Date of Birth Exception Handling
xhxh96 Oct 16, 2018
21aa332
Added AddReportCommandTest and AddReportCommandParserTest
chewkahmeng Oct 16, 2018
01db716
Rectified style errors
chewkahmeng Oct 16, 2018
0f09141
Updated JUnit Test for AddInfoCommand
xhxh96 Oct 17, 2018
caa62d0
Finished main code. In working order.
xShaivan Oct 17, 2018
7652e79
Removed unused imports (Codacy)
xShaivan Oct 17, 2018
a585fd2
Corrected checkstyle errors (Travis)
xShaivan Oct 17, 2018
550936e
Corrected checkstyle errors 2 (Travis)
xShaivan Oct 17, 2018
78436e3
Corrected checkstyle errors 3 (Travis)
xShaivan Oct 17, 2018
63db762
Corrected checkstyle errors 4 (Travis)
xShaivan Oct 17, 2018
4574819
Attempted to correct assertion error at XmlUtilTest.java
xShaivan Oct 17, 2018
51c9397
Attempted to correct assertion error at XmlUtilTest.java part 2
xShaivan Oct 17, 2018
faa1f0c
Rectified error in EditCommandSystemTest.java
xShaivan Oct 17, 2018
65b4922
Rectified careless mistake
xShaivan Oct 17, 2018
502463e
Updated UserGuide.adoc with `addhist` command
xShaivan Oct 17, 2018
f1929d6
Updated AddInfoCommandTest
xhxh96 Oct 17, 2018
0209d53
Syntax error correction
xShaivan Oct 17, 2018
d256910
Update DeveloperGuide.adoc
brandonccm1996 Oct 17, 2018
6b6270f
Updated DG: current implementation of addhist command
xShaivan Oct 17, 2018
379b65d
Update DeveloperGuide.adoc
brandonccm1996 Oct 17, 2018
758d4b2
Added sequence diagram for addappt
brandonccm1996 Oct 17, 2018
15b264e
Merge remote-tracking branch 'CS2113-AY1819S1-T12-2/master'
chewkahmeng Oct 17, 2018
50574d5
Rectified checkstyle errors
brandonccm1996 Oct 17, 2018
ca695b4
Merge pull request #57 from brandonccm1996/documentation
brandonccm1996 Oct 17, 2018
a11edb7
Merge pull request #45 from brandonccm1996/timetable_v1.2
brandonccm1996 Oct 17, 2018
80a79b2
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 17, 2018
32bd636
Merge branch 'v1.2' into IndividualFeature
brandonccm1996 Oct 17, 2018
7f43bc1
Rectified some mistakes
brandonccm1996 Oct 17, 2018
e1dae24
Rectified some mistakes
brandonccm1996 Oct 17, 2018
9be4aa1
Rectified checkstyle errors
brandonccm1996 Oct 17, 2018
fcfe47e
Rectified checkstyle errors
brandonccm1996 Oct 17, 2018
914a46b
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 17, 2018
b03cd84
Updated JUnit Test for AddInfoCommand
xhxh96 Oct 17, 2018
a6062ac
Merge pull request #47 from chewkahmeng/IndividualFeature
brandonccm1996 Oct 17, 2018
09917fe
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 17, 2018
45a577c
Updated user guide and developer guide
chewkahmeng Oct 17, 2018
d2f09d8
Fixed checkstyle errors
xhxh96 Oct 17, 2018
84d7a1b
Merge branch 'master' into Documentation
chewkahmeng Oct 17, 2018
6fe08fb
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 17, 2018
4a46cca
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 17, 2018
e8a0960
Merge pull request #59 from chewkahmeng/Documentation
chewkahmeng Oct 17, 2018
cec249d
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 17, 2018
330967b
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 17, 2018
c9d7365
Updated User Guide and Developer Guide for addinfo
xhxh96 Oct 17, 2018
1194876
Merge branch 'v1.2' into v1.3
brandonccm1996 Oct 17, 2018
04d8017
Rectified mistakes
brandonccm1996 Oct 17, 2018
2b3f6d5
Merge branch 'master' into Documentation
xhxh96 Oct 17, 2018
3d36ab3
Rectified checkstyle errors
brandonccm1996 Oct 17, 2018
21e0931
Rectified checkstyle errors
brandonccm1996 Oct 17, 2018
4cd82f7
Merge pull request #56 from xShaivan/Documentation
xhxh96 Oct 17, 2018
ed20635
Merge branch 'master' into documentation
xhxh96 Oct 17, 2018
fd5047f
Rectified checkstyle errors
brandonccm1996 Oct 17, 2018
74084fb
Merge pull request #68 from xhxh96/documentation
xhxh96 Oct 17, 2018
bc05bf7
Standardised EditCommandSystemTest
brandonccm1996 Oct 17, 2018
190e284
Merge pull request #50 from xShaivan/v1.3
brandonccm1996 Oct 17, 2018
abd1746
Merge branch 'v1.2' into v1.2
brandonccm1996 Oct 17, 2018
2c40764
Rectified mistakes
brandonccm1996 Oct 17, 2018
b0cf96f
Merge pull request #52 from xhxh96/v1.2
brandonccm1996 Oct 17, 2018
2d0f791
Merge pull request #58 from chokxy/v1.2
brandonccm1996 Oct 17, 2018
c52d370
Merge branch 'master' into v1.2
brandonccm1996 Oct 17, 2018
9a8b972
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 17, 2018
392c54b
Merge remote-tracking branch 'remotes/Organisation-repo/midv1.2_branc…
chokxy Oct 18, 2018
347b53c
Merge remote-tracking branch 'remotes/origin-org/passAllTests_endv1.2…
xhxh96 Oct 18, 2018
35e50aa
Merge remote-tracking branch 'origin/v1.2' into v1.2
xhxh96 Oct 18, 2018
9ea24e7
Fixed errors
xhxh96 Oct 18, 2018
969ceee
Merge pull request #76 from xhxh96/v1.2
xhxh96 Oct 18, 2018
c71163e
Merge remote-tracking branch 'remotes/Organisation-repo/v1.2' into v1.2
chokxy Oct 18, 2018
cb3bc90
Find by name, phone, email, address and tag by specifying prefixes be…
chokxy Oct 18, 2018
dfdee10
Merge pull request #77 from chokxy/v1.2
chokxy Oct 18, 2018
67a3259
Updated JUnit Test
xhxh96 Oct 18, 2018
f01fb42
Fix checkstyle error
xhxh96 Oct 18, 2018
75ddc42
Fix checkstyle error
xhxh96 Oct 18, 2018
39a9bf8
Fix checkstyle error
xhxh96 Oct 18, 2018
5816bfd
Merge pull request #79 from CS2113-AY1819S1-T12-2/v1.2-updated
xhxh96 Oct 18, 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
26 changes: 10 additions & 16 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,38 +1,32 @@
= Address Book (Level 4)
= Health Book

ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/nusCS2113-AY1819S1/addressbook-level4[image:https://travis-ci.org/nusCS2113-AY1819S1/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]]
https://travis-ci.org/CS2113-AY1819S1-T12-2/main[image:https://travis-ci.org/CS2113-AY1819S1-T12-2/main.svg?branch=master[Build Status]]
https://app.codacy.com/app/xhxh96/main?utm_source=github.com&utm_medium=referral&utm_content=CS2113-AY1819S1-T12-2/main&utm_campaign=Badge_Grade_Dashboard[image:https://api.codacy.com/project/badge/Grade/b3b9161e1b4a424aa5d1da1a6e759be6[Codacy Badge]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
image::docs/images/MockUi.png[width="600"]
endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
image::images/MockUi.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.
Health Book is a desktop address book application targeted at health care professionals who seek to retrieve their patients' personal details and health-related information all in one place.
The application provides both a Command Line Interface (CLI) for input of data and a Graphical User Interface (GUI) for displaying of output (patient's personal details and health-related information).
The application is fully written in Java, allowing cross-platform compatibility.

== Site Map

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

== Acknowledgements

* This application is a fork of the original Address Book 4 application by https://github.com/se-edu/[SE-Edu Initiatives].
* 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://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/junit5[JUnit5]
Expand Down
Binary file added addressbook.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-name': 'Health Book',
'site-githuburl': 'https://github.com/CS2113-AY1819S1-T12-2/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
48 changes: 21 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,47 @@
: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.}_ +
Health Book was developed by the https://github.com/CS2113-AY1819S1-T12-2[T12-2] team. +
{empty} +
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>>]
=== Hovan Tan Fang Hao
image::xshaivan.png[width="150", align="left"]
{empty}[https://github.com/xShaivan[github]]

Role: Project Advisor
Role: Project Manager

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Development Lead

'''

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

Role: Developer +
Responsibilities: Data
Role: Quality Assurance Lead

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
=== Chok Xin Yan
image::chokxy.png[width="150", align="left"]
{empty}[http://github.com/chokxy[github]]
Role: Design Lead

'''

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

Role: Developer +
Responsibilities: UI
Role: Subject Matter Expert

'''
Loading