Skip to content
Snippets Groups Projects
Commit 784bbe0a authored by xuechen5's avatar xuechen5
Browse files

Format: Delete commented code, change tab to blank space

parent 3846322f
No related branches found
No related tags found
2 merge requests!22Merge UC92 into Master,!15Merge 5-uc-92-activate-pre-registered-patient-2 into UC92v2
...@@ -18,129 +18,121 @@ pageTitle = "iTrust - View All Pre-Registered Patients"; ...@@ -18,129 +18,121 @@ pageTitle = "iTrust - View All Pre-Registered Patients";
<% <%
ViewPreRegisteredPatientListAction action = new ViewPreRegisteredPatientListAction(prodDAO, loggedInMID.longValue()); ViewPreRegisteredPatientListAction action = new ViewPreRegisteredPatientListAction(prodDAO, loggedInMID.longValue());
/////////////////////// ViewPatientOfficeVisitHistoryAction(prodDAO, loggedInMID.longValue());
//List<PatientBean> PreRegisteredPatientList = action.getPatients(); //////// action is in ViewPreRegisteredPatientListAction
//////////////// ???????????????? change <PatientVisitBean> patientVisits to PreRegisteredPatientList
List<PatientBean> PreRegisteredPatientList = action.getPreRegisteredPatients(); List<PatientBean> PreRegisteredPatientList = action.getPreRegisteredPatients();
loggingAction.logEvent(TransactionType.PATIENT_LIST_VIEW, loggedInMID, 0, ""); ////////// ????????? TransactionType.PATIENT_LIST_VIEW loggingAction.logEvent(TransactionType.PATIENT_LIST_VIEW, loggedInMID, 0, "");
%> %>
<script src="/iTrust/DataTables/media/js/jquery.dataTables.min.js" type="text/javascript"></script>
<script type="text/javascript"> <script src="/iTrust/DataTables/media/js/jquery.dataTables.min.js" type="text/javascript"></script>
jQuery.fn.dataTableExt.oSort['lname-asc'] = function(x,y) { <script type="text/javascript">
var a = x.split(" "); jQuery.fn.dataTableExt.oSort['lname-asc'] = function(x,y) {
var b = y.split(" "); var a = x.split(" ");
return ((a[1] < b[1]) ? -1 : ((a[1] > b[1]) ? 1 : 0)); var b = y.split(" ");
}; return ((a[1] < b[1]) ? -1 : ((a[1] > b[1]) ? 1 : 0));
};
jQuery.fn.dataTableExt.oSort['lname-desc'] = function(x,y) {
var a = x.split(" "); jQuery.fn.dataTableExt.oSort['lname-desc'] = function(x,y) {
var b = y.split(" "); var a = x.split(" ");
return ((a[1] < b[1]) ? 1 : ((a[1] > b[1]) ? -1 : 0)); var b = y.split(" ");
}; return ((a[1] < b[1]) ? 1 : ((a[1] > b[1]) ? -1 : 0));
</script> };
</script>
<script type="text/javascript">
$(document).ready(function() { <script type="text/javascript">
$("#patientList").dataTable( { $(document).ready(function() {
"aaColumns": [ [2,'dsc'] ], $("#patientList").dataTable( {
"aoColumns": [ { "sType": "lname" }, null, null], "aaColumns": [ [2,'dsc'] ],
"bStateSave": true, "aoColumns": [ { "sType": "lname" }, null, null],
"sPaginationType": "full_numbers" "bStateSave": true,
}); "sPaginationType": "full_numbers"
}); });
</script> });
<style type="text/css" title="currentStyle"> </script>
@import "/iTrust/DataTables/media/css/demo_table.css";
</style>
<style type="text/css" title="currentStyle">
@import "/iTrust/DataTables/media/css/demo_table.css";
</style>
<br /> <br />
<h2>Pre-Registered Patients</h2> <h2>Pre-Registered Patients</h2>
<form action="viewReport.jsp" method="post" name="myform"> <form action="viewReport.jsp" method="post" name="myform">
<table class="display fTable" id="patientList" align="center"> <table class="display fTable" id="patientList" align="center">
<script type="text/javascript">
<script type="text/javascript">
var editButtonId = ""; var editButtonId = "";
function showButton(){ ///////////////////////////////////// for BUTTONS DEACTIVE, Should HIDE ROW. function showButton(){
//document.getElementById("editButton").style.display="inline";
document.getElementById(editButtonId).style.display="none"; document.getElementById(editButtonId).style.display="none";
return; return;
} }
</script> </script>
<thead>
<tr class="">
<th>Deactivate</th>
<th>Name</th>
<th>Address</th>
<th>Email</th>
<thead> </tr>
</thead>
<tbody>
<tr class=""> <%
<th>Deactivate</th> List<PatientBean> patientsList = new ArrayList<PatientBean>();
<th>Name</th> int index = 0;
<th>Address</th>
<th>Email</th>
</tr>
</thead>
<tbody>
<%
List<PatientBean> patientsList = new ArrayList<PatientBean>(); ///////////////////////////////////
int index = 0;
for (PatientBean bean : PreRegisteredPatientList) { ////////// ???????????????????? Change PatientVisitBean to PatientBean
patientsList.add(bean);
String idName = "row" + index;
String editButtonName = "button" + index;
%>
<script type="text/javascript">
row_id = "<%=idName%>";
function hideRow(rowId){ ///////////////////////////////////// for BUTTONS DEACTIVE, Should HIDE ROW. for (PatientBean bean : PreRegisteredPatientList) {
//document.getElementById("editButton").style.display="inline"; patientsList.add(bean);
//rowId = "<%=idName%>"; String idName = "row" + index;
String editButtonName = "button" + index;
%>
<script type="text/javascript">
row_id = "<%=idName%>";
function hideRow(rowId){
rowId = "<%=idName%>";
document.getElementById(rowId).style.display="none"; document.getElementById(rowId).style.display="none";
return; return;
} }
editButtonId = "<%=editButtonName%>"; editButtonId = "<%=editButtonName%>";
</script> </script>
<tr id=<%=idName%>> <tr id=<%=idName%>>
<td> <td>
<a style="text-decoration: none;"> <a style="text-decoration: none;">
<input type=button value="DeActivate" onclick="javascript:hideRow(row_id);"> <input type=button value="DeActivate" onclick="javascript:hideRow(row_id);">
</a> </a>
</td> </td>
<td > <td >
<a href="viewPreRegisteredPatientInfo.jsp?patient=<%= StringEscapeUtils.escapeHtml("" + (index)) %>" id=<%=editButtonName%>> <a href="viewPreRegisteredPatientInfo.jsp?patient=<%= StringEscapeUtils.escapeHtml("" + (index)) %>" id=<%=editButtonName%>>
<%= StringEscapeUtils.escapeHtml("" + (bean.getFullName())) %> <%= StringEscapeUtils.escapeHtml("" + (bean.getFullName())) %>
</a> </a>
</td> </td>
<td ><%= StringEscapeUtils.escapeHtml("" + (bean.getStreetAddress1() +" " +bean.getStreetAddress2() +" " +bean.getCity() +" " +bean.getState()) +" " +bean.getZip()) %></td> <td ><%= StringEscapeUtils.escapeHtml("" + (bean.getStreetAddress1() +" " +bean.getStreetAddress2() +" " +bean.getCity() +" " +bean.getState()) +" " +bean.getZip()) %></td>
<td > <td >
<%= StringEscapeUtils.escapeHtml("" + (bean.getEmail())) %> <%= StringEscapeUtils.escapeHtml("" + (bean.getEmail())) %>
</td> </td>
</tr> </tr>
<% <%
index ++; index ++;
}
}
session.setAttribute("patients", patientsList); //////////////////// ??????????????????????????????????????????
session.setAttribute("patients", patientsList); //////////////////// ?????????????????????????????????????????? %>
%> </tbody>
</tbody>
</table> </table>
</form> </form>
<br /> <br />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment