Compare commits

...

3 commits

Author SHA1 Message Date
280ef132b3 #18: handle adding nurses, binding new method and validate input
All checks were successful
Quality Check / Qualty Check (push) Successful in 11s
Quality Check / Qualty Check (pull_request) Successful in 12s
2024-05-03 10:09:22 +00:00
4b13bf6fe3 Merge pull request '#29: SetAll instead of AddAll to avoid Duplication' (#30) from bug/treatments-are-shown-duplicate into main
All checks were successful
Quality Check / Qualty Check (push) Successful in 14s
Javadoc Deploy / Javadoc (push) Successful in 26s
Reviewed-on: #30
Reviewed-by: SZUT-Ole <ole.kueck@hmmh.de>
2024-05-03 10:01:34 +00:00
fcebe01f1e
#29: SetAll instead of AddAll to avoid Duplication
All checks were successful
Quality Check / Qualty Check (push) Successful in 8s
Quality Check / Qualty Check (pull_request) Successful in 9s
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-02 15:07:09 +02:00
4 changed files with 55 additions and 5 deletions

View file

@ -1,18 +1,30 @@
package de.hitec.nhplus.nurse;
import static de.hitec.nhplus.utils.Validator.*;
import de.hitec.nhplus.datastorage.DaoFactory;
import javafx.beans.value.ChangeListener;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.TextField;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.control.cell.TextFieldTableCell;
import java.sql.SQLException;
public class AllNurseController {
@FXML
public TextField textFieldSurname;
@FXML
public TextField textFieldFirstname;
@FXML
public TextField textFieldPhoneNumber;
@FXML
public Button buttonAdd;
@FXML
private TableView<Nurse> tableView;
@FXML
@ -43,6 +55,20 @@ public class AllNurseController {
this.columnPhoneNumber.setCellFactory(TextFieldTableCell.forTableColumn());
this.tableView.setItems(this.nurses);
this.buttonAdd.setDisable(true);
ChangeListener<String> inputNewNurseValidationListener = (observableValue, oldText, newText)->
{
boolean isValid = isValidFirstName(this.textFieldFirstname.getText())
&& isValidSurName(this.textFieldSurname.getText())
&& isValidPhoneNumber(this.textFieldPhoneNumber.getText());
AllNurseController.this.buttonAdd.setDisable(!isValid);
};
this.textFieldFirstname.textProperty().addListener(inputNewNurseValidationListener);
this.textFieldSurname.textProperty().addListener(inputNewNurseValidationListener);
this.textFieldPhoneNumber.textProperty().addListener(inputNewNurseValidationListener);
}
private void readAllAndShowInTableView(){
@ -54,4 +80,25 @@ public class AllNurseController {
exception.printStackTrace();
}
}
@FXML
public void handleAdd(){
String surname=this.textFieldSurname.getText();
String firstName=this.textFieldFirstname.getText();
String phoneNumber=this.textFieldPhoneNumber.getText();
try {
this.dao.create(new Nurse(firstName, surname, phoneNumber));
}
catch (SQLException exception){
exception.printStackTrace();
}
readAllAndShowInTableView();
clearTextfields();
}
private void clearTextfields() {
this.textFieldFirstname.clear();
this.textFieldSurname.clear();
this.textFieldPhoneNumber.clear();
}
}

View file

@ -77,11 +77,10 @@ public class AllTreatmentController {
}
public void readAllAndShowInTableView() {
this.treatments.clear();
comboBoxPatientSelection.getSelectionModel().select(0);
this.dao = DaoFactory.getDaoFactory().createTreatmentDao();
try {
this.treatments.addAll(dao.readAll());
this.treatments.setAll(dao.readAll());
} catch (SQLException exception) {
exception.printStackTrace();
}
@ -109,7 +108,7 @@ public class AllTreatmentController {
if (selectedPatient.equals("alle")) {
try {
this.treatments.addAll(this.dao.readAll());
this.treatments.setAll(this.dao.readAll());
} catch (SQLException exception) {
exception.printStackTrace();
}
@ -118,7 +117,7 @@ public class AllTreatmentController {
Patient patient = searchInList(selectedPatient);
if (patient != null) {
try {
this.treatments.addAll(this.dao.readTreatmentsByPid(patient.getId()));
this.treatments.setAll(this.dao.readTreatmentsByPid(patient.getId()));
} catch (SQLException exception) {
exception.printStackTrace();
}

View file

@ -68,6 +68,9 @@ public class Validator
public static boolean isValidSurName(String text){
return !text.isBlank();
}
public static boolean isValidPhoneNumber(String text){
return !text.isBlank();
}
public static boolean isValidCareLevel(String text){
return !text.isBlank();
}

View file

@ -72,6 +72,7 @@
<Button
fx:id="buttonAdd"
mnemonicParsing="false"
onAction="#handleAdd"
prefWidth="90.0"
text="Hinzufügen"
/>