Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,86 @@
+package de.uniluebeck.mi.projmi6.controller;
+
+/**
+ * Created by 631806 on 12.11.15.
+ */
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+
+public class PatientEditorController {
+
+    @FXML
+    private Label patChangeTime;
+
+    @FXML
+    private Button btnPatAbort;
+
+    @FXML
+    private TextField patVersicherungsnummer;
+
+    @FXML
+    private ComboBox<?> patVersicherung;
+
+    @FXML
+    private Label patChanger;
+
+    @FXML
+    private TextField patOrt;
+
+    @FXML
+    private Label patId;
+
+    @FXML
+    private TextField patHausnummer;
+
+    @FXML
+    private Button btnPatSave;
+
+    @FXML
+    private TextField patPlz;
+
+    @FXML
+    private ComboBox<?> patFamilienstand;
+
+    @FXML
+    private TextField patStrasse;
+
+    @FXML
+    private TextField patVorname;
+
+    @FXML
+    private TextArea patCave;
+
+    @FXML
+    private ComboBox<?> patGeschlecht;
+
+    @FXML
+    private Label patCreator;
+
+    @FXML
+    private TextField patGeburtsname;
+
+    @FXML
+    private DatePicker patGeburtsdatum;
+
+    @FXML
+    private Label patCreateTime;
+
+    @FXML
+    private TextField patNachname;
+
+    @FXML
+    void clickedSave(ActionEvent event) {
+
+    }
+
+    @FXML
+    void clickedAbort(ActionEvent event) {
+
+    }
+
+}

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

@@ -0,0 +1,78 @@
+package de.uniluebeck.mi.projmi6.controller;
+
+/**
+ * Created by 631806 on 12.11.15.
+ */
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.ToggleButton;
+
+public class PatientTablesController{
+
+    @FXML
+    private Button btnPatCreate;
+
+    @FXML
+    private TableView<?> tblPatientOverview;
+
+    @FXML
+    private TableColumn<?, ?> colStatEntlassungsdatum;
+
+    @FXML
+    private TableColumn<?, ?> colPatOrt;
+
+    @FXML
+    private ComboBox<?> cmbStationenFilter;
+
+    @FXML
+    private TableColumn<?, ?> colStatFullName;
+
+    @FXML
+    private TableColumn<?, ?> colStatAlter;
+
+    @FXML
+    private TableColumn<?, ?> colPatGebDatum;
+
+    @FXML
+    private TableColumn<?, ?> colStatAufnahmedatum;
+
+    @FXML
+    private Button btnPatEdit;
+
+    @FXML
+    private TableColumn<?, ?> colPatNachname;
+
+    @FXML
+    private TableColumn<?, ?> colPatGeburtsname;
+
+    @FXML
+    private TableColumn<?, ?> colPatStrasse;
+
+    @FXML
+    private TableColumn<?, ?> colPatPlz;
+
+    @FXML
+    private TableColumn<?, ?> colPatPatId;
+
+    @FXML
+    private TableColumn<?, ?> colPatVorname;
+
+    @FXML
+    private ToggleButton btnEntlassenePatientenZeigen;
+
+    @FXML
+    private TableColumn<?, ?> colStatGebDatum;
+
+    @FXML
+    private TableColumn<?, ?> colPatCave;
+
+    @FXML
+    private TableView<?> tblStationOverview;
+
+    @FXML
+    private TableColumn<?, ?> colStatPatId;
+
+}