From 4d56c253b32f1395497a8761bc4d2a78acdea67b Mon Sep 17 00:00:00 2001
From: Bennett <mwb9@fa20-cs427-144.cs.illinois.edu>
Date: Tue, 17 Nov 2020 19:48:31 -0600
Subject: [PATCH] pre filling information for request section (from existing
Appointment)
---
.../WebRoot/auth/patient/editApptPatient.jsp | 100 ++++++++++++------
1 file changed, 65 insertions(+), 35 deletions(-)
diff --git a/iTrust/WebRoot/auth/patient/editApptPatient.jsp b/iTrust/WebRoot/auth/patient/editApptPatient.jsp
index 14d1bdf..dc19f39 100644
--- a/iTrust/WebRoot/auth/patient/editApptPatient.jsp
+++ b/iTrust/WebRoot/auth/patient/editApptPatient.jsp
@@ -191,7 +191,7 @@
}
}
%>
-<h1>Request an Appointment</h1>
+<h1>Cancel Existing Appointment or Request a New Appointment</h1>
<%
if (msg.contains("ERROR")) {
%>
@@ -204,39 +204,66 @@
}
%>
<%=prompt%>
+<%Date d = new Date(original.getDate().getTime());
+DateFormat format = new SimpleDateFormat("MM/dd/yyyy hh:mm a");
+%>
+<div>
+ <h3>The following appointment will be canceled by pressing the "Cancel Appointment" button.</h3>
+ <p><b>Patient:</b> <%= StringEscapeUtils.escapeHtml("" + ( editAction.getName(original.getPatient()) )) %></p>
+ <p><b>HCP:</b> <%= StringEscapeUtils.escapeHtml("" + ( editAction.getName(original.getHcp()) )) %></p>
+ <p><b>Type:</b> <%= StringEscapeUtils.escapeHtml("" + ( original.getApptType() )) %></p>
+ <p><b>Date/Time:</b> <%= StringEscapeUtils.escapeHtml("" + ( format.format(d) )) %></p>
+ <p><b>Duration:</b> <%= StringEscapeUtils.escapeHtml("" + ( apptTypeDAO.getApptType(original.getApptType()).getDuration()+" minutes" )) %></p>
+</div>
+
+
<%-- <form action="appointmentRequests.jsp" method="post"> --%>
<form id="mainForm" type="hidden" method="post" action="editApptPatient.jsp?apt=<%=aptParameter %>&apptID=<%=original.getApptID() %>">
+ <input type="submit" value="Cancel Appointment" name="editApptButton" id="removeButton" onClick="document.getElementById('editAppt').value='Remove'"/>
+ <br/>
+ <br/>
<p>HCP:</p>
<select name="lhcp">
<%
- for (HCPVisitBean visit : visits) {
- %><option
- <%if (visit.getHCPMID() == hcpid)
- out.println("selected");%>
- value="<%=visit.getHCPMID()%>"><%=visit.getHCPName()%></option>
- <%
- }
+///
+//<%
+for(HCPVisitBean visit : visits){
+ if (visit.getHCPMID() == original.getHcp()){ %>
+ <option selected="selected" value="<%=visit.getHCPMID()%>"><%=visit.getHCPName()%></option>
+ <%}else { %>
+ <option value="<%=visit.getHCPMID()%>"><%=visit.getHCPName()%></option>
+ <%} }
+///
+
+
%>
</select>
<p>Appointment Type:</p>
<select name="apptType">
<%
for (ApptTypeBean appt : apptTypes) {
- %><option
- <%if (appt.getName().equals(apptType))
- out.print("selected='selected'");%>
- value="<%=appt.getName()%>"><%=appt.getName()%></option>
- <%
- }
- String startDate = "";
+
+ if (appt.getName().equals(original.getApptType())){ %>
+ <option selected="selected" value="<%=appt.getName()%>"><%=appt.getName()%></option>
+ <%}else { %>
+ <option value="<%=appt.getName()%>"><%=appt.getName()%></option>
+ <%} }
+
+
+
+ String startDate = "";
%>
</select>
<p>Date:</p>
- <input name="startDate"
- value="<%=StringEscapeUtils.escapeHtml("" + (date))%>" size="10">
- <input type=button value="Select Date"
- onclick="displayDatePicker('startDate');">
+ <%DateFormat format_1 = new SimpleDateFormat("MM/dd/yyyy");%>
+ <input name="startDate" value="<%=StringEscapeUtils.escapeHtml("" + ( format_1.format(d) )) %>">
+
+ <input type=button value="Select Date" onclick="displayDatePicker('startDate');">
+
<p>Time:</p>
+ <%DateFormat format_hour = new SimpleDateFormat("hh");%>
+ <%DateFormat format_minute = new SimpleDateFormat("mm");%>
+ <%DateFormat format_ampm = new SimpleDateFormat("a");%>
<select name="time1">
<%
String hour = "";
@@ -245,13 +272,13 @@
hour = "0" + i;
else
hour = i + "";
- %>
- <option <%if (hour.equals(hourI))
- out.print("selected");%>
- value="<%=hour%>"><%=StringEscapeUtils.escapeHtml("" + (hour))%></option>
+ if (hour.equals((format_hour.format(d) ))) { %>
+ <option selected="selected" value="<%=hour%>"><%=StringEscapeUtils.escapeHtml("" + (hour))%></option>
+ <%}else { %>
+ <option value="<%=hour%>"><%=StringEscapeUtils.escapeHtml("" + (hour))%></option>
<%
}
- %>
+ }%>
</select>:<select name="time2">
<%
String min = "";
@@ -260,25 +287,28 @@
min = "0" + i;
else
min = i + "";
- %>
- <option <%if (min.equals(minuteI))
- out.print("selected");%>
- value="<%=min%>"><%=StringEscapeUtils.escapeHtml("" + (min))%></option>
+ if (min.equals((format_minute.format(d) ))) { %>
+ <option selected="selected" value="<%=min%>"><%=StringEscapeUtils.escapeHtml("" + (min))%></option>
+ <%}else { %>
+ <option value="<%=min%>"><%=StringEscapeUtils.escapeHtml("" + (min))%></option>
<%
}
- %>
+ }%>
</select> <select name="time3">
- <option <%if ("AM".equals(tod))
- out.print("selected");%> value="AM">AM</option>
- <option <%if ("PM".equals(tod))
- out.print("selected");%> value="PM">PM</option>
+ <% if (format_ampm.format(d).equals("AM")){ %>
+ <option value="PM">PM</option>
+ <option selected="selected" value="AM">AM</option>
+ <%}else { %>
+ <option value="AM">AM</option>
+ <option selected="selected" value="PM">PM</option>
+ <% }%>
</select>
<p>Comment:</p>
- <textarea name="comment" cols="100" rows="10"><%=StringEscapeUtils.escapeHtml("" + (comment))%></textarea>
+ <textarea name="comment" cols="100" rows="5"><%=StringEscapeUtils.escapeHtml("" + (comment))%></textarea>
<br /> <br />
<input type="hidden" id="editAppt" name="editAppt" value=""/>
<input type="submit" name="request" value="Request" onClick="document.getElementById('editAppt').value='Request'"/>
- <input type="submit" value="Remove" name="editApptButton" id="removeButton" onClick="document.getElementById('editAppt').value='Remove'"/>
+
</form>
<%
--
GitLab