|
From: annie <ann...@us...> - 2010-12-18 02:57:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19672/web/PMmodule/ClientManager Modified Files: Tag: RELEASE_10_06 summary.jsp ocan_form.jsp ocan_form_mentalHealthCenter.jsp Added Files: Tag: RELEASE_10_06 ocan_form_getProgramName.jsp ocan_form_getProgramNumber.jsp ocan_form_getOrgName.jsp Log Message: add orgnization/program name/number (list from connex) on ocan mental health center part. Index: ocan_form.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v retrieving revision 1.15.4.13 retrieving revision 1.15.4.14 diff -C2 -d -r1.15.4.13 -r1.15.4.14 *** ocan_form.jsp 9 Oct 2010 02:30:14 -0000 1.15.4.13 --- ocan_form.jsp 18 Dec 2010 02:57:11 -0000 1.15.4.14 *************** *** 77,80 **** --- 77,82 ---- }); + + </script> *************** *** 86,90 **** var priority = selectBoxId.charAt(selectBoxId.length-1); var selectBoxValue = selectBox.options[selectBox.selectedIndex].value; ! var demographicId='<%=currentDemographicId%>'; --- 88,92 ---- var priority = selectBoxId.charAt(selectBoxId.length-1); var selectBoxValue = selectBox.options[selectBox.selectedIndex].value; ! var demographicId='<%=currentDemographicId%>'; *************** *** 92,106 **** if(document.getElementById("serviceUseRecord_orgName" + priority) == null) { ! $.get('ocan_form_getOrgName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&lhin_num='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); } ! ! //do we need to remove. If there's any blocks > newCount..we need to delete them. if(document.getElementById("serviceUseRecord_orgName" + priority) != null) { ! $("#center_block_orgName"+priority).remove(); } } function changeNumberOfMedications() { var newCount = $("#medications_count").val(); --- 94,167 ---- if(document.getElementById("serviceUseRecord_orgName" + priority) == null) { ! $.get('ocan_form_getOrgName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+selectBoxValue, function(data) { $("#center_block_orgName"+priority).append(data); }); } ! if(document.getElementById("serviceUseRecord_orgName" + priority) != null) { ! $("#center_programNumber"+priority).remove(); ! $("#center_programName"+priority).remove(); ! $("#center_orgName"+priority).remove(); ! ! $.get('ocan_form_getOrgName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+selectBoxValue, function(data) { ! $("#center_block_orgName"+priority).append(data); ! }); } + } + function changeOrgName(selectBox) { + var newCount = $("#center_count").val(); + + var LHIN_code = $("#serviceUseRecord_orgLHIN"+newCount).val(); + var selectBoxId = selectBox.id; + var priority = selectBoxId.charAt(selectBoxId.length-1); + var selectBoxValue = selectBox.options[selectBox.selectedIndex].value; + + var demographicId='<%=currentDemographicId%>'; + + if(document.getElementById("serviceUseRecord_programName" + priority) == null) { + $.get('ocan_form_getProgramName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+selectBoxValue, function(data) { + $("#center_block_orgName"+priority).append(data); + }); + } + if(document.getElementById("serviceUseRecord_programName" + priority) != null) { + $("#center_programName"+priority).remove(); + $("#center_programNumber"+priority).remove(); + $.get('ocan_form_getProgramName.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+selectBoxValue, function(data) { + $("#center_block_orgName"+priority).append(data); + }); + } + } + + function changeProgramName(selectBox) { + var newCount = $("#center_count").val(); + + var selectBoxId = selectBox.id; + var priority = selectBoxId.charAt(selectBoxId.length-1); + var selectBoxValue = selectBox.options[selectBox.selectedIndex].value; + + var LHIN_code = $("#serviceUseRecord_orgLHIN"+priority).val(); + var orgName = $("#serviceUseRecord_orgName"+priority).val(); + var programName = $("#serviceUseRecord_programName"+priority).val(); + + var demographicId='<%=currentDemographicId%>'; + + if(document.getElementById("serviceUseRecord_programNumber" + priority) == null) { + $.get('ocan_form_getProgramNumber.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+orgName+'&programName='+programName, function(data) { + $("#center_block_orgName"+priority).append(data); + }); + } + if(document.getElementById("serviceUseRecord_programNumber" + priority) != null) { + $("#center_programNumber"+priority).remove(); + $.get('ocan_form_getProgramNumber.jsp?demographicId='+demographicId+'¢er_num='+priority+'&LHIN_code='+LHIN_code+'&orgName='+orgName+'&programName='+programName, function(data) { + $("#center_block_orgName"+priority).append(data); + }); + } + } + + + + function changeNumberOfMedications() { var newCount = $("#medications_count").val(); Index: ocan_form_mentalHealthCenter.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_mentalHealthCenter.jsp,v retrieving revision 1.1.4.5 retrieving revision 1.1.4.6 diff -C2 -d -r1.1.4.5 -r1.1.4.6 *** ocan_form_mentalHealthCenter.jsp 30 Sep 2010 15:49:45 -0000 1.1.4.5 --- ocan_form_mentalHealthCenter.jsp 18 Dec 2010 02:57:11 -0000 1.1.4.6 *************** *** 5,8 **** --- 5,9 ---- <%@page import="org.oscarehr.util.LoggedInInfo"%> + <% int currentDemographicId=Integer.parseInt(request.getParameter("demographicId")); *************** *** 13,16 **** --- 14,35 ---- int centerNumber = Integer.parseInt(request.getParameter("center_num")); %> + + <script type="text/javascript"> + $('document').ready(function() { + //load mental health centres orgnaization name + var demographicId='<%=currentDemographicId%>'; + var cenCount = $("#center_count").val(); + var LHIN_code = $("#serviceUseRecord_orgLHIN<%=centerNumber%>").val(); + var item=$("#center_block_orgName<%=centerNumber%>"); + if(LHIN_code != null && LHIN_code!="") { + $.get('ocan_form_getOrgName.jsp?demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code, function(data) { + item.append(data); + }); + } + }); + </script> + + + <div id="center_<%=centerNumber%>"> <table> *************** *** 47,51 **** <td class="genericTableHeader">Organizations LHIN</td> <td class="genericTableData"> ! <select name="serviceUseRecord_orgLHIN<%=centerNumber %>" class="{validate: {required:true}}"> <%=OcanForm.renderAsSelectOptions(ocanStaffForm.getId(), "serviceUseRecord_orgLHIN"+centerNumber, OcanForm.getOcanFormOptions("LHIN code"), prepopulationLevel)%> </select> --- 66,70 ---- <td class="genericTableHeader">Organizations LHIN</td> <td class="genericTableData"> ! <select name="serviceUseRecord_orgLHIN<%=centerNumber %>" id="serviceUseRecord_orgLHIN<%=centerNumber %>" onchange="changeOrgLHIN(this);" class="{validate: {required:true}}"> <%=OcanForm.renderAsSelectOptions(ocanStaffForm.getId(), "serviceUseRecord_orgLHIN"+centerNumber, OcanForm.getOcanFormOptions("LHIN code"), prepopulationLevel)%> </select> *************** *** 54,65 **** <tr> ! <td class="genericTableHeader">Organization Name</td> ! <td class="genericTableData"> ! <!-- ! <input type="text" id="serviceUseRecord_orgName<%=centerNumber %>" name="serviceUseRecord_orgName<%=centerNumber %>"value="<%=LoggedInInfo.loggedInInfo.get().currentFacility.getName() %>" readonly=readonly onfocus="this.blur();"/> ! --> ! <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_orgName"+centerNumber,1,30, prepopulationLevel)%> </td> ! </tr> <tr> <td class="genericTableHeader">Organization Name - Other</td> --- 73,86 ---- <tr> ! <td colspan="2"> ! ! <div id="center_block_orgName<%=centerNumber %>"> ! <!-- results from adding/removing organization name will go into this block --> ! </div> </td> ! </tr> ! ! ! <tr> <td class="genericTableHeader">Organization Name - Other</td> *************** *** 68,80 **** </td> </tr> ! <tr> ! <td class="genericTableHeader">Organization Number</td> ! <td class="genericTableData"> ! <!-- ! <input type="text" id="serviceUseRecord_orgNumber<%=centerNumber %>" name="serviceUseRecord_orgNumber<%=centerNumber %>" value="<%=LoggedInInfo.loggedInInfo.get().currentFacility.getOcanServiceOrgNumber() %>" readonly=readonly onfocus="this.blur();"/> ! --> ! <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_orgNumber"+centerNumber,1,30, prepopulationLevel)%> ! </td> ! </tr> <tr> <td class="genericTableHeader">Organization Number - Other</td> --- 89,93 ---- </td> </tr> ! <tr> <td class="genericTableHeader">Organization Number - Other</td> *************** *** 83,113 **** </td> </tr> ! <!-- ! <tr> ! <td class="genericTableHeader">Program Name</td> ! <td class="genericTableData"> ! <select name="admissionId<%=centerNumber %>"> ! <% ! for (Admission admission : OcanForm.getAdmissions(currentDemographicId)) ! { ! String selected=""; ! ! if (ocanStaffForm.getAdmissionId()!=null && ocanStaffForm.getAdmissionId().intValue()==admission.getId().intValue()) selected="selected=\"selected\""; ! ! %> ! <option <%=selected%> value="<%=admission.getId()%>"><%=OcanForm.getEscapedAdmissionSelectionDisplay(admission)%></option> ! <% ! } ! %> ! </select> ! </td> ! </tr> ! --> ! <tr> ! <td class="genericTableHeader">Program Name</td> ! <td class="genericTableData"> ! <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_programName"+centerNumber,1,30, prepopulationLevel)%> ! </td> ! </tr> <tr> <td class="genericTableHeader">Program Name - Other</td> --- 96,101 ---- </td> </tr> ! ! <tr> <td class="genericTableHeader">Program Name - Other</td> *************** *** 116,125 **** </td> </tr> ! <tr> ! <td class="genericTableHeader">Program Number</td> ! <td class="genericTableData"> ! <%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_programNumber"+centerNumber,1,30, prepopulationLevel)%> ! </td> ! </tr> <tr> <td class="genericTableHeader">Program Number - Other</td> --- 104,108 ---- </td> </tr> ! <tr> <td class="genericTableHeader">Program Number - Other</td> --- NEW FILE: ocan_form_getOrgName.jsp --- <%@page import="org.oscarehr.common.model.OcanStaffForm"%> <%@page import="org.oscarehr.PMmodule.model.Admission"%> <%@page import="org.oscarehr.common.model.Demographic"%> <%@page import="org.oscarehr.PMmodule.web.OcanForm"%> <%@page import="org.oscarehr.util.LoggedInInfo"%> <% int currentDemographicId=Integer.parseInt(request.getParameter("demographicId")); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel); %> <script type="text/javascript"> $('document').ready(function() { //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; var LHIN_code= $("#serviceUseRecord_orgLHIN<%=centerNumber%>").val(); var orgName = $("#serviceUseRecord_orgName<%=centerNumber%>").val(); var item = $("#center_block_orgName<%=centerNumber%>"); if(orgName!=null && orgName!="") { $.get('ocan_form_getProgramName.jsp?demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code+'&orgName='+orgName, function(data) { item.append(data); }); } }); </script> <div id="center_orgName<%=centerNumber%>"> <table> <tr> <td class="genericTableHeader">Organization Name</td> <td class="genericTableData"> <select name="serviceUseRecord_orgName<%=centerNumber %>" id="serviceUseRecord_orgName<%=centerNumber %>" onchange="changeOrgName(this);" class="{validate: {required:true}}"> <%=OcanForm.renderAsConnexOrgNameSelectOptions(ocanStaffForm.getId(), "serviceUseRecord_orgName"+centerNumber, OcanForm.getOcanConnexOrgOptions(LHIN_code), prepopulationLevel)%> </select> </td> </tr> </table> </div> Index: summary.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/summary.jsp,v retrieving revision 1.98.4.1 retrieving revision 1.98.4.2 diff -C2 -d -r1.98.4.1 -r1.98.4.2 *** summary.jsp 27 Jul 2010 23:56:05 -0000 1.98.4.1 --- summary.jsp 18 Dec 2010 02:57:11 -0000 1.98.4.2 *************** *** 518,522 **** <td> <input type="button" value="Update" onclick="document.location='ClientManager/ocan_form.jsp?demographicId=<%=currentDemographic.getDemographicNo()%>'" /> ! <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN Part II Staff Assessment_v1.0.1.pdf"/>')"/> <input type="button" value="Print Preview" onclick="document.location='ClientManager/ocan_form.jsp?demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> </td> --- 518,522 ---- <td> <input type="button" value="Update" onclick="document.location='ClientManager/ocan_form.jsp?demographicId=<%=currentDemographic.getDemographicNo()%>'" /> ! <input type="button" value="Blank Form" onclick="window.open('<html:rewrite page="/ocan/OCAN_2.0_FULL_v2.0.5.pdf"/>')"/> <input type="button" value="Print Preview" onclick="document.location='ClientManager/ocan_form.jsp?demographicId=<%=currentDemographic.getDemographicNo()%>&print=true'" /> </td> --- NEW FILE: ocan_form_getProgramNumber.jsp --- <%@page import="org.oscarehr.common.model.OcanStaffForm"%> <%@page import="org.oscarehr.PMmodule.model.Admission"%> <%@page import="org.oscarehr.common.model.Demographic"%> <%@page import="org.oscarehr.PMmodule.web.OcanForm"%> <%@page import="org.oscarehr.util.LoggedInInfo"%> <% int currentDemographicId=Integer.parseInt(request.getParameter("demographicId")); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); String orgName = request.getParameter("orgName"); String programName = request.getParameter("programName"); OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel); %> <div id="center_programNumber<%=centerNumber%>"> <table> <tr> <td class="genericTableHeader">Program Number</td> <td class="genericTableData"> <%=OcanForm.renderAsOrgProgramNumberTextField(ocanStaffForm.getId(),"serviceUseRecord_programNumber"+centerNumber,OcanForm.getOcanConnexProgramNumber(LHIN_code, orgName, programName), 10, prepopulationLevel)%> </td> </tr> </table> </div> --- NEW FILE: ocan_form_getProgramName.jsp --- <%@page import="org.oscarehr.common.model.OcanStaffForm"%> <%@page import="org.oscarehr.PMmodule.model.Admission"%> <%@page import="org.oscarehr.common.model.Demographic"%> <%@page import="org.oscarehr.PMmodule.web.OcanForm"%> <%@page import="org.oscarehr.util.LoggedInInfo"%> <% int currentDemographicId=Integer.parseInt(request.getParameter("demographicId")); int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL; int centerNumber = Integer.parseInt(request.getParameter("center_num")); String LHIN_code = request.getParameter("LHIN_code"); String orgName = request.getParameter("orgName"); OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel); %> <script type="text/javascript"> $('document').ready(function() { //load mental health centres orgnaization name var demographicId='<%=currentDemographicId%>'; var cenCount = $("#center_count").val(); var LHIN_code = $("#serviceUseRecord_orgLHIN<%=centerNumber%>").val(); var orgName = $("#serviceUseRecord_orgName<%=centerNumber%>").val(); var programName = $("#serviceUseRecord_programName<%=centerNumber%>").val(); var item = $("#center_block_orgName<%=centerNumber%>"); if(programName!=null && programName!="") { $.get('ocan_form_getProgramNumber.jsp?demographicId='+demographicId+'¢er_num=<%=centerNumber%>'+'&LHIN_code='+LHIN_code+'&orgName='+orgName+'&programName='+programName, function(data) { item.append(data); }); } }); </script> <div id="center_programName<%=centerNumber%>"> <table> <tr> <td class="genericTableHeader">Organization Number **</td> <td class="genericTableData"> <%=OcanForm.renderAsOrgProgramNumberTextField(ocanStaffForm.getId(),"serviceUseRecord_orgNumber"+centerNumber,OcanForm.getOcanConnexOrgNumber(LHIN_code, orgName), 10, prepopulationLevel)%> </td> </tr> <tr> <td class="genericTableHeader">Program Name ** </td> <td class="genericTableData"> <select name="serviceUseRecord_programName<%=centerNumber %>" id="serviceUseRecord_programName<%=centerNumber %>" onchange="changeProgramName(this);" class="{validate: {required:true}}"> <%=OcanForm.renderAsConnexProgramNameSelectOptions(ocanStaffForm.getId(), "serviceUseRecord_programName"+centerNumber, OcanForm.getOcanConnexProgramOptions(LHIN_code,orgName), prepopulationLevel)%> </select> </td> </tr> </table> </div> |
