Compare commits
No commits in common. "765d0c8dd224a14a5fe628bc382597d4e56e0490" and "1cbe39b4819c325bb47a8c66a2d0a51b7c7de38e" have entirely different histories.
765d0c8dd2
...
1cbe39b481
15 changed files with 208 additions and 261 deletions
|
@ -6,7 +6,6 @@ import javafx.application.Application;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.fxml.FXMLLoader;
|
import javafx.fxml.FXMLLoader;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
import javafx.scene.control.TabPane;
|
|
||||||
import javafx.scene.layout.BorderPane;
|
import javafx.scene.layout.BorderPane;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
|
@ -24,12 +23,12 @@ public class Main extends Application {
|
||||||
public void mainWindow() {
|
public void mainWindow() {
|
||||||
try {
|
try {
|
||||||
FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/MainWindowView.fxml"));
|
FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/MainWindowView.fxml"));
|
||||||
TabPane pane = loader.load();
|
BorderPane pane = loader.load();
|
||||||
|
|
||||||
Scene scene = new Scene(pane);
|
Scene scene = new Scene(pane);
|
||||||
this.primaryStage.setTitle("NHPlus");
|
this.primaryStage.setTitle("NHPlus");
|
||||||
this.primaryStage.setScene(scene);
|
this.primaryStage.setScene(scene);
|
||||||
this.primaryStage.setResizable(true);
|
this.primaryStage.setResizable(false);
|
||||||
this.primaryStage.show();
|
this.primaryStage.show();
|
||||||
|
|
||||||
this.primaryStage.setOnCloseRequest(event -> {
|
this.primaryStage.setOnCloseRequest(event -> {
|
||||||
|
|
|
@ -5,7 +5,7 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public abstract class DaoImp<T> implements Dao<T> {
|
public abstract class DaoImp<T> implements Dao<T> {
|
||||||
protected final Connection connection;
|
protected Connection connection;
|
||||||
|
|
||||||
public DaoImp(Connection connection) {
|
public DaoImp(Connection connection) {
|
||||||
this.connection = connection;
|
this.connection = connection;
|
||||||
|
|
|
@ -18,7 +18,7 @@ import static de.hitec.nhplus.utils.DateConverter.convertStringToLocalTime;
|
||||||
|
|
||||||
public class TreatmentFixture implements Fixture<Treatment>
|
public class TreatmentFixture implements Fixture<Treatment>
|
||||||
{
|
{
|
||||||
private final Map<String, Patient> patientsByName;
|
private Map<String, Patient> patientsByName;
|
||||||
|
|
||||||
public TreatmentFixture(Map<String, Patient> patientsByName)
|
public TreatmentFixture(Map<String, Patient> patientsByName)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,58 +1,37 @@
|
||||||
package de.hitec.nhplus.main;
|
package de.hitec.nhplus.main;
|
||||||
|
|
||||||
import de.hitec.nhplus.Main;
|
import de.hitec.nhplus.Main;
|
||||||
|
import javafx.event.ActionEvent;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.fxml.FXMLLoader;
|
import javafx.fxml.FXMLLoader;
|
||||||
import javafx.scene.control.Tab;
|
|
||||||
import javafx.scene.layout.AnchorPane;
|
|
||||||
import javafx.scene.layout.BorderPane;
|
import javafx.scene.layout.BorderPane;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class MainWindowController {
|
public class MainWindowController {
|
||||||
@FXML
|
|
||||||
private AnchorPane patientPage;
|
|
||||||
@FXML
|
|
||||||
private Tab patientTab;
|
|
||||||
@FXML
|
|
||||||
private AnchorPane treatmentPage;
|
|
||||||
@FXML
|
|
||||||
private Tab treatmentTab;
|
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private BorderPane mainBorderPane;
|
||||||
@FXML
|
@FXML
|
||||||
public void initialize() {
|
public void initialize() {
|
||||||
loadPatientPage();
|
handleShowAllPatient(null);
|
||||||
loadTreatmentsPage();
|
|
||||||
|
|
||||||
patientTab.setOnSelectionChanged(event -> loadPatientPage());
|
|
||||||
treatmentTab.setOnSelectionChanged(event -> loadTreatmentsPage());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadPatientPage() {
|
@FXML
|
||||||
|
private void handleShowAllPatient(ActionEvent event) {
|
||||||
|
FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/patient/AllPatientView.fxml"));
|
||||||
try {
|
try {
|
||||||
BorderPane patientsPane = FXMLLoader.load(
|
mainBorderPane.setCenter(loader.load());
|
||||||
Main.class.getResource("/de/hitec/nhplus/patient/AllPatientView.fxml")
|
|
||||||
);
|
|
||||||
patientPage.getChildren().setAll(patientsPane);
|
|
||||||
AnchorPane.setTopAnchor(patientsPane, 0d);
|
|
||||||
AnchorPane.setBottomAnchor(patientsPane, 0d);
|
|
||||||
AnchorPane.setLeftAnchor(patientsPane, 0d);
|
|
||||||
AnchorPane.setRightAnchor(patientsPane, 0d);
|
|
||||||
} catch (IOException exception) {
|
} catch (IOException exception) {
|
||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadTreatmentsPage() {
|
@FXML
|
||||||
|
private void handleShowAllTreatments(ActionEvent event) {
|
||||||
|
FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/treatment/AllTreatmentView.fxml"));
|
||||||
try {
|
try {
|
||||||
BorderPane treatmentsPane = FXMLLoader.load(
|
mainBorderPane.setCenter(loader.load());
|
||||||
Main.class.getResource("/de/hitec/nhplus/treatment/AllTreatmentView.fxml")
|
|
||||||
);
|
|
||||||
treatmentPage.getChildren().setAll(treatmentsPane);
|
|
||||||
AnchorPane.setTopAnchor(treatmentsPane, 0d);
|
|
||||||
AnchorPane.setBottomAnchor(treatmentsPane, 0d);
|
|
||||||
AnchorPane.setLeftAnchor(treatmentsPane, 0d);
|
|
||||||
AnchorPane.setRightAnchor(treatmentsPane, 0d);
|
|
||||||
} catch (IOException exception) {
|
} catch (IOException exception) {
|
||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,7 +80,9 @@ public class AllPatientController {
|
||||||
.getSelectionModel()
|
.getSelectionModel()
|
||||||
.selectedItemProperty()
|
.selectedItemProperty()
|
||||||
.addListener((observableValue, oldPatient, newPatient) ->
|
.addListener((observableValue, oldPatient, newPatient) ->
|
||||||
AllPatientController.this.buttonDelete.setDisable(newPatient == null)
|
{
|
||||||
|
AllPatientController.this.buttonDelete.setDisable(newPatient == null);
|
||||||
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
this.buttonAdd.setDisable(true);
|
this.buttonAdd.setDisable(true);
|
||||||
|
|
|
@ -4,6 +4,7 @@ import de.hitec.nhplus.main.Person;
|
||||||
import de.hitec.nhplus.treatment.Treatment;
|
import de.hitec.nhplus.treatment.Treatment;
|
||||||
import de.hitec.nhplus.utils.DateConverter;
|
import de.hitec.nhplus.utils.DateConverter;
|
||||||
import javafx.beans.property.SimpleIntegerProperty;
|
import javafx.beans.property.SimpleIntegerProperty;
|
||||||
|
import javafx.beans.property.SimpleLongProperty;
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
|
@ -70,7 +70,9 @@ public class AllTreatmentController {
|
||||||
.getSelectionModel()
|
.getSelectionModel()
|
||||||
.selectedItemProperty()
|
.selectedItemProperty()
|
||||||
.addListener((observableValue, oldTreatment, newTreatment) ->
|
.addListener((observableValue, oldTreatment, newTreatment) ->
|
||||||
AllTreatmentController.this.buttonDelete.setDisable(newTreatment == null)
|
{
|
||||||
|
AllTreatmentController.this.buttonDelete.setDisable(newTreatment == null);
|
||||||
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
this.createComboBoxData();
|
this.createComboBoxData();
|
||||||
|
|
|
@ -60,11 +60,11 @@ public class Treatment {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBegin(String begin) {
|
public void setBegin(String begin) {
|
||||||
this.begin = DateConverter.convertStringToLocalTime(begin);
|
this.begin = DateConverter.convertStringToLocalTime(begin);;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setEnd(String end) {
|
public void setEnd(String end) {
|
||||||
this.end = DateConverter.convertStringToLocalTime(end);
|
this.end = DateConverter.convertStringToLocalTime(end);;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
|
|
|
@ -47,7 +47,7 @@ public class TreatmentController {
|
||||||
|
|
||||||
PatientDao pDao = DaoFactory.getDaoFactory().createPatientDAO();
|
PatientDao pDao = DaoFactory.getDaoFactory().createPatientDAO();
|
||||||
try {
|
try {
|
||||||
this.patient = pDao.read(treatment.getPatientId());
|
this.patient = pDao.read((int) treatment.getPatientId());
|
||||||
this.treatment = treatment;
|
this.treatment = treatment;
|
||||||
showData();
|
showData();
|
||||||
} catch (SQLException exception) {
|
} catch (SQLException exception) {
|
||||||
|
|
|
@ -23,7 +23,7 @@ public class TreatmentDao extends DaoImp<Treatment> {
|
||||||
final String SQL = "INSERT INTO treatment (patientId, treatment_date, begin, end, description, remark) " +
|
final String SQL = "INSERT INTO treatment (patientId, treatment_date, begin, end, description, remark) " +
|
||||||
"VALUES (?, ?, ?, ?, ?, ?)";
|
"VALUES (?, ?, ?, ?, ?, ?)";
|
||||||
preparedStatement = this.connection.prepareStatement(SQL);
|
preparedStatement = this.connection.prepareStatement(SQL);
|
||||||
preparedStatement.setInt(1, treatment.getPatientId());
|
preparedStatement.setLong(1, treatment.getPatientId());
|
||||||
preparedStatement.setString(2, treatment.getDate());
|
preparedStatement.setString(2, treatment.getDate());
|
||||||
preparedStatement.setString(3, treatment.getBegin());
|
preparedStatement.setString(3, treatment.getBegin());
|
||||||
preparedStatement.setString(4, treatment.getEnd());
|
preparedStatement.setString(4, treatment.getEnd());
|
||||||
|
@ -128,7 +128,7 @@ public class TreatmentDao extends DaoImp<Treatment> {
|
||||||
preparedStatement.setString(4, treatment.getEnd());
|
preparedStatement.setString(4, treatment.getEnd());
|
||||||
preparedStatement.setString(5, treatment.getDescription());
|
preparedStatement.setString(5, treatment.getDescription());
|
||||||
preparedStatement.setString(6, treatment.getRemarks());
|
preparedStatement.setString(6, treatment.getRemarks());
|
||||||
preparedStatement.setInt(7, treatment.getId());
|
preparedStatement.setLong(7, treatment.getId());
|
||||||
} catch (SQLException exception) {
|
} catch (SQLException exception) {
|
||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
module de.hitec.nhplus {
|
module de.hitec.nhplus {
|
||||||
requires javafx.controls;
|
requires javafx.controls;
|
||||||
requires javafx.fxml;
|
requires javafx.fxml;
|
||||||
|
requires org.controlsfx.controls;
|
||||||
requires java.sql;
|
requires java.sql;
|
||||||
requires org.xerial.sqlitejdbc;
|
requires org.xerial.sqlitejdbc;
|
||||||
|
|
||||||
|
|
|
@ -1 +1,6 @@
|
||||||
/* https://materialui.co/colors */
|
/* https://materialui.co/colors */
|
||||||
|
.tabs{
|
||||||
|
-fx-background-color: #1565C0;
|
||||||
|
-fx-padding: 4px;
|
||||||
|
-fx-spacing: 4px;
|
||||||
|
}
|
||||||
|
|
|
@ -1,18 +1,44 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<?import javafx.scene.control.Tab?>
|
<?import javafx.geometry.Insets?>
|
||||||
<?import javafx.scene.control.TabPane?>
|
<?import javafx.scene.control.Button?>
|
||||||
<?import javafx.scene.layout.AnchorPane?>
|
<?import javafx.scene.layout.BorderPane?>
|
||||||
<TabPane
|
<?import javafx.scene.layout.HBox?>
|
||||||
tabClosingPolicy="UNAVAILABLE"
|
<BorderPane
|
||||||
xmlns="http://javafx.com/javafx/17.0.2-ea"
|
fx:id="mainBorderPane"
|
||||||
|
maxHeight="-Infinity"
|
||||||
|
maxWidth="-Infinity"
|
||||||
|
minHeight="-Infinity"
|
||||||
|
minWidth="-Infinity"
|
||||||
|
prefHeight="688.0"
|
||||||
|
prefWidth="926.0"
|
||||||
|
xmlns="http://javafx.com/javafx/10.0.2-internal"
|
||||||
xmlns:fx="http://javafx.com/fxml/1"
|
xmlns:fx="http://javafx.com/fxml/1"
|
||||||
fx:controller="de.hitec.nhplus.main.MainWindowController"
|
fx:controller="de.hitec.nhplus.main.MainWindowController">
|
||||||
|
<top>
|
||||||
|
<HBox id="tabs" alignment="CENTER_LEFT" styleClass="tabs" stylesheets="@Application.css">
|
||||||
|
<children>
|
||||||
|
<Button
|
||||||
|
alignment="CENTER"
|
||||||
|
contentDisplay="CENTER"
|
||||||
|
mnemonicParsing="false"
|
||||||
|
onAction="#handleShowAllPatient"
|
||||||
|
prefWidth="105.0"
|
||||||
|
text="Patienten"
|
||||||
>
|
>
|
||||||
<Tab fx:id="patientTab" text="Patienten">
|
<opaqueInsets>
|
||||||
<AnchorPane fx:id="patientPage"/>
|
<Insets/>
|
||||||
</Tab>
|
</opaqueInsets>
|
||||||
<Tab fx:id="treatmentTab" text="Behandlungen">
|
</Button>
|
||||||
<AnchorPane fx:id="treatmentPage"/>
|
<Button
|
||||||
</Tab>
|
alignment="CENTER"
|
||||||
</TabPane>
|
contentDisplay="CENTER"
|
||||||
|
mnemonicParsing="false"
|
||||||
|
onAction="#handleShowAllTreatments"
|
||||||
|
prefWidth="105.0"
|
||||||
|
text="Behandlungen"
|
||||||
|
></Button>
|
||||||
|
</children>
|
||||||
|
</HBox>
|
||||||
|
</top>
|
||||||
|
</BorderPane>
|
||||||
|
|
|
@ -3,72 +3,44 @@
|
||||||
<?import javafx.geometry.Insets?>
|
<?import javafx.geometry.Insets?>
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
<BorderPane
|
<?import javafx.scene.text.Font?>
|
||||||
|
<AnchorPane
|
||||||
|
prefHeight="500.0"
|
||||||
|
prefWidth="855.0"
|
||||||
xmlns="http://javafx.com/javafx/11.0.1"
|
xmlns="http://javafx.com/javafx/11.0.1"
|
||||||
xmlns:fx="http://javafx.com/fxml/1"
|
xmlns:fx="http://javafx.com/fxml/1"
|
||||||
fx:controller="de.hitec.nhplus.patient.AllPatientController"
|
fx:controller="de.hitec.nhplus.patient.AllPatientController">
|
||||||
>
|
<children>
|
||||||
<padding>
|
|
||||||
<Insets top="8" left="8" bottom="8" right="8"/>
|
|
||||||
</padding>
|
|
||||||
<center>
|
|
||||||
<TableView
|
<TableView
|
||||||
fx:id="tableView"
|
fx:id="tableView"
|
||||||
editable="true"
|
editable="true" layoutX="31.0"
|
||||||
>
|
layoutY="120.0" prefHeight="287.0"
|
||||||
|
prefWidth="825.0"
|
||||||
|
AnchorPane.bottomAnchor="100.0"
|
||||||
|
AnchorPane.leftAnchor="15.0"
|
||||||
|
AnchorPane.rightAnchor="15.0"
|
||||||
|
AnchorPane.topAnchor="80.0">
|
||||||
<columns>
|
<columns>
|
||||||
<TableColumn
|
<TableColumn fx:id="columnId" maxWidth="-1.0" minWidth="40.0" prefWidth="5.0" text="ID"/>
|
||||||
fx:id="columnId"
|
<TableColumn fx:id="columnSurname" maxWidth="-1.0" minWidth="140.0" onEditCommit="#handleOnEditSurname"
|
||||||
minWidth="40.0"
|
prefWidth="100.0" text="Nachname"/>
|
||||||
text="ID"
|
<TableColumn fx:id="columnFirstName" maxWidth="-1.00" minWidth="140.0"
|
||||||
/>
|
onEditCommit="#handleOnEditFirstname" prefWidth="75.0" text="Vorname"/>
|
||||||
<TableColumn
|
<TableColumn fx:id="columnDateOfBirth" maxWidth="-1.0" minWidth="140.0"
|
||||||
fx:id="columnSurname"
|
onEditCommit="#handleOnEditDateOfBirth" prefWidth="75.0" text="Geburtstag"/>
|
||||||
minWidth="140.0"
|
<TableColumn fx:id="columnCareLevel" maxWidth="-1.0" minWidth="140.0"
|
||||||
onEditCommit="#handleOnEditSurname"
|
onEditCommit="#handleOnEditCareLevel" prefWidth="75.0" text="Pflegegrad"/>
|
||||||
text="Nachname"
|
<TableColumn fx:id="columnRoomNumber" maxWidth="-1.0" minWidth="140.0"
|
||||||
/>
|
onEditCommit="#handleOnEditRoomNumber" prefWidth="75.0" text="Raum"/>
|
||||||
<TableColumn
|
|
||||||
fx:id="columnFirstName"
|
|
||||||
minWidth="140.0"
|
|
||||||
onEditCommit="#handleOnEditFirstname"
|
|
||||||
text="Vorname"
|
|
||||||
/>
|
|
||||||
<TableColumn
|
|
||||||
fx:id="columnDateOfBirth"
|
|
||||||
minWidth="140.0"
|
|
||||||
onEditCommit="#handleOnEditDateOfBirth"
|
|
||||||
text="Geburtstag"
|
|
||||||
/>
|
|
||||||
<TableColumn
|
|
||||||
fx:id="columnCareLevel"
|
|
||||||
minWidth="140.0"
|
|
||||||
onEditCommit="#handleOnEditCareLevel"
|
|
||||||
prefWidth="75.0"
|
|
||||||
text="Pflegegrad"
|
|
||||||
/>
|
|
||||||
<TableColumn
|
|
||||||
fx:id="columnRoomNumber"
|
|
||||||
minWidth="140.0"
|
|
||||||
onEditCommit="#handleOnEditRoomNumber"
|
|
||||||
text="Raum"
|
|
||||||
/>
|
|
||||||
</columns>
|
</columns>
|
||||||
<columnResizePolicy>
|
<columnResizePolicy>
|
||||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
||||||
</columnResizePolicy>
|
</columnResizePolicy>
|
||||||
</TableView>
|
</TableView>
|
||||||
</center>
|
<HBox layoutX="623.0" layoutY="419.3999938964844" spacing="10.0" AnchorPane.bottomAnchor="15.0"
|
||||||
<bottom>
|
AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0">
|
||||||
<BorderPane>
|
<children>
|
||||||
<BorderPane.margin>
|
<GridPane hgap="10.0" vgap="10.0">
|
||||||
<Insets top="8.0"/>
|
|
||||||
</BorderPane.margin>
|
|
||||||
<center>
|
|
||||||
<GridPane hgap="8.0" vgap="8.0">
|
|
||||||
<padding>
|
|
||||||
<Insets right="48.0"/>
|
|
||||||
</padding>
|
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" prefWidth="200.0"/>
|
<ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" prefWidth="200.0"/>
|
||||||
<ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" minWidth="200.0" prefWidth="200.0"/>
|
<ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" minWidth="200.0" prefWidth="200.0"/>
|
||||||
|
@ -78,65 +50,48 @@
|
||||||
<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>
|
||||||
<TextField
|
<children>
|
||||||
fx:id="textFieldFirstName"
|
<TextField fx:id="textFieldFirstName" minWidth="200.0" prefHeight="26.0" prefWidth="200.0"
|
||||||
minWidth="200.0"
|
promptText="Vorname"/>
|
||||||
prefHeight="26.0"
|
<TextField fx:id="textFieldSurname" minWidth="200.0" prefHeight="26.0" prefWidth="200.0"
|
||||||
prefWidth="200.0"
|
promptText="Nachname" GridPane.columnIndex="1"/>
|
||||||
promptText="Vorname"
|
<TextField fx:id="textFieldDateOfBirth" minWidth="160.0" prefWidth="160.0"
|
||||||
/>
|
promptText="Geburtstag" GridPane.columnIndex="2"/>
|
||||||
<TextField
|
<TextField fx:id="textFieldCareLevel" prefHeight="26.0" prefWidth="200.0"
|
||||||
fx:id="textFieldSurname"
|
promptText="Pflegegrad" GridPane.rowIndex="1"/>
|
||||||
minWidth="200.0"
|
<TextField fx:id="textFieldRoomNumber" prefHeight="26.0" prefWidth="200.0" promptText="Raum"
|
||||||
prefHeight="26.0"
|
GridPane.columnIndex="1" GridPane.rowIndex="1"/>
|
||||||
prefWidth="200.0"
|
</children>
|
||||||
promptText="Nachname"
|
<padding>
|
||||||
GridPane.columnIndex="1"
|
<Insets right="10.0"/>
|
||||||
/>
|
</padding>
|
||||||
<TextField
|
<HBox.margin>
|
||||||
fx:id="textFieldDateOfBirth"
|
<Insets/>
|
||||||
minWidth="160.0"
|
</HBox.margin>
|
||||||
prefWidth="160.0"
|
|
||||||
|
|
||||||
promptText="Geburtstag"
|
|
||||||
GridPane.columnIndex="2"
|
|
||||||
/>
|
|
||||||
<TextField
|
|
||||||
fx:id="textFieldCareLevel"
|
|
||||||
prefHeight="26.0"
|
|
||||||
prefWidth="200.0"
|
|
||||||
|
|
||||||
promptText="Pflegegrad"
|
|
||||||
GridPane.rowIndex="1"
|
|
||||||
/>
|
|
||||||
<TextField
|
|
||||||
fx:id="textFieldRoomNumber"
|
|
||||||
prefHeight="26.0"
|
|
||||||
prefWidth="200.0"
|
|
||||||
promptText="Raum"
|
|
||||||
GridPane.columnIndex="1"
|
|
||||||
GridPane.rowIndex="1"
|
|
||||||
/>
|
|
||||||
</GridPane>
|
</GridPane>
|
||||||
</center>
|
<HBox alignment="TOP_CENTER" prefWidth="190.0" spacing="10.0">
|
||||||
<right>
|
<children>
|
||||||
<VBox spacing="8.0">
|
<Button fx:id="buttonAdd" mnemonicParsing="false" onAction="#handleAdd" prefWidth="90.0"
|
||||||
<Button
|
text="Hinzufügen"/>
|
||||||
fx:id="buttonAdd"
|
<Button fx:id="buttonDelete" mnemonicParsing="false" onAction="#handleDelete" prefWidth="90.0"
|
||||||
mnemonicParsing="false"
|
text="Löschen"/>
|
||||||
onAction="#handleAdd"
|
</children>
|
||||||
prefWidth="90.0"
|
</HBox>
|
||||||
text="Hinzufügen"
|
</children>
|
||||||
/>
|
</HBox>
|
||||||
<Button
|
<HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="10.0" prefWidth="200.0" spacing="25.0"
|
||||||
fx:id="buttonDelete"
|
AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="5.0">
|
||||||
mnemonicParsing="false"
|
<children>
|
||||||
onAction="#handleDelete"
|
<Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Patienten"
|
||||||
prefWidth="90.0"
|
textAlignment="CENTER">
|
||||||
text="Löschen"
|
<font>
|
||||||
/>
|
<Font size="36.0"/>
|
||||||
</VBox>
|
</font>
|
||||||
</right>
|
</Label>
|
||||||
</BorderPane>
|
</children>
|
||||||
</bottom>
|
</HBox>
|
||||||
</BorderPane>
|
</children>
|
||||||
|
<padding>
|
||||||
|
<Insets top="10.0"/>
|
||||||
|
</padding>
|
||||||
|
</AnchorPane>
|
||||||
|
|
|
@ -3,93 +3,70 @@
|
||||||
<?import javafx.geometry.Insets?>
|
<?import javafx.geometry.Insets?>
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
<BorderPane
|
<?import javafx.scene.text.Font?>
|
||||||
xmlns="http://javafx.com/javafx/11.0.1"
|
<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1"
|
||||||
xmlns:fx="http://javafx.com/fxml/1"
|
xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.treatment.AllTreatmentController">
|
||||||
fx:controller="de.hitec.nhplus.treatment.AllTreatmentController"
|
<children>
|
||||||
>
|
<TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="35.0" onMouseClicked="#handleMouseClick"
|
||||||
<padding>
|
prefHeight="364.0" prefWidth="825.0" AnchorPane.bottomAnchor="75.0" AnchorPane.leftAnchor="15.0"
|
||||||
<Insets top="8" left="8" bottom="8" right="8"/>
|
AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="80.0">
|
||||||
</padding>
|
|
||||||
<center>
|
|
||||||
<TableView
|
|
||||||
fx:id="tableView"
|
|
||||||
editable="true"
|
|
||||||
onMouseClicked="#handleMouseClick"
|
|
||||||
>
|
|
||||||
<columns>
|
<columns>
|
||||||
<TableColumn
|
<TableColumn fx:id="columnId" maxWidth="-1.0" minWidth="40.0" prefWidth="50.0" text="ID"/>
|
||||||
fx:id="columnId"
|
<TableColumn fx:id="columnPatientId" maxWidth="-1.0" minWidth="40.0" prefWidth="120.0"
|
||||||
minWidth="40.0"
|
text="PatientID"/>
|
||||||
text="ID"
|
<TableColumn fx:id="columnDate" maxWidth="-1.0" minWidth="140.0" prefWidth="150.0" text="Datum"/>
|
||||||
/>
|
<TableColumn fx:id="columnBegin" maxWidth="-1.0" minWidth="140.0" prefWidth="150.0" text="Beginn"/>
|
||||||
<TableColumn
|
<TableColumn fx:id="columnEnd" maxWidth="-1.0" minWidth="140.0" prefWidth="150.0" text="Ende"/>
|
||||||
fx:id="columnPatientId"
|
<TableColumn fx:id="columnDescription" maxWidth="-1.0" minWidth="200.0" prefWidth="300.0"
|
||||||
minWidth="40.0"
|
text="Kurzbeschreibung"/>
|
||||||
text="PatientID"
|
|
||||||
/>
|
|
||||||
<TableColumn
|
|
||||||
fx:id="columnDate"
|
|
||||||
maxWidth="-1.0"
|
|
||||||
minWidth="140.0"
|
|
||||||
prefWidth="150.0"
|
|
||||||
text="Datum"
|
|
||||||
/>
|
|
||||||
<TableColumn
|
|
||||||
fx:id="columnBegin"
|
|
||||||
minWidth="140.0"
|
|
||||||
text="Beginn"
|
|
||||||
/>
|
|
||||||
<TableColumn
|
|
||||||
fx:id="columnEnd"
|
|
||||||
minWidth="140.0"
|
|
||||||
text="Ende"
|
|
||||||
/>
|
|
||||||
<TableColumn
|
|
||||||
fx:id="columnDescription"
|
|
||||||
minWidth="200.0"
|
|
||||||
text="Kurzbeschreibung"
|
|
||||||
/>
|
|
||||||
</columns>
|
</columns>
|
||||||
<columnResizePolicy>
|
<columnResizePolicy>
|
||||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
||||||
</columnResizePolicy>
|
</columnResizePolicy>
|
||||||
</TableView>
|
</TableView>
|
||||||
</center>
|
<HBox layoutX="623.0" layoutY="419.3999938964844" spacing="10.0" AnchorPane.bottomAnchor="15.0"
|
||||||
<bottom>
|
AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0">
|
||||||
<BorderPane>
|
<children>
|
||||||
<BorderPane.margin>
|
<GridPane hgap="10.0" vgap="10.0">
|
||||||
<Insets top="8.0"/>
|
<columnConstraints>
|
||||||
</BorderPane.margin>
|
<ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" prefWidth="200.0"/>
|
||||||
<center>
|
<ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" minWidth="200.0" prefWidth="200.0"/>
|
||||||
<HBox spacing="8.0">
|
<ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="160.0"/>
|
||||||
<Button
|
</columnConstraints>
|
||||||
fx:id="buttonNewTreament"
|
<rowConstraints>
|
||||||
mnemonicParsing="false"
|
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
|
||||||
onAction="#handleNewTreatment"
|
</rowConstraints>
|
||||||
prefWidth="200.0"
|
<children>
|
||||||
text="neue Behandlung anlegen"
|
<Button fx:id="buttonNewTreament" mnemonicParsing="false" onAction="#handleNewTreatment"
|
||||||
GridPane.columnIndex="1"
|
prefWidth="200.0" text="neue Behandlung anlegen" GridPane.columnIndex="1"/>
|
||||||
/>
|
<ComboBox fx:id="comboBoxPatientSelection" minWidth="160.0" onAction="#handleComboBox"
|
||||||
<ComboBox
|
|
||||||
fx:id="comboBoxPatientSelection"
|
|
||||||
minWidth="160.0"
|
|
||||||
onAction="#handleComboBox"
|
|
||||||
prefWidth="200.0"/>
|
prefWidth="200.0"/>
|
||||||
|
<Button fx:id="buttonDelete" mnemonicParsing="false" onAction="#handleDelete" prefWidth="200.0"
|
||||||
|
text="Löschen" GridPane.columnIndex="2"/>
|
||||||
|
</children>
|
||||||
|
<padding>
|
||||||
|
<Insets right="10.0"/>
|
||||||
|
</padding>
|
||||||
|
<HBox.margin>
|
||||||
|
<Insets/>
|
||||||
|
</HBox.margin>
|
||||||
|
</GridPane>
|
||||||
|
<HBox prefWidth="190.0" spacing="10.0"/>
|
||||||
|
</children>
|
||||||
</HBox>
|
</HBox>
|
||||||
</center>
|
<HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="10.0" prefWidth="200.0" spacing="25.0"
|
||||||
<right>
|
AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="5.0">
|
||||||
<Button
|
<children>
|
||||||
fx:id="buttonDelete"
|
<Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Behandlungen"
|
||||||
mnemonicParsing="false"
|
textAlignment="CENTER">
|
||||||
onAction="#handleDelete"
|
<font>
|
||||||
prefWidth="200.0"
|
<Font size="36.0"/>
|
||||||
text="Löschen"
|
</font>
|
||||||
GridPane.columnIndex="2"
|
</Label>
|
||||||
/>
|
</children>
|
||||||
</right>
|
</HBox>
|
||||||
</BorderPane>
|
</children>
|
||||||
|
<padding>
|
||||||
</bottom>
|
<Insets top="10.0"/>
|
||||||
</BorderPane>
|
</padding>
|
||||||
|
</AnchorPane>
|
||||||
|
|
Loading…
Reference in a new issue