From cc0e780883320ae867e7f0a60c414189d448fed7 Mon Sep 17 00:00:00 2001
From: Johannes Oehm <johannes.oehm@student.uni-luebeck.de>
Date: Thu, 12 Nov 2015 18:42:02 +0100
Subject: [PATCH] Diverse Arbeiten an der GUI

---
 src/main/resources/log.fxml              | 24 ++++++++++
 src/main/resources/main.fxml             |  9 +++-
 src/main/resources/patient_tables.fxml   |  4 +-
 src/main/resources/settings.fxml         | 75 ++++++++++++++++----------------
 src/main/resources/stationshistorie.fxml |  1 -
 5 files changed, 70 insertions(+), 43 deletions(-)
 create mode 100644 src/main/resources/log.fxml

diff --git a/src/main/resources/log.fxml b/src/main/resources/log.fxml
new file mode 100644
index 0000000..d2fe473
--- /dev/null
+++ b/src/main/resources/log.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<VBox minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <TableView fx:id="tblLog" VBox.vgrow="ALWAYS">
+        <columns>
+          <TableColumn fx:id="colLogIp" editable="false" prefWidth="75.0" text="Ursprungs-IP" />
+          <TableColumn fx:id="colLogTime" editable="false" prefWidth="75.0" text="Uhrzeit" />
+          <TableColumn fx:id="colLogMessage" editable="false" prefWidth="75.0" text="Nachricht" />
+        </columns>
+         <columnResizePolicy>
+            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+         </columnResizePolicy>
+      </TableView>
+   </children>
+   <padding>
+      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+   </padding>
+</VBox>
diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml
index da69619..6542d16 100644
--- a/src/main/resources/main.fxml
+++ b/src/main/resources/main.fxml
@@ -10,7 +10,7 @@
     <children>
         <TabPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" side="LEFT" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS">
             <tabs>
-                <Tab text="Patientenübersicht">
+              <Tab text="Patientenübersicht">
                     <content>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
@@ -60,11 +60,16 @@
                         </VBox>
                     </content>
                 </Tab>
-                <Tab text="Einstellungen">
+               <Tab text="Einstellungen">
                <content>
                     <fx:include source="settings.fxml" />
                </content>
                 </Tab>
+                <Tab text="Logs">
+                    <content>
+                        <fx:include source="log.fxml" />
+                    </content>
+                </Tab>
             </tabs>
         </TabPane>
         <ToolBar>
diff --git a/src/main/resources/patient_tables.fxml b/src/main/resources/patient_tables.fxml
index 4d65d60..a82ff28 100644
--- a/src/main/resources/patient_tables.fxml
+++ b/src/main/resources/patient_tables.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<TabPane fx:controller="de.uniluebeck.mi.projmi6.controller.PatientTablesController" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<TabPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.uniluebeck.mi.projmi6.controller.PatientTablesController">
     <tabs>
         <Tab closable="false" text="Patientenübersicht">
             <content>
@@ -18,7 +18,7 @@
                                 <Button fx:id="btnPatEdit" text="Patient _bearbeiten" />
                             </items>
                         </ToolBar>
-                        <TableView fx:id="tblPatientOverview" editable="true" tableMenuButtonVisible="true">
+                        <TableView fx:id="tblPatientOverview" editable="true" tableMenuButtonVisible="true" VBox.vgrow="ALWAYS">
                             <columns>
                                 <TableColumn fx:id="colPatPatId" editable="false" prefWidth="75.0" sortable="false" text="PatID" />
                                 <TableColumn prefWidth="75.0" text="Name">
diff --git a/src/main/resources/settings.fxml b/src/main/resources/settings.fxml
index 91dd603..1847269 100644
--- a/src/main/resources/settings.fxml
+++ b/src/main/resources/settings.fxml
@@ -1,96 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<TilePane fx:controller="de.uniluebeck.mi.projmi6.controller.SettingsController" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" >
+
+
+<TilePane prefHeight="240.0" prefWidth="702.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.uniluebeck.mi.projmi6.controller.SettingsController">
     <children>
-        <VBox prefHeight="150.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;"
-              styleClass="settings-box">
+        <VBox prefHeight="200.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;" styleClass="settings-box">
             <children>
                 <Text strokeType="OUTSIDE" strokeWidth="0.0" text="MySQL-Datenbank">
                     <font>
-                        <Font size="18.0"/>
+                        <Font size="18.0" />
                     </font>
                     <VBox.margin>
-                        <Insets bottom="10.0"/>
+                        <Insets bottom="10.0" />
                     </VBox.margin>
                 </Text>
                 <GridPane>
                     <children>
-                        <Label text="JDBC-Serveradresse:"/>
-                        <Label text="Benutzername:" GridPane.rowIndex="1"/>
-                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" GridPane.columnIndex="1"/>
-                        <TextField fx:id="opsServerIp1" GridPane.columnIndex="1"/>
-                        <TextField fx:id="opsServerCode1" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-                        <Label text="Kennwort:" GridPane.rowIndex="2"/>
-                        <TextField GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+                        <Label text="JDBC-Serveradresse:" />
+                        <Label text="Benutzername:" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" GridPane.columnIndex="1" />
+                        <TextField fx:id="opsServerIp1" GridPane.columnIndex="1" />
+                        <TextField fx:id="opsServerCode1" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                        <Label text="Kennwort:" GridPane.rowIndex="2" />
+                        <TextField GridPane.columnIndex="1" GridPane.rowIndex="2" />
                     </children>
                     <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                     </columnConstraints>
                     <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                 </GridPane>
                 <HBox alignment="BOTTOM_RIGHT" VBox.vgrow="ALWAYS">
                     <children>
-                        <Button fx:id="opsServerSave1" alignment="CENTER_RIGHT" mnemonicParsing="false"
-                                text="Speichern"/>
+                        <Button fx:id="opsServerSave1" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Speichern" />
                     </children>
                 </HBox>
             </children>
             <padding>
-                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
             </padding>
             <TilePane.margin>
-                <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+                <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
             </TilePane.margin>
         </VBox>
-        <VBox prefHeight="200.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;"
-              styleClass="settings-box">
+        <VBox prefHeight="200.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;" styleClass="settings-box">
             <children>
                 <Text strokeType="OUTSIDE" strokeWidth="0.0" text="OPS-Server">
                     <font>
-                        <Font size="18.0"/>
+                        <Font size="18.0" />
                     </font>
                     <VBox.margin>
-                        <Insets bottom="10.0"/>
+                        <Insets bottom="10.0" />
                     </VBox.margin>
                 </Text>
                 <GridPane>
                     <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                     </columnConstraints>
                     <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                     <children>
-                        <Label text="OPS-Sever:"/>
-                        <Label text="Port:" GridPane.rowIndex="1"/>
-                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" GridPane.columnIndex="1"/>
-                        <TextField fx:id="opsServerIp" GridPane.columnIndex="1"/>
-                        <TextField fx:id="opsServerCode" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                        <Label text="OPS-Sever:" />
+                        <Label text="Port:" GridPane.rowIndex="1" />
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" GridPane.columnIndex="1" />
+                        <TextField fx:id="opsServerIp" GridPane.columnIndex="1" />
+                        <TextField fx:id="opsServerCode" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                     </children>
                 </GridPane>
                 <HBox alignment="BOTTOM_RIGHT" VBox.vgrow="ALWAYS">
                     <children>
-                        <Button fx:id="opsServerSave" alignment="CENTER_RIGHT" mnemonicParsing="false"
-                                text="Speichern"/>
+                        <Button fx:id="opsServerSave" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Speichern" />
                     </children>
                 </HBox>
             </children>
             <TilePane.margin>
-                <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+                <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
             </TilePane.margin>
             <padding>
-                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
             </padding>
         </VBox>
     </children>
diff --git a/src/main/resources/stationshistorie.fxml b/src/main/resources/stationshistorie.fxml
index dcae84b..167439f 100644
--- a/src/main/resources/stationshistorie.fxml
+++ b/src/main/resources/stationshistorie.fxml
@@ -6,7 +6,6 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<!-- Test von git in IntelliJ -->
 
 <SplitPane fx:controller="de.uniluebeck.mi.projmi6.controller.StationsHistorieController" dividerPositions="0.45"  xmlns="http://javafx.com/javafx/8"
            xmlns:fx="http://javafx.com/fxml/1">