From cd7f5b390b73c53cabb23b09a93d4d155c8ed47e Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 11 Mar 2019 15:40:16 +0100 Subject: [PATCH] ADD::added titles to the pages from the GUI the different pages now have titles indicating on what page you are, and switching between pages works now --- .../controller/DashBoardController.java | 3 +++ .../src/main/resources/fxml/dashboard.fxml | 20 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/Client/src/main/java/gogreen/client/controller/DashBoardController.java b/src/Client/src/main/java/gogreen/client/controller/DashBoardController.java index 5b4bcb0..7e8a37e 100644 --- a/src/Client/src/main/java/gogreen/client/controller/DashBoardController.java +++ b/src/Client/src/main/java/gogreen/client/controller/DashBoardController.java @@ -50,18 +50,21 @@ public class DashBoardController { } public void displayDashboard(ActionEvent event) { + System.out.println("display dashboard"); dashboardPane.setVisible(true); userPane.setVisible(false); activitiesPane.setVisible(false); } public void displayActivities(ActionEvent event) { + System.out.println("display activities"); dashboardPane.setVisible(false); userPane.setVisible(false); activitiesPane.setVisible(true); } public void displayUser(ActionEvent event) { + System.out.println("display user"); dashboardPane.setVisible(false); userPane.setVisible(true); activitiesPane.setVisible(false); diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml index eff9d05..f709d92 100644 --- a/src/Client/src/main/resources/fxml/dashboard.fxml +++ b/src/Client/src/main/resources/fxml/dashboard.fxml @@ -34,12 +34,26 @@ - - + + + + + + + + + + + + + + + + -