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

[W16-2] SocialCare #174

Open
wants to merge 897 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
897 commits
Select commit Hold shift + click to select a range
d7b3059
Statistics.java: Backend
AmabelYeo Nov 4, 2018
91b6871
Overview.java: Method for caculating number of events
AmabelYeo Nov 4, 2018
6bd52a4
Overview.java: Volunteer Demographic
AmabelYeo Nov 4, 2018
391430f
Add Overview panel and associated events
Kratious Nov 4, 2018
d71b4be
Add UI handling for overview command
Kratious Nov 4, 2018
88a9113
Add javadoc comments in MainWindow.java
Kratious Nov 4, 2018
fc8a69b
Merge pull request #219 from iMarbles/dev
Kratious Nov 4, 2018
9b4a35b
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/mai…
Kratious Nov 4, 2018
6d81d93
ExportCertCommand.java: Update design & contents of certificate
sharan8 Nov 4, 2018
31befb3
ExportCertCommand.java: Export for volunteers with records only
sharan8 Nov 4, 2018
095713a
Update tests to reflect exporting for volunteers with records only
sharan8 Nov 4, 2018
4aff101
ExportCertCommand.java: Add log message for folder creation
sharan8 Nov 4, 2018
4b075b2
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/mai…
sharan8 Nov 4, 2018
f240bed
ExportCertCommand.java: Remove redundant support for absent event rec…
sharan8 Nov 4, 2018
b61844a
Add panes for event overview
Kratious Nov 5, 2018
4544592
Add area for volunteer overview
Kratious Nov 5, 2018
7eef614
Merge pull request #221 from Kratious/event-management
AmabelYeo Nov 5, 2018
d59aacf
Overview: Added charts
AmabelYeo Nov 5, 2018
5c0632f
Add event type indicators in OverviewPanel.java
Kratious Nov 5, 2018
8e6cac1
OverviewPanel.java: Checkstyle
AmabelYeo Nov 5, 2018
5fd1803
Merge pull request #223 from iMarbles/dev
Kratious Nov 5, 2018
da0ff74
Fix formatting in OverviewPanel.fxml
Kratious Nov 5, 2018
cef0f5b
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/mai…
Kratious Nov 5, 2018
5cc13e9
Merge pull request #224 from Kratious/event-management
AmabelYeo Nov 5, 2018
d2b1410
PPP: Rename
AmabelYeo Nov 5, 2018
be2aeac
Overview: Chart Redraw
AmabelYeo Nov 5, 2018
47859f4
Merge pull request #225 from iMarbles/docs-PPP
Kratious Nov 5, 2018
6b7478c
Merge branch 'master' into docs-PPP
AmabelYeo Nov 5, 2018
982ab16
Merge pull request #226 from iMarbles/dev
Kratious Nov 5, 2018
e10e748
team: update adoc name
AmabelYeo Nov 5, 2018
c9f6f27
Merge branch 'master' into docs-PPP
AmabelYeo Nov 5, 2018
55c571f
Merge pull request #227 from iMarbles/docs-PPP
Kratious Nov 5, 2018
a16140b
Add TypicalVolunteersWithRecords.java
sharan8 Nov 5, 2018
e17df36
ExportCertCommandTest.java: Add support for model with records
sharan8 Nov 5, 2018
ecbdaca
CommandTestUtil.java: Remove redundant method
sharan8 Nov 5, 2018
bb4b67f
ExportCertCommand.java: Add info log if volunteer has no records
sharan8 Nov 5, 2018
5e149ce
ExportCertCommand.java: Fix grammar in exported cert
sharan8 Nov 5, 2018
2141f9b
SwitchCommand.java: Restore full list
AmabelYeo Nov 5, 2018
6702874
Merge pull request #228 from iMarbles/dev
Kratious Nov 5, 2018
5208941
OverviewPanel.java: Chart Fixes
AmabelYeo Nov 5, 2018
b6f605f
OverviewPanel.java: Fix Checkstyle
AmabelYeo Nov 5, 2018
641b841
Merge pull request #229 from iMarbles/dev
Kratious Nov 5, 2018
32f28ee
Update UI for graphs in OverviewPanel.java
Kratious Nov 5, 2018
63d4b15
Fix formatting in Custom.css
Kratious Nov 5, 2018
f77c7fd
Merge pull request #230 from Kratious/event-management
AmabelYeo Nov 5, 2018
21c6a0a
Add back export XML/CSV command and parsers
Scrubbius Nov 5, 2018
9862b23
Updated for checkstyle errors
Scrubbius Nov 5, 2018
8c4074b
Rename ExportEventXMLCommandParser.java to ExportEventXmlCommandParse…
Scrubbius Nov 5, 2018
a7f1023
Update for checkstyle errors
Scrubbius Nov 5, 2018
a128ae1
Merge branch 'master' of https://github.com/Scrubbius/main
Scrubbius Nov 5, 2018
cdb2c9d
no message
Scrubbius Nov 5, 2018
d75b703
import commands added
Scrubbius Nov 5, 2018
5b44503
Import commands added
Scrubbius Nov 5, 2018
aaff9ec
checkstyle fix
Scrubbius Nov 5, 2018
8efac0e
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/mai…
sharan8 Nov 5, 2018
02989d1
Update importcsvcommand
Scrubbius Nov 6, 2018
40d0d9e
Update checkstyle
Scrubbius Nov 6, 2018
b7ec682
checkstyle corrections
Scrubbius Nov 6, 2018
01bc12f
Update src/main/java/seedu/address/logic/commands/ExportEventXmlComma…
sharan8 Nov 6, 2018
59412ad
Update src/main/java/seedu/address/logic/commands/ImportVolunteerCsvC…
sharan8 Nov 6, 2018
84350ff
Update src/main/java/seedu/address/logic/commands/ImportVolunteerCsvC…
sharan8 Nov 6, 2018
eb59cc4
Update based on reviews
Scrubbius Nov 6, 2018
35e929f
Merge branch 'ImportCommands' of https://github.com/Scrubbius/main in…
Scrubbius Nov 6, 2018
c82b8e1
Fix compile error
Scrubbius Nov 6, 2018
d071a94
update for checkstyle
Scrubbius Nov 6, 2018
279d5f2
Update importvolunteercsv to read delimiters for csv in bracer and co…
Scrubbius Nov 6, 2018
5c77c98
Correcting syntax error in ImportVolunteerCsvCommand
Scrubbius Nov 6, 2018
5db2fd2
sharan8.adoc: Incorporated feedback from consultation
sharan8 Nov 6, 2018
46f6850
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/mai…
sharan8 Nov 6, 2018
990480b
ExportCertCommand.java: Replace '/' with File.separator
sharan8 Nov 6, 2018
fa22549
Rename certificate export folder to 'Certs'
sharan8 Nov 6, 2018
334ffac
ExportCertCommand.java: Update export success message
sharan8 Nov 6, 2018
1cfcb7f
ExportCertCommand.java: Improve grammar in certificate
sharan8 Nov 6, 2018
7cde001
Update CurrentVolunteerCert.png
sharan8 Nov 6, 2018
db6a0e9
UserGuide.adoc: Update expected `exportcert` success message
sharan8 Nov 6, 2018
ab7f65d
sharan8.adoc: Updated contributions and added links
sharan8 Nov 6, 2018
ce6a42d
Merge pull request #232 from Scrubbius/ImportCommands
AmabelYeo Nov 6, 2018
efef29b
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/mai…
Kratious Nov 6, 2018
a8dd5b7
imarbles.adoc: PPP Update with code contributed
AmabelYeo Nov 6, 2018
05f7774
Merge pull request #222 from sharan8/exportcert-command
AmabelYeo Nov 6, 2018
848946f
Add link to project code dashboard in kratious.adoc
Kratious Nov 6, 2018
34235ca
Merge branch 'ppp' of https://github.com/Kratious/main into ppp
Kratious Nov 6, 2018
45bd852
Merge pull request #187 from sharan8/ppp-sharan
AmabelYeo Nov 6, 2018
a3d67c7
Merge pull request #234 from iMarbles/docs-PPP
Kratious Nov 6, 2018
88926ae
Update version number in MainApp.java
Kratious Nov 6, 2018
36515dc
Merge pull request #185 from Kratious/ppp
AmabelYeo Nov 6, 2018
13be3c2
Add RecordContainsNonZeroHourPredicate.java
sharan8 Nov 6, 2018
d66904e
ExportCertCommand.java: Export only if hours contributed is positive
sharan8 Nov 6, 2018
f5ed6ee
UserGuide.adoc: Add note to `exportcert` section
sharan8 Nov 6, 2018
695efa7
ExportCertCommand.java: Update method naming
sharan8 Nov 6, 2018
c8f9c6a
Merge pull request #235 from sharan8/exportcert-command
AmabelYeo Nov 7, 2018
1de7a3d
Update version in MainApp.java
Kratious Nov 7, 2018
5f922c8
Merge pull request #237 from Kratious/event-management
AmabelYeo Nov 7, 2018
ebccad4
update for handling non null string
Scrubbius Nov 7, 2018
4ce3770
Merge pull request #238 from Scrubbius/ImportCommands
AmabelYeo Nov 7, 2018
08fcdde
MainWindow.java: Updated data origin
AmabelYeo Nov 7, 2018
325899f
Merge pull request #239 from iMarbles/master
Kratious Nov 7, 2018
de8d972
Update ExportVolunteerCsvCommandParser string delimiter
Scrubbius Nov 8, 2018
c107dcd
UserGuide.adoc: Overview and touchup
AmabelYeo Nov 10, 2018
4b7d127
Add Overview Panel Update Events
Kratious Nov 10, 2018
3921bcb
Remove unused import in OverviewPanel.fxml
Kratious Nov 10, 2018
1db7c97
Add Overview Panel trigger update events for Volunteer and Event Add,…
Kratious Nov 10, 2018
1413058
Add logging for events in MainWindow.java
Kratious Nov 10, 2018
0ac5af2
Separate Volunteer and Event statistic update methods in OverviewPane…
Kratious Nov 10, 2018
fde0c44
Merge pull request #242 from Kratious/event-management
AmabelYeo Nov 10, 2018
c29579d
Merge branch 'master' into docs-UG
AmabelYeo Nov 10, 2018
375a7f1
UserGuide.adoc: Delete format
AmabelYeo Nov 10, 2018
3e5bb3b
Fix javadocs type in EventPanel.java
Kratious Nov 10, 2018
9314db9
Fix invalid css property in Custom.css
Kratious Nov 10, 2018
73a8291
Add UI handlers for undo and redo command
Kratious Nov 10, 2018
fb5df80
Add Find command for Event context
Kratious Nov 10, 2018
833bee7
DeveloperGuide.adoc: Minor updates
AmabelYeo Nov 10, 2018
6f85e44
Updated Volunteer Class with new VolunteerId format
afiqlattif Nov 10, 2018
f0d96d7
logic/commands: Updated commands to support new VolunteerId format
afiqlattif Nov 10, 2018
8c7ad4f
logic/parser: Updated parsers to support new VolunteerId format
afiqlattif Nov 10, 2018
fb621ee
Updated Records to support new VolunteerId format
afiqlattif Nov 10, 2018
8cf6297
Updated SampleDataUtil and XmlAdaptedVolunteer with new VolunteerId f…
afiqlattif Nov 10, 2018
65485ee
Updated UI for updated VolunteerId format
afiqlattif Nov 10, 2018
b4de85d
DeveloperGuide.adoc: Restructure
AmabelYeo Nov 10, 2018
608b2f6
Updated test files to support updated VolunteerId format
afiqlattif Nov 10, 2018
eb8886b
Merge branch 'master' into update-volunteer-class
afiqlattif Nov 10, 2018
4a49e8b
Merge pull request #243 from Kratious/undo-redo-ui-fix
AmabelYeo Nov 10, 2018
1556348
Merge pull request #244 from Kratious/event-management
AmabelYeo Nov 10, 2018
7700996
Merge branch 'master' into update-volunteer-class
afiqlattif Nov 10, 2018
eecfd3d
Add sample events to SampleDataUtil.java
Kratious Nov 10, 2018
7a412d7
Removed Birthday restrictions
afiqlattif Nov 10, 2018
e13d920
Updated XmlAdaptedVolunteer to remove Birthday check
afiqlattif Nov 10, 2018
63660d4
Updated prefix from i/ to ic/, and changed comments to NRIC for clarity
afiqlattif Nov 10, 2018
d03c465
Updated test and commands to prevent NRIC from being edited
afiqlattif Nov 10, 2018
7399f82
Updated UI for Volunteer
afiqlattif Nov 10, 2018
566414e
Fixed Checkstyle
afiqlattif Nov 10, 2018
a0dc394
Fixed Checkstyle
afiqlattif Nov 10, 2018
47b9888
Merge pull request #246 from afiqlattif/update-volunteer-class
AmabelYeo Nov 11, 2018
46eeb9b
Merge pull request #247 from Kratious/event-management
AmabelYeo Nov 11, 2018
5d344b9
SampleDataUtil.java: Fixed record volunteerId
AmabelYeo Nov 11, 2018
f671b9b
SampleDataUtil.java: Updated Sample Data
AmabelYeo Nov 11, 2018
ac277fa
Merge pull request #248 from iMarbles/dev
Kratious Nov 11, 2018
1166427
DeveloperGuide.adoc: Updated commands
AmabelYeo Nov 11, 2018
cc82672
ExportCertCommand.java: Replace 'ID' with 'NRIC' in cert
sharan8 Nov 11, 2018
34c1b53
Merge pull request #245 from iMarbles/docs-DG
Kratious Nov 11, 2018
1e0168e
Merge pull request #241 from iMarbles/docs-UG
Kratious Nov 11, 2018
f5c36b1
Merge pull request #249 from sharan8/exportcert-command
AmabelYeo Nov 11, 2018
a3b12c4
DeveloperGuide.adoc: Remove duplicate section
AmabelYeo Nov 11, 2018
bb5bbfe
DeveloperGuide.adoc: Updated sequence diagrams
AmabelYeo Nov 11, 2018
33ebc89
AboutUs.adoc: Updated link to about us
AmabelYeo Nov 11, 2018
76ad597
Merge pull request #250 from iMarbles/docs-DG
Kratious Nov 11, 2018
181217e
PPP: Update tag
AmabelYeo Nov 11, 2018
8294742
Merge branch 'master' into docs-PPP
AmabelYeo Nov 11, 2018
bc2d9d5
Update auto incremend event id implementation in DeveloperGuide.adoc
Kratious Nov 11, 2018
2945426
PPP: Better intro
AmabelYeo Nov 11, 2018
af579a8
UserGuide.adoc: Scaling
AmabelYeo Nov 11, 2018
e679e8f
UserGuide.adoc: Scaling
AmabelYeo Nov 11, 2018
09bae62
UserGuide.adoc: Scaling
AmabelYeo Nov 11, 2018
f49ceea
Create CertGenerator.java
sharan8 Nov 11, 2018
1fb7d9a
UserGuide.adoc: 500 scale
AmabelYeo Nov 11, 2018
8c20cf6
ExportCertCommand.java: Refactor to use CertGenerator class
sharan8 Nov 11, 2018
70c7a01
Update tests to get save path from command object
sharan8 Nov 11, 2018
f5c2a11
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/mai…
sharan8 Nov 11, 2018
c909013
CommandTestUtil.java: Fix Checkstyle
sharan8 Nov 11, 2018
28d6642
ExportCertCommand.java: Change alt save path to 'user.dir'
sharan8 Nov 11, 2018
7e87071
Update CurrentVolunteerCert.png
sharan8 Nov 11, 2018
b15d821
UserGuide.adoc: Update `exportcert` section
sharan8 Nov 11, 2018
4bb42b0
Merge pull request #251 from iMarbles/docs-PPP
Kratious Nov 12, 2018
b6b1cc9
Add description and sequence diagram for Overview command implementat…
Kratious Nov 12, 2018
3d112ae
Merge pull request #252 from sharan8/exportcert-refactor
AmabelYeo Nov 12, 2018
139e1c0
Add code snippets and design considerations for Overview command in D…
Kratious Nov 12, 2018
427b5c6
Add end tag for Command implementation in DeveloperGuide.adoc
Kratious Nov 12, 2018
13166cd
Merge pull request #240 from Scrubbius/ImportCommands
AmabelYeo Nov 12, 2018
84fcba2
Create tests for Volunteer Class
afiqlattif Nov 12, 2018
20627c1
Update Birthday class to check for valid Birthday
afiqlattif Nov 12, 2018
f962b3e
Fixed formatting of AddCommand message
afiqlattif Nov 12, 2018
a36461f
Merge branch 'master' into update-volunteer-tests
afiqlattif Nov 12, 2018
0e2b94c
Remove redundant FinalVolunteerCert.png
sharan8 Nov 12, 2018
9579649
AboutUs.adoc: Update sharan8's responsibilities
sharan8 Nov 12, 2018
255c1de
UserGuide.adoc: Add `exportcert` flowchart
sharan8 Nov 12, 2018
41f5231
UserGuide.adoc: Resize current volunteer cert image
sharan8 Nov 12, 2018
d766d86
DeveloperGuide.adoc: Add `exportcert` activity diagram
sharan8 Nov 12, 2018
5599e04
DeveloperGuide.adoc: Resize current volunteer cert image
sharan8 Nov 12, 2018
5b93ccc
DeveloperGuide.adoc: Update `exportcert` export location
sharan8 Nov 12, 2018
0610f61
DeveloperGuide.adoc: Add `exportcert` sequence diagrams
sharan8 Nov 12, 2018
449839b
DeveloperGuide.adoc: Update `exportcert` design considerations
sharan8 Nov 12, 2018
4886b00
Merge pull request #254 from afiqlattif/update-volunteer-tests
AmabelYeo Nov 12, 2018
2ff3b16
DeveloperGuide.adoc: Switch command
AmabelYeo Nov 12, 2018
95f7085
CertGenerator.java: Update exported certificate
sharan8 Nov 12, 2018
326e3d7
DeveloperGuide.adoc: Manage command
AmabelYeo Nov 12, 2018
57ce9fc
Update CurrentVolunteerCert.png
sharan8 Nov 12, 2018
7558f44
CertGenerator.java: Set limit on number of records displayed
sharan8 Nov 12, 2018
ed2fa4f
Update docs for volunteer management
afiqlattif Nov 12, 2018
7b61c5c
Update PPP for afiqlattif
afiqlattif Nov 12, 2018
db3d426
Merge branch 'master' into update-docs
afiqlattif Nov 12, 2018
ea97554
DeveloperGuide.adoc: Language
AmabelYeo Nov 12, 2018
1c1321d
PPP: Reorder
AmabelYeo Nov 12, 2018
e045a42
DeveloperGuide.adoc: Minor spacing
AmabelYeo Nov 12, 2018
5486f3b
DeveloperGuide.adoc: Spacing
AmabelYeo Nov 12, 2018
3e0cf32
Merge branch 'master' into dg-documentation
Kratious Nov 12, 2018
215cbb2
UserGuide.adoc: Language
AmabelYeo Nov 12, 2018
f05274b
CertGenerator.java: Refactor methods and class fields
sharan8 Nov 12, 2018
a9d220d
Merge branch 'exportcert-command' into exportcert-developerguide
sharan8 Nov 12, 2018
76b7957
DeveloperGuide.adoc: Language
AmabelYeo Nov 12, 2018
5ec1587
UserGuide.adoc: Update exported certificate contents
sharan8 Nov 12, 2018
92f17f1
Update overview for kratious.adoc
Kratious Nov 12, 2018
a255abb
Merge pull request #253 from Kratious/dg-documentation
AmabelYeo Nov 12, 2018
bf0137a
Merge branch 'master' into docs-DG
AmabelYeo Nov 12, 2018
255bf10
CertGenerator.java: Fix total hour count bug
sharan8 Nov 12, 2018
a40916d
DeveloperGuide.adoc: Update exported certificate contents
sharan8 Nov 12, 2018
2904b0f
imarbles.adoc: Overview
AmabelYeo Nov 12, 2018
bd9a07d
Filter excerpts from Guides for sharan8.adoc
sharan8 Nov 12, 2018
f1ec616
imarbles.adoc: language
AmabelYeo Nov 12, 2018
4c0b003
imarbles.adoc: overview
AmabelYeo Nov 12, 2018
3585a76
imarbles.adoc: overview
AmabelYeo Nov 12, 2018
49e3cb8
imarbles.adoc: Bullet points
AmabelYeo Nov 12, 2018
9157ab7
Update missing image in delete command in UserGuide.adoc
Kratious Nov 12, 2018
e45c54c
PPP: language
AmabelYeo Nov 12, 2018
79c9395
ppp: language
AmabelYeo Nov 12, 2018
5919fb6
ppp: language
AmabelYeo Nov 12, 2018
36637a0
UserGuide.adoc: Supplement certificate description
sharan8 Nov 12, 2018
75fe649
sharan8.adoc: Update contributions
sharan8 Nov 12, 2018
123f22b
Added Sequence Diagram for Add Command portion of DeveloperGuide.adoc
afiqlattif Nov 12, 2018
5219f9c
Merge branch 'master' into update-docs
afiqlattif Nov 12, 2018
58d9077
UserGuide.adoc: language
AmabelYeo Nov 12, 2018
9193384
DeveloperGuide.adoc: Added 'Add Volunteer Command' section in Impleme…
afiqlattif Nov 12, 2018
215fa03
afiqlattif.adoc: Updated PPP
afiqlattif Nov 12, 2018
74e64bb
DeveloperGuide.adoc: manage command
AmabelYeo Nov 12, 2018
2fe6421
Fixed Checkstyle
afiqlattif Nov 12, 2018
2168f8d
DeveloperGuide.adoc: switch command
AmabelYeo Nov 12, 2018
832f376
Language
AmabelYeo Nov 12, 2018
92557e5
UserGuide.adoc: Consistency
AmabelYeo Nov 12, 2018
065dd30
Consistency
AmabelYeo Nov 12, 2018
14976df
Update PPP for kratious.adoc
Kratious Nov 12, 2018
453ba7e
Update PPP for afiqlattif
afiqlattif Nov 12, 2018
70b5214
Merge pull request #255 from iMarbles/docs-DG
Kratious Nov 12, 2018
667ca19
Resize images in event management section of UserGuide.adoc
Kratious Nov 12, 2018
de2585e
Resize images for volunteer management
afiqlattif Nov 12, 2018
eddac33
Remove comments from code snippets in DeveloperGuide.adoc
Kratious Nov 12, 2018
5797305
Remove PR references from kratious.adoc
Kratious Nov 12, 2018
42c98d7
Remove PR reference in kratious.adoc
Kratious Nov 12, 2018
5664fb0
Update sharan8.adoc PPP
sharan8 Nov 12, 2018
6dc8dc9
imarbles.adoc: s
AmabelYeo Nov 12, 2018
9c473c9
sharan8.adoc: Cut word count to reduce number of pages
sharan8 Nov 12, 2018
f2a8e8b
Guides: Reduce image sizes
sharan8 Nov 12, 2018
534009e
Merge pull request #260 from iMarbles/master
Kratious Nov 12, 2018
68432a4
Merge pull request #259 from Kratious/dg-documentation
AmabelYeo Nov 12, 2018
9709df6
DeveloperGuide.adoc: Clean up appendix section
sharan8 Nov 12, 2018
03960d8
Merge pull request #257 from afiqlattif/update-docs
AmabelYeo Nov 12, 2018
e401482
Merge branch 'master' of https://github.com/CS2103-AY1819S1-W16-2/mai…
sharan8 Nov 12, 2018
37055c6
Merge pull request #256 from sharan8/exportcert-command
AmabelYeo Nov 12, 2018
911b43c
Update Ui.png
Kratious Nov 12, 2018
855dd3d
Fix conflicts
sharan8 Nov 12, 2018
245ba8d
Merge pull request #258 from sharan8/exportcert-developerguide
AmabelYeo Nov 12, 2018
65a198e
Merge pull request #261 from Kratious/dg-documentation
AmabelYeo Nov 12, 2018
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
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lib/*
*.log
*.log.*
*.csv
config.json
/config.json
src/test/data/sandbox/
preferences.json
.DS_Store
Expand All @@ -18,3 +18,4 @@ classes/
/bin/
src/main/resources/docs/
out/
Certs/
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MIT License

Copyright (c) 2016 Software Engineering Education - FOSS Resources

Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any volunteer obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
Expand Down
29 changes: 15 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
= Address Book (Level 4)
= SocialCare
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://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/CS2103-AY1819S1-W16-2/main[image:https://travis-ci.org/CS2103-AY1819S1-W16-2/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/Kratious/main[image:https://ci.appveyor.com/api/projects/status/suon744fyw9kqi3x?svg=true[Build status]]
https://coveralls.io/github/CS2103-AY1819S1-W16-2/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-W16-2/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,24 +13,27 @@ 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.
* 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.
* SocialCare is a social welfare event and volunteer management system. It is a desktop application and has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is *written in OOP fashion*, and is morphed from the https://se-edu.github.io/docs/Team.html[se-edu] team's https://github.com/nus-cs2103-AY1819S1/addressbook-level4[Address Book - Level 4], which 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 application is intended for social welfare organisations that want to better manage their volunteers & events, and export volunteer certificates.
* SocialCare allows users to:
** Manage contacts and events faster than a typical mouse/GUI driven app.
** Use tags to categorize events and volunteers.
** Manage additional volunteer data, such as number of service hours per volunteer.
** Export volunteer certificates detailing each volunteer's involvement in the organisation's events.


== Site Map

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

== Acknowledgements

* This application is based on https://github.com/nus-cs2103-AY1819S1/addressbook-level4[Address Book - Level 4] developed by
the https://se-edu.github.io/docs/Team.html[se-edu] team.
* 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
30 changes: 30 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"authors":
[
{
"githubId": "afiqlattif",
"displayName": "MUHAM...ATTIF",
"authorNames": ["afiqlattif", "Afiq Lattif"]
},
{
"githubId": "Scrubbius",
"displayName": "NGOH ...N JUN",
"authorNames": ["Scrubbius"]
},
{
"githubId": "Kratious",
"displayName": "SEM J...G HAN",
"authorNames": ["Kratious"]
},
{
"githubId": "sharan8",
"displayName": "THANG...HARAN",
"authorNames": ["sharan8", "Sharan"]
},
{
"githubId": "iMarbles",
"displayName": "YEO Y...MABEL",
"authorNames": ["iMarbles"]
}
]
}
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ dependencies {
testRuntimeOnly group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-9+181'
testRuntimeOnly group:'org.junit.vintage', name:'junit-vintage-engine', version: jUnitVersion
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion

compile 'org.apache.pdfbox:pdfbox:2.0.2'
}

shadowJar {
Expand Down Expand Up @@ -207,9 +209,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-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
'site-name': 'SocialCare',
'site-githuburl': 'https://github.com/CS2103-AY1819S1-W16-2/main'
]

options['template_dirs'].each {
Expand Down
46 changes: 21 additions & 25 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,49 @@
: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.}_ +
{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>>]
=== Afiq Lattif
image::afiqlattif.png[width="150", align="left"]
{empty}[https://github.com/afiqlattif[github]] [<<afiqlattif#, portfolio>>]

Role: Project Advisor
Role: Developer +
Responsibilities: Volunteer Management Feature

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Event Management Feature

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Amabel Yeo
image::imarbles.png[width="150", align="left"]
{empty}[https://github.com/iMarbles[github]] [<<amabelyeo#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: Assignment of Volunteers Feature

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Statistics Feature

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Data Management Feature

'''
Loading