Merge branch 'master' of gogs.dittberner.it:nils/projmi

src/main/java/de/uniluebeck/mi/projmi6/controller/SettingsController.java

@@ -0,0 +1,32 @@
+package de.uniluebeck.mi.projmi6.controller;
+
+/**
+ * Created by 626947 on 12.11.15.
+ */
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+
+public class SettingsController {
+
+    @FXML
+    private Button opsServerSave;
+
+    @FXML
+    private Button opsServerSave1;
+
+    @FXML
+    private TextField opsServerIp1;
+
+    @FXML
+    private TextField opsServerIp;
+
+    @FXML
+    private TextField opsServerCode;
+
+    @FXML
+    private TextField opsServerCode1;
+
+}
+

src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java

@@ -0,0 +1,73 @@
+package de.uniluebeck.mi.projmi6.controller;
+
+/**
+ * Created by 626947 on 12.11.15.
+ */
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+
+public class UntersuchungenController {
+
+    @FXML
+    private Button btnUntsCancel;
+
+    @FXML
+    private Button btnUntsCreate;
+
+    @FXML
+    private TextField untsZeit;
+
+    @FXML
+    private Button btnUntsSave;
+
+    @FXML
+    private Label untsChanger;
+
+    @FXML
+    private Label untsCreator;
+
+    @FXML
+    private Label untsChangeTime;
+
+    @FXML
+    private Label untsCreateTime;
+
+    @FXML
+    private DatePicker untsDatum;
+
+    @FXML
+    private ListView<?> untsList;
+
+    @FXML
+    private ComboBox<?> untsOpsCode;
+
+    @FXML
+    private Button btnUntsNow;
+
+    @FXML
+    private ComboBox<?> untsArzt;
+
+    @FXML
+    void clickedUntsCreate(ActionEvent event) {
+
+    }
+
+    @FXML
+    void clickedUntsNow(ActionEvent event) {
+
+    }
+
+    @FXML
+    void clickedUntsAbort(ActionEvent event) {
+
+    }
+
+    @FXML
+    void clickedUntsSave(ActionEvent event) {
+
+    }
+
+}
+

src/main/resources/settings.fxml

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.*?>
-<?import javafx.scene.text.*?>
-<?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-
-
-<TilePane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<?import javafx.scene.text.*?>
+<TilePane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="SettingsController">
     <children>
         <VBox prefHeight="150.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;"
               styleClass="settings-box">

src/main/resources/untersuchungen.fxml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.text.*?>
-<?import java.lang.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-
-<SplitPane dividerPositions="0.45" prefHeight="421.0" prefWidth="652.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<SplitPane xmlns:fx="http://javafx.com/fxml/1" dividerPositions="0.45" prefHeight="421.0" prefWidth="652.0"
+           xmlns="http://javafx.com/javafx/8" fx:controller="ControllerUntersuchungen">
     <items>
         <VBox>
             <children>