From eac96114e6b7436d14abf8faeafdd192a4870d16 Mon Sep 17 00:00:00 2001 From: dalvarezgon Date: Mon, 23 Dec 2019 17:36:54 +0100 Subject: [PATCH] =?UTF-8?q?Correciones=20p=C3=A1gina=20gesti=C3=B3n=20espe?= =?UTF-8?q?cialidades?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemAdmin/ManageSpecialties.xhtml | 35 +++++++++++-------- .../systemAdmin/ManageSpecialitiesMBean.java | 7 ++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml index 04ba735..57086b2 100644 --- a/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml +++ b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml @@ -6,9 +6,9 @@ - - - + + +
@@ -23,42 +23,47 @@
- +
- +
- +
- +
- + + + +
-
- +
+
- +
- +
- +
-
- +
+ diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java index c225f76..f079867 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java @@ -95,11 +95,11 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ public void saveData() { int error = 0; - if (this.medicalSpecialty.getName() == null) { + if (this.medicalSpecialty.getName() == null || this.medicalSpecialty.getName().trim().length() == 0) { this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Nombre no relleno", "Por favor, escriba un nombre de especialidad."); error++; } - if (this.medicalSpecialty.getDescription() == null) { + if (this.medicalSpecialty.getDescription() == null || this.medicalSpecialty.getDescription().trim().length() == 0) { this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Descripción no rellena", "Por favor, escriba una descripción."); error++; } @@ -109,6 +109,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ MedicalSpecialtyTO ms = this.getRemoteManagerSystemAdmin().updateSpecialtyData(this.medicalSpecialty.getId(), this.medicalSpecialty.getName(), this.medicalSpecialty.getDescription()); this.setSpecialtyData(ms); this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los datos se han guardado", "Los datos de la especialidad se han guardado correctamente."); + this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); } catch (Exception e) { this.manageException(e); } @@ -131,6 +132,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ try { this.getRemoteManagerSystemAdmin().deleteSpecialtyData(this.medicalSpecialty.getId(), this.medicalSpecialty.getName(), this.medicalSpecialty.getDescription()); this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los especialidad se ha borrado", "Los datos de la especialidad se han borrado correctamente."); + this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); } catch (Exception e) { this.manageException(e); } @@ -154,6 +156,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ MedicalSpecialtyTO ms = this.getRemoteManagerSystemAdmin().insertSpecialtyData(name, description); this.setSpecialtyData(ms); this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los datos se han guardado", "Los datos de la especialidad se han guardado correctamente."); + this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); } catch (Exception e) { this.manageException(e); }