diff --git a/iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp b/iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp
index c38fc2f1e1b90d7346e82efb326f6298dcb0b932..b0cd7e48303408e9c7f6163a588cb0d544716ba5 100644
--- a/iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp
+++ b/iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp
@@ -24,4 +24,4 @@ loggingAction.logEvent(TransactionType.INBOX_VIEW, loggedInMID.longValue(), 0L,
</div>
-<%@include file="/footer.jsp" %>
+<%@include file="/footer.jsp" %>
\ No newline at end of file
diff --git a/iTrust/WebRoot/auth/hcp/menu.jsp b/iTrust/WebRoot/auth/hcp/menu.jsp
index cce925e3c8c5df00282bfb8d1eef8f5e41dbcdc5..ae1e0cc95f4072425cdfe32c4414306e363a020c 100644
--- a/iTrust/WebRoot/auth/hcp/menu.jsp
+++ b/iTrust/WebRoot/auth/hcp/menu.jsp
@@ -65,11 +65,12 @@
<div class="panel-body" id="msg-menu">
<ul class="nav nav-sidebar">
<li><a href="/iTrust/auth/hcp/sendMessage.jsp">Compose a Message</a>
- <li><a href="/iTrust/auth/hcp-patient/messageInbox.jsp">Message Inbox</a>
- <li><a href="/iTrust/auth/hcp-patient/messageOutbox.jsp">Message Outbox</a>
+ <li><a href="/iTrust/auth/hcp/messageInbox.jsp">Message Inbox</a>
+ <li><a href="/iTrust/auth/hcp/messageOutbox.jsp">Message Outbox</a>
<li><a href="/iTrust/auth/hcp-uap/showEmailHistory.jsp">Email History</a>
</ul>
</div>
+
</div>
<div class="panel panel-default">
diff --git a/iTrust/WebRoot/auth/hcp/messageInbox.jsp b/iTrust/WebRoot/auth/hcp/messageInbox.jsp
index bea87e3c3f2c84e95a34e494dc6bab7f9b9b1ade..408048ddd7fd847de0f2f9fd5e5b8674a4d142fd 100644
--- a/iTrust/WebRoot/auth/hcp/messageInbox.jsp
+++ b/iTrust/WebRoot/auth/hcp/messageInbox.jsp
@@ -35,6 +35,8 @@ pageTitle = "iTrust - View My Message ";
//Edit Filter backend
boolean editing = false;
String headerMessage = "";
+ String filterMessage = "";
+
String[] fields = new String[6];
if(request.getParameter("edit") != null && request.getParameter("edit").equals("true")) {
editing = true;
@@ -57,7 +59,8 @@ pageTitle = "iTrust - View My Message ";
nf += request.getParameter("endDate");
//Validate Filter
- nf = action.validateAndCreateFilter(nf);
+
+ filterMessage = nf;
if(nf.startsWith("Error")) {
error = true;
headerMessage = nf;
@@ -65,16 +68,24 @@ pageTitle = "iTrust - View My Message ";
if(!error) {
if(request.getParameter("test") != null) {
+ filterMessage = nf;
response.sendRedirect("messageInbox.jsp?edit=true&testFilter="+nf);
- } else if(request.getParameter("save") != null) {
- f_action.editMessageFilter(nf);
- response.sendRedirect("messageInbox.jsp?filter=true");
+ }
+
+ if(request.getParameter("save") != null) {
+ filterMessage = nf;
+
+ f_action.editMessageFilter(nf);
+ response.sendRedirect("messageInbox.jsp?filter=true&testFilter="+nf);
}
}
}
if(request.getParameter("testFilter") != null) {
String filter = request.getParameter("testFilter");
+
+ filterMessage = filter;
+
String[] f = filter.split(",", -1);
for(i=0; i<6; i++) {
try {
@@ -85,6 +96,9 @@ pageTitle = "iTrust - View My Message ";
}
} else {
String filter = dao.getPersonnel(loggedInMID.longValue()).getMessageFilter();
+
+ filterMessage = filter;
+
if(!filter.equals("")) {
String[] f = filter.split(",", -1);
for(i=0; i<6; i++) {
@@ -124,9 +138,14 @@ pageTitle = "iTrust - View My Message ";
String filter = "";
if(request.getParameter("testFilter") != null) {
filter = request.getParameter("testFilter");
+
+ filterMessage = filter;
} else {
filter = dao.getPersonnel(loggedInMID.longValue()).getMessageFilter();
+
+ filterMessage = filter;
}
+
if(!filter.equals("") && !filter.equals(",,,,,")) {
List<MessageBean> filtered = action.filterMessages(messages, filter);
messages = filtered;
@@ -217,7 +236,7 @@ pageTitle = "iTrust - View My Message ";
</tr>
<tr>
<td><a href="messageInbox.jsp?edit=true" >Edit Filter</a></td>
- <td><a href="messageInbox.jsp?filter=true" >Apply Filter</a></td>
+ <td><a href="messageInbox.jsp?filter=true&testFilter=<%=filterMessage%>" >Apply Filter</a></td>
</tr>
</table>
</form>
diff --git a/iTrust/WebRoot/auth/hcp/messageOutbox.jsp b/iTrust/WebRoot/auth/hcp/messageOutbox.jsp
index 5ed4b2df06362044971c415a3a484bb01f5f017e..52ef995f712bb03e7a40e5ed95fbe19766f8f686 100644
--- a/iTrust/WebRoot/auth/hcp/messageOutbox.jsp
+++ b/iTrust/WebRoot/auth/hcp/messageOutbox.jsp
@@ -3,8 +3,15 @@
<%@page import="java.util.List"%>
<%@page import="edu.ncsu.csc.itrust.action.ViewMyMessagesAction"%>
+<%@page import="edu.ncsu.csc.itrust.action.EditPersonnelAction"%>
<%@page import="edu.ncsu.csc.itrust.beans.MessageBean"%>
<%@page import="edu.ncsu.csc.itrust.dao.DAOFactory"%>
+<%@page import="edu.ncsu.csc.itrust.dao.mysql.PersonnelDAO"%>
+<%@page import="java.util.ArrayList"%>
+<%@page import="java.text.DateFormat"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.util.Calendar"%>
<%@include file="/global.jsp" %>
@@ -17,12 +24,90 @@ pageTitle = "iTrust - View My Sent Messages";
<div align=center>
<h2>My Sent Messages</h2>
<a href="/iTrust/auth/hcp/sendMessage.jsp">Compose a Message</a><br /><br />
+
<%
- loggingAction.logEvent(TransactionType.OUTBOX_VIEW, loggedInMID.longValue(), 0, "");
-
+ loggingAction.logEvent(TransactionType.OUTBOX_VIEW, loggedInMID.longValue(), 0, "");
+
ViewMyMessagesAction action = new ViewMyMessagesAction(prodDAO, loggedInMID.longValue());
+ EditPersonnelAction f_action = new EditPersonnelAction(prodDAO, loggedInMID.longValue(), loggedInMID.toString());
+ PersonnelDAO dao = new PersonnelDAO(prodDAO);
List<MessageBean> messages = null;
- if(request.getParameter("sortby") != null) {
+
+ //Edit Filter backend
+ boolean editing = false;
+ String headerMessage = "";
+ String filterMessage = "";
+ String[] fields = new String[6];
+ if(request.getParameter("edit") != null && request.getParameter("edit").equals("true")) {
+ editing = true;
+
+ int i;
+ for(i=0; i<6; i++) {
+ fields[i] = "";
+ }
+
+ if(request.getParameter("cancel") != null)
+ response.sendRedirect("messageOutbox.jsp");
+ else if(request.getParameter("test") != null || request.getParameter("save") != null) {
+ boolean error = false;
+ String nf = "";
+ nf += request.getParameter("receiver").replace(",","")+",";
+ nf += request.getParameter("subject").replace(",","")+",";
+ nf += request.getParameter("hasWords").replace(",","")+",";
+ nf += request.getParameter("notWords").replace(",","")+",";
+ nf += request.getParameter("startDate").replace(",","")+",";
+ nf += request.getParameter("endDate");
+
+ //Validate Filter
+
+ if(nf.startsWith("Error")) {
+ error = true;
+ headerMessage = nf;
+ }
+
+ if(!error) {
+ if(request.getParameter("test") != null) {
+ filterMessage = nf;
+ response.sendRedirect("messageOutbox.jsp?edit=true&testFilter="+nf);
+ } else if(request.getParameter("save") != null) {
+
+ filterMessage = nf;
+
+ f_action.editMessageFilter(nf);
+ response.sendRedirect("messageOutbox.jsp?filter=true&testFilter="+nf);
+ }
+ }
+ }
+
+ if(request.getParameter("testFilter") != null) {
+ String filter = request.getParameter("testFilter");
+ filterMessage = filter;
+ String[] f = filter.split(",", -1);
+ for(i=0; i<6; i++) {
+ try {
+ fields[i] = f[i];
+ } catch(ArrayIndexOutOfBoundsException e) {
+ //do nothing
+ }
+ }
+ } else {
+ String filter = dao.getPersonnel(loggedInMID.longValue()).getMessageFilter();
+ filterMessage = filter;
+ if(!filter.equals("")) {
+ String[] f = filter.split(",", -1);
+ for(i=0; i<6; i++) {
+ try {
+ fields[i] = f[i];
+ } catch(ArrayIndexOutOfBoundsException e) {
+ //do nothing
+ }
+ }
+ }
+ }
+ }
+
+ //Sorts messages
+ if(request.getParameter("sort") != null) {
if(request.getParameter("sortby").equals("name")) {
if(request.getParameter("sorthow").equals("asce")) {
messages = action.getAllMySentMessagesNameAscending();
@@ -40,9 +125,87 @@ pageTitle = "iTrust - View My Sent Messages";
else {
messages = action.getAllMySentMessages();
}
+
+ //Filters Messages
+ boolean is_filtered = false;
+ if((request.getParameter("filter") != null && request.getParameter("filter").equals("true")) || request.getParameter("testFilter") != null) {
+ String filter = "";
+ if(request.getParameter("testFilter") != null) {
+ filter = request.getParameter("testFilter");
+
+ filterMessage = filter;
+ } else {
+ filter = dao.getPersonnel(loggedInMID.longValue()).getMessageFilter();
+ filterMessage = filter;
+ }
+ if(!filter.equals("") && !filter.equals(",,,,,")) {
+ List<MessageBean> filtered = action.filterSentMessages(messages, filter);
+ messages = filtered;
+ is_filtered = true;
+ }
+ }
+
session.setAttribute("messages", messages);
- if (messages.size() > 0) { %>
- <form method="post" action="messageOutbox.jsp">
+ %>
+
+ <%
+
+ if(editing) {
+ %>
+ <div class="filterEdit">
+ <div align="center">
+ <span style="font-size: 13pt; font-weight: bold;">Edit Message Filter</span>
+ <%= headerMessage.equals("") ? "" : "<br /><span class=\"iTrustMessage\">"+headerMessage+"</span><br /><br />" %>
+ <form method="post" action="messageOutbox.jsp?edit=true">
+ <table>
+ <tr style="text-align: right;">
+ <td>
+ <label for="receiver">Receiver: </label>
+ <input type="text" name="receiver" id="receiver" value="<%= StringEscapeUtils.escapeHtml("" + (fields[0] )) %>" />
+ </td>
+ <td style="padding-left: 10px; padding-right: 10px;">
+ <label for="hasWords">Has the words: </label>
+ <input type="text" name="hasWords" id="hasWords" value="<%= StringEscapeUtils.escapeHtml("" + (fields[2] )) %>" />
+ </td>
+ <td>
+ <label for="startDate">Start Date: </label>
+ <input type="text" name="startDate" id="startDate" value="<%= StringEscapeUtils.escapeHtml("" + (fields[4] )) %>" />
+ <input type="button" value="Select Date" onclick="displayDatePicker('startDate');" />
+ </td>
+ </tr>
+ <tr style="text-align: right;">
+ <td>
+ <label for="subject">Subject: </label>
+ <input type="text" name="subject" id="subject" value="<%= StringEscapeUtils.escapeHtml("" + (fields[1] )) %>" />
+ </td>
+ <td style="padding-left: 10px; padding-right: 10px;">
+ <label for="notWords">Does not have the words: </label>
+ <input type="text" name="notWords" id="notWords" value="<%= StringEscapeUtils.escapeHtml("" + (fields[3] )) %>" />
+ </td>
+ <td>
+ <label for="endDate">End Date: </label>
+ <input type="text" name="endDate" id="endDate" value="<%= StringEscapeUtils.escapeHtml("" + (fields[5] )) %>" />
+ <input type="button" value="Select Date" onclick="displayDatePicker('endDate');" />
+ </td>
+ </tr>
+ <tr style="text-align: center;">
+ <td colspan="3">
+ <input type="submit" name="test" value="Test Filter" />
+ <input type="submit" name="save" value="Save" />
+ <input type="submit" name="cancel" value="Cancel" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ <br />
+ <%
+ }
+
+ %>
+
+ <form method="post" action="messageOutbox.jsp<%= StringEscapeUtils.escapeHtml("" + (is_filtered?"?filter=true":"" )) %>">
<table>
<tr>
<td>
@@ -60,27 +223,32 @@ pageTitle = "iTrust - View My Sent Messages";
</select>
</td>
<td>
- <input type="submit" value="Sort" />
+ <input type="submit" name="sort" value="Sort" />
</td>
</tr>
+ <tr>
+ <td><a href="messageOutbox.jsp?edit=true" >Edit Filter</a></td>
+ <td><a href="messageOutbox.jsp?filter=true&testFilter=<%=filterMessage%>" >Apply Filter</a></td>
+ </tr>
</table>
</form>
<br />
+ <%if(messages.size() > 0) { %>
<table class="fancyTable">
<tr>
<th>To</th>
<th>Subject</th>
- <th>Sent</th>
+ <th>Received</th>
<th></th>
</tr>
-<% int index = 0; %>
-<% for(MessageBean message : messages) { %>
+<% int index = 0;
+ for(MessageBean message : messages) { %>
<tr <%=(index%2 == 1)?"class=\"alt\"":"" %>>
- <td><%= StringEscapeUtils.escapeHtml("" + ( action.getName(message.getTo()) )) %></td>
- <td><%= StringEscapeUtils.escapeHtml("" + ( message.getSubject() )) %></td>
- <td><%= StringEscapeUtils.escapeHtml("" + ( message.getSentDate() )) %></td>
- <td><a href="viewMessageOutbox.jsp?msg=<%= StringEscapeUtils.escapeHtml("" + ( index )) %>">Read</a></td>
- </tr>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( action.getName(message.getTo()) )) %></td>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( message.getSubject() )) %></td>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( message.getSentDate() )) %></td>
+ <td><a href="viewMessageOutbox.jsp?msg=<%= StringEscapeUtils.escapeHtml("" + ( index )) %>">Read</a></td>
+ </tr>
<% index ++; %>
<% } %>
</table>
diff --git a/iTrust/WebRoot/auth/patient/menu.jsp b/iTrust/WebRoot/auth/patient/menu.jsp
index cd613b69cc9327af60c185b4968e0295d9379d6e..e31d0313772566e1e85c1f60919994a5e3947257 100644
--- a/iTrust/WebRoot/auth/patient/menu.jsp
+++ b/iTrust/WebRoot/auth/patient/menu.jsp
@@ -78,8 +78,8 @@
<div class="panel-body" id="msg-menu">
<ul class="nav nav-sidebar">
<li><a href="/iTrust/auth/patient/sendMessage.jsp">Compose a Message</a>
- <li><a href="/iTrust/auth/hcp-patient/messageInbox.jsp">Message Inbox</a>
- <li><a href="/iTrust/auth/hcp-patient/messageOutbox.jsp">Message Outbox</a>
+ <li><a href="/iTrust/auth/patient/messageInbox.jsp">Message Inbox</a>
+ <li><a href="/iTrust/auth/patient/messageOutbox.jsp">Message Outbox</a>
</ul>
</div>
</div>
diff --git a/iTrust/WebRoot/auth/patient/messageInbox.jsp b/iTrust/WebRoot/auth/patient/messageInbox.jsp
index 4eec68b03535e63ff95bf56208249b8b9f499c3e..241d029cbb711eae25a3ddaee066295a5a9b7bc0 100644
--- a/iTrust/WebRoot/auth/patient/messageInbox.jsp
+++ b/iTrust/WebRoot/auth/patient/messageInbox.jsp
@@ -5,6 +5,7 @@
<%@page import="edu.ncsu.csc.itrust.action.ViewMyMessagesAction"%>
<%@page import="edu.ncsu.csc.itrust.action.EditPatientAction"%>
<%@page import="edu.ncsu.csc.itrust.beans.MessageBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
<%@page import="edu.ncsu.csc.itrust.dao.DAOFactory"%>
<%@page import="edu.ncsu.csc.itrust.dao.mysql.PatientDAO"%>
<%@page import="java.util.ArrayList"%>
@@ -33,6 +34,7 @@ pageTitle = "iTrust - View My Message ";
//Edit Filter backend
boolean editing = false;
String headerMessage = "";
+ String filterMessage = "";
String[] fields = new String[6];
if(request.getParameter("edit") != null && request.getParameter("edit").equals("true")) {
editing = true;
@@ -54,8 +56,9 @@ pageTitle = "iTrust - View My Message ";
nf += request.getParameter("startDate").replace(",","")+",";
nf += request.getParameter("endDate");
+ filterMessage = nf;
+
//Validate Filter
- nf = action.validateAndCreateFilter(nf);
if(nf.startsWith("Error")) {
error = true;
headerMessage = nf;
@@ -63,16 +66,19 @@ pageTitle = "iTrust - View My Message ";
if(!error) {
if(request.getParameter("test") != null) {
+ filterMessage = nf;
response.sendRedirect("messageInbox.jsp?edit=true&testFilter="+nf);
} else if(request.getParameter("save") != null) {
+ filterMessage = nf;
f_action.editMessageFilter(nf);
- response.sendRedirect("messageInbox.jsp?filter=true");
+ response.sendRedirect("messageInbox.jsp?filter=true&testFilter="+nf);
}
}
}
if(request.getParameter("testFilter") != null) {
String filter = request.getParameter("testFilter");
+ filterMessage = filter;
String[] f = filter.split(",", -1);
for(i=0; i<6; i++) {
try {
@@ -83,6 +89,7 @@ pageTitle = "iTrust - View My Message ";
}
} else {
String filter = dao.getPatient(loggedInMID.longValue()).getMessageFilter();
+ filterMessage = filter;
if(!filter.equals("")) {
String[] f = filter.split(",", -1);
for(i=0; i<6; i++) {
@@ -126,8 +133,10 @@ pageTitle = "iTrust - View My Message ";
String filter = "";
if(request.getParameter("testFilter") != null) {
filter = request.getParameter("testFilter");
+ filterMessage = filter;
} else {
filter = dao.getPatient(loggedInMID.longValue()).getMessageFilter();
+ filterMessage = filter;
}
if(!filter.equals("") && !filter.equals(",,,,,")) {
List<MessageBean> filtered = action.filterMessages(messages, filter);
@@ -219,7 +228,7 @@ pageTitle = "iTrust - View My Message ";
</tr>
<tr>
<td><a href="messageInbox.jsp?edit=true" >Edit Filter</a></td>
- <td><a href="messageInbox.jsp?filter=true" >Apply Filter</a></td>
+ <td><a href="messageInbox.jsp?filter=true&testFilter=<%=filterMessage%>" >Apply Filter</a></td>
</tr>
</table>
</form>
diff --git a/iTrust/WebRoot/auth/patient/messageOutbox.jsp b/iTrust/WebRoot/auth/patient/messageOutbox.jsp
index 190b1515f12d01f102018a15f0f6f9b8d8bb2b4e..035ee28b7fc796673a89e7496e7a254f8bd655f9 100644
--- a/iTrust/WebRoot/auth/patient/messageOutbox.jsp
+++ b/iTrust/WebRoot/auth/patient/messageOutbox.jsp
@@ -3,15 +3,21 @@
<%@page import="java.util.List"%>
<%@page import="edu.ncsu.csc.itrust.action.ViewMyMessagesAction"%>
+<%@page import="edu.ncsu.csc.itrust.action.EditPatientAction"%>
<%@page import="edu.ncsu.csc.itrust.beans.MessageBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
<%@page import="edu.ncsu.csc.itrust.dao.DAOFactory"%>
+<%@page import="edu.ncsu.csc.itrust.dao.mysql.PatientDAO"%>
+<%@page import="java.util.ArrayList"%>
+<%@page import="java.text.DateFormat"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.util.Calendar"%>
<%@include file="/global.jsp" %>
<%
pageTitle = "iTrust - View My Sent Messages";
-
-
%>
<%@include file="/header.jsp" %>
@@ -19,11 +25,98 @@ pageTitle = "iTrust - View My Sent Messages";
<div align=center>
<h2>My Sent Messages</h2>
<a href="/iTrust/auth/patient/sendMessage.jsp">Compose a Message</a><br /><br />
+
+
<%
-loggingAction.logEvent(TransactionType.OUTBOX_VIEW, loggedInMID.longValue(), loggedInMID.longValue(), "");
ViewMyMessagesAction action = new ViewMyMessagesAction(prodDAO, loggedInMID.longValue());
+ EditPatientAction f_action = new EditPatientAction(prodDAO, loggedInMID.longValue(), loggedInMID.toString());
+ PatientDAO dao = new PatientDAO(prodDAO);
List<MessageBean> messages = null;
- if(request.getParameter("sortby") != null) {
+
+ String filterMessage = "";
+
+
+ //Edit Filter backend
+ boolean editing = false;
+ String headerMessage = "";
+ String[] fields = new String[6];
+ if(request.getParameter("edit") != null && request.getParameter("edit").equals("true")) {
+ editing = true;
+
+ int i;
+ for(i=0; i<6; i++) {
+ fields[i] = "";
+ }
+
+ if(request.getParameter("cancel") != null)
+ response.sendRedirect("messageOutbox.jsp");
+ else if(request.getParameter("test") != null || request.getParameter("save") != null) {
+ boolean error = false;
+ String nf = "";
+ nf += request.getParameter("receiver").replace(",","")+",";
+ nf += request.getParameter("subject").replace(",","")+",";
+ nf += request.getParameter("hasWords").replace(",","")+",";
+ nf += request.getParameter("notWords").replace(",","")+",";
+ nf += request.getParameter("startDate").replace(",","")+",";
+ nf += request.getParameter("endDate");
+
+ //Validate Filter
+ if(nf.startsWith("Error")) {
+ error = true;
+ headerMessage = nf;
+ }
+
+ if(!error) {
+ if(request.getParameter("test") != null) {
+
+ filterMessage = nf;
+
+ response.sendRedirect("messageOutbox.jsp?edit=true&testFilter="+nf);
+
+
+ } else if(request.getParameter("save") != null) {
+
+ filterMessage = nf;
+
+ f_action.editMessageFilter(nf);
+ response.sendRedirect("messageOutbox.jsp?filter=true&testFilter="+nf);
+ }
+ }
+ }
+
+ if(request.getParameter("testFilter") != null) {
+ String filter = request.getParameter("testFilter");
+
+filterMessage = filter;
+
+ String[] f = filter.split(",", -1);
+ for(i=0; i<6; i++) {
+ try {
+ fields[i] = f[i];
+ } catch(ArrayIndexOutOfBoundsException e) {
+ //do nothing
+ }
+ }
+ } else {
+ String filter = dao.getPatient(loggedInMID.longValue()).getMessageFilter();
+
+filterMessage = filter;
+
+ if(!filter.equals("")) {
+ String[] f = filter.split(",", -1);
+ for(i=0; i<6; i++) {
+ try {
+ fields[i] = f[i];
+ } catch(ArrayIndexOutOfBoundsException e) {
+ //do nothing
+ }
+ }
+ }
+ }
+ }
+
+ //Sorts messages
+ if(request.getParameter("sort") != null) {
if(request.getParameter("sortby").equals("name")) {
if(request.getParameter("sorthow").equals("asce")) {
messages = action.getAllMySentMessagesNameAscending();
@@ -39,11 +132,99 @@ loggingAction.logEvent(TransactionType.OUTBOX_VIEW, loggedInMID.longValue(), log
}
}
else {
+ if(request.getParameter("edit") == null && request.getParameter("filter") == null) {
+ //loggingAction.logEvent(TransactionType.OUTBOX_VIEW, loggedInMID, 0, "");
+ loggingAction.logEvent(TransactionType.OUTBOX_VIEW, loggedInMID.longValue(), loggedInMID.longValue(), "");
+ }
+
messages = action.getAllMySentMessages();
}
- session.setAttribute("messages", messages);
- if (messages.size() > 0) { %>
- <form method="post" action="messageOutbox.jsp">
+
+ //Filters Messages
+ boolean is_filtered = false;
+ if((request.getParameter("filter") != null && request.getParameter("filter").equals("true")) || request.getParameter("testFilter") != null) {
+ String filter = "";
+ if(request.getParameter("testFilter") != null) {
+ filter = request.getParameter("testFilter");
+
+filterMessage = filter;
+
+ } else {
+ filter = dao.getPatient(loggedInMID.longValue()).getMessageFilter();
+
+filterMessage = filter;
+ }
+ if(!filter.equals("") && !filter.equals(",,,,,")) {
+ List<MessageBean> filtered = action.filterSentMessages(messages, filter);
+ messages = filtered;
+ is_filtered = true;
+ }
+ }
+
+ session.setAttribute("messages", messages);
+ %>
+
+ <%
+
+ if(editing) {
+ %>
+ <div class="filterEdit">
+ <div align="center">
+ <span style="font-size: 13pt; font-weight: bold;">Edit Message Filter</span>
+ <%= headerMessage.equals("") ? "" : "<br /><span class=\"iTrustMessage\">"+headerMessage+"</span><br /><br />" %>
+ <form method="post" action="messageOutbox.jsp?edit=true">
+ <table>
+ <tr style="text-align: right;">
+ <td>
+ <label for="receiver">Receiver: </label>
+ <input type="text" name="receiver" id="receiver" value="<%= StringEscapeUtils.escapeHtml("" + (fields[0] )) %>" />
+ </td>
+ <td style="padding-left: 10px; padding-right: 10px;">
+ <label for="hasWords">Has the words: </label>
+ <input type="text" name="hasWords" id="hasWords" value="<%= StringEscapeUtils.escapeHtml("" + (fields[2] )) %>" />
+ </td>
+ <td>
+ <label for="startDate">Start Date: </label>
+ <input type="text" name="startDate" id="startDate" value="<%= StringEscapeUtils.escapeHtml("" + (fields[4] )) %>" />
+ <input type="button" value="Select Date" onclick="displayDatePicker('startDate');" />
+ </td>
+ </tr>
+ <tr style="text-align: right;">
+ <td>
+ <label for="subject">Subject: </label>
+ <input type="text" name="subject" id="subject" value="<%= StringEscapeUtils.escapeHtml("" + (fields[1] )) %>" />
+ </td>
+ <td style="padding-left: 10px; padding-right: 10px;">
+ <label for="notWords">Does not have the words: </label>
+ <input type="text" name="notWords" id="notWords" value="<%= StringEscapeUtils.escapeHtml("" + (fields[3] )) %>" />
+ </td>
+ <td>
+ <label for="endDate">End Date: </label>
+ <input type="text" name="endDate" id="endDate" value="<%= StringEscapeUtils.escapeHtml("" + (fields[5] )) %>" />
+ <input type="button" value="Select Date" onclick="displayDatePicker('endDate');" />
+ </td>
+ </tr>
+ <tr style="text-align: center;">
+ <td colspan="3">
+ <input type="submit" name="test" value="Test Filter" />
+ <input type="submit" name="save" value="Save" />
+ <input type="submit" name="cancel" value="Cancel" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ <br />
+ <%
+ }
+
+ %>
+
+
+
+
+ <form method="post" action="messageOutbox.jsp<%= StringEscapeUtils.escapeHtml("" + (is_filtered?"?filter=true":"" )) %>">
<table>
<tr>
<td>
@@ -61,27 +242,33 @@ loggingAction.logEvent(TransactionType.OUTBOX_VIEW, loggedInMID.longValue(), log
</select>
</td>
<td>
- <input type="submit" value="Sort" />
+ <input type="submit" name="sort" value="Sort" />
</td>
</tr>
+ <tr>
+ <td><a href="messageOutbox.jsp?edit=true" >Edit Filter</a></td>
+ <td><a href="messageOutbox.jsp?filter=true&testFilter=<%=filterMessage%>" >Apply Filter</a></td>
+ </tr>
</table>
</form>
<br />
+
+ <%if(messages.size() > 0) { %>
<table class="fancyTable">
<tr>
<th>To</th>
<th>Subject</th>
<th>Received</th>
- <th></th>
+ <th> </th>
</tr>
-<% int index = 0; %>
-<% for(MessageBean message : messages) { %>
+<% int index = 0;
+ for(MessageBean message : messages) { %>
<tr <%=(index%2 == 1)?"class=\"alt\"":"" %>>
- <td><%= StringEscapeUtils.escapeHtml("" + ( action.getName(message.getTo()) )) %></td>
- <td><%= StringEscapeUtils.escapeHtml("" + ( message.getSubject() )) %></td>
- <td><%= StringEscapeUtils.escapeHtml("" + ( message.getSentDate() )) %></td>
- <td><a href="viewMessageOutbox.jsp?msg=<%= StringEscapeUtils.escapeHtml("" + ( index )) %>">Read</a></td>
- </tr>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( action.getName(message.getTo()) )) %></td>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( message.getSubject() )) %></td>
+ <td><%= StringEscapeUtils.escapeHtml("" + ( message.getSentDate() )) %></td>
+ <td><a href="viewMessageOutbox.jsp?msg=<%= StringEscapeUtils.escapeHtml("" + ( index )) %>">Read</a></td>
+ </tr>
<% index ++; %>
<% } %>
</table>
@@ -93,4 +280,4 @@ loggingAction.logEvent(TransactionType.OUTBOX_VIEW, loggedInMID.longValue(), log
<br />
</div>
-<%@include file="/footer.jsp" %>
+<%@include file="/footer.jsp" %>
\ No newline at end of file
diff --git a/iTrust/sql/createTables.sql b/iTrust/sql/createTables.sql
index 38a757b4532fa349f9cc39fe692d0719ba79ffd7..8e8e7fce0b5eb3d273aabcffb84900987c0de199 100644
--- a/iTrust/sql/createTables.sql
+++ b/iTrust/sql/createTables.sql
@@ -47,6 +47,7 @@ CREATE TABLE personnel(
phone varchar(12) NOT NULL default '',
specialty varchar(40) default NULL,
email varchar(55) default '',
+ MessageFilter varchar(200) default '',
PRIMARY KEY (MID)
) auto_increment=9000000000 ENGINE=MyISAM;
@@ -88,6 +89,7 @@ CREATE TABLE patients(
SpiritualPractices varchar(512) default '',
AlternateName varchar(32) default '',
DateOfDeactivation DATE default NULL,
+ MessageFilter varchar(200) default '',
PRIMARY KEY (MID)
) ENGINE=MyISAM;
@@ -132,6 +134,7 @@ CREATE TABLE historypatients(
SpiritualPractices varchar(512) default '',
AlternateName varchar(32) default '',
DateOfDeactivation DATE default NULL,
+ MessageFilter varchar(200) default '',
PRIMARY KEY (ID)
) ENGINE=MyISAM;
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
index 45ff96223e9275c061899c143b6d859823dd6b70..fe355018b332817206ec088c95c5eda06c0f8632 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java
@@ -161,4 +161,16 @@ public class EditPatientAction extends PatientBaseAction {
return true;
}
-}
+
+ /**
+ * Updates patient info to filter
+ * @param nf The filter
+ * @throws ITrustException
+ * @throws FormValidationException
+ */
+ public void editMessageFilter(String nf) throws ITrustException, FormValidationException {
+ PatientBean p = patientDAO.getPatient(this.getPid());
+ p.setMessageFilter(nf);
+ this.updateInformation(p);
+ }
+}
\ No newline at end of file
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java
index 0d04d6e920b0bb185b497fe11062256c882a9684..01b6f147afedb2ef12240286e0f28f9431dc5bcb 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java
@@ -60,5 +60,17 @@ public class EditPersonnelAction extends PersonnelBaseAction {
validator.validate(personnelForm);
personnelDAO.editPersonnel(personnelForm);
}
+
+ /**
+ * Updates the personnel info to filter
+ * @param fn The filter
+ * @throws ITrustException
+ * @throws FormValidationException
+ */
+ public void editMessageFilter(String nf) throws ITrustException, FormValidationException {
+ PersonnelBean p = personnelDAO.getPersonnel(this.getPid());
+ p.setMessageFilter(nf);
+ this.updateInformation(p);
+ }
}
diff --git a/iTrust/src/edu/ncsu/csc/itrust/action/ViewMyMessagesAction.java b/iTrust/src/edu/ncsu/csc/itrust/action/ViewMyMessagesAction.java
index 9d5305774af378140785b598d32631d3b0909ee1..57c5f9d0aef86503ac5cb732bc0550e0c360a469 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/action/ViewMyMessagesAction.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/action/ViewMyMessagesAction.java
@@ -135,7 +135,7 @@ public class ViewMyMessagesAction {
/**
- * Gets a list of messages for a user based on their filter criteria.
+ * Gets a list of received messages for a user based on their filter criteria.
*
* @param messages List of all of a user's MessageBeans
* @param filter String containing a user's filter criteria.
@@ -222,6 +222,94 @@ public class ViewMyMessagesAction {
return filtered;
}
+ /**
+ * Gets a list of Sent messages for a user based on their filter criteria.
+ *
+ * @param messages List of all of a user's MessageBeans
+ * @param filter String containing a user's filter criteria.
+ * @return a List of MessageBeans that meet the criteria of the filter.
+ * @throws ITrustException
+ * @throws ParseException
+ */
+ public List<MessageBean> filterSentMessages(List<MessageBean> messages, String filter) throws ITrustException, ParseException {
+ List<MessageBean> filtered = new ArrayList<MessageBean>();
+ String[] f = filter.split(",", -1);
+ for(MessageBean m : messages) {
+ /**
+ * Check the sender filter field.
+ * Exclude if this MessageBean does not match the
+ * requested sender, if one is specified.
+ */
+ if(!f[0].equals("")) {
+ if(!this.getName(m.getTo()).equalsIgnoreCase(f[0]))
+ continue;
+ }
+ /**
+ * Check the subject filter field.
+ * Exclude if this MessageBean does not match the
+ * requested subject, if one is specified.
+ */
+ if(!f[1].equals("")) {
+ if(!m.getSubject().equalsIgnoreCase(f[1]))
+ continue;
+ }
+ /**
+ * Check the body of the message for certain words.
+ * Exclude if this MessageBean if it does not contain
+ * those words in the message body.
+ */
+ if(!f[2].equals("")) {
+ if(!m.getSubject().toLowerCase().contains(f[2].toLowerCase()) && !m.getBody().toLowerCase().contains(f[2].toLowerCase()))
+ continue;
+ }
+ /**
+ * Check the body of the message for certain words.
+ * Exclude if this MessageBean if it does contain
+ * those words in the message body.
+ */
+ if(!f[3].equals("")) {
+ if(m.getSubject().toLowerCase().contains(f[3].toLowerCase()) || m.getBody().toLowerCase().contains(f[3].toLowerCase()))
+ continue;
+ }
+ /**
+ * Check the start date filter field.
+ * Exclude if this MessageBean was not sent after
+ * this date.
+ */
+ if(!f[4].equals("")) {
+ DateFormat format = new SimpleDateFormat("MM/dd/yyyy");
+ Date s = format.parse(f[4]);
+ if(s.after(m.getSentDate()))
+ continue;
+
+ }
+ /**
+ * Check the end date filter field.
+ * Exclude if this MessageBean was not sent before
+ * this date.
+ */
+ if(!f[5].equals("")) {
+ DateFormat format = new SimpleDateFormat("MM/dd/yyyy");
+ Date s = format.parse(f[5]);
+ Calendar c = Calendar.getInstance();
+ c.setTime(s);
+ c.add(Calendar.DAY_OF_MONTH, 1);
+ s = c.getTime();
+ if(s.before(m.getSentDate()))
+ continue;
+
+ }
+ /**
+ * If the message has not been eliminated by any
+ * of the filter fields, add it to the new list
+ * of messages.
+ */
+ filtered.add(m);
+ }
+
+ return filtered;
+ }
+
/**
* Gets a patient's name from their MID
*
diff --git a/iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java b/iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java
index 64b8b0f1321272964cf6c18a200b62e18bed5a38..a563644763999f613610fe249348658345eb9eed 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java
@@ -61,7 +61,15 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
private String spiritualPractices = "";
private String alternateName = "";
private String dateOfDeactivationStr = "";
+ private String messageFilter= "";
+ public void setMessageFilter(String nf) {
+ this.messageFilter = nf;
+ }
+
+ public String getMessageFilter(){
+ return messageFilter;
+ }
public BloodType getBloodType() {
return bloodType;
diff --git a/iTrust/src/edu/ncsu/csc/itrust/beans/PersonnelBean.java b/iTrust/src/edu/ncsu/csc/itrust/beans/PersonnelBean.java
index a073981b3b15cf1e7c52cea3831bf2012aa5e97f..efc86b2db1ea0d599ce2b8f5c941b7c21d6a46c3 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/beans/PersonnelBean.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/beans/PersonnelBean.java
@@ -32,6 +32,15 @@ public class PersonnelBean implements Serializable {
private String phone = "";
private String email = "";
private String specialty = "";
+ private String messageFilter= "";
+
+ public String getMessageFilter(){
+ return messageFilter;
+ }
+
+ public void setMessageFilter(String nf) {
+ this.messageFilter = nf;
+ }
public String getEmail() {
return email;
diff --git a/iTrust/src/edu/ncsu/csc/itrust/beans/loaders/PatientLoader.java b/iTrust/src/edu/ncsu/csc/itrust/beans/loaders/PatientLoader.java
index 8b6c152a65e6b8c4415ec2c9ce52506e72fc2677..ff90037c3b102b9cbae249ea09c4b37e39ddf84d 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/beans/loaders/PatientLoader.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/beans/loaders/PatientLoader.java
@@ -80,6 +80,7 @@ public class PatientLoader implements BeanLoader<PatientBean> {
if (dateOfDeactivation != null){
p.setDateOfDeactivationStr(DATE_FORMAT.format(dateOfDeactivation));
}
+ p.setMessageFilter(rs.getString("MessageFilter"));
}
/**
@@ -188,6 +189,7 @@ public class PatientLoader implements BeanLoader<PatientBean> {
}
}
ps.setDate(i++, date);
+ ps.setString(i++, p.getMessageFilter());
return ps;
}
}
diff --git a/iTrust/src/edu/ncsu/csc/itrust/beans/loaders/PersonnelLoader.java b/iTrust/src/edu/ncsu/csc/itrust/beans/loaders/PersonnelLoader.java
index 5cfa62a8945db1b783943796ed0dd228be7c1132..cf40b7b6db65b854836232d84834fb8095db25ff 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/beans/loaders/PersonnelLoader.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/beans/loaders/PersonnelLoader.java
@@ -37,6 +37,7 @@ public class PersonnelLoader implements BeanLoader<PersonnelBean> {
p.setZip((rs.getString("zip")));
p.setEmail(rs.getString("email"));
p.setSpecialty(rs.getString("specialty"));
+ p.setMessageFilter(rs.getString("MessageFilter"));
return p;
}
@@ -53,6 +54,7 @@ public class PersonnelLoader implements BeanLoader<PersonnelBean> {
ps.setString(i++, p.getZip());
ps.setString(i++, p.getSpecialty());
ps.setString(i++, p.getEmail());
+ ps.setString(i++, p.getMessageFilter());
return ps;
}
}
diff --git a/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java b/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
index 416a2aad56db654b1a397eddaa66905c789d6887..6d8d3afa4c4890e1cfc385639523d55d7cffa01b 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
@@ -207,10 +207,10 @@ public class PatientDAO {
+ "DateOfDeath=?,CauseOfDeath=?,MotherMID=?,FatherMID=?,"
+ "BloodType=?,Ethnicity=?,Gender=?,TopicalNotes=?, CreditCardType=?, CreditCardNumber=?, "
+ "DirectionsToHome=?, Religion=?, Language=?, SpiritualPractices=?, "
- + "AlternateName=?, DateOfDeactivation=? WHERE MID=?");
+ + "AlternateName=?, DateOfDeactivation=?, MessageFilter=? WHERE MID=?");
patientLoader.loadParameters(ps, p);
- ps.setLong(37, p.getMID());
+ ps.setLong(38, p.getMID());
ps.executeUpdate();
addHistory(p.getMID(), hcpid);
diff --git a/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PersonnelDAO.java b/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PersonnelDAO.java
index 126208df9b58ff12f8f1c7f1ed0a34ebf50cb19d..f727a316a9668dac8a6ad6c29f3c401f11ee63fd 100644
--- a/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PersonnelDAO.java
+++ b/iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PersonnelDAO.java
@@ -195,10 +195,10 @@ public class PersonnelDAO {
try {
conn = factory.getConnection();
pstmt = conn.prepareStatement("UPDATE personnel SET AMID=?,firstName=?,lastName=?,"
- + "phone=?, address1=?,address2=?,city=?, state=?, zip=?, specialty=?, email=?"
- + " WHERE MID=?");
+ + "phone=?, address1=?,address2=?,city=?, state=?, zip=?, specialty=?, email=?, "
+ + "MessageFilter=? WHERE MID=?");
personnelLoader.loadParameters(pstmt, pBean);
- pstmt.setLong(12, pBean.getMID());
+ pstmt.setLong(13, pBean.getMID());
pstmt.executeUpdate();
pstmt.close();
} catch (SQLException e) {
diff --git a/iTrust/test/edu/ncsu/csc/itrust/selenium/MessageFilterTest.java b/iTrust/test/edu/ncsu/csc/itrust/selenium/MessageFilterTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cf3a08d4823c01b0b9f056d6eb434248dd38999d
--- /dev/null
+++ b/iTrust/test/edu/ncsu/csc/itrust/selenium/MessageFilterTest.java
@@ -0,0 +1,120 @@
+package edu.ncsu.csc.itrust.selenium;
+
+import edu.ncsu.csc.itrust.enums.TransactionType;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+
+import java.util.concurrent.TimeUnit;
+
+public class MessageFilterTest extends iTrustSeleniumTest {
+ private WebDriver driver;
+ private StringBuffer verificationErrors = new StringBuffer();
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ gen.standardData();
+ driver = new HtmlUnitDriver();
+ driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+ }
+
+ @Test
+ public void testEditFilter() throws Exception {
+
+ // This logs us into iTrust and returns the HtmlUnitDriver for use in
+ HtmlUnitDriver driver = (HtmlUnitDriver)login("9000000000", "pw");
+
+ // Make sure we were able to log in
+ assertEquals("iTrust - HCP Home", driver.getTitle());
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("Message Inbox")).click();
+ assertLogged(TransactionType.INBOX_VIEW, 9000000000L, 0L, "");
+ String text = driver.findElement(By.cssSelector("table.fancyTable")).getText();
+ assertTrue("Text not found!", text.contains("Random Person"));
+ assertTrue("Text not found!", text.contains("Andy Programmer"));
+
+ driver.findElement(By.linkText("Edit Filter")).click();
+ driver.findElementById("subject").sendKeys("Scratchy Throat");
+
+ driver.findElement(By.xpath("//input[@name='save']")).click();
+ text = driver.findElement(By.cssSelector("table.fancyTable")).getText();
+ assertTrue("Text not found!", text.contains("Scratchy Throat"));
+ assertFalse("Text found!", text.contains("Missed Appointment"));
+
+ }
+
+ @Test
+ public void testFilterPersistence() throws Exception {
+
+ // This logs us into iTrust and returns the HtmlUnitDriver for use in
+ HtmlUnitDriver driver = (HtmlUnitDriver)login("9000000000", "pw");
+
+ // Make sure we were able to log in
+ assertEquals("iTrust - HCP Home", driver.getTitle());
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("Message Outbox")).click();
+ assertLogged(TransactionType.OUTBOX_VIEW, 9000000000L, 0L, "");
+ String text = driver.findElement(By.cssSelector("table.fancyTable")).getText();
+ assertTrue("Text not found!", text.contains("Random Person"));
+ assertTrue("Text not found!", text.contains("Andy Programmer"));
+
+ driver.findElement(By.linkText("Edit Filter")).click();
+ driver.findElementById("subject").sendKeys("Scratchy Throat");
+
+ driver.findElement(By.xpath("//input[@name='save']")).click();
+ driver.findElement(By.linkText("Edit Filter")).click();
+ text = driver.findElementById("subject").getAttribute("value");
+ assertTrue("Filters are not persistent from page to page", text.contains("Scratchy Throat"));
+
+ driver.findElement(By.xpath("//a[@href='/iTrust/logout.jsp']")).click();
+ assertEquals("iTrust - Login", driver.getTitle());
+
+ // Check if it's persistent between sessions
+ HtmlUnitDriver driver2 = (HtmlUnitDriver)login("9000000000", "pw");
+
+ assertEquals("iTrust - HCP Home", driver2.getTitle());
+ driver2.findElement(By.cssSelector("h2.panel-title")).click();
+ driver2.findElement(By.linkText("Message Outbox")).click();
+
+ // Don't insert anything, just check what's already inputted
+ driver2.findElement(By.linkText("Edit Filter")).click();
+ text = driver2.findElementById("subject").getAttribute("value");
+ assertTrue("Filters are not persistent between sessions", text.contains("Scratchy Throat"));
+ }
+
+ @Test
+ public void testSortMessages() throws Exception {
+
+ // This logs us into iTrust and returns the HtmlUnitDriver for use in
+ HtmlUnitDriver driver = (HtmlUnitDriver)login("9000000000", "pw");
+
+ // Make sure we were able to log in
+ assertEquals("iTrust - HCP Home", driver.getTitle());
+ driver.findElement(By.cssSelector("h2.panel-title")).click();
+ driver.findElement(By.linkText("Message Inbox")).click();
+ assertLogged(TransactionType.INBOX_VIEW, 9000000000L, 0L, "");
+ String text = driver.findElement(By.cssSelector("table.fancyTable")).getText();
+
+ assertTrue("Text not found!", text.contains("Random Person"));
+ assertTrue("Text not found!", text.contains("Andy Programmer"));
+
+ driver.findElement(By.xpath("//option[text()='Name']")).click();
+ driver.findElement(By.xpath("//option[text()='Ascending']")).click();
+ driver.findElement(By.xpath("//input[@name='sort']")).click();
+
+ text = driver.findElement(By.cssSelector("table.fancyTable")).getText();
+ String first = text.split("Read")[0];
+
+ // This should be the first in reverse alphabetical order
+ assertTrue("Text not found!", first.contains("Random Person"));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ driver.quit();
+ }
+}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditPatientActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditPatientActionTest.java
index bfb5d9e6c329e7b979d641f9ebb3897f114d6ae2..15b1bde8e67276c4cca369bb0072e570b6589bd9 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditPatientActionTest.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditPatientActionTest.java
@@ -10,6 +10,7 @@ import edu.ncsu.csc.itrust.exception.ITrustException;
import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
import edu.ncsu.csc.itrust.exception.FormValidationException;
+import org.junit.Test;
public class EditPatientActionTest extends TestCase {
private DAOFactory factory = TestDAOFactory.getTestInstance();
@@ -170,4 +171,20 @@ public class EditPatientActionTest extends TestCase {
//Check that patient 2 is not a dependent
assertFalse(authDAO.isDependent(2L));
}
+
+ /**
+ * Test that the filter will persist at the database level
+ *
+ * @throws Exception
+ *
+ */
+ public void testEditMessageFilter() throws Exception {
+ PatientDAO patientDAO = new PatientDAO(factory);
+ PatientBean p = patientDAO.getPatient(2);
+ assertEquals("", p.getMessageFilter());
+
+ String newFilter = "2,,,,,";
+ action.editMessageFilter(newFilter);
+ assertEquals(newFilter, patientDAO.getPatient(2).getMessageFilter());
+ }
}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditPersonnelActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditPersonnelActionTest.java
index 5f6b403861ae8ae4f717dcd5fb062567feba533b..d984fab1a3ac2246797c6d0c28d03fb0be560ff6 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditPersonnelActionTest.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/EditPersonnelActionTest.java
@@ -1,5 +1,8 @@
package edu.ncsu.csc.itrust.unit.action;
+import edu.ncsu.csc.itrust.beans.PatientBean;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.dao.mysql.PersonnelDAO;
import junit.framework.TestCase;
import edu.ncsu.csc.itrust.action.EditPersonnelAction;
import edu.ncsu.csc.itrust.beans.PersonnelBean;
@@ -77,6 +80,22 @@ public class EditPersonnelActionTest extends TestCase {
j = factory.getPersonnelDAO().getPersonnel(8000000009l);
assertEquals("second line", j.getStreetAddress2());
}
-
-
+
+ /**
+ * Test that the filter will persist at the database level
+ *
+ * @throws Exception
+ *
+ */
+ public void testEditMessageFilter() throws Exception {
+ gen.uap1();
+ personnelEditor = new EditPersonnelAction(factory, 8000000009L, "8000000009");
+ PersonnelDAO personnelDAO = new PersonnelDAO(factory);
+ PersonnelBean p = personnelDAO.getPersonnel(8000000009L);
+ assertEquals("", p.getMessageFilter());
+
+ String newFilter = "2,,,,,";
+ personnelEditor.editMessageFilter(newFilter);
+ assertEquals(newFilter, personnelDAO.getPersonnel(8000000009L).getMessageFilter());
+ }
}
diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewMyMessagesActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewMyMessagesActionTest.java
index dcfa853141e219e2c4a99aac0a409d11fd231aa0..f8fabb40def9637c48173678c0c7ea9460ca19ff 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewMyMessagesActionTest.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewMyMessagesActionTest.java
@@ -2,6 +2,8 @@ package edu.ncsu.csc.itrust.unit.action;
import java.sql.SQLException;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.List;
import edu.ncsu.csc.itrust.action.ViewMyMessagesAction;
@@ -299,4 +301,144 @@ public class ViewMyMessagesActionTest extends TestCase {
assertNull(resultList);
}
}
+
+ /**
+ * Test that filtering by MID works properly
+ *
+ * @throws Exception
+ */
+ public void testFilterSentMessagesByMID() throws Exception {
+ // Check that we actually have messages to filter
+ List<MessageBean> unfilteredMessages = action.getAllMySentMessages();
+ if (unfilteredMessages.size() == 0) {
+ fail("There are no messages to sort!");
+ }
+
+ // Check that the messages are filtered properly
+ List<MessageBean> filteredMessages = action.filterSentMessages(unfilteredMessages, "9000000000,,,,,");
+ for (MessageBean m : filteredMessages) {
+ if (m.getTo() != 9000000000L) {
+ fail("This filter should not contain anything but MID 9000000000");
+ }
+ }
+ }
+
+ /**
+ * Test that filtering by subject works properly
+ *
+ * @throws Exception
+ */
+ public void testFilterSentMessagesBySubject() throws Exception {
+ // Check that we actually have messages to filter
+ List<MessageBean> unfilteredMessages = action.getAllMySentMessages();
+ if (unfilteredMessages.size() == 0) {
+ fail("There are no messages to sort!");
+ }
+
+ // Try a different filter method, ensure all work
+ List<MessageBean> filteredMessages = action.filterSentMessages(unfilteredMessages, ",Scratchy Throat,,,,");
+ for (MessageBean m : filteredMessages) {
+ if (!m.getSubject().equalsIgnoreCase("Scratchy Throat")) {
+ fail("Subject name " + m.getSubject() + " was not filtered properly");
+ }
+ }
+ }
+
+ /**
+ * Test that the specified word is included within the body or the subject line
+ *
+ * @throws Exception
+ */
+ public void testFilterSentMessagesByContentInclusion() throws Exception {
+ // Check that we actually have messages to filter
+ List<MessageBean> unfilteredMessages = action.getAllMySentMessages();
+ if (unfilteredMessages.size() == 0) {
+ fail("There are no messages to sort!");
+ }
+
+ List<MessageBean> filteredMessages = action.filterSentMessages(unfilteredMessages, ",,throat,,,");
+ for (MessageBean m : filteredMessages) {
+ if (!m.getSubject().toLowerCase().contains("throat") && !m.getBody().toLowerCase().contains("throat")) {
+ fail("Messages filtered should have the word throat in the body or subject");
+ }
+ }
+ }
+
+ /**
+ * Test that the specified word is not included within the body or subject line
+ *
+ * @throws Exception
+ */
+ public void testFilterSentMessagesByContentExclusion() throws Exception {
+ // Check that we actually have messages to filter
+ List<MessageBean> unfilteredMessages = action.getAllMySentMessages();
+ if (unfilteredMessages.size() == 0) {
+ fail("There are no messages to sort!");
+ }
+
+ List<MessageBean> filteredMessages = action.filterSentMessages(unfilteredMessages, ",,,prescription,,");
+ assertTrue(filteredMessages.size() <= 2);
+ for (MessageBean m : filteredMessages) {
+ assertTrue(!m.getSubject().toLowerCase().contains("prescription") && !m.getBody().toLowerCase().contains("prescription"));
+ }
+ }
+
+ /**
+ * Test that the messages selected have been sent after the starting date
+ *
+ * @throws Exception
+ */
+ public void testFilterSentMessagesByStartingDate() throws Exception {
+ // Check that we actually have messages to filter
+ List<MessageBean> unfilteredMessages = action.getAllMySentMessages();
+ if (unfilteredMessages.size() == 0) {
+ fail("There are no messages to sort!");
+ }
+
+ String now = new SimpleDateFormat("MM/dd/yyyy").format(Calendar.getInstance().getTime());
+ List<MessageBean> filteredMessages = action.filterSentMessages(unfilteredMessages, ",,,,01/01/1900," + now);
+
+ // Ensure that all messages are captured by a large interval
+ assertTrue(filteredMessages.size() == unfilteredMessages.size());
+
+ }
+
+ /**
+ * Test that the messages selected have been sent before the end date
+ *
+ * @throws Exception
+ */
+ public void testFilterSentMessagesByEndingDate() throws Exception {
+ // Check that we actually have messages to filter
+ List<MessageBean> unfilteredMessages = action.getAllMySentMessages();
+ if (unfilteredMessages.size() == 0) {
+ fail("There are no messages to sort!");
+ }
+
+ List<MessageBean> filteredMessages = action.filterSentMessages(unfilteredMessages, ",,,,,02/01/2010");
+ // We should lose the scratchy throat message
+ assertEquals(unfilteredMessages.size() - 1, filteredMessages.size());
+
+ }
+
+ /**
+ * Test a bunch of complex queries with multiple filters
+ *
+ * @throws Exception
+ */
+ public void testFilterSentMessagesComplexFilter() throws Exception {
+ // Check that we actually have messages to filter
+ List<MessageBean> unfilteredMessages = action.getAllMySentMessages();
+ if (unfilteredMessages.size() == 0) {
+ fail("There are no messages to sort!");
+ }
+
+ // Do a complex filtering operation with including word throat
+ List<MessageBean> filteredMessages = action.filterSentMessages(unfilteredMessages, ",,throat,,,02/01/2010");
+ assertEquals(0, filteredMessages.size());
+
+ // Same but excluding the word throat
+ filteredMessages = action.filterSentMessages(unfilteredMessages, ",,,throat,,02/01/2010");
+ assertEquals(2, filteredMessages.size());
+ }
}