From 93aaf19f13e6d78dd342bbd80ceb70e223442e64 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <s.vanderhoeven@student.tudelft.nl>
Date: Wed, 20 Mar 2019 13:15:12 +0100
Subject: [PATCH] DEBUG/FIX::fixed bug where total amount of vegetarian meals
 wouldn't update

fixed the bug where totalVeganMeals wouldn't update on clicking the activities button if you were already on the activities screen

ADD::added id to 'add activity' button on dashboard

for adding a color change when clicking it, still need to implement it completely
---
 .../client/controller/DashBoardController.java         | 10 ++++++++--
 src/Client/src/main/resources/fxml/dashboard.fxml      |  2 +-
 .../src/main/resources/stylesheets/dashboardStyle.css  |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
index fa7cb12..df2f2b5 100644
--- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
+++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
@@ -50,6 +50,7 @@ public class DashBoardController {
     public Button userButton;
     public Line pathLine;
     public AnchorPane menuBar;
+    public Button addNewActivityButton;
 
     FadeTransition fadeTrans;       //transition for switching between the different panels
 
@@ -67,6 +68,7 @@ public class DashBoardController {
         userButton.setSkin(new MyButtonSkin(userButton));
 
 
+
     }
 
     /**
@@ -101,9 +103,12 @@ public class DashBoardController {
      * @param event the event (clicking the button)
      */
     public void displayActivities(ActionEvent event) {
+
+
         addFadeTransition(activitiesPane);
 
-        totalVeganMealCounter.setText("" + userService.currentUser.getVeganMeal());
+        int net = userService.currentUser.getVeganMeal() + count;
+        totalVeganMealCounter.setText("" + net);
         System.out.println("display activities");
         dashboardPane.setVisible(false);
         userPane.setVisible(false);
@@ -141,8 +146,9 @@ public class DashBoardController {
         System.out.println("Vegetarian meal is added");
     }
 
+    //sets the slide in transition for startup
     public void addSlideTransition(Node node, Line path1) {
-        PathTransition pathTrans = new PathTransition(Duration.millis(1500), path1, node);
+        PathTransition pathTrans = new PathTransition(Duration.millis(1100), path1, node);
         pathTrans.play();
     }
 
diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml
index 53d81ed..ee7d589 100644
--- a/src/Client/src/main/resources/fxml/dashboard.fxml
+++ b/src/Client/src/main/resources/fxml/dashboard.fxml
@@ -196,7 +196,7 @@
                   <Font size="30.0" />
                </font>
             </Label>
-            <Button contentDisplay="RIGHT" layoutX="496.0" layoutY="26.0" mnemonicParsing="false" onAction="#displayActivities" prefHeight="74.0" prefWidth="200.0" style="-fx-border-radius: 20px; -fx-padding: 0px 0px 0px 0px; -fx-background-color: transparent;" text="Add a new activity" textFill="#29721a">
+            <Button fx:id="addNewActivityButton" contentDisplay="RIGHT" layoutX="496.0" layoutY="26.0" mnemonicParsing="false" onAction="#displayActivities" prefHeight="74.0" prefWidth="200.0" style="-fx-border-radius: 20px; -fx-padding: 0px 0px 0px 0px; -fx-background-color: transparent;" text="Add a new activity" textFill="#29721a">
                <font>
                   <Font name="Corbel Bold" size="14.0" />
                </font>
diff --git a/src/Client/src/main/resources/stylesheets/dashboardStyle.css b/src/Client/src/main/resources/stylesheets/dashboardStyle.css
index 1cc0944..df39894 100644
--- a/src/Client/src/main/resources/stylesheets/dashboardStyle.css
+++ b/src/Client/src/main/resources/stylesheets/dashboardStyle.css
@@ -39,3 +39,7 @@
   -fx-background-color: #b7e2c2;
 }
 
+#addNewActivityButton:pressed {
+  -fx-background-color: #e8e8e8;
+}
+