diff --git a/1.sources/MyHealth/docroot/medicaltest/SearchSpecialist.xhtml b/1.sources/MyHealth/docroot/medicaltest/SearchSpecialist.xhtml index 32d245f..c748c52 100644 --- a/1.sources/MyHealth/docroot/medicaltest/SearchSpecialist.xhtml +++ b/1.sources/MyHealth/docroot/medicaltest/SearchSpecialist.xhtml @@ -15,11 +15,11 @@
- - - + + diff --git a/1.sources/MyHealth/src/TO/SystemAdminTO.java b/1.sources/MyHealth/src/TO/SystemAdminTO.java index 6508000..ef1e878 100644 --- a/1.sources/MyHealth/src/TO/SystemAdminTO.java +++ b/1.sources/MyHealth/src/TO/SystemAdminTO.java @@ -10,7 +10,7 @@ import javax.xml.bind.annotation.XmlRootElement; * * Además esta clase facilita la implementación futura de una Capa SOA (Se * define la anotación para la serialización de esta clase: @XmlRootElement(name - * = "medicalspeciality") + * = "medicalspecialty") * * @author mark * diff --git a/1.sources/MyHealth/src/TO/VisitTO.java b/1.sources/MyHealth/src/TO/VisitTO.java index a0db0e6..b8740f9 100644 --- a/1.sources/MyHealth/src/TO/VisitTO.java +++ b/1.sources/MyHealth/src/TO/VisitTO.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlRootElement; /** * Transfer object (TO) MedicalSpecialtyTO Para el intercambio de datos entre la capa de interfaz y la capa de negocio * - * Además esta clase facilita la implementación futura de una Capa SOA (Se define la anotación para la serialización de esta clase: @XmlRootElement(name = "medicalspeciality") + * Además esta clase facilita la implementación futura de una Capa SOA (Se define la anotación para la serialización de esta clase: @XmlRootElement(name = "medicalspecialty") * * @author mark * diff --git a/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java b/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java index 429da54..f7d3236 100644 --- a/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java @@ -45,8 +45,8 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal { * * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects). */ - public List listAllMedicalSpecialities() { - return this.listMedicalSpecialitiesPaged(0, 0); + public List listAllMedicalSpecialties() { + return this.listMedicalSpecialtiesPaged(0, 0); } /** @@ -60,8 +60,8 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal { * * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects). */ - public List listMedicalSpecialitiesPaged(int pageNumber, int pageSize) { - return listMedicalSpecialitiesFiltered(null, pageNumber, pageSize); + public List listMedicalSpecialtiesPaged(int pageNumber, int pageSize) { + return listMedicalSpecialtiesFiltered(null, pageNumber, pageSize); } /** @@ -77,7 +77,7 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal { * * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects). */ - public List listMedicalSpecialitiesFiltered(String searchTerm, int pageNumber, int pageSize) { + public List listMedicalSpecialtiesFiltered(String searchTerm, int pageNumber, int pageSize) { String strQuery = "SELECT ms from MedicalSpecialtyJPA ms %s order by ms.name, ms.description"; String strFilter = ""; if (searchTerm == null) diff --git a/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java b/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java index 876314c..9ff116c 100644 --- a/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java +++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java @@ -31,11 +31,11 @@ import jpa.VisitJPA; @Local public interface CommonFacadeLocal { - public List listAllMedicalSpecialities(); + public List listAllMedicalSpecialties(); - public List listMedicalSpecialitiesPaged(int pageNumber, int pageSize); + public List listMedicalSpecialtiesPaged(int pageNumber, int pageSize); - public List listMedicalSpecialitiesFiltered(String searchTerm, int pageNumber, int pageSize); + public List listMedicalSpecialtiesFiltered(String searchTerm, int pageNumber, int pageSize); public List listAllCAPs(); diff --git a/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java b/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java index 6918f5c..ae03d56 100644 --- a/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java @@ -18,11 +18,11 @@ import TO.SpecialistDoctorTO; @Remote public interface CommonFacadeRemote { - public List listAllMedicalSpecialities(); + public List listAllMedicalSpecialties(); - public List listMedicalSpecialitiesPaged(int pageNumber, int pageSize); + public List listMedicalSpecialtiesPaged(int pageNumber, int pageSize); - public List listMedicalSpecialitiesFiltered(String searchTerm, int pageNumber, int pageSize); + public List listMedicalSpecialtiesFiltered(String searchTerm, int pageNumber, int pageSize); public List listAllCAPs(); diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java index 74ac098..68249ef 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java @@ -225,7 +225,7 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote { entman.persist(mt); } - public Long getSpecialistDoctorByMedicalSpecialityCount(int specialityId) { + public Long getSpecialistDoctorByMedicalSpecialtyCount(int specialityId) { TypedQuery query = entman.createQuery("SELECT count(1) from SpecialistDoctorJPA q where q.medicalSpecialty.id=:specId", Long.class); query.setParameter("specId", specialityId); @@ -237,7 +237,7 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote { * * @param speciality */ - public List findSpecialistDoctorByMedicalSpeciality(int specialityId, int pageNumber, int pageSize) { + public List findSpecialistDoctorByMedicalSpecialty(int specialityId, int pageNumber, int pageSize) { List pendingQuestions = new ArrayList(); TypedQuery query = entman.createQuery( diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java index 8ad42ad..d40e9d2 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java @@ -126,12 +126,12 @@ public interface MedicalTestFacadeRemote { */ public void removeImage(int idMedicalTest); - public Long getSpecialistDoctorByMedicalSpecialityCount(int specialityId); + public Long getSpecialistDoctorByMedicalSpecialtyCount(int specialityId); /** * Listar médicos con una especialidad concreta * * @param speciality */ - public List findSpecialistDoctorByMedicalSpeciality(int specialityId, int pageNumber, int pageSize); + public List findSpecialistDoctorByMedicalSpecialty(int specialityId, int pageNumber, int pageSize); } \ No newline at end of file diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/SearchSpecialistMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/SearchSpecialistMBean.java index 3ef34ff..3647f01 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/SearchSpecialistMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/SearchSpecialistMBean.java @@ -8,6 +8,7 @@ import javax.annotation.PostConstruct; import javax.faces.view.ViewScoped; import javax.inject.Named; +import org.primefaces.event.SelectEvent; import org.primefaces.model.LazyDataModel; import org.primefaces.model.SortOrder; @@ -22,8 +23,8 @@ public class SearchSpecialistMBean extends ManagedBeanBase implements Serializab private static final long serialVersionUID = 1L; - private List medicalSpecialitiesList; - private MedicalSpecialtyTO medicalSpeciality; + private List medicalSpecialtiesList; + private MedicalSpecialtyTO medicalSpecialty; private String lastUIQueryMS; private LazyDataModel lazyDataModelDoctorList; @@ -33,8 +34,8 @@ public class SearchSpecialistMBean extends ManagedBeanBase implements Serializab @PostConstruct public void init() { // Inicialización de variables y propiedades van aquí. - this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); - this.medicalSpeciality = null; + this.medicalSpecialtiesList = this.getRemoteManagerCommon().listMedicalSpecialtiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); + this.medicalSpecialty = null; this.lastUIQueryMS = ""; this.lazyDataModelDoctorList = new LazyDataModel() { @@ -42,14 +43,14 @@ public class SearchSpecialistMBean extends ManagedBeanBase implements Serializab @Override public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { - if (medicalSpeciality == null) { + if (medicalSpecialty == null) { this.setRowCount(0); return null; } else { - Long totalRowCount = getRemoteManagerMedicalTest().getSpecialistDoctorByMedicalSpecialityCount(medicalSpeciality.getId()); + Long totalRowCount = getRemoteManagerMedicalTest().getSpecialistDoctorByMedicalSpecialtyCount(medicalSpecialty.getId()); this.setRowCount(totalRowCount.intValue()); - return getRemoteManagerMedicalTest().findSpecialistDoctorByMedicalSpeciality(medicalSpeciality.getId(), (first / pageSize), pageSize); + return getRemoteManagerMedicalTest().findSpecialistDoctorByMedicalSpecialty(medicalSpecialty.getId(), (first / pageSize), pageSize); } } }; @@ -59,33 +60,29 @@ public class SearchSpecialistMBean extends ManagedBeanBase implements Serializab return lazyDataModelDoctorList; } - public void showData() { - - } - - public List completeMedicalSpeciality(String query) { + public List completeMedicalSpecialty(String query) { if (query != null && query.equals(this.lastUIQueryMS) == false) { this.lastUIQueryMS = query; // Recuperamos las 200 primeras coincidencias - this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesFiltered(query, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); + this.medicalSpecialtiesList = this.getRemoteManagerCommon().listMedicalSpecialtiesFiltered(query, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); } - return this.medicalSpecialitiesList; + return this.medicalSpecialtiesList; } - public List getMedicalSpecialitiesList() { - return medicalSpecialitiesList; + public List getMedicalSpecialtiesList() { + return medicalSpecialtiesList; } - public void setMedicalSpecialitiesList(List medicalSpecialitiesList) { - this.medicalSpecialitiesList = medicalSpecialitiesList; + public void setMedicalSpecialtiesList(List value) { + this.medicalSpecialtiesList = value; } - public MedicalSpecialtyTO getMedicalSpeciality() { - return medicalSpeciality; + public MedicalSpecialtyTO getMedicalSpecialty() { + return medicalSpecialty; } - public void setMedicalSpeciality(MedicalSpecialtyTO medicalSpecialty) { - this.medicalSpeciality = medicalSpecialty; + public void setMedicalSpecialty(MedicalSpecialtyTO medicalSpecialty) { + this.medicalSpecialty = medicalSpecialty; } } diff --git a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java index 401cbbe..17ba392 100644 --- a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java @@ -50,7 +50,7 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable { private UserType userType; private PrimaryHealthCareCenterTO primaryHealthCareCenter; private MedicalSpecialtyTO medicalSpecialty; - private List medicalSpecialitiesList; + private List medicalSpecialtiesList; private List primaryHealthCareCentersList; public RegisterUserMBean() { @@ -74,7 +74,7 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable { this.userType = UserType.PATIENT; - this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); + this.medicalSpecialtiesList = this.getRemoteManagerCommon().listMedicalSpecialtiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); this.primaryHealthCareCentersList = this.getRemoteManagerCommon().listCAPsPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); } @@ -109,7 +109,7 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable { } public List getMedicalSpecialtiesList() { - return medicalSpecialitiesList; + return medicalSpecialtiesList; } public List getPhcList() { @@ -141,9 +141,9 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable { if (query != null && query.equals(this.lastUIQueryMS) == false) { this.lastUIQueryMS = query; // Recuperamos las 200 primeras coincidencias - this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesFiltered(query, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); + this.medicalSpecialtiesList = this.getRemoteManagerCommon().listMedicalSpecialtiesFiltered(query, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); } - return this.medicalSpecialitiesList; + return this.medicalSpecialtiesList; } /** diff --git a/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java b/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java index 538e10d..89d4e9d 100644 --- a/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java @@ -52,7 +52,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable private UserType userType; private PrimaryHealthCareCenterTO primaryHealthCareCenter; private MedicalSpecialtyTO medicalSpecialty; - private List medicalSpecialitiesList; + private List medicalSpecialtiesList; private List primaryHealthCareCentersList; private FamilyDoctorTO familyDoctor; private List familyDoctorList; @@ -92,7 +92,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable this.setPatientData(this.getRemoteManagerCommon().findPatientById(this.id)); break; case SPECIALIST_DOCTOR: - this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); + this.medicalSpecialtiesList = this.getRemoteManagerCommon().listMedicalSpecialtiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); this.setSpecialistDoctorData(this.getRemoteManagerCommon().findSpecialistDoctorById(this.id)); break; case FAMILY_DOCTOR: @@ -159,7 +159,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable } public List getMedicalSpecialtiesList() { - return medicalSpecialitiesList; + return medicalSpecialtiesList; } public List getPhcList() { @@ -191,9 +191,9 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable if (query != null && query.equals(this.lastUIQueryMS) == false) { this.lastUIQueryMS = query; // Recuperamos las XXX primeras coincidencias - this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesFiltered(query, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); + this.medicalSpecialtiesList = this.getRemoteManagerCommon().listMedicalSpecialtiesFiltered(query, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); } - return this.medicalSpecialitiesList; + return this.medicalSpecialtiesList; } /** diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/ListDoctorsByCenterMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/ListDoctorsByCenterMBean.java index e38cab4..d3440e7 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/ListDoctorsByCenterMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/ListDoctorsByCenterMBean.java @@ -45,7 +45,7 @@ public class ListDoctorsByCenterMBean extends ManagedBeanBase implements Seriali this.setRowCount(0); return null; } else { - Long totalRowCount = getRemoteManagerMedicalTest().getSpecialistDoctorByMedicalSpecialityCount(primaryHealthCareCenter.getId()); + Long totalRowCount = getRemoteManagerMedicalTest().getSpecialistDoctorByMedicalSpecialtyCount(primaryHealthCareCenter.getId()); this.setRowCount(totalRowCount.intValue()); return getRemoteManagerSystemAdmin().listAllFamilyDoctorsByCAPPaged(primaryHealthCareCenter.getId(), (first / pageSize), pageSize); diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java index 5349cf1..b738690 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java @@ -23,7 +23,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ private String name; private String description; private MedicalSpecialtyTO medicalSpecialty; - private List medicalSpecialitiesList; + private List medicalSpecialtiesList; public ManageSpecialitiesMBean() { } @@ -50,7 +50,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ } private void refreshFormData() { - this.medicalSpecialitiesList = this.getRemoteManagerCommon().listAllMedicalSpecialities(); + this.medicalSpecialtiesList = this.getRemoteManagerCommon().listAllMedicalSpecialties(); } public Integer getId() { @@ -92,7 +92,7 @@ public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializ } public List getMedicalSpecialtiesList() { - return medicalSpecialitiesList; + return medicalSpecialtiesList; } public MedicalSpecialtyTO getMedicalSpecialty() {