droideparanoico/myhealth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quitadas relgas de navegacion del fichero faces-config, para utilizar la

Browse Source 
navegación implicita de JSF 2.0
This commit is contained in:
Marcos Garcia Nuñez
2019-12-08 19:13:23 +01:00
parent fac86a7c20
commit 1e05d8e82f
19 changed files with 83 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
1.sources/MyHealth/src/managedbean/common/MenuMBean.java
View File

@@ -34,7 +34,7 @@ public class MenuMBean implements Serializable {
DefaultMenuItem item;
DefaultSubMenu subMenu;
model.addElement(createMenuItem("Home", "pi pi-home", "home", null));
model.addElement(createMenuItem("Home", "pi pi-home", "/home", null));
if (SessionUtils.isLogedIn() == true) {
@@ -42,10 +42,10 @@ public class MenuMBean implements Serializable {
// TODO: mostrar este menú solo si el usuario es administrador
if (1 == 1) {
subMenu = new DefaultSubMenu("Administración del sistema", "pi pi-cog");
subMenu.addElement(createMenuItem("Esp. médicas", "pi pi-calendar", "ManageMedicalSpecialties", null));
subMenu.addElement(createMenuItem("Centros At. Primaria", "pi pi-briefcase", "ManageCAPs", null));
subMenu.addElement(createMenuItem("Esp. médicas", "pi pi-calendar", "/systemAdmin/ManageSpecialties", null));
subMenu.addElement(createMenuItem("Centros At. Primaria", "pi pi-briefcase", "/systemAdmin/ManageSpecialties", null));
subMenu.addElement(new DefaultSeparator());
subMenu.addElement(createMenuItem("Añadir usuario Admin", "pi pi-calendar", "AddUserAdmin", null));
subMenu.addElement(createMenuItem("Añadir usuario Admin", "pi pi-calendar", "/systemAdmin/ManageSpecialties", null));
model.addElement(subMenu);
}
@@ -53,8 +53,8 @@ public class MenuMBean implements Serializable {
// TODO: mostrar este menú solo si el usuario es paciente
if (1 == 1) {
subMenu = new DefaultSubMenu("Visitas", "pi pi-calendar");
subMenu.addElement(createMenuItem("Agendar", "pi pi-calendar", "ScheduleVisit", null));
subMenu.addElement(createMenuItem("Consultar", "pi pi-briefcase", "QueryVisit", null));
subMenu.addElement(createMenuItem("Agendar", "pi pi-calendar", "/visit/VisitView", null));
subMenu.addElement(createMenuItem("Consultar", "pi pi-briefcase", "/visit/VisitView", null));
model.addElement(subMenu);
}
@@ -63,12 +63,12 @@ public class MenuMBean implements Serializable {
if (1 == 1) {
subMenu = new DefaultSubMenu("Pruebas Medicas", "pi pi-clone");
subMenu.addElement(createMenuItem("Añadir", "pi pi-clone", "AddMedicalTest", null));
subMenu.addElement(createMenuItem("Gestionar", "pi pi-briefcase", "MedicaltestManage", null));
subMenu.addElement(createMenuItem("Añadir", "pi pi-clone", "/medicaltest/MedicalTests", null));
subMenu.addElement(createMenuItem("Gestionar", "pi pi-briefcase", "/medicaltest/MedicalTests", null));
subMenu.addElement(new DefaultSeparator());
subMenu.addElement(createMenuItem("Consultar médicos pro esp.", "pi pi-search", "QueryDoctorBySpecialty", null));
subMenu.addElement(createMenuItem("Consultar médicos pro esp.", "pi pi-search", "/medicaltest/MedicalTests", null));
subMenu.addElement(new DefaultSeparator());
subMenu.addElement(createMenuItem("Listar médicos", "pi pi-list", "ListDoctorsbySpecialty", null));
subMenu.addElement(createMenuItem("Listar médicos", "pi pi-list", "/medicaltest/MedicalTests", null));
model.addElement(subMenu);
}
@@ -78,10 +78,10 @@ public class MenuMBean implements Serializable {
subMenu = new DefaultSubMenu("Preguntas", "pi pi-clone");
// TODO: Si es paciente puede preguntar
if (true == true)
subMenu.addElement(createMenuItem("Añadir pregunta", "pi pi-clone", "AskQuestion", null));
subMenu.addElement(createMenuItem("Añadir pregunta", "pi pi-clone", "/medicaltest/MedicalTests", null));
// TODO: Si es medico de familia puede responder
if (true == true)
subMenu.addElement(createMenuItem("Responder pregunta", "pi pi-question", "AnswerQuestion", null));
subMenu.addElement(createMenuItem("Responder pregunta", "pi pi-question", "/medicaltest/MedicalTests", null));
model.addElement(subMenu);
}
@@ -90,24 +90,24 @@ public class MenuMBean implements Serializable {
// Perfil
subMenu = new DefaultSubMenu("Gestionar perfil", "pi pi-id-card");
if (SessionUtils.isLogedIn() == false) {
subMenu.addElement(createMenuItem("Registro de usuario", "pi pi-users", "RegisterUser", null));
subMenu.addElement(createMenuItem("Registro de paciente", "pi pi-user-plus", "AddPatient", null));
subMenu.addElement(createMenuItem("Registro de médico", "pi pi-user-plus", "AddFamilyDoctor", null));
subMenu.addElement(createMenuItem("Registro de especialista", "pi pi-user-plus", "AddFamilyDoctor", null));
subMenu.addElement(createMenuItem("Registro de médico", "pi pi-user-plus", "AddSpecialistDoctor", null));
subMenu.addElement(createMenuItem("Registro de usuario", "pi pi-users", "/profile/RegisterUser", null));
subMenu.addElement(createMenuItem("Registro de paciente", "pi pi-user-plus", "/profile/AddPatient", null));
subMenu.addElement(createMenuItem("Registro de médico", "pi pi-user-plus", "/profile/AddFamilyDoctor", null));
subMenu.addElement(createMenuItem("Registro de especialista", "pi pi-user-plus", "/profile/AddFamilyDoctor", null));
subMenu.addElement(createMenuItem("Registro de médico", "pi pi-user-plus", "/profile/AddSpecialistDoctor", null));
subMenu.addElement(new DefaultSeparator());
} else {
subMenu.addElement(createMenuItem("Actualizar mi perfil", "pi pi-user-edit", "UpdateProfile", null));
subMenu.addElement(createMenuItem("Actualizar mi perfil", "pi pi-user-edit", "/profile/UpdateProfile", null));
subMenu.addElement(new DefaultSeparator());
// TODO: mostrar este menú solo si el usuario es paciente
if (true == true) {
subMenu.addElement(createMenuItem("Cambiar médico de familia", "pi pi-chevron-circle-right", "ChangeFamilyDoctor", null));
subMenu.addElement(createMenuItem("Cambiar médico de familia", "pi pi-chevron-circle-right", "/profile/ChangeFamilyDoctor", null));
subMenu.addElement(new DefaultSeparator());
}
// TODO: mostrar este menú solo si el usuario es médico de familia
if (true == true)
subMenu.addElement(createMenuItem("Cambiar CAP", "fa fa-h-square", "changecap", null));
subMenu.addElement(createMenuItem("Cambiar CAP", "fa fa-h-square", "/profile/ChangePrimaryHealthCareCenter", null));
}
model.addElement(subMenu);
}

2
1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
View File

@@ -36,7 +36,7 @@ import managedbean.common.ValidationUtils;
* @author Marcos García Núñez (mgarcianun@uoc.edu)
*
*/
@Named("registerUser")
@Named("RegisterUser")
@ViewScoped
public class RegisterUserMBean extends ManagedBeanBase implements Serializable {

6
1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
View File

@@ -41,7 +41,6 @@ public class LoginMBean extends ManagedBeanBase {
}
public String login() {
FacesMessage message = null;
boolean loggedIn = false;
LoggedUserTO usr = null;
@@ -56,7 +55,7 @@ public class LoginMBean extends ManagedBeanBase {
this.addFacesMessageKeep(FacesMessage.SEVERITY_INFO, "Login correcto", "Bienvenido " + usr.getName());
return ("home?faces-redirect=true");
return ("/home?faces-redirect=true");
} else
this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
} catch (Exception ex) {
@@ -66,7 +65,6 @@ public class LoginMBean extends ManagedBeanBase {
} else
this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
FacesContext.getCurrentInstance().addMessage(null, message);
PrimeFaces.current().ajax().addCallbackParam("loggedIn", loggedIn);
return "";
@@ -78,6 +76,6 @@ public class LoginMBean extends ManagedBeanBase {
SessionUtils.DestroySession();
return "home?faces-redirect=true";
return "/home?faces-redirect=true";
}
}