From 257419490d1ee31c993c7c64c22d64bae697e11e Mon Sep 17 00:00:00 2001
From: Aditya Bhansali <adityab3@illinois.edu>
Date: Thu, 29 Oct 2020 06:37:22 -0500
Subject: [PATCH] removed dead code in preregisterpatient.jsp
---
iTrust/WebRoot/util/PreRegisterPatient.jsp | 82 +++-------------------
1 file changed, 11 insertions(+), 71 deletions(-)
diff --git a/iTrust/WebRoot/util/PreRegisterPatient.jsp b/iTrust/WebRoot/util/PreRegisterPatient.jsp
index 7fa89d8..d433504 100755
--- a/iTrust/WebRoot/util/PreRegisterPatient.jsp
+++ b/iTrust/WebRoot/util/PreRegisterPatient.jsp
@@ -6,7 +6,6 @@
<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
<%@page import="edu.ncsu.csc.itrust.beans.HealthRecord"%>
<%@page import="edu.ncsu.csc.itrust.exception.FormValidationException"%>
-
<%@include file="/global.jsp" %>
<%
@@ -19,76 +18,17 @@ pageTitle = "iTrust - Add Patient";
boolean formIsFilled = request.getParameter("formIsFilled") != null && request.getParameter("formIsFilled").equals("true");
if (formIsFilled) {
- //PatientBean p = new BeanBuilder<PatientBean>().build(request.getParameterMap(), new PatientBean());
- //HealthRecord h = new BeanBuilder<HealthRecord>().build(request.getParameterMap(), new HealthRecord());
-
- //This page is not actually a "page", it just adds a user and forwards.
- PatientBean p = new BeanBuilder<PatientBean>().build(request.getParameterMap(), new PatientBean());
- ////////////// ????????????????????????
-
- try{
- boolean isDependent = false;
- long representativeId = -1L;
-
- if(request.getParameter("isDependent") != null && request.getParameter("isDependent").equals("on")){
- isDependent = true;
- }
-
- if(request.getParameter("repId") != "" && isDependent){
- representativeId = Long.valueOf(request.getParameter("repId"));
- }else if(isDependent && request.getParameter("repId") == ""){
- throw new FormValidationException("Representative MID must be filled if the patient is marked as a dependent.");
- }
-
- long newMID = 1L;
-
- if(isDependent){
- newMID = new AddPatientAction(prodDAO, loggedInMID.longValue()).addDependentPatient(p, representativeId);
- }else{
- newMID = new AddPatientAction(prodDAO, loggedInMID.longValue()).addPatient(p);
- }
-
- session.setAttribute("pid", Long.toString(newMID));
- String fullname;
- String password;
- password = p.getPassword();
- fullname = p.getFullName();
-
- if (isDependent) {
- loggingAction.logEvent(TransactionType.HCP_CREATED_DEPENDENT_PATIENT, loggedInMID.longValue(), newMID, "");
- } else {
- loggingAction.logEvent(TransactionType.PATIENT_CREATE, loggedInMID.longValue(), newMID, "");
- }
-%>
- <div align=center>
- <span class="iTrustMessage">New patient <%= StringEscapeUtils.escapeHtml("" + (fullname)) %> successfully added!</span>
- <br />
- <table class="fTable">
- <tr>
- <th colspan=2>New Patient Information</th>
- </tr>
- <tr>
- <td class="subHeaderVertical">MID:</td>
- <td><%= StringEscapeUtils.escapeHtml("" + (newMID)) %></td>
- </tr>
- <tr>
- <td class="subHeaderVertical">Temporary Password:</td>
- <td><%= StringEscapeUtils.escapeHtml("" + (password)) %></td>
- </tr>
- </table>
- <br />Please get this information to <b><%= StringEscapeUtils.escapeHtml("" + (fullname)) %></b>!
- <p>
- <a href = "/iTrust/auth/hcp-uap/editPatient.jsp">Continue to patient information.</a>
- </p>
- </div>
-<%
- } catch(FormValidationException e){
+ PatientBean p = new BeanBuilder<PatientBean>().build(request.getParameterMap(), new PatientBean());
+ HealthRecord h = new BeanBuilder<HealthRecord>().build(request.getParameterMap(), new HealthRecord());
+
+ String s = "bla";
+ if (p != null) {
+ s = p.getFullName();
+ }
%>
- <div align=center>
- <span class="iTrustError"><%=StringEscapeUtils.escapeHtml(e.getMessage()) %></span>
- </div>
+<div><%=s%></div>
<%
- }
+
}
%>
@@ -149,11 +89,11 @@ to recover the password.</div>
</tr>
<tr>
<td class="subHeaderVertical">Height:</td>
- <td><input type="number" name="height"></td>
+ <td><input type="text" name="height" value="0"></td>
</tr>
<tr>
<td class="subHeaderVertical">Weight:</td>
- <td><input type="number" name="weight"></td>
+ <td><input type="text" name="weight" value="0"></td>
</tr>
<tr>
<td class="subHeaderVertical">Smoker:</td>
--
GitLab