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.

Sign up for GitHub

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

Jump to bottom

Restaurant Categorisation 1.1 #18

Merged
merged 26 commits into from
Mar 3, 2019
Merged

Restaurant Categorisation 1.1 #18

merged 26 commits into from
Mar 3, 2019

Conversation

rbth7e5
Copy link
Collaborator

@rbth7e5 rbth7e5 commented Mar 1, 2019 •
edited

closes #19
closes #20
closes #21

@rbth7e5
src/../restaurant: initialise Cuisine class and add relevant fields a…
73935c4 
…nd methods to restaurant class
@rbth7e5
src/../commands: initialise set cuisine command class
4ed0515
@rbth7e5
setCuisineCommand: implement skeleton of execute method
f3c0a94
@rbth7e5
restaurant.java: make restaurant immutable for adding cuisine
93c6aaa
@rbth7e5
complete execute method for set cuisine command
f95c1b0
@rbth7e5
add method to get cuisine in restaurant class
c9ecac3
@rbth7e5
initialise CuisineCommandParser class
ba5edcd
@rbth7e5
add PREFIX_CUISINE for set cuisine command
2234f47
@rbth7e5
update set cuisine command example
c6788df
@rbth7e5
implemented parse method for CuisineCommandParser
f864d41
@rbth7e5
add cuisine command case into Food Diary Parser
69e73ef
@rbth7e5
fix style violations in main
7d8b8b8
@rbth7e5
add Cuisine into JsonAdaptedRestaurant
b8035ad
@rbth7e5
update UI to show cuisine if present
19a049c
@rbth7e5
fix bug where new cuisine additions affected existing tests
a36ccc7
@rbth7e5 rbth7e5 added this to the 1.1 milestone Mar 1, 2019
@rbth7e5 rbth7e5 self-assigned this Mar 1, 2019
@rbth7e5 rbth7e5 modified the milestones: 1.1, v1.1 Mar 2, 2019
@rbth7e5
Merge and resolve conflicts of review/weblinks into restaurant_catego…
1c361c3 
…risation_1.1

# Conflicts:
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/logic/parser/CliSyntax.java
#	src/main/java/seedu/address/logic/parser/ParserUtil.java
#	src/main/java/seedu/address/model/restaurant/Restaurant.java
#	src/main/java/seedu/address/storage/JsonAdaptedRestaurant.java
#	src/main/java/seedu/address/ui/RestaurantCard.java
#	src/main/resources/view/RestaurantListCard.fxml
#	src/test/java/seedu/address/storage/JsonAdaptedRestaurantTest.java
@rbth7e5
fix bugs introduced by merge
70eac38
chanqingzhou
chanqingzhou approved these changes Mar 3, 2019
View reviewed changes
Copy link
Collaborator

@chanqingzhou chanqingzhou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can consider putting cuisine as enum or a class rather than strings

@rbth7e5 rbth7e5 merged commit ddea379 into CS2103-AY1819S2-W17-1:master Mar 3, 2019
@rbth7e5 rbth7e5 deleted the restaurant_categorisation_1.1 branch March 3, 2019 09:42
@rbth7e5 rbth7e5 changed the title Restaurant categorisation 1.1 [W7][W17-1]Chen Caijie Mar 13, 2019
@rbth7e5 rbth7e5 changed the title [W7][W17-1]Chen Caijie Restaurant Categorisation 1.1 Mar 13, 2019
@chanqingzhou chanqingzhou mentioned this pull request Mar 13, 2019
Closed
29 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Wklee96 Wklee96 Wklee96 approved these changes

@chanqingzhou chanqingzhou chanqingzhou approved these changes

Assignees

@rbth7e5 rbth7e5

Labels
None yet
Projects
None yet
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.

update docs for set cuisine command update tests for set cuisine command add set cuisine command
3 participants
@rbth7e5 @Wklee96 @chanqingzhou