diff --git a/iTrust/WebRoot/auth/hcp/causeOfDeathTrendsReport.jsp b/iTrust/WebRoot/auth/hcp/causeOfDeathTrendsReport.jsp index 97bb7e9b2e22f132ffe304100477809a628a12c8..aa62c6f6ec0c111cd59db11ca3bce759d288630d 100644 --- a/iTrust/WebRoot/auth/hcp/causeOfDeathTrendsReport.jsp +++ b/iTrust/WebRoot/auth/hcp/causeOfDeathTrendsReport.jsp @@ -3,7 +3,10 @@ <%@page import="edu.ncsu.csc.itrust.dao.mysql.CauseOfDeathTrendsReportDAO"%> <%@page import="java.util.List"%> +<%@page import="java.util.ArrayList"%> <%@page import="java.sql.Date"%> +<%@page import="java.util.Iterator"%> + <%@include file="/global.jsp" %> @@ -16,18 +19,27 @@ String view = request.getParameter("viewSelect"); <%@include file="/header.jsp" %> <% CauseOfDeathTrendsReportDAO report = new CauseOfDeathTrendsReportDAO(prodDAO); - List<String> allDeaths = null; + ArrayList<String> allDeaths = null; //get form data //Date startDate = Date.valueOf(request.getParameter("startDate")); //Date endDate = Date.valueOf(request.getParameter("endDate")); - Date startDate = Date.valueOf("2020-09-20"); - Date endDate = Date.valueOf("2020-10-30"); + //String startDate = request.getParameter("startDate"); + //String endDate = request.getParameter("endDate"); + Date startDate = Date.valueOf("1910-09-20"); + Date endDate = Date.valueOf("2020-11-04"); + + String gender = request.getParameter("gender"); - //String gender = request.getParameter("gender"); + allDeaths = (ArrayList) report.getTopTwoDeathsForAll(gender, startDate, endDate); - allDeaths = report.getTopTwoDeathsForAll("All", startDate, endDate); + //if (startDate == null) + //startDate = ""; + //if (endDate == null) + //endDate = ""; + //if (gender == null) + //gender = ""; %> <br /> @@ -77,14 +89,22 @@ String view = request.getParameter("viewSelect"); <% if (allDeaths != null) { %> - -<table class="fTable" align="center" id="trendReport"> -<tr> - <th>Trends Report</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(); + %> <tr style="text-align:center;"> - <td><%= allDeaths %></td> + <td><%=reports.toString()%></td> </tr> + <% + } + %> </table>