SZUT/nhplus
5
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases 1 Wiki Activity Actions

Refaktoring #21

Merged
SZUT-Dominik merged 12 commits from refactor into main 2024-04-30 12:21:17 +00:00
Conversation 1 Commits 12 Files changed 148 +95 -52
3 changed files with 95 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ac86f614d6 - Show all commits

102
src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
View file

@ -3,42 +3,86 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?> <BorderPane
<BorderPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns="http://javafx.com/javafx/11.0.1"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.nurse.AllNurseController"> xmlns:fx="http://javafx.com/fxml/1"
<children> fx:controller="de.hitec.nhplus.nurse.AllNurseController"
>
<padding>
<Insets top="8" left="8" right="8" bottom="8"/>
</padding>
<center>
<TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="40.0"> <TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="40.0">
<columns> <columns>
<TableColumn fx:id="columnId" maxWidth="1200.0" minWidth="5.0" prefWidth="5.0" text="ID"/> <TableColumn
<TableColumn fx:id="columnSurname" maxWidth="7500.0" minWidth="20.0" prefWidth="100.0" text="Nachname"/> fx:id="columnId"
<TableColumn fx:id="columnFirstName" maxWidth="7500.0" prefWidth="75.0" text="Vorname"/> minWidth="40.0"
<TableColumn fx:id="columnPhoneNumber" maxWidth="7500.0" prefWidth="75.0" text="Telefonnummer"/> text="ID"
/>
<TableColumn
fx:id="columnSurname"
minWidth="140.0"
text="Nachname"
/>
<TableColumn
fx:id="columnFirstName"
minWidth="140.0"
text="Vorname"
/>
<TableColumn
fx:id="columnPhoneNumber"
minWidth="140.0"
text="Telefonnummer"
/>
</columns> </columns>
<columnResizePolicy> <columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy> </columnResizePolicy>
</TableView> </TableView>
<HBox layoutX="420.0" layoutY="450.0" spacing="10.0"> </center>
<children> <bottom>
<TextField fx:id="txfSurname" prefHeight="26.0" prefWidth="220.0" promptText="Nachname"/> <BorderPane>
<TextField fx:id="txfFirstname" prefHeight="26.0" prefWidth="220.0" promptText="Vorname"/> <BorderPane.margin>
<TextField fx:id="txfPhoneNumber" prefWidth="160.0" promptText="Telefonnummer"/> <Insets top="8.0"/>
<Button fx:id="btnAdd" mnemonicParsing="false" prefWidth="90.0" text="Hinzufügen"/> </BorderPane.margin>
<Button fx:id="btnDelete" mnemonicParsing="false" prefWidth="90.0" text="Löschen"/> <center>
</children> <HBox spacing="8.0">
</HBox>
<HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="10.0" prefWidth="200.0" spacing="25.0">
<children>
<Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Pfleger/innen"
textAlignment="CENTER">
<font>
<Font size="36.0"/>
</font>
</Label>
</children>
</HBox>
</children>
<padding> <padding>
<Insets top="10.0"/> <Insets right="8.0"/>
</padding> </padding>
<TextField
fx:id="textFieldSurname"
prefWidth="200.0"
promptText="Nachname"
/>
<TextField
fx:id="textFieldFirstname"
prefWidth="200.0"
promptText="Vorname"
/>
<TextField
fx:id="textFieldPhoneNumber"
prefWidth="200.0"
promptText="Telefonnummer"
/>
</HBox>
</center>
<right>
<HBox spacing="8.0">
<Button
fx:id="buttonAdd"
mnemonicParsing="false"
prefWidth="90.0"
text="Hinzufügen"
/>
<Button
fx:id="buttonDelete"
mnemonicParsing="false"
prefWidth="90.0"
text="Löschen"
/>
</HBox>
</right>
</BorderPane>
</bottom>
</BorderPane> </BorderPane>

38
src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
View file

@ -78,42 +78,42 @@
<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> </rowConstraints>
<!-- Row 0-->
<TextField <TextField
fx:id="textFieldFirstName" GridPane.rowIndex="0"
minWidth="200.0" GridPane.columnIndex="0"
prefHeight="26.0"
prefWidth="200.0" prefWidth="200.0"
fx:id="textFieldFirstName"
promptText="Vorname" promptText="Vorname"
/> />
<TextField <TextField
GridPane.rowIndex="0"
GridPane.columnIndex="1"
prefWidth="200.0"
fx:id="textFieldSurname" fx:id="textFieldSurname"
minWidth="200.0"
prefHeight="26.0"
prefWidth="200.0"
promptText="Nachname" promptText="Nachname"
GridPane.columnIndex="1"
/> />
<TextField <TextField
fx:id="textFieldDateOfBirth" GridPane.rowIndex="0"
minWidth="160.0"
prefWidth="160.0"
promptText="Geburtstag"
GridPane.columnIndex="2" GridPane.columnIndex="2"
prefWidth="200.0"
fx:id="textFieldDateOfBirth"
promptText="Geburtstag"
/> />
<!-- Row 1-->
<TextField <TextField
GridPane.rowIndex="1"
GridPane.columnIndex="0"
prefWidth="200.0"
fx:id="textFieldCareLevel" fx:id="textFieldCareLevel"
prefHeight="26.0"
prefWidth="200.0"
promptText="Pflegegrad" promptText="Pflegegrad"
GridPane.rowIndex="1"
/> />
<TextField <TextField
fx:id="textFieldRoomNumber"
prefHeight="26.0"
prefWidth="200.0"
promptText="Raum"
GridPane.columnIndex="1"
GridPane.rowIndex="1" GridPane.rowIndex="1"
GridPane.columnIndex="1"
prefWidth="200.0"
fx:id="textFieldRoomNumber"
promptText="Raum"
/> />
</GridPane> </GridPane>
</center> </center>

3
src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
View file

@ -65,9 +65,8 @@
<HBox spacing="8.0"> <HBox spacing="8.0">
<ComboBox <ComboBox
fx:id="comboBoxPatientSelection" fx:id="comboBoxPatientSelection"
minWidth="160.0"
onAction="#handleComboBox"
prefWidth="200.0" prefWidth="200.0"
onAction="#handleComboBox"
/> />
<Button <Button
mnemonicParsing="false" mnemonicParsing="false"