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

Integradas sugerencias de la vista recibidas de Marcos, se ha tenido que

Browse Source 
integrar con el uso de las firmas de EJB de MagicDrw, además de eliminar
el uso de propiedades sueltas en pro del objeto seleccionado, y también
se ha hecho algún cambio extra para que la botonera de la interfaz quede
más integrada.
This commit is contained in:
Roberto Orden Erena
2019-12-26 21:10:40 +01:00
parent 85f6cf9644
commit 6fd9e7ca6c
2 changed files with 116 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
1.sources/MyHealth/docroot/medicaltest/Questions.xhtml
View File

@@ -1,56 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
<ui:composition template="../header.xhtml">
<ui:define name="content">
<h:form id="frmQuestions">
<p:growl id="msgs" showDetail="true" closable="true"
autoupdate="true" />
<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
<p:panel id="panelQuestions" header="Preguntas">
<div class="ui-g ui-fluid">
<div class="ui-g-3 ui-md-3">
<p:commandButton rendered="#{Questions.showCreate}" action="#{Questions.create}" value="Nuevo" update="panelDetail"></p:commandButton>
<p:orderList value="#{Questions.pendingQuestions}" var="pq"
controlsLocation="none" itemValue="#{pq}">
<o:converter converterId="omnifaces.ListConverter"
list="#{Questions.pendingQuestions}" />
<p:ajax event="select" listener="#{Questions.onSelect}"
update="panelDetail"></p:ajax >
<p:ajax event="unselect" listener="#{Questions.onUnSelect}"
update="panelDetail"></p:ajax>
<p:column>
<h:graphicImage name="images/#{pq.status}.png"
alt="#{pq.status}" styleClass="ui-theme" />
</p:column>
<p:column>
<h:outputText value="#{pq.title}" />
</p:column>
</p:orderList>
<div class="ui-g-4">
<p:panel id="panelQuestionList" header="Lista de preguntas">
<f:facet name="actions">
<h:commandLink action="#{Questions.init}" update="frmQuestions" styleClass="ui-panel-titlebar-icon ui-corner-all ui-state-default"><h:outputText styleClass="ui-icon pi pi-refresh" /></h:commandLink>
<h:commandLink rendered="#{Questions.patient}" action="#{Questions.create}" update="frmQuestions" styleClass="ui-panel-titlebar-icon ui-corner-all ui-state-default"><h:outputText styleClass="ui-icon pi pi-plus" /></h:commandLink>
</f:facet>
<p:orderList value="#{Questions.pendingQuestions}" var="pq" controlsLocation="none" itemValue="#{pq}" responsive="true">
<o:converter converterId="omnifaces.ListConverter" list="#{Questions.pendingQuestions}" />
<p:ajax event="select" listener="#{Questions.onSelect}" update="frmQuestions"></p:ajax>
<p:ajax event="unselect" listener="#{Questions.onUnSelect}" update="frmQuestions"></p:ajax>
<p:column>
<h:graphicImage name="images/#{pq.status}.png" alt="#{pq.status}" styleClass="ui-theme" />
</p:column>
<p:column headerText="Título">
<h:outputText value="#{pq.title}" />
</p:column>
</p:orderList>
</p:panel>
</div>
<div class="ui-g-1 ui-md-1"></div>
<div class="ui-g-8 ui-md-8">
<p:panel id="panelDetail" visible="#{Questions.showPanelDetail}" header="Pregunta de #{Questions.selected.patient.name} #{Questions.selected.patient.surname} ">
<!-- Creación de pregunta -->
<p:inputText rendered="#{Questions.selected.status == 'NEW'}" value="#{Questions.selected.title}"></p:inputText>
<p:textEditor rendered="#{Questions.selected.status == 'NEW'}" value="#{Questions.selected.message}" ></p:textEditor>
<!-- Respuesta a una pregunta -->
<h:outputText rendered="#{Questions.selected.status != 'NEW'}">#{Questions.selected.title}</h:outputText>
<h:outputText rendered="#{Questions.selected.status != 'NEW'}" value="#{Questions.selected.message}" escape="false"></h:outputText>
<p:panel rendered="#{Questions.selected.status != 'NEW'}" style="border: 0px !important;">
<h3>Respuesta:</h3>
<p:textEditor rendered="#{Questions.selected.status == 'PENDING'}" value="#{Questions.selected.response}"></p:textEditor>
<h:outputText rendered="#{Questions.selected.status == 'ANSWERED'}" value="#{Questions.selected.response}" escape="false"></h:outputText>
</p:panel>
<br/>
<p:commandButton rendered="#{Questions.askButton}" value="Preguntar" action="#{Questions.askQuestion}" update="frmQuestions" icon="pi pi-save" ></p:commandButton>
<p:commandButton rendered="#{Questions.answerButton}" value="Responder" action="#{Questions.answerQuestion}" update="frmQuestions" icon="pi pi-save" ></p:commandButton>
<div class="ui-g-8">
<p:panel id="panelAddQuestion" rendered="#{Questions.addNewMode}" header="Añadir nueva pregunta">
<div class="ui-g ui-fluid">
<div class="ui-g-12">
<h3>Título:</h3>
</div>
<div class="ui-g-12">
<p:inputText value="#{Questions.selected.title}" required="true" requiredMessage="Es necesario especificar el título de la pregunta" />
</div>
<div class="ui-g-12">
<h3>Pregunta:</h3>
</div>
<div class="ui-g-12">
<p:textEditor value="#{Questions.selected.message}" required="true" requiredMessage="Es necesario especificar el texto de la pregunta" />
</div>
<div class="ui-g-4" />
<div class="ui-g-4">
<p:commandButton value="Preguntar" action="#{Questions.addNewQuestion}" update="frmQuestions" icon="pi pi-save" />
</div>
<div class="ui-g-4" />
</div>
</p:panel>
<p:panel id="panelDetail" rendered="#{Questions.showPanelDetail}" header="Pregunta de #{Questions.selected.patient.displayName}">
<!-- Responder pregunta -->
<div class="ui-g ui-fluid">
<div class="ui-g-12">
<h3>Título:</h3>
</div>
<div class="ui-g-12">
<p:inputText value="#{Questions.selected.title}" readonly="true" />
</div>
<div class="ui-g-12">
<h3>Pregunta:</h3>
</div>
<div class="ui-g-12">
<p:textEditor value="#{Questions.selected.message}" toolbarVisible="false" readonly="true" />
</div>
<div class="ui-g-12">
<h3>Respuesta:</h3>
</div>
<div class="ui-g-12">
<p:textEditor value="#{Questions.selected.response}" toolbarVisible="#{Questions.respuestaEditable}" readonly="#{not Questions.respuestaEditable}" required="true" requiredMessage="Es necesario especificar una respuesta." />
</div>
<div class="ui-g-4" />
<div class="ui-g-4">
<p:commandButton value="Responder" rendered="#{Questions.respuestaEditable}" action="#{Questions.save}" update="frmQuestions" icon="pi pi-save" />
</div>
<div class="ui-g-4" />
</div>
</p:panel>
</div>
</div>

128
1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.List;
import javax.annotation.PostConstruct;
import javax.faces.application.FacesMessage;
import javax.faces.view.ViewScoped;
import javax.inject.Named;
@@ -23,8 +24,10 @@ public class QuestionsMBean extends ManagedBeanBase implements Serializable {
private int userID;
private UserType userType;
private List<QuestionTO> allQuestions;
protected QuestionTO selected;
private List<QuestionTO> pendingQuestions;
private Integer id;
private QuestionTO selected;
private boolean addNewMode;
public QuestionsMBean() {
}
@@ -34,78 +37,40 @@ public class QuestionsMBean extends ManagedBeanBase implements Serializable {
// Inicialización de variables y propiedades van aquí.
this.userType = SessionUtils.getUserType();
this.userID = Integer.valueOf(SessionUtils.getUserId());
this.addNewMode = false;
this.selected = null;
this.loadQuestions();
}
private void printSelected(String asd) {
if(asd!=null) {
asd = "'" + asd + "'";
}else {
asd = "";
}
System.out.println("Selected " + asd + ": ");
System.out.println(this.selected);
}
public List<QuestionTO> getPendingQuestions() {
return allQuestions;
return pendingQuestions;
}
public void setPendingQuestions(List<QuestionTO> value) {
this.allQuestions = value;
this.pendingQuestions = value;
}
/**
* Cargará las preguntas enviadas al médico o escritas por el paciente, esto irá
* en función del tipo de usuario en sesión
*/
private void loadQuestions() {
this.printSelected("");
if (userType == UserType.FAMILY_DOCTOR) {
if (this.userType == UserType.FAMILY_DOCTOR) {
// Listar las preguntas destinadas a él
// El método disponible del API básico es referente al doctor
this.allQuestions = getRemoteManagerMedicalTest().listAllPendingQuestions(userID);
} else if (userType == UserType.PATIENT) {
this.pendingQuestions = getRemoteManagerMedicalTest().listAllPendingQuestions(userID);
} else if (this.userType == UserType.PATIENT) {
// Listar las preguntas realiadas por él
// Para reutilizar la misma view, necesitaremos nuevos métodos para el API de
// cara a recoger sus preguntas realizadas.
this.allQuestions = getRemoteManagerMedicalTest().listAllMyQuestions(userID);
this.pendingQuestions = getRemoteManagerMedicalTest().listAllMyQuestions(userID);
}
}
public boolean getShowCreate() {
return userType == UserType.PATIENT;
}
public boolean isShowCreate() {
return this.getShowCreate();
}
public void setShowCreate() {
//
}
public boolean getDisabledMessage() {
if (this.selected != null) {
return this.selected.getStatus() != QuestionStatus.NEW;
}
return false;
}
public boolean isDisabledMessage() {
return this.getDisabledMessage();
}
public void setDisabledMessage(boolean bval) {
// Nothing to do
}
public void onSelect(SelectEvent event) {
this.printSelected("onSelect antes");
this.addNewMode = false;
this.selected = (QuestionTO) event.getObject();
this.printSelected("onSelect despues");
}
public void onUnSelect(SelectEvent event) {
@@ -113,76 +78,55 @@ public class QuestionsMBean extends ManagedBeanBase implements Serializable {
}
public void setSelected(QuestionTO selected) {
this.printSelected("setSelected antes");
this.selected = selected;
this.printSelected("setSelected despues");
}
public QuestionTO getSelected() {
return this.selected;
}
public void answerQuestion() {
// Es un selected recuperado de la lista
public void save() {
getRemoteManagerMedicalTest().answerQuestion(this.selected.getId(), this.selected.getResponse());
this.init();
}
public void askQuestion() {
// Es un question nuevo
QuestionTO q = this.selected;
getRemoteManagerMedicalTest().askQuestion(q.getPatient().getId(), q.getTitle(), q.getMessage());
this.init();
this.loadQuestions();
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Datos guardados", "La respuesta se registrado correctamente en el sistema.");
this.selected = null;
}
public void create() {
this.printSelected("create start");
String template = "";
this.addNewMode = true;
this.selected = new QuestionTO();
this.selected.setId(-1);
this.selected.setTitle(template);
this.selected.setMessage(template);
this.selected.setResponse(template);
this.selected.setStatus(QuestionStatus.NEW);
this.selected.getPatient().setId(Integer.parseInt(SessionUtils.getloggedOnUser().getId()));
this.selected.getPatient().setName(SessionUtils.getloggedOnUser().getName());
this.printSelected("create end");
this.selected.setTitle("");
this.selected.setMessage("");
}
public boolean getShowPanelDetail() {
return this.selected != null;
public void addNewQuestion() {
getRemoteManagerMedicalTest().askQuestion(userID, this.selected.getTitle(), this.selected.getMessage());
this.loadQuestions();
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Datos guardados", "La pregunta se registrado correctamente en el sistema.");
}
public boolean isShowPanelDetail() {
return this.getShowPanelDetail();
return this.selected != null && this.addNewMode == false;
}
public void setShowPanelDetail() {
//
public boolean isPatient() {
return (this.userType == UserType.PATIENT);
}
public boolean getAskButton() {
return this.selected == null ? (userType == UserType.PATIENT)
: (userType == UserType.PATIENT && this.selected.getStatus() == QuestionStatus.NEW);
public boolean isFamilyDoctor() {
return (this.userType == UserType.FAMILY_DOCTOR);
}
public boolean isAskButton() {
return this.getAskButton();
public boolean isAddNewMode() {
return addNewMode;
}
public void setAskButton() {
public boolean isRespuestaEditable() {
return (this.userType == UserType.FAMILY_DOCTOR && this.selected != null && this.selected.getStatus() == QuestionStatus.PENDING);
}
public boolean getAnswerButton() {
return this.selected == null ? (userType == UserType.FAMILY_DOCTOR)
: (userType == UserType.FAMILY_DOCTOR && this.selected.getStatus() == QuestionStatus.PENDING);
public void setAddNewMode(boolean addNewMode) {
this.addNewMode = addNewMode;
}
public boolean isAnswerButton() {
return this.getAnswerButton();
}
public void setAnswerButton() {
}
}