From 2b8975b2917a8fa3426cc3a8d8e96b6138001b32 Mon Sep 17 00:00:00 2001 From: Johannes Oehm Date: Thu, 26 Nov 2015 12:34:42 +0100 Subject: [PATCH] =?UTF-8?q?DiagnoseController=20pr=C3=BCft=20ab=20ob=20ICD?= =?UTF-8?q?-10-Code=20und=20DiagnoseArt=20gesetzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mi/projmi6/controller/DiagnoseController.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java index d154a42..a248f52 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java @@ -167,6 +167,41 @@ public class DiagnoseController { } + + /** + * Alert dialog when the data entered is invalid. + */ + private void showMessage(String title, String message) { + Alert alert = new Alert(Alert.AlertType.INFORMATION); + alert.setTitle("Diagnosedaten unvollst\u00e4ndig!"); + alert.setHeaderText(title); + alert.setContentText(message); + + alert.showAndWait(); + } + + + /** + * Checks if doctor, icd10-code and Diagnoseart are set. + */ + private boolean validateData(Diagnose diagnose){ + if(diagnose.getArzt()==null){ + showMessage("Arzt nicht angegeben!","Bitte den Arzt, der die Diagnose erstellt hat, aus der List ausw\u00e4hlen!"); + return false; + } + if(diagnose.getDiagArt()==null){ + showMessage("Diagnoseart nicht angegeben!", "Bitte die Art der Diagnose angeben!"); + return false; + } + if(diagnose.getIcd10code()==null){ + showMessage("Die Diagnose hat keinen ICD-10-Code!", "Bitte einen ICD-10-Code angeben!"); + return false; + } + + return true; + } + + /** * Bind button visibility to application state. */ @@ -229,6 +264,9 @@ public class DiagnoseController { //Create new diagnosis Diagnose diagnose = new Diagnose(); copyFieldDataIntoDiagnose(diagnose); + if(!validateData(diagnose)){ + return; + } try { DBHandler.setDiagnose(diagnose); } catch (Exception e) {