Created Type attribute for Menu and changed Regex for Price #88
Conversation
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
…bute and the Price regex
SalsabilTasnia
added
the
status.ongoing
and convertPricetoString()
kianhong95
requested changes
Oct 23, 2018
px1099
reviewed
Oct 23, 2018
| return priceIndouble; | ||
| } | ||
|
|
||
| public String convertPricetoString(double priceIndouble){ |
There was a problem hiding this comment.
This method can be adjusted to convert the double to the correct 2 digits after the dot format
| public static final String MESSAGE_PRICE_CONSTRAINTS = "Price should be in SGD and in dollars and cents"; | ||
| public static final String PHONE_VALIDATION_REGEX = "\\d+";//"^\\$\\d+([.][0-9]+)?$"; | ||
| public static final String PHONE_VALIDATION_REGEX = "\\$[1-9][0-9]*(\\.[0-9]{2})?|\\$0?\\.[0-9][0-9]";//"^\\$\\d+([.][0-9]+)?$"; |
There was a problem hiding this comment.
PRICE_VALIDATION_REGEX can be adjusted to accept price with only one digit after the dot
| builder.append(getPrice()); | ||
| return builder.toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Formats a menu item as text, showing only non-private contact details. | ||
| */ | ||
| default String getAsTextHidePrivate() { |
There was a problem hiding this comment.
Should merge getAsTextShowAll() and getAsTextShowPrivate() into one single method getAsText()
kianhong95
approved these changes
Oct 23, 2018
px1099
reviewed
Oct 23, 2018
SalsabilTasnia
added
the
status.review-pending
…wn to 2 decimal place if there are more than 2 decimal digits in the priceIndouble variable
px1099
reviewed
Oct 25, 2018
| @@ -45,6 +45,11 @@ public static String convertPricetoString(double priceIndouble){ | |||
| if((valueAsPrice.substring(decimalIndex)).length()<3){ | |||
| valueAsPrice = valueAsPrice + "0"; | |||
| } | |||
| if((valueAsPrice.substring(decimalIndex)).length()>3){ | |||
| priceIndouble = Math.round(priceIndouble*100.0)/100.0; | |||
There was a problem hiding this comment.
The result of this calculation may create a result of 0 or 1 digit after the dot, which makes the string format not to have exactly 2 digits after the dot.
AngWM
approved these changes
Oct 25, 2018
kianhong95
removed
status.ongoing
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.