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.5rc][F12-B4] HuatAh! #75

Open
wants to merge 811 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
811 commits
Select commit Hold shift + click to select a range
d157bae
[UI.png] Update screenshot.
jonleeyz Apr 12, 2018
ae2e207
Merge pull request #152 from jonleeyz/rebrand
melvintzw Apr 12, 2018
df6ffcf
[HtmlWriter.java] improve look of PersonPage for Runner
eencogneeto Apr 12, 2018
cf29a86
update user guide
melvintzw Apr 12, 2018
7ac7b29
Improved readability of edit command success message
melvintzw Apr 12, 2018
6cc8d6c
Fix bug where "find w" does not work - where w is an alphanum character
melvintzw Apr 12, 2018
7e3d589
fix bugs where invalid values are provided for interest rate and mone…
melvintzw Apr 12, 2018
dde7123
[HtmlWriter.java] additional phone, email, address fields
eencogneeto Apr 12, 2018
1c02cd4
Merge pull request #155 from melvintzw/VariousBugFixes
jonleeyz Apr 12, 2018
08bc89e
Remove ListCommand alias.
jonleeyz Apr 12, 2018
3235b6b
Change LocateCommand alias.
jonleeyz Apr 12, 2018
343e592
Add home ResultDisplay message.
jonleeyz Apr 12, 2018
fa1ee10
Change FindCommmand and LocateCommand templates.
jonleeyz Apr 12, 2018
59ad52b
[README.adoc] Update.
jonleeyz Apr 12, 2018
c21a702
Update comments for Event classes.
jonleeyz Apr 12, 2018
eb85a3a
[AddressBookParserTest.java] Remove JUnit test for ListCommand alias.
jonleeyz Apr 12, 2018
74c9d31
[HtmlWriter.java] modify view for Customer
eencogneeto Apr 12, 2018
b756b00
Merge pull request #157 from jonleeyz/templateAndAliases-tweaks
melvintzw Apr 12, 2018
a787db6
Improve Locate Command messages
melvintzw Apr 12, 2018
63fc893
[HtmlWriter.java] Modify test
eencogneeto Apr 12, 2018
761b510
Merge branch 'master' of https://github.com/CS2103JAN2018-F12-B4/main…
eencogneeto Apr 12, 2018
9614ff1
Merge pull request #159 from melvintzw/LocateCommandBugFix
eencogneeto Apr 12, 2018
24f5127
Merge branch 'master' of https://github.com/CS2103JAN2018-F12-B4/main…
eencogneeto Apr 12, 2018
81eb375
Merge pull request #160 from Der-Erlkonig/person_page_4
melvintzw Apr 12, 2018
a5e8e4a
Modify EditCommandParser and EditCommand to enable editing of Custome…
melvintzw Apr 12, 2018
b70b10b
Update UserGuide with edit command enhancement to accept customer-onl…
melvintzw Apr 12, 2018
1bdee5b
Ensure that BrowserPanel reflects most up-to-date Person information
melvintzw Apr 12, 2018
1b5e973
Remove temporarily the assert function for testing the selection of p…
melvintzw Apr 12, 2018
55d1a5a
Merge pull request #161 from melvintzw/EditCommand2
jonleeyz Apr 12, 2018
48ffdef
[UserGuide.adoc] Update LocateCommand entry.
jonleeyz Apr 12, 2018
f19cccc
Merge pull request #163 from jonleeyz/UG-locate
melvintzw Apr 12, 2018
5fd9976
Update EditCommand messages
melvintzw Apr 12, 2018
076b5b0
update UG for EditCommand
melvintzw Apr 12, 2018
e844807
Improved Email invalid regex message to be slightly more concise and …
melvintzw Apr 12, 2018
cf61013
Update UG: known issues
melvintzw Apr 12, 2018
c385f3d
Update Portfolio of zhangriqi
Apr 13, 2018
9e89694
fix typos
Apr 13, 2018
1607bcf
mention ui
Apr 13, 2018
a33f777
project management
Apr 13, 2018
63cafcc
Merge pull request #164 from melvintzw/Msgs&UG&DG
jonleeyz Apr 13, 2018
3785396
fix trailing space
Apr 13, 2018
0fe7282
fix travis error
Apr 13, 2018
0b01f57
[HtmlWriter.java] add amount borrowed field for customer to show
eencogneeto Apr 13, 2018
659b9a1
Merge branch 'master' into UpdatePortfolio
jonleeyz Apr 13, 2018
ecfc388
Merge branch 'master' into person_page_5
eencogneeto Apr 13, 2018
f1b1f73
Merge pull request #166 from Der-Erlkonig/person_page_5
eencogneeto Apr 13, 2018
0731889
Merge branch 'master' into UpdatePortfolio
jonleeyz Apr 13, 2018
3147989
Update Project Portfolio Page
melvintzw Apr 13, 2018
83d21d1
Merge branch 'master' into PPP
melvintzw Apr 13, 2018
4c18507
Merge pull request #165 from zhangriqi/UpdatePortfolio
melvintzw Apr 13, 2018
8e351ad
Merge branch 'master' into PPP
melvintzw Apr 13, 2018
b47530b
Update Project, DevGuide
eencogneeto Apr 13, 2018
a0455e8
Merge pull request #167 from melvintzw/PPP
eencogneeto Apr 13, 2018
2ecaf81
Merge branch 'master' into PPP_1
eencogneeto Apr 13, 2018
a5ff79c
Merge pull request #169 from Der-Erlkonig/PPP_1
melvintzw Apr 13, 2018
d165132
Add include:: tags.
jonleeyz Apr 13, 2018
93719ea
[jonleeyz.adoc] Update Project Portfolio Page.
jonleeyz Apr 13, 2018
6b25071
[jonleeyz.adoc] Fix checkstyle violation: no EOF.
jonleeyz Apr 13, 2018
0851764
Merge pull request #170 from jonleeyz/PPP-jonlee
zhangriqi Apr 13, 2018
64e74be
Collate
melvintzw Apr 13, 2018
1e91088
Merge pull request #171 from melvintzw/master
zhangriqi Apr 13, 2018
c7243b5
[UserGuide.adoc] Add inline anchors and cross-references.
jonleeyz Apr 13, 2018
ee4405d
[UserGuide.adoc] Underline "Usage examples" header.
jonleeyz Apr 13, 2018
7f70c87
[UserGuide.adoc] Add syntax subsections.
jonleeyz Apr 13, 2018
9c9f36d
[UserGuide.adoc] Add sections for remaining commands.
jonleeyz Apr 13, 2018
8fd44ee
Update PPP introduction messages.
jonleeyz Apr 13, 2018
233291b
[UserGuide.adoc] Remove underlines from subsection headers.
jonleeyz Apr 13, 2018
412602f
[UserGuide.adoc] Fix inconsistencies.
jonleeyz Apr 13, 2018
37b51bb
Fix command message inconsistencies.
jonleeyz Apr 13, 2018
aad92c0
Change AddCommand alias.
jonleeyz Apr 13, 2018
ca4de22
Change AssignCommand alias.
jonleeyz Apr 13, 2018
679ba18
Merge pull request #172 from jonleeyz/documentation-update
melvintzw Apr 13, 2018
522a58a
edit Value Proposition, feature contribution and `delete` test case
melvintzw Apr 13, 2018
40b283c
Improved various portions in the UserGuide
melvintzw Apr 13, 2018
66ed88f
Add some regex tests for XmlAdaptedPerson.toModelType()
melvintzw Apr 13, 2018
3cd401d
in command summary, shifted redo section to after undo section
melvintzw Apr 13, 2018
1f6645b
Merge pull request #174 from melvintzw/Doc_v1.5
jonleeyz Apr 13, 2018
27ef4af
[ClearCommandTest.java] Add test: verifyGetCommandWordWorksCorrectly().
jonleeyz Apr 13, 2018
87247ad
[ListCommandTest.java] Add test: verifyGetCommandWordWorksCorrectly().
jonleeyz Apr 13, 2018
f09bb90
[RedoCommandTest.java] Add test: verifyGetCommandWordWorksCorrectly().
jonleeyz Apr 13, 2018
e796845
[UndoCommandTest.java] Add test: verifyGetCommandWordWorksCorrectly().
jonleeyz Apr 13, 2018
6aa3c98
[ParserUtilTest.java] Update test implementation: parseAddress_invali…
jonleeyz Apr 13, 2018
b080d80
[MoneyBorrowed.java] Rework error messages.
jonleeyz Apr 13, 2018
9f26f6d
[ParserUtil.java] Update implementation: parseMoneyBorrowed().
jonleeyz Apr 13, 2018
398430f
[LateInterest.java] Update implementation of LateInterest class.
jonleeyz Apr 13, 2018
c9ea370
[StandardInterest.java] Rework messages.
jonleeyz Apr 13, 2018
d03d244
[MoneyBorrowed.java] Rework messages.
jonleeyz Apr 13, 2018
168425e
[ParserUtil.java] Update implementation: parseLateInterest().
jonleeyz Apr 13, 2018
90df6f6
[ParserUtil.java] Update implementation: parseMoneyBorrowed().
jonleeyz Apr 13, 2018
621f624
[ParserUtil.java] Update implementation: parseStandardInterest().
jonleeyz Apr 13, 2018
89942f8
[ParserUtilTest.java] Add tests for parseMoneyBorrowed().
jonleeyz Apr 13, 2018
bb7e57e
[ParserUtilTest.java] Add tests for parseStandardInterest().
jonleeyz Apr 13, 2018
fabf780
[ParserUtilTest.java] Add tests for parseLateInterest().
jonleeyz Apr 13, 2018
d77143c
[ParserUtil.java] Tweak implementation: parseAddress().
jonleeyz Apr 13, 2018
e391e2a
[ParserUtilTest.java] Remove dysfunctional test.
jonleeyz Apr 13, 2018
e991b27
[ParserUtilTest.java] Fix various checkstyle violations.
jonleeyz Apr 13, 2018
5fa958a
[ParserUtilTest.java] Fix various checkstyle violations.
jonleeyz Apr 13, 2018
998cbf3
Merge pull request #175 from jonleeyz/Tests-ParserAndCommands
jonleeyz Apr 13, 2018
daee725
Refactor: PREFIX_MONEYOWED -> PREFIX_MONEY_BORROWED.
jonleeyz Apr 13, 2018
bb15e8b
[CommandTestUtil.java] Add new constants.
jonleeyz Apr 13, 2018
db83f41
[EditPersonDescriptorBuilder.java] Add test helper methods.
jonleeyz Apr 13, 2018
48453a0
[EditCommandParserTest.java] Update test implementations.
jonleeyz Apr 13, 2018
7f7a610
[ParserUtil.java] Update test method comments.
jonleeyz Apr 13, 2018
279ab8f
[ParserUtilTest.java] Add collate annotation.
jonleeyz Apr 13, 2018
6dd893e
[ParserUtil.java] Update test method signatures.
jonleeyz Apr 13, 2018
48874e2
change first two Customers to Runners.
melvintzw Apr 13, 2018
f302750
implement buildRunner()
melvintzw Apr 13, 2018
0724e73
Create JUnit test for assignCommand - unit test seems to work success…
melvintzw Apr 13, 2018
ba727bf
[AddressBookSystemTest.java] Move declaration and initialisation of G…
jonleeyz Apr 13, 2018
85d5d57
[AddressBookSystemTest.java] Add new rule: EventsCollectorRule.
jonleeyz Apr 13, 2018
ec506ab
[AddCommandSystemTest.java] Reorganise tests.
jonleeyz Apr 13, 2018
b461868
[DeleteCommandSystemTest.java] Reorganise tests.
jonleeyz Apr 13, 2018
8367cfc
[EditCommandSystemTest.java] Reorganise tests.
jonleeyz Apr 13, 2018
08da275
[FindCommandSystemTest.java] Reorganise tests.
jonleeyz Apr 13, 2018
ddfc33b
[SelectCommandSystemTest.java] Reorganise tests.
jonleeyz Apr 13, 2018
497ed3d
Add check for raising of PopulatePrefixesRequestEvent.
jonleeyz Apr 13, 2018
0c169cf
[HistoryCommandTest.java] Add test: verifyGetCommandWordWorksCorrectl…
jonleeyz Apr 13, 2018
03143fc
Make an error message a psf String
melvintzw Apr 13, 2018
541ebde
Implement two more working test cases (1 valid test case and 1 invali…
melvintzw Apr 13, 2018
0a7e8be
change error message to Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX
melvintzw Apr 13, 2018
0e3b601
Merge branch 'master' of https://github.com/CS2103JAN2018-F12-B4/main…
melvintzw Apr 13, 2018
3df8e8d
change message references
melvintzw Apr 13, 2018
7e45146
[HelpCommandSystemTest.java] Restructure tests.
jonleeyz Apr 13, 2018
38deb69
[EditCommandSystemTest.java] Add comments.
jonleeyz Apr 13, 2018
8c296fc
Fix various checkstyle violations.
jonleeyz Apr 13, 2018
ba2a987
Merge pull request #177 from jonleeyz/Tests-ParserAndCommands
melvintzw Apr 13, 2018
6303451
change Runners to the last two persons in the list
melvintzw Apr 13, 2018
6967d37
change runner index to the to refer to the correct runners in Typical…
melvintzw Apr 13, 2018
0dda835
change build type
melvintzw Apr 13, 2018
5a74d83
Merge branch 'master' into JUnitTests
melvintzw Apr 13, 2018
92aacaf
Merge pull request #176 from melvintzw/JUnitTests
jonleeyz Apr 13, 2018
59aa772
Add more JUnit test for Locate Command
Apr 14, 2018
566f005
Update ppp
Apr 14, 2018
0de735e
Change app name to HuatAh!
Apr 14, 2018
4a9bb55
fix failed test
Apr 14, 2018
4f5f72a
Merge pull request #180 from zhangriqi/UpdateAppName
melvintzw Apr 14, 2018
f61778d
Return error message when locating a person without address.
Apr 14, 2018
0a6af0a
locate command JUnit test
Apr 14, 2018
fbcea36
Merge branch 'master' into FixLocateCommandBug
melvintzw Apr 14, 2018
53ca34c
Merge pull request #181 from zhangriqi/FixLocateCommandBug
melvintzw Apr 14, 2018
0b0f26a
[CommandBox.java] Implement helper merthods.
jonleeyz Apr 14, 2018
0a329bd
[CommandBox.java] Implement moveToPreviousPrefix().
jonleeyz Apr 14, 2018
6b33599
[CommandBox.java] Implement moveToNextPrefix().
jonleeyz Apr 14, 2018
5742d0d
[CommandBox.java] Implement clearCurrentFieldOrPrefix().
jonleeyz Apr 14, 2018
46091a0
[CommandBox.java] Add method calls.
jonleeyz Apr 14, 2018
dd02781
[*Command.java] Made COMAND_TEMPLATE a constant.
jonleeyz Apr 14, 2018
4000ad6
[*CommandSystemTest.java] Update tests to reference constants.
jonleeyz Apr 14, 2018
8d2f5da
[EditCommand.java] Update MESSAGE_USAGE and getCaretIndex().
jonleeyz Apr 14, 2018
21267d4
[CommandBoxHandle.java] Implement helper methods.
jonleeyz Apr 14, 2018
f478fb9
[CommandBoxTest.java] Add new tests.
jonleeyz Apr 14, 2018
23ff2aa
[CommandBox.java] Fix checkstyle violations.
jonleeyz Apr 14, 2018
86de31d
Add more tests for LocateCommand
Apr 14, 2018
5bbe9ae
Merge pull request #183 from jonleeyz/commandbox-enhancements
zhangriqi Apr 14, 2018
d0d28f8
add alias to shortcuts table
eencogneeto Apr 14, 2018
0ef3e35
Merge branch 'master' of git://github.com/CS2103JAN2018-F12-B4/main i…
Apr 14, 2018
100be18
clean code
Apr 14, 2018
c7c2252
Update project portfolio
Apr 14, 2018
08aa870
Merge pull request #179 from zhangriqi/LocateJUnitTest
melvintzw Apr 14, 2018
709e81e
add Customer field oweStartDate
eencogneeto Apr 14, 2018
9d6e2db
add customer field interest rate
eencogneeto Apr 14, 2018
e2d0f44
change keyboard shortcut of exit to Alt+Q
eencogneeto Apr 14, 2018
d557ba5
edit colours of application (light blue)
eencogneeto Apr 14, 2018
66e8f87
swap email and address lines
eencogneeto Apr 14, 2018
0a609b1
modify test accordingly
eencogneeto Apr 14, 2018
b822a0c
Merge branch 'master' into 14April_Afternoon
melvintzw Apr 14, 2018
488d2e9
Merge pull request #184 from Der-Erlkonig/14April_Afternoon
melvintzw Apr 14, 2018
173f66a
hardcoded setStyle() in PersonCard to detemine personCard colour base…
melvintzw Apr 14, 2018
e66787b
Merge pull request #185 from melvintzw/newUI
eencogneeto Apr 14, 2018
152835c
change UI screenshot
melvintzw Apr 14, 2018
be4a7de
Implement JUnit tests for AssignCommandParser
melvintzw Apr 14, 2018
4a7664f
Implementing AssignCommandSystemTest
melvintzw Apr 14, 2018
036c2d8
Modify AssignCommandSystemTests so that it works (there seems to be a…
melvintzw Apr 14, 2018
39ce87f
Merge pull request #186 from melvintzw/JUnitTests
zhangriqi Apr 14, 2018
0fc8fb5
Merge branch 'master' into newUI
jonleeyz Apr 15, 2018
d3af0d6
Merge pull request #187 from melvintzw/newUI
jonleeyz Apr 15, 2018
f023485
change list-cell colour to -main-colour
melvintzw Apr 15, 2018
891ee7b
fix unwanted lines in personListPanel
melvintzw Apr 15, 2018
51b7895
Merge pull request #189 from melvintzw/newUI
jonleeyz Apr 15, 2018
56fb75f
Add feature in v2.0
Apr 15, 2018
24fe240
Add more AssignCommand JUnit tests
melvintzw Apr 15, 2018
2e0cfc4
Merge pull request #191 from zhangriqi/DocumentationForv2.0
melvintzw Apr 15, 2018
1573652
Merge branch 'master' into JUnitTests
melvintzw Apr 15, 2018
411fd73
Merge pull request #192 from melvintzw/JUnitTests
jonleeyz Apr 15, 2018
782ffef
[CommandBoxTest.java] Reimplement tests.
jonleeyz Apr 14, 2018
f49bf1a
[LocateCommandParserTest.java] Add tests.
jonleeyz Apr 14, 2018
8ff1da3
[LocateCommandParserTest.java] Disable 1 test: dysfunctional.
jonleeyz Apr 14, 2018
a397c35
Fix checkstyle violations.
jonleeyz Apr 14, 2018
d1e29ca
[UniquePersonListTest.java] Add new test: testHashCode_symmetric().
jonleeyz Apr 15, 2018
0282e79
[AddressTest.java] Add new test: testHashCode_symmetric().
jonleeyz Apr 15, 2018
a59b7bd
[EmailTest.java] Add new test: testHashCode_symmetric().
jonleeyz Apr 15, 2018
81c3cb8
[NameTest.java] Add new test: testHashCode_symmetric().
jonleeyz Apr 15, 2018
1ff9787
[PhoneTest.java] Add new test: testHashCode_symmetric().
jonleeyz Apr 15, 2018
e14d142
[AddressBookTest.java] Add new test: testHashCode_symmetric().
jonleeyz Apr 15, 2018
8a5901b
[AddressBookTest.java] Add new test: removeNonExistentPerson_throwsPe…
jonleeyz Apr 15, 2018
a91afd4
[LateInterestTest.java] Add new tests.
jonleeyz Apr 15, 2018
a9b3526
[MoneyBorrowedTest.java] Add new tests.
jonleeyz Apr 15, 2018
8e3359a
[StandardInterestTest.java] Add new tests.
jonleeyz Apr 15, 2018
422b3f7
[UserPrefsTest.java] Add new tests.
jonleeyz Apr 15, 2018
9e1eeb4
[SampleDataUtil.java] Remove unused method: defaultDate().
jonleeyz Apr 15, 2018
97b2267
[AddressTest.java] Fix test: testHashcode_symmetric().
jonleeyz Apr 15, 2018
649ed38
[PersonListPanel.java] Add whitespaces.
jonleeyz Apr 15, 2018
dc108db
Fix checkstyle violation: rename package Customer to customer.
jonleeyz Apr 15, 2018
2aadcae
[UniquePersonListTest.java] Fix checkstyle violation: remove imports.
jonleeyz Apr 15, 2018
c1cff57
[UserPrefsTest.java] Fix checkstyle violation: rename methods.
jonleeyz Apr 15, 2018
c21c09f
[SampleDataUtil.java] Fix checkstyle violation: remove import.
jonleeyz Apr 15, 2018
6b96b2c
Merge pull request #193 from jonleeyz/JUnitTests
melvintzw Apr 15, 2018
2f6cc67
Add tests and getter methods to facilitate tests
eencogneeto Apr 15, 2018
a6b9856
Update DeveloperGuide
eencogneeto Apr 15, 2018
70e670a
[UI-start.PNG] Add new screenshot.
jonleeyz Apr 15, 2018
4d6cf18
update DevGuide
eencogneeto Apr 15, 2018
447a2c3
[UserGuide.adoc] Update numerous sections.
jonleeyz Apr 15, 2018
f17ff2f
[UserGuide.adoc] Add section: Navigation Shortcuts.
jonleeyz Apr 15, 2018
34340d4
Merge branch 'master' of https://github.com/CS2103JAN2018-F12-B4/main…
eencogneeto Apr 15, 2018
b18b3a1
Update version to v1.5.
jonleeyz Apr 15, 2018
c6eb4cc
[UI_old.jpg] Remove redundant image.
jonleeyz Apr 15, 2018
a1b3408
[README.adoc] Update.
jonleeyz Apr 15, 2018
8498728
Correct Test checkstyles, update DevGuide
eencogneeto Apr 15, 2018
1527ac6
Merge pull request #195 from jonleeyz/documentation
melvintzw Apr 15, 2018
e34c027
Fix checkstyle
eencogneeto Apr 15, 2018
b42d8f9
Merge branch 'master' of git://github.com/CS2103JAN2018-F12-B4/main i…
Apr 15, 2018
67fa0f3
Merge branch 'master' into 15April
melvintzw Apr 15, 2018
ccae461
Merge pull request #194 from Der-Erlkonig/15April
eencogneeto Apr 15, 2018
4212c43
Update documentation for locate
Apr 15, 2018
ae4137c
Update documentation for command alias
Apr 15, 2018
7b6c30d
update ppp
Apr 15, 2018
c4ba459
[jonleeyz.adoc] Update.
jonleeyz Apr 15, 2018
6370124
[UserGuide.adoc] Update.
jonleeyz Apr 15, 2018
55e3b3a
Add diagrams for FindCommand and Model2
melvintzw Apr 15, 2018
1445118
update various documentation's app version to 1.5
melvintzw Apr 15, 2018
eb40c24
update melvintzw PPP
melvintzw Apr 15, 2018
f9c61fd
add tags(FindCommandEnhancement, ModelTwo) to DeveloperGuide
melvintzw Apr 15, 2018
d638cbd
update devGuide implementation section with Model 2.0
melvintzw Apr 15, 2018
b7db38f
Update developer guide
Apr 15, 2018
c665d26
PPP and DevGuide
eencogneeto Apr 15, 2018
e76ad42
PPP
eencogneeto Apr 15, 2018
aeeab19
Merge pull request #197 from melvintzw/Doc_v1.5
jonleeyz Apr 15, 2018
7c0b5d0
Merge branch 'master' into PPP
zhangriqi Apr 15, 2018
1132d4b
Merge branch 'master' into 15_April_2
zhangriqi Apr 15, 2018
7c02508
Merge pull request #198 from Der-Erlkonig/15_April_2
zhangriqi Apr 15, 2018
21dac26
Merge branch 'master' into PPP
zhangriqi Apr 15, 2018
139ba97
Merge pull request #196 from zhangriqi/PPP
melvintzw Apr 15, 2018
2eb741d
include tags in PPP
melvintzw Apr 15, 2018
e5d6f4c
Include hyperlinks for examples for bug fix section
melvintzw Apr 15, 2018
c93b741
Merge pull request #199 from melvintzw/Doc_v1.5
zhangriqi Apr 15, 2018
a326668
Merge branch 'master' into documentation
jonleeyz Apr 15, 2018
7a79f4d
Merge pull request #200 from jonleeyz/documentation
melvintzw Apr 15, 2018
2858988
[DeveloperGuide.adoc] Update.
jonleeyz Apr 15, 2018
c4fbe0b
Merge pull request #201 from jonleeyz/documentation-updated
melvintzw Apr 15, 2018
50434db
Change devGuide>implementation>browserPanel image name and width
melvintzw Apr 15, 2018
67b1feb
Merge pull request #202 from melvintzw/master
jonleeyz Apr 15, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ classes/
/bin/
src/main/resources/docs/
out/
PersonPage.html
Binary file added Collate-GUI.jar
Binary file not shown.
35 changes: 17 additions & 18 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
= Address Book (Level 4)
= HuatAh! v1.5
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/CS2103JAN2018-F12-B4/main[image:https://travis-ci.org/CS2103JAN2018-F12-B4/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/jonleeyz/main/branch/master[image:https://ci.appveyor.com/api/projects/status/o5fr0a29pv70cubj/branch/master?svg=true[Build status]]
https://coveralls.io/github/CS2103JAN2018-F12-B4/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-F12-B4/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,21 +13,22 @@ 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.
* HuatAh! is a desktop loan shark manager application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java application intended for 21st century loan shark bosses to streamline their syndicate operations.

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>
* *Download our latest release https://github.com/CS2103JAN2018-F12-B4/main/releases[here]!*
* *Documentation:*
** <<UserGuide#, User Guide>>
** <<DeveloperGuide#, Developer Guide>>
* *The Team:*
** <<AboutUs#, About Us>>
** <<ContactUs#, Contact Us>>
* *Contributing*:
** View our https://github.com/CS2103JAN2018-F12-B4/main[source code]!
** Visit our https://github.com/CS2103JAN2018-F12-B4/main/issues[issue tracker]!
** Submit a https://github.com/CS2103JAN2018-F12-B4/main/pulls[pull request]!

== Acknowledgements

Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ dependencies {
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
compile group: 'com.google.guava', name: 'guava', version: '19.0'
compile group: 'com.joestelmach', name: 'natty', version: '0.11'

testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.testfx', name: 'testfx-core', version: testFxVersion
Expand Down
225 changes: 225 additions & 0 deletions collated/functional/Der-Erlkonig.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
# Der-Erlkonig
###### \java\seedu\address\storage\HtmlWriter.java
``` java
/**
* Writes Person Data to a HTML file
*/
public class HtmlWriter {
public static final String OPENING_LINE = "<!DOCTYPE html><html><head>\n"
+ "<body style=\"background-color:#CEDBFB;\"\n>"
+ "<font face=\"Segoe UI\" size=\"5\" color=\"black\">"
+ "<table><tr><th align=\"left\" colspan=\"2\">";

private final String name;
private final String phone;
private final String email;
private final String address;
private final String amountBorrowed;
private final String interestRate;
private final String amountCurrentlyOwed;
private final String oweStartDate;
private final String oweDueDate;
private final String runnerAssigned;

private final List<Person> customerList;

private final SimpleDateFormat simpledate = new SimpleDateFormat("EEE, d MMM yyyy");

public HtmlWriter() {
this.name = null;
this.phone = null;
this.address = null;
this.email = null;
this.amountBorrowed = null;
this.interestRate = null;
this.amountCurrentlyOwed = null;
this.oweStartDate = null;
this.oweDueDate = null;
this.runnerAssigned = null;
this.customerList = null;
}

/**
* Constructs HtmlWriter with Customer's details
* @param customer
*/
public HtmlWriter(Customer customer) {
this.name = customer.getName().fullName;
this.phone = customer.getPhone().value;
this.address = customer.getAddress().value;
this.email = customer.getEmail().value;
this.amountBorrowed = String.format("%,.2f", customer.getMoneyBorrowed().value);
this.interestRate = customer.getStandardInterest().toString();
this.amountCurrentlyOwed = String.format("%,.2f", customer.getMoneyCurrentlyOwed());
this.oweStartDate = simpledate.format(customer.getOweStartDate());
this.oweDueDate = simpledate.format(customer.getOweDueDate());
this.runnerAssigned = customer.getRunner().getName().fullName;
this.customerList = null;
}

/**
* Constructs HtmlWriter with Runner's Details
* @param runner
*/
public HtmlWriter(Runner runner) {
this.name = runner.getName().fullName;
this.phone = runner.getPhone().value;
this.email = runner.getEmail().value;
this.address = runner.getAddress().value;
this.amountBorrowed = "";
this.interestRate = "";
this.amountCurrentlyOwed = "";
this.oweStartDate = "";
this.oweDueDate = "";
this.runnerAssigned = "";
this.customerList = runner.getCustomers();
}

/**
* Writes Customer's data to a HTML file and returns the file location
* @return
*/
public String writeCustomer() {
String filepath = System.getProperty("user.dir") + File.separator + "PersonPage.html";
String absoluteFilepath;
File file = new File(filepath);
try {
PrintWriter printWriter = new PrintWriter(file);
printWriter.print(OPENING_LINE);
printWriter.println(name + "</th></tr>");
printWriter.println("<tr><td style=\"width: 240px;\">phone: </td><td>" + phone + "</td></tr>");
printWriter.println("<tr><td>address: </td><td>" + address + "</td></tr>");
printWriter.println("<tr><td>email: </td><td>" + email + "</td></tr>");
printWriter.println("<tr><td>amount borrowed: </td><td>$" + amountBorrowed + "</td></tr>");
printWriter.println("<tr><td>interest (weekly): </td><td>" + interestRate + "%</td></tr>");
printWriter.println("<tr><td>amount owed: </td><td>$" + amountCurrentlyOwed + "</td></tr>");
printWriter.println("<tr><td>start date: </td><td>" + oweStartDate + "</td></tr>");
printWriter.println("<tr><td>due date: </td><td>" + oweDueDate + "</td></tr>");
printWriter.println("<tr><td>runner assigned: </td><td>" + runnerAssigned + "</td></tr>");
printWriter.println("</table></body></html>");
printWriter.close();
} catch (FileNotFoundException e) {
return "";
}
absoluteFilepath = file.getAbsolutePath();
absoluteFilepath = absoluteFilepath.replaceAll("\"", "/");
return absoluteFilepath;
}

/**
* Writes Runner's data to HTML file and returns the file location
* @return
*/
public String writeRunner() {
String filepath = System.getProperty("user.dir") + File.separator + "PersonPage.html";
String absoluteFilepath;
File file = new File(filepath);
int customerListSize = customerList.size();
try {
PrintWriter printWriter = new PrintWriter(file);
printWriter.print(OPENING_LINE);
printWriter.println(name + "</th></tr>");
printWriter.println("<tr><td style=\"width: 120px;\">phone: </td><td>" + phone + "</td></tr>");
printWriter.println("<tr><td>email: </td><td>" + email + "</td></tr>");
printWriter.println("<tr><td>address: </td><td>" + address + "</td></tr>");
printWriter.println("</table><br><br><table><tr><th align=\"left\">");
printWriter.println("Customers Assigned [" + customerListSize + "]");
printWriter.println("</th></tr>");
for (Person eachCustomer: customerList) {
printWriter.println("<tr><td>");
printWriter.println("- " + eachCustomer.getName().fullName);
printWriter.println("</td></tr>");
}
printWriter.println("</table></body></html>");
printWriter.close();
} catch (FileNotFoundException e) {
return "";
}
absoluteFilepath = file.getAbsolutePath();
absoluteFilepath = absoluteFilepath.replaceAll("\"", "/");
return absoluteFilepath;
}

public String getName() {
return name;
}

public String getPhone() {
return phone;
}

public String getEmail() {
return email;
}

public String getAddress() {
return address;
}

public String getAmountBorrowed() {
return amountBorrowed;
}

public String getInterestRate() {
return interestRate;
}

public String getAmountCurrentlyOwed() {
return amountCurrentlyOwed;
}

public String getOweStartDate() {
return oweStartDate;
}

public String getOweDueDate() {
return oweDueDate;
}

public String getRunnerAssigned() {
return runnerAssigned;
}

public List getCustomerList() {
return customerList;
}
}
```
###### \java\seedu\address\ui\BrowserPanel.java
``` java
/**
* Loads a HTML file with person details
* @param person
*/
private void loadPersonPage(Person person) {
String personfilepath;
if (person instanceof Customer) {
htmlWriter = new HtmlWriter((Customer) person);
personfilepath = htmlWriter.writeCustomer();
} else if (person instanceof Runner) {
htmlWriter = new HtmlWriter((Runner) person);
personfilepath = htmlWriter.writeRunner();
} else {
personfilepath = "";
}
loadPage("file:///" + personfilepath);
}

public void loadPage(String url) {
Platform.runLater(() -> browser.getEngine().load(url));
}

```
###### \resources\view\DarkTheme.css
``` css
th {
background-color: ;
border-bottom: 1px solid white;
padding: 5px;
text-align: left;
}

td {
height: 28px;
}
```
Loading