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

Changed color label FINALLY #68

Merged
merged 2 commits into from Oct 30, 2018

Conversation

TTTaus
Copy link

@TTTaus TTTaus commented Oct 30, 2018

ITS WORKING!

@TTTaus TTTaus requested a review from arjo129 October 30, 2018 16:06
@TTTaus TTTaus added the enhancement New feature or request label Oct 30, 2018
@TTTaus TTTaus removed the request for review from arjo129 October 30, 2018 17:10
Added screenshots and updated the DG
@arjo129 arjo129 merged commit 7985d11 into CS2113-AY1819S1-W13-2:master Oct 30, 2018
@arjo129 arjo129 mentioned this pull request Oct 30, 2018
Copy link

@arjo129 arjo129 left a comment

Choose a reason for hiding this comment

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

Some minor changes for next round.

@@ -86,6 +86,8 @@ private void loadDivePage(DiveSession dive) {
dateTime.setText(String.format(FORMAT_TIME_NOW, dive.getDateStart().getOurDateString()));
checkPressureGrp(dive.getPressureGroupAtBeginning().getPressureGroup());
currentDive = dive;
pgStart.getStyleClass().add(checkPressureGrp(dive.getPressureGroupAtBeginning().getPressureGroup()));
pgEnd.getStyleClass().add(checkPressureGrp(dive.getPressureGroupAtEnd().getPressureGroup()));
Copy link

Choose a reason for hiding this comment

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

you need to remove existing style classes too!!

@@ -124,64 +126,65 @@ private String dateTimeSend() {
* Receives the pressure group that needs to be parsed
* sets the attribute on the screen depending on the Pressure group.
*/
private void checkPressureGrp(String pgGrp) {
private String checkPressureGrp(String pgGrp) {
switch(pgGrp) {
case "A":
Copy link

Choose a reason for hiding this comment

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

You might want to check in the standard if it is possible to make this shorter.

case "B":
break;
return "thisIsGreen";
Copy link

Choose a reason for hiding this comment

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

Declare these as constants!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants