forked from se-edu/addressbook-level4
-
Notifications
You must be signed in to change notification settings - Fork 69
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.4][T11-B4] TravelBanker #55
Open
pkuhanan
wants to merge
152
commits into
nus-cs2103-AY1718S2:master
Choose a base branch
from
unknown repository
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
152 commits
Select commit
Hold shift + click to select a range
2b5aa27
Add NFRs
a29a8c3
Merge pull request #1 from pkuhanan/add-NFRs
c78ccd6
create a removeTagCommand class to mimic EditCommand
chenchongsong 6cbe3ec
modify the newly added RemoveTagCommand
chenchongsong 19406f3
Merge pull request #2 from chenchongsong/ccs
chenchongsong 5583f44
Revert "Chen Chongsong Enhancement"
chenchongsong 98184c6
Merge pull request #3 from CS2103JAN2018-T11-B4/revert-2-ccs
chenchongsong 6cf215a
Allowed program to recognize h alias as help command
articho28 370034c
hi is now shortcut for History Command
articho28 169e1ea
c is now a shortcut for Clear command
articho28 d1e89de
l is now shortcut for list command
articho28 acd295c
u is shortcut for Undo and r is shortcut for Redo
articho28 3beb42a
a is shortcut for add
articho28 06dbf2f
d is shorcut for delete
articho28 424275a
e is now shortcut for edit
articho28 3634375
f is now shortcut for find
articho28 94509bf
s is now shortcut for Select
articho28 8fb756b
Updated User Guide to include shortcuts
articho28 3eb8d87
Added JUnit test for help shortcut
articho28 7e82e88
Added test for list shortcut
articho28 dd12262
Added test for clear command shortcut
articho28 eb95f6e
Added test for history shortcut
articho28 957f919
Added tests for find, edit, and delete shortcuts
articho28 18e53c4
Added tests for redo, undo, select shortcuts
articho28 6f90b27
Added test for add command shortcut
articho28 3026364
Updated Target user profile, value proposition, and user stories
articho28 94db81b
Fixed formatting issues in Developper Guide
articho28 c5ed3ab
Remove Codacy badge
62e5b07
Style errors (#10)
ad3b9ed
fix user story format
chenchongsong 5313f1b
update use cases
chenchongsong 87ab44e
Merge pull request #1 from CS2103JAN2018-T11-B4/master
chenchongsong 5063e9e
User and Developer Guide Update including instructions on the balance…
articho28 32afd24
Update UserGuide.adoc (#22)
e2fa60c
Add money field and add/edit capability (#28)
ccf9e5e
merge Master2 into Master (#29)
chenchongsong 0b02a3f
Merge pull request #4 from CS2103JAN2018-T11-B4/master
chenchongsong 210c3f2
Remove tag feature enabled (#30)
chenchongsong 8f6475d
Merge pull request #5 from CS2103JAN2018-T11-B4/master
chenchongsong 496b128
SortCommand Init (mimic listCommand)
chenchongsong 493ecc8
Merge pull request #6 from chenchongsong/master
chenchongsong c82b0ad
commit parser init
chenchongsong 1545040
Feature Contribution for Developer Guide + Modified Documentation Fol…
articho28 77c75ec
Update UserGuide Appendix B [Feature Contribution] (#34)
chenchongsong b37884d
updated developer guide with balance (#35)
software-1234 ca7ebd9
About us update (#25)
software-1234 1beb23c
Add feature info to developer guide (#36)
d371e1b
Update AboutUs.adoc (#37)
software-1234 3ec8c53
Update my minor feature (#41)
8655f15
Add command biggest-debtor (#42)
d60a99f
Rename biggest-debtor to max (#43)
d78e1cf
Add 1 page of documentation for add/edit money field feature (#45)
7ca66ad
sort command enabled for name filed
chenchongsong b42c92b
Balance feature documentation, source code, and tests included. (#33)
articho28 7787f00
resolve conflicts
chenchongsong 34f0149
Merge pull request #8 from CS2103JAN2018-T11-B4/master
chenchongsong cf2576c
update method prototypes for future use
chenchongsong 180d9c8
Min feature - Source Code and Documentation (#47)
articho28 7a038db
remove BiggestDebtor (#50)
5edb4a6
Min Feature Updated - Corrected to not select anyone if no money is o…
articho28 50a7d1c
sorting keyword: email, phone, money, address enabled
chenchongsong 2e5718f
update compareTo methods for various class
chenchongsong 35182f6
sorting enabled for no_of_tags
chenchongsong 89a7fe6
Merge branch 'master' into sort-feature
chenchongsong 515c4ad
fix travis
chenchongsong de81ead
Merge branch 'sort-feature' of https://github.com/chenchongsong/main …
chenchongsong 422ab63
fix test part for travis
chenchongsong e97cb3f
update userGuide.adoc
chenchongsong 6929a9a
Sort feature (#51)
chenchongsong 4eff081
Merge pull request #10 from chenchongsong/sort-feature
chenchongsong f9c5f91
Merge pull request #9 from CS2103JAN2018-T11-B4/master
chenchongsong 9122b22
Sort implementation documentation (Chen Chongsong) (#53)
chenchongsong 65e4b34
Eric list developer guide (#55)
software-1234 4c4740c
listing balances (#54)
software-1234 f409383
Update DeveloperGuide.adoc (#56)
eb3d8f8
Add settle command (#57)
74dc47e
Add files via upload (#59)
758859e
Merge pull request #11 from CS2103JAN2018-T11-B4/master
chenchongsong 59eaf42
V1.3 split feature (#68)
chenchongsong e427295
change command word and shortcut (#71)
software-1234 cf06497
Merging MapCommand : Loads a search for nearest ATM (#72)
articho28 e89d4b8
Updated UIMockup in ReadMe.adoc (#73)
articho28 0176961
added wipe balance (#76)
software-1234 0e8cf84
ran /gradle shadowJar (#78)
articho28 a1d60dc
Modified version number in main - Added tag v1.3 to release (#79)
articho28 f8cf337
Merge pull request #12 from CS2103JAN2018-T11-B4/master
chenchongsong 35f547e
update userguide image
chenchongsong cd2e4a5
update img (#80)
chenchongsong beb213c
Item feature Init (#83)
chenchongsong 6c01c92
Merge remote-tracking branch 'upstream/master'
chenchongsong 4746d14
Build the remind command feature (#81)
9b26e79
Itemadd command (#87)
chenchongsong e398c5c
Merge remote-tracking branch 'upstream/master'
chenchongsong 24f6016
add collate comments //@@author chenchongsong
chenchongsong 0f4972a
add collated *.md files
chenchongsong 57db803
update documentation for major enhancement and ItemAddCommand
chenchongsong 9cf69b7
travis
chenchongsong 6068030
Update user guide with currency and wipe
software-1234 9d2b668
Update UserGuide.adoc (#92)
software-1234 35b2950
started currency conversion for specific addressbook entries (#93)
software-1234 4579065
Merge branch 'master' into master
chenchongsong dd71c2c
Collate (#86)
bc694d4
Merge branch 'master' into master
chenchongsong 86b1f96
Collate and update Documentation (#89)
chenchongsong d4d95e1
Currency converter (#95)
software-1234 51554b8
Select feature now searches for Address (#96)
articho28 0ed851b
Finalized v1.4 (#98)
articho28 c57b85e
Merge branch 'master' into master
chenchongsong e66475e
ItemDeleteCommand and update ItemShowCommand (#106)
chenchongsong f35ce80
update documentation and collate for v1.5rc (#108)
chenchongsong 79369d6
Create .overalls.yml
chenchongsong e0cf3d8
Add PPP (#144)
1e29220
Remove biggest debtor and add collate (#145)
69f088c
add more JUnit tests (#141)
chenchongsong 237856f
Create transaction command (#143)
9bac11f
Collated Code with SearchTagCommand, documentation and tests (#146)
articho28 d581751
Update UserGuide.adoc (#151)
software-1234 aeb3ae7
Update DeveloperGuide.adoc (#154)
software-1234 0016a4e
Update DeveloperGuide.adoc
software-1234 285a7b2
software-1234-ppp (#155)
software-1234 3a66888
Update software-1234.adoc
software-1234 285eebc
Update software-1234.adoc
software-1234 ff3b02e
Currency changes (#150)
software-1234 9522748
Wipe undo (#159)
software-1234 a86faef
update doc and bug fixing (#162)
chenchongsong 9e1037a
Add Balance label and fix remind command usage instructions (#160)
5906165
update docs and fix bugs (#163)
chenchongsong 59c6796
Add some tests (#164)
2490719
Fix ppp (#165)
6f26e8c
add tests for itemshowcommand parser and itemdeletecommandparser (#166)
chenchongsong bdb4b37
add 2 tests (#167)
chenchongsong 7185f13
Update README.adoc
chenchongsong ba43f98
Added tests for maxborrowed command (MinCommand in code) (#168)
articho28 e087ae5
Modified portofolio, about us, and formatting (#169)
articho28 2a301e0
Update collated (#170)
1b677d9
Documentation modification, updated collation and added tests (#171)
articho28 13cd602
Update README.adoc
articho28 d88fbbd
change mockup (#172)
articho28 a47215f
Update UserGuide.adoc
articho28 09ccb3b
Update README.adoc
articho28 573f21d
Update README.adoc
chenchongsong 9845422
Addressed all Issues reported in peer-testing to resubmit (#173)
articho28 b8e0ff9
Fixed collation of my code (#174)
articho28 a84486e
added Tests for list balances (#175)
software-1234 7b543c5
Update UserGuide.adoc (#176)
software-1234 38aa55c
Update README.adoc
chenchongsong b995b9d
Add files via upload
software-1234 114049a
Update UserGuide.adoc
software-1234 2c879e0
add files
software-1234 5f4a5c5
Update UserGuide.adoc
software-1234 c298021
Update DeveloperGuide.adoc (#178)
software-1234 977276c
Update software-1234.adoc (#177)
software-1234 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,56 @@ | ||
= Address Book (Level 4) | ||
= TravelBanker | ||
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://travis-ci.org/CS2103JAN2018-T11-B4/main[image:https://travis-ci.org/CS2103JAN2018-T11-B4/main.svg?branch=master[Build Status]] | ||
https://coveralls.io/github/CS2103JAN2018-T11-B4/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-T11-B4/main/badge.svg?branch=master[Coverage Status]] | ||
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]] | ||
|
||
ifdef::env-github[] | ||
image::docs/images/Ui.png[width="600"] | ||
endif::[] | ||
|
||
ifndef::env-github[] | ||
image::images/Ui.png[width="600"] | ||
image::docs/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. | ||
== Introduction | ||
|
||
* This is a desktop java application that helps people, particularly travellers, to informally keep accounts with other people. | ||
* Record how much money you owe someone, or someone owes to you, plus much more! | ||
* Most of your user interactions are via command line, while there exists a GUI (Graphical User Interface). | ||
|
||
== Getting Started | ||
For developers, please refer to the "DeveloperGuide.adoc" under "Section 1. Setting Up" | ||
and ensure the steps are properly followed. | ||
|
||
For users, please refer to the "UserGuide.adoc" for instructions on how to | ||
use the application. | ||
|
||
Below is a list of useful links to the relevant documents to get you started. | ||
|
||
== Site Map | ||
|
||
* <<UserGuide#, User Guide>> | ||
* <<DeveloperGuide#, Developer Guide>> | ||
* <<LearningOutcomes#, Learning Outcomes>> | ||
* <<AboutUs#, About Us>> | ||
* <<ContactUs#, Contact Us>> | ||
|
||
|
||
== Built With | ||
- IntelliJ IDE - Software Development | ||
- GitHub - Source Control | ||
|
||
== Authors (in Alphabetical Order) | ||
- Artsiom Skliar - Developer | ||
- Chen Chongsong - Developer | ||
- Eric Lingfeng Zhou - Developer | ||
- Prian Kuhanandan - Developer | ||
|
||
== 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://github.com/TomasMikula/EasyBind[EasyBind], 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/junit4[JUnit4] | ||
* Source code is based on the https://github.com/se-edu/addressbook-level4[AddressBook-Level4] project created by SE-EDU initiative. | ||
|
||
== Licence : link:LICENSE[MIT] |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Aritcho28-reused | ||
###### /java/seedu/address/ui/PersonCard.java | ||
``` java | ||
/** | ||
* Returns the color for a specific tag. | ||
*/ | ||
private String getTagColor(String tagName) { | ||
return TAG_COLOR[Math.abs(tagName.hashCode()) % TAG_COLOR.length]; | ||
} | ||
|
||
/** | ||
* Creates the tag colors for a person. | ||
*/ | ||
private void initTags(Person person) { | ||
person.getTags().forEach(tag -> { | ||
Label tagLabel = new Label(tag.tagName); | ||
tagLabel.getStyleClass().add(getTagColor(tag.tagName)); | ||
tags.getChildren().add(tagLabel); | ||
}); | ||
} | ||
``` |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These should be found in AboutUs.