story/bugfixes #48
9 changed files with 26 additions and 9 deletions
Binary file not shown.
|
@ -109,7 +109,6 @@ public class LockedNurseController {
|
||||||
readAllAndShowInTableView();
|
readAllAndShowInTableView();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
public void handleMouseClick() {
|
public void handleMouseClick() {
|
||||||
Nurse nurse = tableView.getSelectionModel().getSelectedItem();
|
Nurse nurse = tableView.getSelectionModel().getSelectedItem();
|
||||||
|
@ -137,5 +136,4 @@ public class LockedNurseController {
|
||||||
}
|
}
|
||||||
readAllAndShowInTableView();
|
readAllAndShowInTableView();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -322,6 +322,13 @@ public class AllTreatmentController {
|
||||||
}catch (SQLException exception){
|
}catch (SQLException exception){
|
||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
}
|
}
|
||||||
|
if (selectedItem.calculateDeleteDate().isBefore(LocalDate.now())){
|
||||||
|
try {
|
||||||
|
dao.delete(selectedItem.getId());
|
||||||
|
} catch (SQLException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
readAllAndShowInTableView();
|
readAllAndShowInTableView();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
tabClosingPolicy="UNAVAILABLE"
|
tabClosingPolicy="UNAVAILABLE"
|
||||||
xmlns="http://javafx.com/javafx/17.0.2-ea"
|
xmlns="http://javafx.com/javafx/17.0.2-ea"
|
||||||
xmlns:fx="http://javafx.com/fxml/1"
|
xmlns:fx="http://javafx.com/fxml/1"
|
||||||
|
minWidth="1200"
|
||||||
|
minHeight="700"
|
||||||
fx:controller="de.hitec.nhplus.main.MainWindowController"
|
fx:controller="de.hitec.nhplus.main.MainWindowController"
|
||||||
>
|
>
|
||||||
<Tab fx:id="patientTab" text="Patienten">
|
<Tab fx:id="patientTab" text="Patienten">
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnId"
|
fx:id="columnId"
|
||||||
minWidth="40.0"
|
minWidth="40.0"
|
||||||
|
maxWidth="40.0"
|
||||||
text="ID"
|
text="ID"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnId"
|
fx:id="columnId"
|
||||||
minWidth="40.0"
|
minWidth="40.0"
|
||||||
|
maxWidth="40.0"
|
||||||
text="ID"
|
text="ID"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnId"
|
fx:id="columnId"
|
||||||
minWidth="40.0"
|
minWidth="40.0"
|
||||||
|
maxWidth="40.0"
|
||||||
text="ID"
|
text="ID"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
|
|
|
@ -21,38 +21,45 @@
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnId"
|
fx:id="columnId"
|
||||||
minWidth="40.0"
|
minWidth="40.0"
|
||||||
|
maxWidth="40.0"
|
||||||
text="ID"
|
text="ID"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnPatientName"
|
fx:id="columnPatientName"
|
||||||
minWidth="80.0"
|
minWidth="80.0"
|
||||||
|
prefWidth="150"
|
||||||
text="Patient"
|
text="Patient"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnNurseName"
|
fx:id="columnNurseName"
|
||||||
minWidth="80.0"
|
minWidth="80.0"
|
||||||
|
prefWidth="150"
|
||||||
text="Pflegekraft"
|
text="Pflegekraft"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnDate"
|
fx:id="columnDate"
|
||||||
maxWidth="-1.0"
|
minWidth="60.0"
|
||||||
minWidth="140.0"
|
maxWidth="100"
|
||||||
prefWidth="150.0"
|
prefWidth="90.0"
|
||||||
text="Datum"
|
text="Datum"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnBegin"
|
fx:id="columnBegin"
|
||||||
minWidth="140.0"
|
minWidth="60.0"
|
||||||
|
maxWidth="100"
|
||||||
|
prefWidth="60"
|
||||||
text="Beginn"
|
text="Beginn"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnEnd"
|
fx:id="columnEnd"
|
||||||
minWidth="140.0"
|
minWidth="60.0"
|
||||||
|
maxWidth="100"
|
||||||
|
prefWidth="60"
|
||||||
text="Ende"
|
text="Ende"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnDescription"
|
fx:id="columnDescription"
|
||||||
minWidth="200.0"
|
minWidth="80.0"
|
||||||
text="Kurzbeschreibung"
|
text="Kurzbeschreibung"
|
||||||
/>
|
/>
|
||||||
</columns>
|
</columns>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<TableColumn
|
<TableColumn
|
||||||
fx:id="columnId"
|
fx:id="columnId"
|
||||||
minWidth="40.0"
|
minWidth="40.0"
|
||||||
prefWidth="102.0"
|
maxWidth="40.0"
|
||||||
text="ID"
|
text="ID"
|
||||||
/>
|
/>
|
||||||
<TableColumn
|
<TableColumn
|
||||||
|
|
Loading…
Reference in a new issue