From dab2ba81630e5bcaae10128e17a2e01d0bfa3491 Mon Sep 17 00:00:00 2001
From: Ida Merete Enholm <ida.enholm@me.com>
Date: Mon, 16 Apr 2018 17:39:52 +0200
Subject: [PATCH] #99 UI changes

---
 .../gr1802/app/core/BackendConnector.java     |  2 +-
 .../gr1802/app/ui/SeeWorkoutsController.java  |  3 +++
 .../tdt4140/gr1802/app/ui/AddSleepdata.fxml   |  2 +-
 .../gr1802/app/ui/CoachSeeWorkout.fxml        | 22 +++++++++----------
 .../gr1802/app/ui/HomeScreenAthlete.fxml      |  8 +++----
 .../tdt4140/gr1802/app/ui/SeeWorkouts.fxml    |  3 ++-
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/tdt4140-gr1802/app.core/src/main/java/tdt4140/gr1802/app/core/BackendConnector.java b/tdt4140-gr1802/app.core/src/main/java/tdt4140/gr1802/app/core/BackendConnector.java
index dfde255..e706349 100644
--- a/tdt4140-gr1802/app.core/src/main/java/tdt4140/gr1802/app/core/BackendConnector.java
+++ b/tdt4140-gr1802/app.core/src/main/java/tdt4140/gr1802/app/core/BackendConnector.java
@@ -13,7 +13,7 @@
 
 public final class BackendConnector {
         
-        static String baseUrl = "http://10.22.62.15:8000/"; 
+        static String baseUrl = "http://10.22.36.132:8000/"; 
         public static JSONObject makeRequest(HashMap<String, String> dict, String path) throws Exception { 
                 
                 HttpURLConnection con = null;
diff --git a/tdt4140-gr1802/app.ui/src/main/java/tdt4140/gr1802/app/ui/SeeWorkoutsController.java b/tdt4140-gr1802/app.ui/src/main/java/tdt4140/gr1802/app/ui/SeeWorkoutsController.java
index 692db96..4df3d25 100644
--- a/tdt4140-gr1802/app.ui/src/main/java/tdt4140/gr1802/app/ui/SeeWorkoutsController.java
+++ b/tdt4140-gr1802/app.ui/src/main/java/tdt4140/gr1802/app/ui/SeeWorkoutsController.java
@@ -80,6 +80,9 @@ public class SeeWorkoutsController{
 	@FXML
 	private Label txtLabelUsername;
 	
+	@FXML
+	private Button btSeeWorkout;
+	
 	private AthleteWorkoutController athleteWorkoutController = new AthleteWorkoutController();
 	private Workout workout;
 
diff --git a/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/AddSleepdata.fxml b/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/AddSleepdata.fxml
index 4c3429f..fb7b494 100644
--- a/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/AddSleepdata.fxml
+++ b/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/AddSleepdata.fxml
@@ -41,7 +41,7 @@
                         <Pane layoutX="159.0" prefHeight="655.0" prefWidth="1127.0">
                            <children>
                               <TextField fx:id="filepathTextField" layoutX="29.0" layoutY="65.0" prefHeight="27.0" prefWidth="501.0" promptText="Enter CSV Filepath" />
-                              <Button fx:id="addButton" layoutX="29.0" layoutY="188.0" mnemonicParsing="false" onAction="#clickAddButton" prefHeight="27.0" prefWidth="107.0" text="Add" />
+                              <Button fx:id="addButton" layoutX="29.0" layoutY="115.0" mnemonicParsing="false" onAction="#clickAddButton" prefHeight="27.0" prefWidth="107.0" text="Add" />
                            </children></Pane>
                      </children>
                   </AnchorPane>
diff --git a/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/CoachSeeWorkout.fxml b/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/CoachSeeWorkout.fxml
index 9b5bfb9..25c71d6 100644
--- a/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/CoachSeeWorkout.fxml
+++ b/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/CoachSeeWorkout.fxml
@@ -44,31 +44,31 @@
                                     <content>
                                       <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
                                              <children>
-                                                <Label fx:id="dateLabel" layoutX="66.0" layoutY="31.0" prefHeight="17.0" prefWidth="145.0" />
-                                                <Label fx:id="typeLabel" layoutX="77.0" layoutY="84.0" prefHeight="17.0" prefWidth="164.0" />
-                                                <Label fx:id="durationLabel" layoutX="91.0" layoutY="133.0" prefHeight="17.0" prefWidth="96.0" />
-                                                <Label fx:id="maxHRLabel" layoutX="88.0" layoutY="231.0" prefHeight="17.0" prefWidth="135.0" />
-                                                <Text layoutX="27.0" layoutY="45.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Date:">
+                                                <Label fx:id="dateLabel" layoutX="103.0" layoutY="73.0" prefHeight="17.0" prefWidth="145.0" />
+                                                <Label fx:id="typeLabel" layoutX="114.0" layoutY="126.0" prefHeight="17.0" prefWidth="164.0" />
+                                                <Label fx:id="durationLabel" layoutX="128.0" layoutY="175.0" prefHeight="17.0" prefWidth="96.0" />
+                                                <Label fx:id="maxHRLabel" layoutX="125.0" layoutY="273.0" prefHeight="17.0" prefWidth="135.0" />
+                                                <Text layoutX="64.0" layoutY="87.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Date:">
                                                    <font>
                                                       <Font name="System Bold" size="14.0" />
                                                    </font>
                                                 </Text>
-                                                <Text layoutX="29.0" layoutY="98.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Type:">
+                                                <Text layoutX="66.0" layoutY="140.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Type:">
                                                    <font>
                                                       <Font name="System Bold" size="14.0" />
                                                    </font>
                                                 </Text>
-                                                <Text layoutX="27.0" layoutY="245.0" strokeType="OUTSIDE" strokeWidth="0.0" text="MaxHR:">
+                                                <Text layoutX="64.0" layoutY="287.0" strokeType="OUTSIDE" strokeWidth="0.0" text="MaxHR:">
                                                    <font>
                                                       <Font size="14.0" />
                                                    </font>
                                                 </Text>
-                                                <Text layoutX="27.0" layoutY="147.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Duration:">
+                                                <Text layoutX="64.0" layoutY="189.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Duration:">
                                                    <font>
                                                       <Font size="14.0" />
                                                    </font>
                                                 </Text>
-                                                <PieChart fx:id="pulszonesChart" layoutX="571.0" layoutY="51.0" prefHeight="248.0" prefWidth="262.0" title="Puls zones" />
+                                                <PieChart fx:id="pulszonesChart" layoutX="609.0" layoutY="51.0" prefHeight="286.0" prefWidth="430.0" title="Puls zones" />
                                                 <LineChart fx:id="pulsLine" layoutX="18.0" layoutY="354.0" prefHeight="248.0" prefWidth="1048.0">
                                                   <xAxis>
                                                     <CategoryAxis side="BOTTOM" fx:id="xAxis" />
@@ -77,12 +77,12 @@
                                                     <NumberAxis fx:id="yAxis" side="LEFT" />
                                                   </yAxis>
                                                 </LineChart>
-                                                <Text layoutX="28.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="AvgHR:">
+                                                <Text layoutX="65.0" layoutY="240.0" strokeType="OUTSIDE" strokeWidth="0.0" text="AvgHR:">
                                                    <font>
                                                       <Font size="14.0" />
                                                    </font>
                                                 </Text>
-                                                <Label fx:id="avgHRLabel" layoutX="91.0" layoutY="184.0" prefHeight="17.0" prefWidth="107.0" />
+                                                <Label fx:id="avgHRLabel" layoutX="128.0" layoutY="226.0" prefHeight="17.0" prefWidth="107.0" />
                                                 <Label fx:id="athleteLabel" layoutX="385.0" layoutY="14.0" prefWidth="250.0">
                                                    <font>
                                                       <Font name="System Bold" size="18.0" />
diff --git a/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/HomeScreenAthlete.fxml b/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/HomeScreenAthlete.fxml
index 8f1fb00..634a823 100644
--- a/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/HomeScreenAthlete.fxml
+++ b/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/HomeScreenAthlete.fxml
@@ -36,10 +36,10 @@
                         <Pane layoutX="159.0" prefHeight="650.0" prefWidth="1121.0">
                            <children>
                               <HBox layoutX="56.0" layoutY="232.0" prefHeight="64.0" prefWidth="532.0" />
-                              <PieChart fx:id="zoneChart" layoutX="379.0" layoutY="83.0" prefHeight="349.0" prefWidth="418.0" />
-                              <Text layoutX="383.0" layoutY="470.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Low:" />
-                              <Text layoutX="494.0" layoutY="470.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Moderate:" />
-                              <Text layoutX="638.0" layoutY="470.0" strokeType="OUTSIDE" strokeWidth="0.0" text="High:" />
+                              <PieChart fx:id="zoneChart" layoutX="334.0" layoutY="90.0" prefHeight="349.0" prefWidth="418.0" />
+                              <Text layoutX="369.0" layoutY="470.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Low:" />
+                              <Text layoutX="480.0" layoutY="470.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Moderate:" />
+                              <Text layoutX="624.0" layoutY="470.0" strokeType="OUTSIDE" strokeWidth="0.0" text="High:" />
                               <Label fx:id="lowLabel" layoutX="417.0" layoutY="457.0" prefHeight="17.0" prefWidth="73.0" />
                               <Label fx:id="moderateLabel" layoutX="565.0" layoutY="457.0" prefHeight="17.0" prefWidth="63.0" />
                               <Label fx:id="highLabel" layoutX="675.0" layoutY="457.0" prefHeight="17.0" prefWidth="63.0" />
diff --git a/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/SeeWorkouts.fxml b/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/SeeWorkouts.fxml
index 6f270ec..75b4c41 100644
--- a/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/SeeWorkouts.fxml
+++ b/tdt4140-gr1802/app.ui/src/main/resources/tdt4140/gr1802/app/ui/SeeWorkouts.fxml
@@ -43,7 +43,8 @@
                                     <TableColumn fx:id="maxHRColumn" prefWidth="101.0" text="Max HR" />
                                 </columns>
                               </TableView>
-                              <Button fx:id="hideButton" layoutX="997.0" layoutY="578.0" mnemonicParsing="false" onAction="#hideWorkout" prefHeight="37.0" prefWidth="63.0" text="Hide" />
+                              <Button fx:id="hideButton" layoutX="875.0" layoutY="578.0" mnemonicParsing="false" onAction="#hideWorkout" prefHeight="37.0" prefWidth="63.0" text="Hide" />
+                              <Button fx:id="btSeeWorkout" layoutX="966.0" layoutY="578.0" mnemonicParsing="false" onAction="#clickSeeWorkout" prefHeight="37.0" prefWidth="115.0" text="See Workout" />
                            </children>
                         </Pane>
                         <Line endX="1280.0" startX="-400.0" AnchorPane.bottomAnchor="656.3" AnchorPane.leftAnchor="-391.5" AnchorPane.rightAnchor="518.9000000000001" AnchorPane.topAnchor="-0.5" />