From a35d7fe7fe075e37788ad38a6743753a17f4bd99 Mon Sep 17 00:00:00 2001 From: Roberto Orden Erena Date: Tue, 24 Dec 2019 18:36:41 +0100 Subject: [PATCH] =?UTF-8?q?Preguntas=20y=20respuestas=20funcionando=20para?= =?UTF-8?q?=20m=C3=A9dicos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/build.xml | 2 +- .../medicaltest/PendingQuestions.xhtml | 85 ------ .../docroot/medicaltest/Questions.xhtml | 80 ++++++ .../docroot/resources/css/estilos.css | 7 +- .../docroot/resources/images/ANSWERED.png | Bin 0 -> 775 bytes .../docroot/resources/images/ANSWERED.svg | 9 + .../docroot/resources/images/PENDING.png | Bin 0 -> 909 bytes .../docroot/resources/images/PENDING.svg | 248 ++++++++++++++++++ .../docroot/resources/images/clock.png | Bin 0 -> 5375 bytes .../docroot/resources/images/clock.svg | 36 +++ .../docroot/resources/images/quote.png | Bin 0 -> 8596 bytes .../docroot/resources/images/quote.svg | 11 + 1.sources/MyHealth/ecosystem.json | 9 + 1.sources/MyHealth/src/TO/QuestionTO.java | 18 ++ .../MyHealth/src/common/QuestionStatus.java | 2 +- .../medicalTest/MedicalTestFacadeBean.java | 28 +- .../medicalTest/MedicalTestFacadeRemote.java | 2 +- 1.sources/MyHealth/src/jpa/QuestionJPA.java | 1 + .../common/AuthorizationFilter.java | 6 +- .../src/managedbean/common/MenuMBean.java | 15 +- .../medicalTest/PendingQuestionsMBean.java | 55 ---- .../medicalTest/QuestionsMBean.java | 191 ++++++++++++++ 1.sources/MyHealth/start.sh | 5 + 23 files changed, 647 insertions(+), 163 deletions(-) delete mode 100644 1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml create mode 100644 1.sources/MyHealth/docroot/medicaltest/Questions.xhtml create mode 100644 1.sources/MyHealth/docroot/resources/images/ANSWERED.png create mode 100644 1.sources/MyHealth/docroot/resources/images/ANSWERED.svg create mode 100644 1.sources/MyHealth/docroot/resources/images/PENDING.png create mode 100644 1.sources/MyHealth/docroot/resources/images/PENDING.svg create mode 100644 1.sources/MyHealth/docroot/resources/images/clock.png create mode 100644 1.sources/MyHealth/docroot/resources/images/clock.svg create mode 100644 1.sources/MyHealth/docroot/resources/images/quote.png create mode 100644 1.sources/MyHealth/docroot/resources/images/quote.svg create mode 100644 1.sources/MyHealth/ecosystem.json delete mode 100644 1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java create mode 100644 1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java create mode 100755 1.sources/MyHealth/start.sh diff --git a/1.sources/MyHealth/build.xml b/1.sources/MyHealth/build.xml index 2210832..5cf2dcd 100644 --- a/1.sources/MyHealth/build.xml +++ b/1.sources/MyHealth/build.xml @@ -4,7 +4,7 @@ - + diff --git a/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml b/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml deleted file mode 100644 index 625f747..0000000 --- a/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - -
- -
- -
-
- -
-
- -
- -
- -
-
- -
-
- -
- -
- -
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- -
-
- -
-
-
-
- - - - - diff --git a/1.sources/MyHealth/docroot/medicaltest/Questions.xhtml b/1.sources/MyHealth/docroot/medicaltest/Questions.xhtml new file mode 100644 index 0000000..b6774f2 --- /dev/null +++ b/1.sources/MyHealth/docroot/medicaltest/Questions.xhtml @@ -0,0 +1,80 @@ + + + + + + + + + + +
+
+ + + + + + + + + + + + +
+
+
+ + #{Questions.selected.title} + + + + +

Respuesta:

+ + + +
+ + + + +
+
+ + + + + diff --git a/1.sources/MyHealth/docroot/resources/css/estilos.css b/1.sources/MyHealth/docroot/resources/css/estilos.css index 2c95b88..f60ebb1 100644 --- a/1.sources/MyHealth/docroot/resources/css/estilos.css +++ b/1.sources/MyHealth/docroot/resources/css/estilos.css @@ -1,4 +1,4 @@ -BODY { +body { font-family: Verdana, Arial, Helvetica, sans-serif; } @@ -36,4 +36,9 @@ ul.ui-menu-list { .red-button.ui-button.ui-state-default:enabled:hover, .red-button.ui-button.ui-state-default:focus { background-color: #d43f3a; border-color: #d9534f; +} + +.ui-orderlist .ui-orderlist-list { + height: 70vh !important; + width: 25vw !important; } \ No newline at end of file diff --git a/1.sources/MyHealth/docroot/resources/images/ANSWERED.png b/1.sources/MyHealth/docroot/resources/images/ANSWERED.png new file mode 100644 index 0000000000000000000000000000000000000000..5427f7df1c3cd3a3e7584f0b81556ba389967bf6 GIT binary patch literal 775 zcmV+i1Ni)jP)OaovT_yM+r@It`5*4N zeBSr@z2_XxIYJtFda6q>X0w0`v>@)v5NMwmuKLP4`>b-3YSf0@E}PPJnKi!a6 z?69x0E1VYSxm8mqq8EUvlfcIGOGNhg$^+gBK+o;9S4>);xx|0fW32$T3>rDk3<8I zj-m#d!iO0A@hUA$An2 + + + + + + + + \ No newline at end of file diff --git a/1.sources/MyHealth/docroot/resources/images/PENDING.png b/1.sources/MyHealth/docroot/resources/images/PENDING.png new file mode 100644 index 0000000000000000000000000000000000000000..d2a21bccdf9a6d606ab5e8bdadf81f58a096cda9 GIT binary patch literal 909 zcmV;819JR{P)^w%BT`^+-VvHj@U)da)7pVp;Sis92$(Xk=@sJwOvu^Xly`r`_v0 z=bp0{b>-aaZLsf~KmY&l_x=3-&q8Xwr>e>}UxuqP%kR-VnrN1VsT8U74Pr>)lyW=--kI6rl0y*`+NrGCj+amta{oX3UQ~CIuWCGM+Z0B1}Q02$$G!mtiBZA zhyI}m8$N5Jac>!=^L+`0Hh{InJ|9z=V14)V-ITur~=m8kJfb}_E~^^4c*kP z%_k>2Ex~l}{&Rw%2$hR0KtbHI5H%eu(hERZX=}3rv;cG5MHjljJ_qn!-GV7FfSc{Z zEH2Ujm{xoptO)LcGn4T^K}K%;>1{U*nkqhS`8EzsrA(ijsII>3h=!6;kq{4t^r-Xb z76VP1#&*4DO+F&Kfq>Hx`djCR`upaQuikW}sAs2@wl*ezU%5a7@EoYOAFbCRRtA!d zVu!J%*B$sRaQ@`G->j^1&2_?NFYRa>ex}zX1LG j555=+j~cgueL(16%rpgDh9#Ak00000NkvXXu0mjfD>|aY literal 0 HcmV?d00001 diff --git a/1.sources/MyHealth/docroot/resources/images/PENDING.svg b/1.sources/MyHealth/docroot/resources/images/PENDING.svg new file mode 100644 index 0000000..32a7f04 --- /dev/null +++ b/1.sources/MyHealth/docroot/resources/images/PENDING.svg @@ -0,0 +1,248 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/1.sources/MyHealth/docroot/resources/images/clock.png b/1.sources/MyHealth/docroot/resources/images/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..ed0f093a0e977e89005f42eb7a761331aaf69ec4 GIT binary patch literal 5375 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 literal 0 HcmV?d00001 diff --git a/1.sources/MyHealth/docroot/resources/images/clock.svg b/1.sources/MyHealth/docroot/resources/images/clock.svg new file mode 100644 index 0000000..d2b759c --- /dev/null +++ b/1.sources/MyHealth/docroot/resources/images/clock.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/1.sources/MyHealth/docroot/resources/images/quote.png b/1.sources/MyHealth/docroot/resources/images/quote.png new file mode 100644 index 0000000000000000000000000000000000000000..2aab88a31918fce582f0f0e2c12588e8530ec910 GIT binary patch literal 8596 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 literal 0 HcmV?d00001 diff --git a/1.sources/MyHealth/docroot/resources/images/quote.svg b/1.sources/MyHealth/docroot/resources/images/quote.svg new file mode 100644 index 0000000..45d5294 --- /dev/null +++ b/1.sources/MyHealth/docroot/resources/images/quote.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/1.sources/MyHealth/ecosystem.json b/1.sources/MyHealth/ecosystem.json new file mode 100644 index 0000000..e590ff6 --- /dev/null +++ b/1.sources/MyHealth/ecosystem.json @@ -0,0 +1,9 @@ +{ + "apps" : [{ + "name": "ANT", + "script": "start.sh", + "cwd": "./", + "ignore_watch": ["*.ear", "*.jar", "*.war", "./build/*", "./dist/*"], + "watch": true + }] +} diff --git a/1.sources/MyHealth/src/TO/QuestionTO.java b/1.sources/MyHealth/src/TO/QuestionTO.java index 7c5cc17..99096be 100644 --- a/1.sources/MyHealth/src/TO/QuestionTO.java +++ b/1.sources/MyHealth/src/TO/QuestionTO.java @@ -27,6 +27,8 @@ public class QuestionTO implements Serializable { public QuestionTO() { super(); + this.patient = new PatientTO(); + this.fdoctor = new FamilyDoctorTO(); } public QuestionTO(int id, String title, String message, QuestionStatus status, PatientTO patient, @@ -96,5 +98,21 @@ public class QuestionTO implements Serializable { public void setResponse(String response) { this.response = response; } + + public String toString() { + return "{" + + "ObjectID" + super.toString() + + ",id" + this.getId() + + ",title" + this.getTitle() + + ",message" + this.getMessage() + + ",response" + this.getResponse() + + ",status" + this.getStatus() + + ",patient-id" + this.getPatient().getId() + + ",patient-name-surname" + this.getPatient().getName() + " " + this.getPatient().getSurname() + + ",fdoctor-id" + this.getDoctor().getId() + + ",fdoctor-name-surname" + this.getDoctor().getName() + " " + this.getDoctor().getSurname() + + "}"; + + } } diff --git a/1.sources/MyHealth/src/common/QuestionStatus.java b/1.sources/MyHealth/src/common/QuestionStatus.java index b32bbf6..ac3ba66 100644 --- a/1.sources/MyHealth/src/common/QuestionStatus.java +++ b/1.sources/MyHealth/src/common/QuestionStatus.java @@ -6,7 +6,7 @@ package common; * */ public enum QuestionStatus { - ANSWERED("Respondida"), PENDING("Pendiente"); + ANSWERED("Respondida"), PENDING("Pendiente"), NEW("New"); private String questionStatusName; diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java index 8dd4956..c796b9d 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java @@ -74,11 +74,35 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote { * @param response */ @Override - public void answerQuestion(String question, String response) { + public void answerQuestion(QuestionTO q) { + QuestionJPA qjpa = entman.find(QuestionJPA.class, q.getId()); + qjpa.setResponse(q.getResponse()); + qjpa.setStatus(QuestionStatus.ANSWERED); + + PatientJPA patient = entman.find(PatientJPA.class, q.getPatient().getId()); + // 1. Buscar el médico de familia con ese professionalNumber + FamilyDoctorJPA fdoctor = entman.find(FamilyDoctorJPA.class, q.getDoctor().getId()); + + qjpa.setPatient(patient); + qjpa.setFamilyDoctor(fdoctor); + + entman.persist(qjpa); } public List listAllPendingQuestions(int familyDoctorId) { - return null; + // TypedQuery query = entman.createQuery("SELECT q from QuestionJPA q where q.status=:status and q.familyDoctor.id=:docId order by q.title", QuestionJPA.class); + TypedQuery query = entman.createQuery("SELECT q from QuestionJPA q where q.familyDoctor.id=:docId order by q.status desc, q.title asc", QuestionJPA.class); + // query.setParameter("status", QuestionStatus.PENDING); + query.setParameter("docId", familyDoctorId); + + List allJPA = query.getResultList(); + List pendingQuestions = new ArrayList(); + + for (QuestionJPA item : allJPA) { + pendingQuestions.add(commonServices.getPOJOforQuestionJPA(item, 1)); + } + + return pendingQuestions; } public Long getPendingQuestionsCount(int familyDoctorId) { diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java index 73fcc00..8382cc2 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java @@ -37,7 +37,7 @@ public interface MedicalTestFacadeRemote { * @param question * @param response */ - public void answerQuestion(String question, String response); + public void answerQuestion(QuestionTO question); /** * Recuperar las preguntas sin respuesta para un médico diff --git a/1.sources/MyHealth/src/jpa/QuestionJPA.java b/1.sources/MyHealth/src/jpa/QuestionJPA.java index 3b5f826..40132a0 100644 --- a/1.sources/MyHealth/src/jpa/QuestionJPA.java +++ b/1.sources/MyHealth/src/jpa/QuestionJPA.java @@ -12,6 +12,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import TO.QuestionTO; import common.QuestionStatus; /** diff --git a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java index 946fff9..1142b0f 100644 --- a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java +++ b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java @@ -99,7 +99,7 @@ public class AuthorizationFilter implements Filter { authorized = true; if (reqURI.indexOf("/visit/CancelVisit") > 0) authorized = true; - if (reqURI.indexOf("/medicaltest/AddQuestion") > 0) + if (reqURI.indexOf("/medicaltest/Questions") > 0) authorized = true; if (reqURI.indexOf("/medicaltest/ViewMedicalTest") > 0) authorized = true; @@ -121,9 +121,7 @@ public class AuthorizationFilter implements Filter { authorized = true; if (reqURI.indexOf("/medicaltest/MedicalTests") > 0) authorized = true; - if (reqURI.indexOf("/medicaltest/AnswerQuestion") > 0) - authorized = true; - if (reqURI.indexOf("/medicaltest/PendingQuestions") > 0) + if (reqURI.indexOf("/medicaltest/Questions") > 0) authorized = true; if (reqURI.indexOf("/medicaltest/ViewMedicalTest") > 0) authorized = true; diff --git a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java index 7342482..d17400f 100644 --- a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java +++ b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java @@ -78,7 +78,7 @@ public class MenuMBean implements Serializable { // Todos pueden consultar (P S F) subMenu.addElement(createMenuItem("Consultar prueba", "fa fa-search", "/medicaltest/MedicalTests", null)); - subMenu.addElement(new DefaultSeparator()); + subMenu.addElement(new DefaultSeparator()); if (tipoUsuario == UserType.SPECIALIST_DOCTOR) { subMenu.addElement(new DefaultSeparator()); @@ -93,18 +93,7 @@ public class MenuMBean implements Serializable { // Preguntas médicas if (tipoUsuario == UserType.PATIENT || tipoUsuario == UserType.FAMILY_DOCTOR) { - subMenu = new DefaultSubMenu("Preguntas", "fa fa-question-circle"); - - if (tipoUsuario == UserType.PATIENT) - subMenu.addElement(createMenuItem("Hacer pregunta", "fa fa-comment-o", "/medicaltest/MedicalTests", null)); - - if (tipoUsuario == UserType.FAMILY_DOCTOR) - subMenu.addElement(createMenuItem("Responder pregunta", "fa fa-comments", "/medicaltest/MedicalTests", null)); - - if (tipoUsuario == UserType.FAMILY_DOCTOR) - subMenu.addElement(createMenuItem("Ver preguntas pendientes", "fa fa-comments-o", "/medicaltest/PendingQuestions", null)); - - model.addElement(subMenu); + model.addElement(createMenuItem("Preguntas", "fa fa-comment-o", "/medicaltest/Questions", null)); } } diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java deleted file mode 100644 index f179753..0000000 --- a/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java +++ /dev/null @@ -1,55 +0,0 @@ -package managedbean.medicalTest; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import javax.annotation.PostConstruct; -import javax.faces.view.ViewScoped; -import javax.inject.Named; - -import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; - -import TO.QuestionTO; -import managedbean.common.ManagedBeanBase; -import managedbean.common.SessionUtils; - -@Named("PendingQuestions") -@ViewScoped -public class PendingQuestionsMBean extends ManagedBeanBase implements Serializable { - - private static final long serialVersionUID = 1L; - - private int familyDoctorId; - private LazyDataModel lazyDataModelQuestionList; - - public PendingQuestionsMBean() { - } - - @PostConstruct - public void init() { - // Inicialización de variables y propiedades van aquí. - this.familyDoctorId = Integer.valueOf(SessionUtils.getUserId()); - - this.lazyDataModelQuestionList = new LazyDataModel() { - private static final long serialVersionUID = 1L; - - @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { - Long totalRowCount = getRemoteManagerMedicalTest().getPendingQuestionsCount(familyDoctorId); - this.setRowCount(totalRowCount.intValue()); - - return getRemoteManagerMedicalTest().listPendingQuestionsPaged(familyDoctorId, (first / pageSize), pageSize); - } - }; - } - - public LazyDataModel getLazyDataModelQuestionList() { - return lazyDataModelQuestionList; - } - - public void saveData() { - - } -} diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java new file mode 100644 index 0000000..d335145 --- /dev/null +++ b/1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java @@ -0,0 +1,191 @@ +package managedbean.medicalTest; + +import java.io.Serializable; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.faces.view.ViewScoped; +import javax.inject.Named; + +import org.primefaces.event.SelectEvent; + +import TO.PatientTO; +import TO.QuestionTO; +import common.QuestionStatus; +import common.UserType; +import managedbean.common.ManagedBeanBase; +import managedbean.common.SessionUtils; + +@Named("Questions") +@ViewScoped +public class QuestionsMBean extends ManagedBeanBase implements Serializable { + + private static final long serialVersionUID = 1L; + + private int userID; + private UserType userType; + private List pendingQuestions; + protected String title; + protected String message; + protected String response; + protected QuestionTO selected; + + public QuestionsMBean() { + } + + @PostConstruct + public void init() { + // Inicialización de variables y propiedades van aquí. + this.userType = SessionUtils.getUserType(); + this.userID = Integer.valueOf(SessionUtils.getUserId()); + + this.loadQuestions(); + this.printSelected(); + } + + private void printSelected() { + System.out.println("Selected: "); + System.out.println(this.selected); + } + + public List getPendingQuestions() { + return pendingQuestions; + } + + public void setPendingQuestions(List 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) { + // Listar las preguntas destinadas a él + // El método disponible del API básico es referente al doctor + this.pendingQuestions = getRemoteManagerMedicalTest().listAllPendingQuestions(userID); + } else if (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. + } + } + + 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 boolean getEnableResponseEditor() { + if(this.selected != null) { + return this.selected.getStatus() == QuestionStatus.PENDING; + } + return false; + } + + public boolean isEnableResponseEditor() { + return this.getEnableResponseEditor(); + } + + public void setEnableResponseEditor(boolean bval) { + // Nothing to do + } + + public boolean getEnableResponseOutput() { + if(this.selected != null) { + return this.selected.getStatus() == QuestionStatus.ANSWERED; + } + return false; + } + + public boolean isEnableResponseOutput() { + return this.getEnableResponseEditor(); + } + + public void setEnableResponseOutput(boolean bval) { + // Nothing to do + } + + public void onSelect(SelectEvent event) { + this.printSelected(); + this.selected = (QuestionTO) event.getObject(); + this.printSelected(); + } + + public void onUnSelect(SelectEvent event) { + this.selected = null; + } + + public void setSelected(QuestionTO selected) { + this.selected = selected; + } + + public QuestionTO getSelected() { + return this.selected; + } + + public void setTitle(String title) { + this.title = title; + } + + public void setMessage(String message) { + this.message = message; + } + + public void setResponse(String response) { + this.response = response; + } + + public void save() { + getRemoteManagerMedicalTest().answerQuestion(this.selected); + } + + public void create() { + this.printSelected(); + String template = "-"; + this.selected = new QuestionTO(); + this.selected.setTitle(template); + this.selected.setMessage(template); + this.selected.setResponse(template); + this.selected.setStatus(QuestionStatus.NEW); + this.selected.getPatient().setName(template); + this.selected.getPatient().setSurname(template); + this.printSelected(); + } + + public boolean getShowPanelDetail() { + return this.selected != null; + } + + public boolean isShowPanelDetail() { + return this.getShowPanelDetail(); + } + + public void setShowPanelDetail() { + // + } + +} diff --git a/1.sources/MyHealth/start.sh b/1.sources/MyHealth/start.sh new file mode 100755 index 0000000..a9db8b4 --- /dev/null +++ b/1.sources/MyHealth/start.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +ant + +read -p "Di hola pringao!" asd