DateTimePicker überall,

Controller weiter entwickelt

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

@@ -3,12 +3,12 @@ package de.uniluebeck.mi.projmi6.controller;
 /**
  * Created by 631806 on 12.11.15.
  */
+import de.uniluebeck.mi.projmi6.view.DateTimePicker;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
-import javafx.scene.control.DatePicker;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
@@ -26,7 +26,7 @@ public class FallController {
     }
 
     @FXML
-    private Button btnFallAufnNow;
+    private DateTimePicker dtTmAufnahme, dtTmEntlassung;
 
     @FXML
     private ComboBox<?> fallFallart;
@@ -41,30 +41,15 @@ public class FallController {
     private Label fallCreator;
 
     @FXML
-    private DatePicker fallEntlDate;
-
-    @FXML
-    private DatePicker fallAufnDate;
-
-    @FXML
     private Label fallEditor;
 
     @FXML
     private TextField fallVersichertennummer;
 
     @FXML
-    private Button btnFallEntlNow;
-
-    @FXML
-    private Label fallEditTime;
-
-    @FXML
     private Label fallPatID;
 
     @FXML
-    private TextField fallAufnTime;
-
-    @FXML
     private TextField fallEinweisenderArzt;
 
     @FXML

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

@@ -6,24 +6,66 @@ package de.uniluebeck.mi.projmi6.controller;
 import de.uniluebeck.mi.projmi6.model.Patient;
 import javafx.collections.FXCollections;
 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.*;
 import javafx.event.ActionEvent;
-import javafx.scene.control.TextField;
 import javafx.stage.Stage;
 
 public class PatientEditorController {
 
-   // private MainController mainController;
-
+    /**
+     * The patient that is shown in the edit window, or null if a new patient should be created.
+     */
     private Patient patient = null;
 
-   // public PatientEditorController(MainController mainController){
-   //     this.mainController = mainController;
-   // }
+
+    @FXML
+    private Label patChangeTime;
+    @FXML
+    private Label patChanger;
+    @FXML
+    private Label patCreator;
+    @FXML
+    private Label patCreateTime;
+
+    @FXML
+    private Label patId;
+
+    @FXML
+    private TextField patVorname;
+    @FXML
+    private TextField patGeburtsname;
+    @FXML
+    private TextField patNachname;
+
+    @FXML
+    private TextField patStrasse;
+    @FXML
+    private TextField patHausnummer;
+    @FXML
+    private TextField patPlz;
+    @FXML
+    private TextField patOrt;
+
+    @FXML
+    private DatePicker patGeburtsdatum;
+
+    @FXML
+    private ComboBox<Patient.Familienstand> patFamilienstand;
+    @FXML
+    private ComboBox<Patient.Geschlecht> patGeschlecht;
+
+    @FXML
+    private TextField patVersicherungsnummer;
+    @FXML
+    private ComboBox<?> patVersicherung;
+
+    @FXML
+    private TextArea patCave;
+
+    @FXML
+    private Button btnPatAbort;
+    @FXML
+    private Button btnPatSave;
 
 
     @FXML
@@ -44,7 +86,6 @@ public class PatientEditorController {
 
     }
 
-
     private void copyPatientDataIntoFields(){
         patId.setText(Integer.toString(patient.getPatID()));
         patGeburtsname.setText(patient.getGeburtsname());
@@ -67,6 +108,45 @@ public class PatientEditorController {
         patChangeTime.setText(patient.getBearbeitetDatumZeit());
     }
 
+    private void showMessage(String title, String message){
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
+        alert.setTitle("Ung\u00fcltige Daten!");
+        alert.setHeaderText(title);
+        alert.setContentText(message);
+
+        alert.showAndWait();
+    }
+
+    private void copyFieldDataIntoPatient(Patient patient){
+
+        patient.setGeburtsname(patGeburtsname.getText());
+        patient.setNachname(patNachname.getText());
+        patient.setVorname(patVorname.getText());
+        patient.setStrasse(patStrasse.getText());
+        patient.setHausnummer(patHausnummer.getText());
+        patient.setPlz(patPlz.getText());
+        patient.setOrt(patOrt.getText());
+        patient.setGeburtsdatum(patGeburtsdatum.getValue());
+        patient.setFamilienstand(patFamilienstand.getValue());
+        patient.setGeschlecht(patient.getGeschlecht());
+        patient.setVersichertennummer(patVersicherungsnummer.getText());
+        //patient.setVersicherung TODO
+        patient.setCave(patCave.getText());
+    }
+
+
+    private boolean validateData(){
+        if(!patPlz.getText().matches("[0-9]{5}")){
+            showMessage("Die eingegebene PLZ ist ung\u00fcltig!",
+                    "Postleitzahlen m\u00fcssen aus exakt 5 Ziffern bestehen!");
+            return false;
+        }
+
+        return true;
+    }
+
+
+
     private void clearFields(){
         patId.setText("<auto>");
         patGeburtsname.setText("");
@@ -89,72 +169,21 @@ public class PatientEditorController {
         patChangeTime.setText("<auto>");
     }
 
-
-
-
-    @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<Patient.Familienstand> patFamilienstand;
-
-    @FXML
-    private TextField patStrasse;
-
-    @FXML
-    private TextField patVorname;
-
-    @FXML
-    private TextArea patCave;
-
-    @FXML
-    private ComboBox<Patient.Geschlecht> 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) {
+        if(!validateData()){
+            return;
+        }
 
+        if(patient==null){
+            patient = new Patient();
+            copyFieldDataIntoPatient(patient);
+            //Create new db entry TODO
+        }else{
+            copyFieldDataIntoPatient(patient);
+            //Update db entry... TODO
+        }
+        ((Stage)patNachname.getScene().getWindow()).close();
     }
 
     @FXML

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

@@ -1,5 +1,6 @@
 package de.uniluebeck.mi.projmi6.controller;
 
+import de.uniluebeck.mi.projmi6.view.DateTimePicker;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -24,6 +25,9 @@ public class StationsHistorieController {
     @FXML
     private TableColumn<?,?> colStatHistAbteilung, colStatHistStation, colStatHistAufnahmeDatum, colStatHistEntlassungsDatum;
 
+    @FXML
+    private DateTimePicker dtTmAufnahme, dtTmEntlassung;
+
     public StationsHistorieController(MainController mainController){
         this.mainController = mainController;
     }

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

@@ -5,6 +5,8 @@ package de.uniluebeck.mi.projmi6.controller;
  */
 
 import de.uniluebeck.mi.projmi6.Main;
+import de.uniluebeck.mi.projmi6.model.Mitarbeiter;
+import de.uniluebeck.mi.projmi6.view.DateTimePicker;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
@@ -26,7 +28,7 @@ public class UntersuchungenController {
     private Button btnUntsCreate;
 
     @FXML
-    private TextField untsZeit;
+    private DateTimePicker dtTmUntersuchungszeitpunkt;
 
     @FXML
     private Button btnUntsSave;
@@ -44,19 +46,13 @@ public class UntersuchungenController {
     private Label untsCreateTime;
 
     @FXML
-    private DatePicker untsDatum;
-
-    @FXML
     private ListView<?> untsList;
 
     @FXML
     private ComboBox<?> untsOpsCode;
 
     @FXML
-    private Button btnUntsNow;
-
-    @FXML
-    private ComboBox<?> untsArzt;
+    private ComboBox<Mitarbeiter> untsArzt;
 
     @FXML
     void clickedUntsCreate(ActionEvent event) {
@@ -64,11 +60,6 @@ public class UntersuchungenController {
     }
 
     @FXML
-    void clickedUntsNow(ActionEvent event) {
-
-    }
-
-    @FXML
     void clickedUntsAbort(ActionEvent event) {
 
     }

src/main/java/de/uniluebeck/mi/projmi6/view/DateTimePicker.java

@@ -27,8 +27,6 @@ import java.time.LocalDateTime;
  */
 public class DateTimePicker extends HBox {
     private DatePicker datePicker = new DatePicker();
-    //private ComboBox<Integer> hourPicker = new ComboBox<>();
-   // private ComboBox<Integer> minutePicker = new ComboBox<>();
     private NumberTextField hourText = new NumberTextField();
     private NumberTextField minuteText = new NumberTextField();
     private Button btnNow = new Button("Jetzt");
@@ -40,7 +38,7 @@ public class DateTimePicker extends HBox {
      * Empty constructor for the FXMLLoader.
      */
     public DateTimePicker(){
-        this.setAlignment(Pos.CENTER);
+        this.setAlignment(Pos.CENTER_LEFT);
         hourText.setOnKeyReleased(event ->{
             if(hourText.getCaretPosition()>=2){
                 int hour = Integer.parseInt(hourText.getText());
@@ -88,15 +86,18 @@ public class DateTimePicker extends HBox {
 
         HBox timePicker = new HBox(hourText, colon,minuteText);
         timePicker.maxHeightProperty().bind(datePicker.heightProperty());
-        timePicker.setMaxWidth(140);
+        timePicker.setMinWidth(55);
+        timePicker.setMaxWidth(70);
         timePicker.getStyleClass().add("button");
 
         //Set Now-Button action
         btnNow.setOnAction(event -> setToCurrentDateTime());
-
+        //Make it large enough to read the text
+        btnNow.setMinWidth(50);
 
         //Add the subcomponents to the view.
         this.getChildren().addAll(datePicker,timePicker,btnNow);
+        this.setSpacing(5);
     }
 
 

src/main/resources/diagnose.fxml

@@ -7,6 +7,7 @@
 <?import javafx.scene.layout.*?>
 
 
+<?import java.net.URL?>
 <SplitPane dividerPositions="0.45" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.uniluebeck.mi.projmi6.controller.DiagnoseController">
 	<items>
 	    <VBox>
@@ -55,29 +56,32 @@
 						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 					</padding>
 	            </HBox>
-	            <GridPane>
-	                <children>
-	                    <Label styleClass="ersteller-label" text="Letzter Bearbeiter:" GridPane.rowIndex="2" />
-	                    <Label styleClass="ersteller-label" text="Ersteller: " />
-	                    <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1" />
-	                    <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="3" />
-	                    <Label fx:id="diagCreator" text="lorem" GridPane.columnIndex="1" />
-	                    <Label fx:id="diagCreateTime" text="ipsum" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-	                    <Label fx:id="diagChanger" text="dolor" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-	                    <Label fx:id="diagChangeTime" text="amet" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-	                </children>
+				<GridPane>
+					<children>
+						<Label styleClass="ersteller-label" text="Letzter Bearbeiter:" GridPane.rowIndex="2" />
+						<Label styleClass="ersteller-label" text="Ersteller: " />
+						<Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1" />
+						<Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="3" />
+						<Label styleClass="ersteller-value" fx:id="diagCreator" text="lorem" GridPane.columnIndex="1" />
+						<Label styleClass="ersteller-value" fx:id="diagCreateTime" text="ipsum" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+						<Label styleClass="ersteller-value" fx:id="diagChanger" text="dolor" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+						<Label styleClass="ersteller-value" fx:id="diagChangeTime" text="amet" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+					</children>
 					<columnConstraints>
 						<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" />
 						<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" />
 					</columnConstraints>
-	                <rowConstraints>
-	                    <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-	                    <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-	                    <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-	                    <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-	                </rowConstraints>
-	            </GridPane>
+					<rowConstraints>
+						<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+						<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+						<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+						<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+					</rowConstraints>
+				</GridPane>
 	        </children>
 	    </VBox>
 	</items>
+	<stylesheets>
+		<URL value="@style.css" />
+	</stylesheets>
 </SplitPane>

src/main/resources/fall.fxml

@@ -6,14 +6,16 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-<VBox fx:controller="de.uniluebeck.mi.projmi6.controller.FallController"  xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<?import java.net.URL?>
+<?import de.uniluebeck.mi.projmi6.view.DateTimePicker?>
+<VBox fx:controller="de.uniluebeck.mi.projmi6.controller.FallController" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <GridPane vgap="5.0">
             <children>
                 <Label text="Patient:"/>
                 <Label fx:id="fallPatID" text="John Doe (PatID = XXX)" GridPane.columnIndex="1"/>
                 <Label text="Aufnahmedatum:" GridPane.rowIndex="1"/>
-                <HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+               <!-- <HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
                     <children>
                         <DatePicker fx:id="fallAufnDate"/>
                         <TextField fx:id="fallAufnTime" prefColumnCount="5" promptText="HH:MM"/>
@@ -23,15 +25,18 @@
                     <GridPane.margin>
                         <Insets/>
                     </GridPane.margin>
-                </HBox>
-                <Label text="Entlassungsdatum:" GridPane.rowIndex="2"/>           <HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
+                </HBox>-->
+                <DateTimePicker GridPane.rowIndex="1" GridPane.columnIndex="1" fx:id="dtTmAufnahme" />
+                <Label text="Entlassungsdatum:" GridPane.rowIndex="2"/>
+                <!--<HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
                     <children>
                         <DatePicker fx:id="fallEntlDate"/>
                         <TextField fx:id="fallEntlTime" prefColumnCount="5" promptText="HH:MM"/>
                         <Button fx:id="btnFallEntlNow" mnemonicParsing="false" onAction="#clickedFallEntlNow"
                                 text="Jetzt"/>
                     </children>
-                </HBox>
+                </HBox>-->
+                <DateTimePicker GridPane.rowIndex="2" GridPane.columnIndex="1" fx:id="dtTmEntlassung" />
                 <Label text="Versichertennummer:" GridPane.rowIndex="3"/>
                 <Label text="Einweisender Arzt:" GridPane.rowIndex="4"/>
                 <HBox alignment="CENTER_LEFT" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="4">
@@ -92,8 +97,8 @@
                     <children>
                         <Label styleClass="ersteller-label" text="Ersteller: "/>
                         <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1"/>
-                        <Label fx:id="fallCreator" text="Doc Holiday" GridPane.columnIndex="1"/>
-                        <Label fx:id="fallCreateTime" text="12.01.2011 12:50" GridPane.columnIndex="1"
+                        <Label styleClass="ersteller-value" fx:id="fallCreator" text="Doc Holiday" GridPane.columnIndex="1"/>
+                        <Label styleClass="ersteller-value" fx:id="fallCreateTime" text="12.01.2011 12:50" GridPane.columnIndex="1"
                                GridPane.rowIndex="1"/>
                     </children>
                     <columnConstraints>
@@ -117,8 +122,8 @@
                     <children>
                         <Label styleClass="ersteller-label" text="Letzter Bearbeiter"/>
                         <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="1"/>
-                        <Label fx:id="fallEditor" text="Dr. House" GridPane.columnIndex="1"/>
-                        <Label fx:id="fallEditTime" text="11.11.2011 11:11" GridPane.columnIndex="1"
+                        <Label styleClass="ersteller-value" fx:id="fallEditor" text="Dr. House" GridPane.columnIndex="1"/>
+                        <Label styleClass="ersteller-value" fx:id="fallEditTime" text="11.11.2011 11:11" GridPane.columnIndex="1"
                                GridPane.rowIndex="1"/>
                     </children>
                 </GridPane>
@@ -128,4 +133,7 @@
             </VBox.margin>
         </HBox>
     </children>
+    <stylesheets>
+        <URL value="@style.css" />
+    </stylesheets>
 </VBox>

src/main/resources/log.fxml

@@ -5,6 +5,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
+<?import java.net.URL?>
 <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">
@@ -21,4 +22,7 @@
    <padding>
       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
    </padding>
+    <stylesheets>
+        <URL value="@style.css" />
+    </stylesheets>
 </VBox>

src/main/resources/main.fxml

@@ -6,7 +6,8 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<VBox fx:controller="de.uniluebeck.mi.projmi6.controller.MainController" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"  xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<?import java.net.URL?>
+<VBox fx:controller="de.uniluebeck.mi.projmi6.controller.MainController" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <TabPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" side="LEFT" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS">
             <tabs>
@@ -81,4 +82,7 @@
             </items>
         </ToolBar>
     </children>
+    <stylesheets>
+        <URL value="@style.css" />
+    </stylesheets>
 </VBox>

src/main/resources/patient_edit.fxml

@@ -6,6 +6,7 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
+<?import java.net.URL?>
 <VBox fx:controller="de.uniluebeck.mi.projmi6.controller.PatientEditorController" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="633.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <GridPane>
@@ -104,8 +105,8 @@
                   <children>
                       <Label styleClass="ersteller-label" text="Ersteller: " GridPane.rowIndex="0" />
                       <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1" />
-                      <Label fx:id="patCreator" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-                      <Label fx:id="patCreateTime" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                      <Label styleClass="ersteller-value" fx:id="patCreator" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                      <Label styleClass="ersteller-value" fx:id="patCreateTime" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                   </children>
                   <columnConstraints>
                       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" />
@@ -128,11 +129,17 @@
               <children>
                 <Label styleClass="ersteller-label" text="Letzter Bearbeiter:" GridPane.rowIndex="0" />
                 <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="1" />
-                <Label fx:id="patChanger" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-                <Label fx:id="patChangeTime" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                <Label styleClass="ersteller-value" fx:id="patChanger" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                <Label styleClass="ersteller-value" fx:id="patChangeTime" GridPane.columnIndex="1" GridPane.rowIndex="1" />
               </children>
             </GridPane>
          </children>
+          <VBox.margin>
+              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+          </VBox.margin>
       </GridPane>
     </children>
+    <stylesheets>
+        <URL value="@style.css" />
+    </stylesheets>
 </VBox>

src/main/resources/patient_tables.fxml

@@ -6,6 +6,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
+<?import java.net.URL?>
 <TabPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.uniluebeck.mi.projmi6.controller.PatientTablesController" fx:id="patientOverviewTabPane">
     <tabs>
         <Tab closable="false" text="Patientenübersicht" fx:id="patientOverviewTab">
@@ -85,4 +86,7 @@
             </content>
         </Tab>
     </tabs>
+    <stylesheets>
+        <URL value="@style.css" />
+    </stylesheets>
 </TabPane>

src/main/resources/settings.fxml

@@ -7,6 +7,7 @@
 <?import javafx.scene.text.*?>
 
 
+<?import java.net.URL?>
 <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="200.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;" styleClass="settings-box">
@@ -93,4 +94,7 @@
             </padding>
         </VBox>
     </children>
+    <stylesheets>
+        <URL value="@style.css" />
+    </stylesheets>
 </TilePane>

src/main/resources/stationshistorie.fxml

@@ -43,26 +43,12 @@
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                     </rowConstraints>
                     <children>
-                        <Label text="Abteilung"/>
-                        <Label text="Station" GridPane.rowIndex="1"/>
-                        <Label text="Aufnahmedatum / -Zeit" GridPane.rowIndex="2"/>
-                        <DateTimePicker GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                        <!--<HBox alignment="CENTER" GridPane.columnIndex="1" GridPane.rowIndex="2">
-                            <children>
-                                <DatePicker GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                                <TextField prefColumnCount="10" promptText="HH:MM"/>
-                                <Button mnemonicParsing="false" text="Jetzt"/>
-                            </children>
-                        </HBox>-->
-                        <Label text="Entlassungsdatum/ -Zeit" GridPane.rowIndex="3"/>
-                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1"
-                              GridPane.rowIndex="3">
-                            <children>
-                                <DatePicker/>
-                                <TextField  prefColumnCount="10" promptText="HH:MM"/>
-                                <Button mnemonicParsing="false" text="Jetzt"/>
-                            </children>
-                        </HBox>
+                        <Label text="Abteilung:"/>
+                        <Label text="Station:" GridPane.rowIndex="1"/>
+                        <Label text="Aufnahmedatum / -Zeit:" GridPane.rowIndex="2" />
+                        <DateTimePicker GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="dtTmAufnahme"/>
+                        <Label text="Entlassungsdatum/ -Zeit:" GridPane.rowIndex="3"/>
+                        <DateTimePicker  GridPane.columnIndex="1" GridPane.rowIndex="3" fx:id="dtTmEntlassung"/>
                         <ComboBox prefWidth="150.0" GridPane.columnIndex="1"/>
                         <ComboBox prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
                     </children>
@@ -79,10 +65,10 @@
                         <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1"/>
                         <Label styleClass="ersteller-label" text="Letzter Bearbeiter:" GridPane.rowIndex="2"/>
                         <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="3"/>
-                        <Label GridPane.columnIndex="1" GridPane.rowIndex="0" fx:id="statHistCreator" text="a"/>
-                        <Label GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="statHistCreateTime" text="b"/>
-                        <Label GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="statHistEditor" text="c"/>
-                        <Label GridPane.columnIndex="1" GridPane.rowIndex="3" fx:id="statHistEditTime" text="d"/>
+                        <Label styleClass="ersteller-value" GridPane.columnIndex="1" GridPane.rowIndex="0" fx:id="statHistCreator" text="a"/>
+                        <Label styleClass="ersteller-value" GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="statHistCreateTime" text="b"/>
+                        <Label styleClass="ersteller-value" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="statHistEditor" text="c"/>
+                        <Label styleClass="ersteller-value" GridPane.columnIndex="1" GridPane.rowIndex="3" fx:id="statHistEditTime" text="d"/>
                     </children>
                     <columnConstraints>
                         <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0"/>

src/main/resources/style.css

@@ -0,0 +1,7 @@
+.ersteller-label {
+    -fx-text-fill: gray;
+}
+
+.ersteller-value {
+  /*  -fx-text-fill: red; */
+}

src/main/resources/untersuchungen.fxml

@@ -3,6 +3,8 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+<?import java.net.URL?>
+<?import de.uniluebeck.mi.projmi6.view.DateTimePicker?>
 <SplitPane xmlns:fx="http://javafx.com/fxml/1" dividerPositions="0.45"
            xmlns="http://javafx.com/javafx/8" fx:controller="de.uniluebeck.mi.projmi6.controller.UntersuchungenController">
     <items>
@@ -32,15 +34,16 @@
                         <Label text="OPS-Code" />
                         <ComboBox fx:id="untsOpsCode" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" />
                         <Label text="Durchführender Arzt" GridPane.rowIndex="1" />
-                        <Label text="Untersuchungsdatum / -Zeit" GridPane.rowIndex="2" />
+                        <Label text="Untersuchungszeitpunkt" GridPane.rowIndex="2" />
                         <ComboBox fx:id="untsArzt" maxWidth="1.7976931348623157E308" promptText="aktueller Arzt is default" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                        <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
+                        <!--<HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
                             <children>
                                 <DatePicker fx:id="untsDatum" prefWidth="150.0" />
                                 <TextField fx:id="untsZeit" prefColumnCount="5" promptText="HH:MM" />
         						<Button fx:id="btnUntsNow" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#clickedUntsNow" text="Jetzt" HBox.hgrow="ALWAYS" />
                             </children>
-                        </HBox>
+                        </HBox>-->
+                        <DateTimePicker fx:id="dtTmUntersuchungszeitpunkt" GridPane.columnIndex="1" GridPane.rowIndex="2" />
                     </children>
                 </GridPane>
                 <HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="5.0" VBox.vgrow="ALWAYS">
@@ -68,13 +71,16 @@
                         <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.columnIndex="0" GridPane.rowIndex="1" />
                         <Label styleClass="ersteller-label" text="Letzter Bearbeiter:" GridPane.columnIndex="0" GridPane.rowIndex="2" />
                         <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.columnIndex="0" GridPane.rowIndex="3" />
-                        <Label fx:id="untsCreator" text="Dr. Haha" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-                        <Label fx:id="untsCreateTime" text="10.10.2013 09:00" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-  						<Label fx:id="untsChanger" text="Dr. Haha" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                        <Label fx:id="untsChangeTime" text="10.10.2013 09:00" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                        <Label styleClass="ersteller-value" fx:id="untsCreator" text="Dr. Haha" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                        <Label styleClass="ersteller-value" fx:id="untsCreateTime" text="10.10.2013 09:00" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+  						<Label styleClass="ersteller-value" fx:id="untsChanger" text="Dr. Haha" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                        <Label styleClass="ersteller-value" fx:id="untsChangeTime" text="10.10.2013 09:00" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                     </children>
                 </GridPane>
             </children>
         </VBox>
     </items>
+    <stylesheets>
+        <URL value="@style.css" />
+    </stylesheets>
 </SplitPane>