Issue #1 Missing Telefonnummer in patient_edit.fxml gefixt

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

@@ -45,6 +45,9 @@ public class PatientEditorController {
     private TextField patNachname;
 
     @FXML
+    private TextField patTelefonnummer;
+
+    @FXML
     private TextField patStrasse;
     @FXML
     private TextField patHausnummer;
@@ -101,6 +104,7 @@ public class PatientEditorController {
         patGeburtsname.setText(patient.getGeburtsname());
         patNachname.setText(patient.getNachname());
         patVorname.setText(patient.getVorname());
+        patTelefonnummer.setText(patient.getTelefon());
         patStrasse.setText(patient.getStrasse());
         patHausnummer.setText(patient.getHausnummer());
         patPlz.setText(patient.getPlz());
@@ -137,6 +141,7 @@ public class PatientEditorController {
         patient.setGeburtsname(patGeburtsname.getText());
         patient.setNachname(patNachname.getText());
         patient.setVorname(patVorname.getText());
+        patient.setTelefon(patTelefonnummer.getText());
         patient.setStrasse(patStrasse.getText());
         patient.setHausnummer(patHausnummer.getText());
         patient.setPlz(patPlz.getText());
@@ -172,6 +177,7 @@ public class PatientEditorController {
         patHausnummer.setText("");
         patPlz.setText("");
         patOrt.setText("");
+        patTelefonnummer.setText("");
         patGeburtsdatum.setValue(LocalDate.of(1900, 1, 1));
         patFamilienstand.setValue(Patient.Familienstand.LEDIG);
         patGeschlecht.setValue(Patient.Geschlecht.FEMALE);

src/main/resources/patient_edit.fxml

@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.net.*?>
 <?import javafx.geometry.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.scene.control.*?>
 <?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">
+
+<VBox 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" fx:controller="de.uniluebeck.mi.projmi6.controller.PatientEditorController">
     <children>
         <GridPane>
             <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="35.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" />
@@ -29,6 +28,7 @@
                 <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 maxHeight="1.7976931348623157E308" minHeight="10.0" vgrow="SOMETIMES" />
             </rowConstraints>
             <children>
                 <Label text="PatID:" />
@@ -43,35 +43,45 @@
                 <Label text="Nachname:" GridPane.rowIndex="3" />
                 <TextField fx:id="patNachname" GridPane.columnIndex="1" GridPane.rowIndex="3" />
 
-                <Label text="Straße:" GridPane.rowIndex="4" />
-                <TextField fx:id="patStrasse" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                <Label text="Straße / Hausnummer:" GridPane.rowIndex="4" />
+            <HBox alignment="CENTER_RIGHT" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="4">
+               <children>
+                      <TextField fx:id="patStrasse" promptText="Straße" GridPane.columnIndex="1" GridPane.rowIndex="4" HBox.hgrow="ALWAYS" />
+                      <TextField fx:id="patHausnummer" promptText="Hausnummer" HBox.hgrow="SOMETIMES" />
+               </children>
+            </HBox>
 
-                <Label text="Hausnummer:" GridPane.rowIndex="5" />
-                <TextField fx:id="patHausnummer" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+                <Label text="PLZ / Ort:" GridPane.rowIndex="5" />
+            <HBox alignment="CENTER_RIGHT" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="5">
+               <children>
+                      <TextField fx:id="patPlz" promptText="PLZ" GridPane.columnIndex="1" GridPane.rowIndex="6" HBox.hgrow="SOMETIMES" />
+                      <TextField fx:id="patOrt" promptText="Ort" HBox.hgrow="ALWAYS" />
+               </children>
+            </HBox>
 
-                <Label text="PLZ:" GridPane.rowIndex="6" />
-                <TextField fx:id="patPlz" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+                <Label text="Telefonnummer:" GridPane.rowIndex="6" />
+            <TextField fx:id="patTelefonnummer" GridPane.columnIndex="1" GridPane.rowIndex="6" />
 
-                <Label text="Ort:" GridPane.rowIndex="7" />
-                <TextField fx:id="patOrt" GridPane.columnIndex="1" GridPane.rowIndex="7" />
-
-                <Label text="Geburtsdatum:" GridPane.rowIndex="8" />
-                <DatePicker fx:id="patGeburtsdatum" GridPane.columnIndex="1" GridPane.rowIndex="8" />
+                <Label text="Geburtsdatum:" GridPane.rowIndex="7" />
+                <DatePicker fx:id="patGeburtsdatum" GridPane.columnIndex="1" GridPane.rowIndex="7" />
                 
-                <Label text="Familienstand:" GridPane.rowIndex="9" />
-                <ComboBox fx:id="patFamilienstand" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="9" />
+                <Label text="Familienstand:" GridPane.rowIndex="8" />
+                <ComboBox fx:id="patFamilienstand" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="8" />
 
-                <Label text="Geschlecht:" GridPane.rowIndex="10" />
-                <ComboBox fx:id="patGeschlecht" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="10" />
+                <Label text="Geschlecht:" GridPane.rowIndex="9" />
+                <ComboBox fx:id="patGeschlecht" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="9" />
                 
-                <Label text="Versicherungsnummer:" GridPane.rowIndex="11" />
-                <TextField fx:id="patVersicherungsnummer" GridPane.columnIndex="1" GridPane.rowIndex="11" />
+                <Label text="Versicherungsnummer:" GridPane.rowIndex="10" />
+                <TextField fx:id="patVersicherungsnummer" GridPane.columnIndex="1" GridPane.rowIndex="10" />
                 
-                <Label text="Versicherung:" GridPane.rowIndex="12" />
-                <ComboBox fx:id="patVersicherung" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="12" />
+                <Label text="Versicherung:" GridPane.rowIndex="11" />
+                <ComboBox fx:id="patVersicherung" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="11" />
 
-                <Label text="CAVE:" GridPane.rowIndex="13" />
-                <TextArea fx:id="patCave" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="13" />
+                <Label text="CAVE:" GridPane.rowIndex="12" />
+                <TextArea fx:id="patCave" maxHeight="100.0" prefHeight="56.0" prefWidth="383.0" GridPane.columnIndex="1" GridPane.rowIndex="12">
+               <GridPane.margin>
+                  <Insets top="5.0" />
+               </GridPane.margin></TextArea>
                 
             </children>
          <VBox.margin>
@@ -105,8 +115,8 @@
                   <children>
                       <Label styleClass="ersteller-label" text="Ersteller: " GridPane.rowIndex="0" />
                       <Label styleClass="ersteller-label" text="Erstelldatum:" 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" />
+                      <Label fx:id="patCreator" styleClass="ersteller-value" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                      <Label fx:id="patCreateTime" styleClass="ersteller-value" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                   </children>
                   <columnConstraints>
                       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" />
@@ -123,19 +133,19 @@
                 <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" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
               </rowConstraints>
               <children>
                 <Label styleClass="ersteller-label" text="Letzter Bearbeiter:" GridPane.rowIndex="0" />
                 <Label styleClass="ersteller-label" text="Letzte Änderung:" 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" />
+                <Label fx:id="patChanger" styleClass="ersteller-value" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                <Label fx:id="patChangeTime" styleClass="ersteller-value" GridPane.columnIndex="1" GridPane.rowIndex="1" />
               </children>
             </GridPane>
          </children>
           <VBox.margin>
-              <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" />
           </VBox.margin>
       </GridPane>
     </children>