From 010f0b9215d4e72c88513b23a09af3398ccfc148 Mon Sep 17 00:00:00 2001
From: stevenbobo <sbobo3@illinois.edu>
Date: Sat, 14 Nov 2020 19:40:42 -0600
Subject: [PATCH] Updated causeOfDeathTrendsReport jsp to pass field values
(patient, gender, start date, and end date) to DAO class methods. Also
modified trends report table by iterating through bean object to retrieve
return values from DAO.
---
.../auth/hcp/causeOfDeathTrendsReport.jsp | 126 +++++++++++++-----
1 file changed, 96 insertions(+), 30 deletions(-)
diff --git a/iTrust/WebRoot/auth/hcp/causeOfDeathTrendsReport.jsp b/iTrust/WebRoot/auth/hcp/causeOfDeathTrendsReport.jsp
index aa62c6f..99e23e5 100644
--- a/iTrust/WebRoot/auth/hcp/causeOfDeathTrendsReport.jsp
+++ b/iTrust/WebRoot/auth/hcp/causeOfDeathTrendsReport.jsp
@@ -2,10 +2,11 @@
<%@page errorPage="/auth/exceptionHandler.jsp"%>
<%@page import="edu.ncsu.csc.itrust.dao.mysql.CauseOfDeathTrendsReportDAO"%>
+<%@page import="edu.ncsu.csc.itrust.beans.CauseOfDeathTrendsReportBean"%>
<%@page import="java.util.List"%>
<%@page import="java.util.ArrayList"%>
-<%@page import="java.sql.Date"%>
<%@page import="java.util.Iterator"%>
+<%@page import="edu.ncsu.csc.itrust.exception.FormValidationException"%>
<%@include file="/global.jsp" %>
@@ -19,32 +20,49 @@ String view = request.getParameter("viewSelect");
<%@include file="/header.jsp" %>
<%
CauseOfDeathTrendsReportDAO report = new CauseOfDeathTrendsReportDAO(prodDAO);
- ArrayList<String> allDeaths = null;
+ List<CauseOfDeathTrendsReportBean> allDeaths = null;
//get form data
- //Date startDate = Date.valueOf(request.getParameter("startDate"));
- //Date endDate = Date.valueOf(request.getParameter("endDate"));
- //String startDate = request.getParameter("startDate");
- //String endDate = request.getParameter("endDate");
- Date startDate = Date.valueOf("1910-09-20");
- Date endDate = Date.valueOf("2020-11-04");
+ long mid = Long.valueOf(request.getUserPrincipal().getName());
- String gender = request.getParameter("gender");
+ String startDate = request.getParameter("startDate");
+ String endDate = request.getParameter("endDate");
- allDeaths = (ArrayList) report.getTopTwoDeathsForAll(gender, startDate, endDate);
+ String gender = request.getParameter("gender");
- //if (startDate == null)
- //startDate = "";
- //if (endDate == null)
- //endDate = "";
- //if (gender == null)
- //gender = "";
+ String patients = request.getParameter("patients");
+ if (patients == null)
+ patients = "";
+
+ //try to get the report. If there's an error, print it. If null is returned, it's the first page load
+ if(patients.equalsIgnoreCase("My Patients")) {
+ try {
+ allDeaths = report.getTopTwoDeathsForHCP(mid, gender, startDate, endDate);
+ } catch(FormValidationException e){
+ e.printHTML(pageContext.getOut());
+ }
+ }
+
+ if(patients.equalsIgnoreCase("All Patients") || patients.equalsIgnoreCase("")) {
+ try {
+ allDeaths = report.getTopTwoDeathsForAll(gender, startDate, endDate);
+ } catch(FormValidationException e){
+ e.printHTML(pageContext.getOut());
+ }
+ }
+
+ if (gender == null)
+ gender = "";
+ if (startDate == null)
+ startDate = "";
+ if (endDate == null)
+ endDate = "";
%>
<br />
<form action="causeOfDeathTrendsReport.jsp" method="post" id="formMain">
-<input type="hidden" name="viewSelect" value="trends" />
+<input type="hidden" name="viewSelect" />
<table class="fTable" align="center" id="causeOfDeathTrendsReportTable">
<tr>
<th colspan="4">Cause of Death Trends Report</th>
@@ -52,18 +70,60 @@ String view = request.getParameter("viewSelect");
<tr class="subHeader">
<td>Patients:</td>
<td>
- <select name="viewSelect" style="font-size:10" >
- <option value=""> All Patients </option>
- <option value=""> My Patients </option>
+ <select name="patients" style="font-size:10" >
+ <%
+ if (patients != null && !patients.equalsIgnoreCase("")) {
+ if (patients.equalsIgnoreCase("All Patients")) {
+ %>
+ <option selected="selected" value="All Patients"> All Patients </option>
+ <option value="My Patients"> My Patients </option>
+ <%
+ } else if (patients.equalsIgnoreCase("My Patients")) {
+ %>
+ <option value="All Patients"> All Patients </option>
+ <option selected="selected" value="My Patients"> My Patients </option>
+ <%
+ }
+ } else {
+ %>
+ <option value="All Patients"> All Patients </option>
+ <option value="My Patients"> My Patients </option>
</select>
+ <%
+ }
+ %>
</td>
<td>Gender:</td>
<td>
<select name="gender" style="font-size:10" >
- <option value="All"> All </option>
+ <%
+ if (gender != null && !gender.equalsIgnoreCase("")) {
+ if (gender.equalsIgnoreCase("All")) {
+ %>
+ <option selected="selected" value="All"> All </option>
<option value="Male"> Male </option>
<option value="Female"> Female </option>
+ <%
+ } else if(gender.equalsIgnoreCase("Male")){
+ %>
+ <option value="All"> All </option>
+ <option selected="selected" value="Male"> Male </option>
+ <option value="Female"> Female </option>
+ <%
+ } else if(gender.equalsIgnoreCase("Female")){
+ %>
+ <option value="All"> All </option>
+ <option value="Male"> Male </option>
+ <option selected="selected" value="Female"> Female </option>
+ <%
+ }
+ } else {
+ %>
+ <option value="All"> All </option>
+ <option value="Male"> Male </option>
+ <option value="Female"> Female </option>
</select>
+ <% } %>
</td>
</tr>
<tr class="subHeader">
@@ -89,18 +149,24 @@ String view = request.getParameter("viewSelect");
<% if (allDeaths != null) { %>
+<table class="fTable" align="center" id="causeOfDeathTrendsTable">
+<tr>
+ <th>ICD-9CM Name</th>
+ <th>ICD-9CM Code</th>
+ <th>Quantity of Deaths</th>
+</tr>
+
<%
- Iterator<String> iterator = allDeaths.iterator();
-
- while(iterator.hasNext()) { %>
- <table class="fTable" align="center" id="trendReport">
- <tr>
- <th>Trends Report</th>
- </tr>
- <% String reports = iterator.next();
+ Iterator<CauseOfDeathTrendsReportBean> iterator = allDeaths.iterator();
+
+ while(iterator.hasNext()) {
+
+ CauseOfDeathTrendsReportBean reports = iterator.next();
%>
<tr style="text-align:center;">
- <td><%=reports.toString()%></td>
+ <td><%=reports.getCause()%></td>
+ <td><%=reports.getCode()%></td>
+ <td><%=reports.getDeaths()%></td>
</tr>
<%
}
--
GitLab