From 1ec6ae678c834592b5d731171a936161147c0707 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 11:34:14 +0200
Subject: Adjust employee list item to be more compact, adjust sizes [#28618]

---
 src/main/resources/fxml/employeeList.fxml          |  5 +-
 src/main/resources/fxml/employeeListItem.fxml      | 55 ++++++++++++----------
 .../resources/fxml/filterEmployeesControl.fxml     |  2 +-
 src/main/resources/fxml/manageEmployees.fxml       | 42 ++++++++++-------
 4 files changed, 60 insertions(+), 44 deletions(-)

(limited to 'src/main/resources/fxml')

diff --git a/src/main/resources/fxml/employeeList.fxml b/src/main/resources/fxml/employeeList.fxml
index 52c502a..4131125 100644
--- a/src/main/resources/fxml/employeeList.fxml
+++ b/src/main/resources/fxml/employeeList.fxml
@@ -5,5 +5,8 @@
   xmlns:fx="http://javafx.com/fxml"
   fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListController"
   fx:id="flowPaneEmployeeList"
-  prefHeight="346.0" prefWidth="742.0" style="-fx-background-color: #EFEBE8;">
+  stylesheets="@/styles/main.css"
+  prefWidth="${flowPaneEmployeeList.parent.width}"
+  prefHeight="${flowPaneEmployeeList.parent.height}"
+  style="-fx-background-color: #EFEBE8;">
 </FlowPane>
diff --git a/src/main/resources/fxml/employeeListItem.fxml b/src/main/resources/fxml/employeeListItem.fxml
index eb5c95c..3c020eb 100644
--- a/src/main/resources/fxml/employeeListItem.fxml
+++ b/src/main/resources/fxml/employeeListItem.fxml
@@ -4,50 +4,53 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.text.Font?>
+
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
-  prefHeight="96.0" prefWidth="360.0" styleClass="bg-white, shadowed"
+  onMouseClicked="#onEmployeeClicked" prefHeight="80.0" prefWidth="320.0"
+  styleClass="bg-white, shadowed" stylesheets="@/styles/main.css"
   xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
-  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListItemController"
-  onMouseClicked="#onEmployeeClicked">
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListItemController">
   <children>
-    <Label fx:id="lblName" layoutX="8.0" layoutY="22.0" text="Peter Mustermann"
-      AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="5.0">
-      <font>
-        <Font name="System Bold" size="18.0"/>
-      </font>
+    <Label fx:id="lblName" layoutX="8.0" layoutY="22.0" styleClass="text-big, text-bold"
+      text="Peter Mustermann" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="5.0">
     </Label>
-    <HBox layoutX="10.0" layoutY="40.0" prefHeight="42.0" prefWidth="339.0"
+    <HBox layoutX="10.0" layoutY="40.0" prefHeight="42.0" prefWidth="300.0"
       AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="40.0">
       <children>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0">
+        <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+          minWidth="-Infinity" prefHeight="42.0" prefWidth="100.0">
           <children>
             <!-- TODO: update images to have transparent background! -->
-            <ImageView fx:id="imgQualification" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
-              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
-              AnchorPane.topAnchor="10.0"/>
-            <Label fx:id="lblQualification" layoutX="45.0" layoutY="14.0" text="Notarzt"
-              AnchorPane.leftAnchor="45.0" AnchorPane.topAnchor="14.0"/>
+            <ImageView fx:id="imgQualification" fitHeight="25.0" fitWidth="25.0" layoutX="2.0"
+              pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="0.0"
+              AnchorPane.topAnchor="0.0"/>
+            <Label fx:id="lblQualification" layoutX="45.0" layoutY="14.0" styleClass="text-small"
+              text="Notarzt" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="0.0">
+            </Label>
           </children>
         </AnchorPane>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0">
+        <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+          minWidth="-Infinity" prefHeight="42.0" prefWidth="100.0">
           <children>
             <!-- TODO: update images to have transparent background! -->
             <ImageView fx:id="imgPilot" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
-              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
-              AnchorPane.topAnchor="10.0"/>
-            <Label fx:id="lblPilot" layoutX="53.0" layoutY="14.0" text="nicht Pilot"
-              AnchorPane.leftAnchor="45.0" AnchorPane.topAnchor="14.0"/>
+              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="0.0"
+              AnchorPane.topAnchor="0.0"/>
+            <Label fx:id="lblPilot" layoutX="53.0" layoutY="14.0" styleClass="text-small"
+              text="nicht Pilot" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="0.0">
+            </Label>
           </children>
         </AnchorPane>
-        <AnchorPane prefHeight="42.0" prefWidth="112.0">
+        <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+          minWidth="-Infinity" prefHeight="42.0" prefWidth="100.0">
           <children>
             <!-- TODO: update images to have transparent background! -->
             <ImageView fx:id="imgDriver" fitHeight="25.0" fitWidth="25.0" layoutX="10.0"
-              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="10.0"
-              AnchorPane.topAnchor="10.0"/>
-            <Label fx:id="lblDriver" layoutX="54.0" layoutY="14.0" text="ist Fahrer"
-              AnchorPane.leftAnchor="45.0" AnchorPane.topAnchor="14.0"/>
+              layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="0.0"
+              AnchorPane.topAnchor="0.0"/>
+            <Label fx:id="lblDriver" layoutX="54.0" layoutY="14.0" styleClass="text-small"
+              text="ist Fahrer" AnchorPane.leftAnchor="30.0" AnchorPane.topAnchor="0.0">
+            </Label>
           </children>
         </AnchorPane>
       </children>
diff --git a/src/main/resources/fxml/filterEmployeesControl.fxml b/src/main/resources/fxml/filterEmployeesControl.fxml
index 68a6f3e..01ec7b6 100644
--- a/src/main/resources/fxml/filterEmployeesControl.fxml
+++ b/src/main/resources/fxml/filterEmployeesControl.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane prefHeight="86.0" prefWidth="740.0" style="-fx-background-color: white;"
+<AnchorPane prefHeight="86.0" prefWidth="640.0" style="-fx-background-color: white;"
   xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
   fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.FilterEmployeesController">
   <children>
diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
index c007c88..8607396 100644
--- a/src/main/resources/fxml/manageEmployees.fxml
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -5,36 +5,46 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="816.0" style="-fx-background-color: #EFEBE8;" visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ManageEmployeesController">
+<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+  minWidth="-Infinity" prefHeight="536.0" prefWidth="720.0" style="-fx-background-color: #EFEBE8;"
+  visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ManageEmployeesController">
   <children>
-    <AnchorPane prefHeight="118.0" prefWidth="816.0" style="-fx-background-color: #C55A11;">
+    <AnchorPane prefHeight="118.0" prefWidth="720.0" style="-fx-background-color: #C55A11;"
+      AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
       <children>
         <Label layoutX="39.0" layoutY="23.0" text="Personen" textFill="WHITE">
           <font>
-            <Font name="Calibri Bold" size="22.0" />
+            <Font name="Calibri Bold" size="22.0"/>
           </font>
         </Label>
-            <Hyperlink onAction="#backToMain" layoutX="702.0" layoutY="15.0" prefHeight="42.0" prefWidth="86.0" text="Zurück" textFill="WHITE">
-               <font>
-                  <Font name="System Bold" size="16.0" />
-               </font>
-            </Hyperlink>
+        <Hyperlink layoutX="702.0" layoutY="15.0" onAction="#backToMain" prefHeight="42.0"
+          prefWidth="86.0" text="Zurück" textFill="WHITE" AnchorPane.rightAnchor="0.0">
+          <font>
+            <Font name="System Bold" size="16.0"/>
+          </font>
+        </Hyperlink>
       </children>
+      <padding>
+        <Insets right="10.0"/>
+      </padding>
     </AnchorPane>
-    <VBox layoutX="37.0" layoutY="60.0" prefHeight="454.0" prefWidth="742.0">
+    <AnchorPane layoutX="37.0" layoutY="60.0" maxHeight="-Infinity" maxWidth="-Infinity"
+      minHeight="-Infinity" minWidth="-Infinity" prefHeight="460.0" prefWidth="662.0">
       <children>
-        <AnchorPane fx:id="containerHeader" prefHeight="86.0" prefWidth="740.0" style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);" />
-        <ScrollPane hbarPolicy="NEVER" style="-fx-background-color: #EFEBE8;" vbarPolicy="NEVER">
-          <VBox.margin>
-            <Insets top="20.0" />
-          </VBox.margin>
+        <ScrollPane hbarPolicy="NEVER" layoutY="92.0" maxHeight="-Infinity" maxWidth="-Infinity"
+          minHeight="-Infinity" minWidth="-Infinity" prefHeight="366.0" prefWidth="662.0"
+          vbarPolicy="NEVER" AnchorPane.topAnchor="86.0">
           <content>
             <fx:include fx:id="employeeList" source="employeeList.fxml"/>
           </content>
         </ScrollPane>
+        <AnchorPane fx:id="containerHeader" maxHeight="-Infinity" maxWidth="-Infinity"
+          minHeight="-Infinity" minWidth="-Infinity" prefHeight="86.0" prefWidth="652.0"
+          style="-fx-background-color: white; -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 5);"
+          AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="0.0"/>
       </children>
-    </VBox>
+    </AnchorPane>
   </children>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2