Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1927
Modified Files:
appointmentprovideradminday.jsp
Log Message:
i18n for shortcuts and new ones added, mac extensions held
Index: appointmentprovideradminday.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** appointmentprovideradminday.jsp 4 Apr 2008 17:50:34 -0000 1.126
--- appointmentprovideradminday.jsp 5 Apr 2008 13:29:02 -0000 1.127
***************
*** 595,599 ****
<li>
<a HREF="#" ONCLICK ="popupOscarRx(600,900,'../oscarMessenger/DisplayMessages.do?providerNo=<%=curUser_no%>&userName=<%=URLEncoder.encode(userfirstname+" "+userlastname)%>')" title="<bean:message key="global.messenger"/>">
! <span id="oscar_new_msg">Msg</span></a>
</li>
</caisi:isModuleLoad>
--- 595,599 ----
<li>
<a HREF="#" ONCLICK ="popupOscarRx(600,900,'../oscarMessenger/DisplayMessages.do?providerNo=<%=curUser_no%>&userName=<%=URLEncoder.encode(userfirstname+" "+userlastname)%>')" title="<bean:message key="global.messenger"/>">
! <span id="oscar_new_msg"><bean:message key="global.msg"/></span></a>
</li>
</caisi:isModuleLoad>
***************
*** 620,632 ****
<caisi:isModuleLoad moduleName="ticklerplus" reverse="true">
<a HREF="#" ONCLICK ="popupPage2('../tickler/ticklerMain.jsp','<bean:message key="global.tickler"/>');return false;" TITLE='<bean:message key="global.tickler"/>'>
! <span id="oscar_new_tickler"><bean:message key="global.tickler"/></span></a>
</caisi:isModuleLoad>
<caisi:isModuleLoad moduleName="ticklerplus">
! <a HREF="#" ONCLICK ="popupPage2('../Tickler.do','<bean:message key="global.tickler"/>');return false;" TITLE='Tickler+'>
! <span id="oscar_new_tickler"><bean:message key="global.tickler"/></span></a>
</caisi:isModuleLoad>
</li>
<oscar:oscarPropertiesCheck property="WORKFLOW" value="yes">
! <li><a href="javascript: function myFunction() {return false; }" onClick="popup(700,1000,'../oscarWorkflow/WorkFlowList.jsp','workflow')">WorkFlow</a></li>
</oscar:oscarPropertiesCheck>
<oscar:oscarPropertiesCheck property="MY_OSCAR" value="yes">
--- 620,632 ----
<caisi:isModuleLoad moduleName="ticklerplus" reverse="true">
<a HREF="#" ONCLICK ="popupPage2('../tickler/ticklerMain.jsp','<bean:message key="global.tickler"/>');return false;" TITLE='<bean:message key="global.tickler"/>'>
! <span id="oscar_new_tickler"><bean:message key="global.btntickler"/></span></a>
</caisi:isModuleLoad>
<caisi:isModuleLoad moduleName="ticklerplus">
! <a HREF="#" ONCLICK ="popupPage2('../Tickler.do','<bean:message key="global.tickler"/>');return false;" TITLE='<bean:message key="global.tickler"/>'+'+'>
! <span id="oscar_new_tickler"><bean:message key="global.btntickler"/></span></a>
</caisi:isModuleLoad>
</li>
<oscar:oscarPropertiesCheck property="WORKFLOW" value="yes">
! <li><a href="javascript: function myFunction() {return false; }" onClick="popup(700,1000,'../oscarWorkflow/WorkFlowList.jsp','<bean:message key="global.workflow"/>')"><bean:message key="global.btnworkflow"/></a></li>
</oscar:oscarPropertiesCheck>
<oscar:oscarPropertiesCheck property="MY_OSCAR" value="yes">
***************
*** 634,638 ****
<li>
! <a HREF="#" ONCLICK ="popup('600', '900','../phr/PhrMessage.do?method=viewMessages','INDIVOMESSENGER2<%=curUser_no%>')" title="myOscar"><phr:setColor>myOscar</phr:setColor></a>
</li>
</myoscar:indivoRegistered>
--- 634,638 ----
<li>
! <a HREF="#" ONCLICK ="popup('600', '900','../phr/PhrMessage.do?method=viewMessages','INDIVOMESSENGER2<%=curUser_no%>')" title='<bean:message key="global.myoscar"/>'><phr:setColor><bean:message key="global.btnmyoscar"/></phr:setColor></a>
</li>
</myoscar:indivoRegistered>
***************
*** 641,645 ****
<security:oscarSec roleName="<%=roleName$%>" objectName="_admin,_admin.userAdmin,_admin.schedule,_admin.billing,_admin.resource,_admin.reporting,_admin.backup,_admin.messenger,_admin.eform,_admin.encounter,_admin.misc" rights="r">
<li>
! <a HREF="#" ONCLICK ="popupPage2('../admin/admin.jsp', 'Admin');return false;">Admin</a>
</li>
</security:oscarSec>
--- 641,645 ----
<security:oscarSec roleName="<%=roleName$%>" objectName="_admin,_admin.userAdmin,_admin.schedule,_admin.billing,_admin.resource,_admin.reporting,_admin.backup,_admin.messenger,_admin.eform,_admin.encounter,_admin.misc" rights="r">
<li>
! <a HREF="#" ONCLICK ="popupPage2('../admin/admin.jsp', 'Admin');return false;"><bean:message key="global.admin"/></a>
</li>
</security:oscarSec>
***************
*** 1187,1233 ****
</body>
<script language="JavaScript">
! if (navigator.appVersion.indexOf("Mac")!=-1) {
! document.onkeydown=function(e){
! evt = e || window.event; // window.event is the IE equivalent
! if (evt.metaKey) {
! switch(evt.keyCode) {
! case 65 : popupPage2('../admin/admin.jsp', 'Admin'); break; //run code for 'A'dmin
! case 66 : popupPage2('../billing/CA/<%=prov%>/billingReportCenter.jsp?displaymode=billreport&providerview=<%=curUser_no%>');return false; //code for 'B'illing
! case 67 : popupPage(310,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday","UTF-8")%>'); return false; //run code for 'C'alendar
! case 68 : popup('700', '1000', '../dms/documentReport.jsp?function=provider&functionid=<%=curUser_no%>&curUser=<%=curUser_no%>', 'edocView'); return false; //run code for e'D'oc
! case 72 : popupPage(600,750,'<%=resourcebaseurl+"Support"%>'); return false; //run code for 'H'elp
! case 73 : popupPage2('../Tickler.do','<bean:message key="global.tickler"/>'); return false; //run code for t'I'ckler
! case 76 : popupPage2('../oscarMDS/Index.jsp?providerNo=<%=curUser_no%>', '<bean:message key="global.lab"/>'); return false; //run code for 'L'ab
! case 77 : popupOscarRx(600,900,'../oscarMessenger/DisplayMessages.do?providerNo=<%=curUser_no%>&userName=<%=URLEncoder.encode(userfirstname+" "+userlastname)%>'); return false; //run code for 'M'essage
! case 79 : popupOscarRx(625,900,'../oscarEncounter/IncomingConsultation.do?providerNo=<%=curUser_no%>&userName=<%=URLEncoder.encode(userfirstname+" "+userlastname)%>'); return false; //run code for c'O'nsultation
! case 80 : popupPage(400,680,'providerpreference.jsp?provider_no=<%=curUser_no%>&start_hour=<%=startHour%>&end_hour=<%=endHour%>&every_min=<%=everyMin%>&mygroup_no=<%=mygroupno%>&new_tickler_warning_window=<%=newticklerwarningwindow%>&default_pmm=<%=default_pmm%>'); return false; //run code for 'P'references **note that there may be 2 of em!**
! case 81 : window.open('../logout.jsp','_self'); return false; // 'Q'uit/log out
! case 82 : popupPage2('../report/reportindex.jsp','reportPage'); return false; //run code for Reports
! case 83 : popupPage2('../demographic/search.jsp'); return false; //run code for 'S'earch
! case 84 : window.open("providercontrol.jsp?year=<%=curYear%>&month=<%=curMonth%>&day=<%=curDay%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday","_self") ; return false; //run code for 'T'oday
! case 86 : review('1'); return false; //all provider 'V'iew
! default : return;
! }
! }
! }
! } else {
! document.onkeydown=function(e){
evt = e || window.event; // window.event is the IE equivalent
if (evt.altKey) {
switch(evt.keyCode) {
! case 65 : popupPage2('../admin/admin.jsp', 'Admin'); break; //run code for 'A'dmin
! case 66 : popupPage2('../billing/CA/<%=prov%>/billingReportCenter.jsp?displaymode=billreport&providerview=<%=curUser_no%>');return false; //code for 'B'illing
! case 67 : popupPage(310,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday","UTF-8")%>'); return false; //run code for 'C'alendar
! case 68 : popup('700', '1000', '../dms/documentReport.jsp?function=provider&functionid=<%=curUser_no%>&curUser=<%=curUser_no%>', 'edocView'); return false; //run code for e'D'oc
! case 72 : popupPage(600,750,'<%=resourcebaseurl+"Support"%>'); return false; //run code for 'H'elp
! case 73 : popupPage2('../Tickler.do','<bean:message key="global.tickler"/>'); return false; //run code for t'I'ckler
! case 76 : popupPage2('../oscarMDS/Index.jsp?providerNo=<%=curUser_no%>', '<bean:message key="global.lab"/>'); return false; //run code for 'L'ab
! case 77 : popupOscarRx(600,900,'../oscarMessenger/DisplayMessages.do?providerNo=<%=curUser_no%>&userName=<%=URLEncoder.encode(userfirstname+" "+userlastname)%>'); return false; //run code for 'M'essage
! case 79 : popupOscarRx(625,900,'../oscarEncounter/IncomingConsultation.do?providerNo=<%=curUser_no%>&userName=<%=URLEncoder.encode(userfirstname+" "+userlastname)%>'); return false; //run code for c'O'nsultation
! case 80 : popupPage(400,680,'providerpreference.jsp?provider_no=<%=curUser_no%>&start_hour=<%=startHour%>&end_hour=<%=endHour%>&every_min=<%=everyMin%>&mygroup_no=<%=mygroupno%>&new_tickler_warning_window=<%=newticklerwarningwindow%>&default_pmm=<%=default_pmm%>'); return false; //run code for 'P'references **note that there may be 2 of em!**
! case 82 : popupPage2('../report/reportindex.jsp','reportPage'); return false; //run code for Reports
! case 83 : popupPage2('../demographic/search.jsp'); return false; //run code for 'S'earch
! case 84 : window.open("providercontrol.jsp?year=<%=curYear%>&month=<%=curMonth%>&day=<%=curDay%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday","_self") ; return false; //run code for 'T'oday
! case 86 : review('1'); return false; //all provider 'V'iew
default : return;
}
--- 1187,1220 ----
</body>
<script language="JavaScript">
!
! document.onkeydown=function(e){
evt = e || window.event; // window.event is the IE equivalent
if (evt.altKey) {
+ //use if (evt.altKey || evt.metaKey) Alt+A (and)/or for Mac when the browser supports it, Command+A
switch(evt.keyCode) {
! case <bean:message key="global.adminShortcut"/> : popupPage2('../admin/admin.jsp', 'Admin'); break; //run code for 'A'dmin
! case <bean:message key="global.billingShortcut"/> : popupPage2('../billing/CA/<%=prov%>/billingReportCenter.jsp?displaymode=billreport&providerview=<%=curUser_no%>');return false; //code for 'B'illing
! case <bean:message key="global.calendarShortcut"/> : popupPage(310,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday","UTF-8")%>'); return false; //run code for 'C'alendar
! case <bean:message key="global.edocShortcut"/> : popup('700', '1000', '../dms/documentReport.jsp?function=provider&functionid=<%=curUser_no%>&curUser=<%=curUser_no%>', 'edocView'); return false; //run code for e'D'oc
! case <bean:message key="global.resourcesShortcut"/> : popupPage2('<%=resourcebaseurl%>'); return false; // code for R'e'sources
! case <bean:message key="global.helpShortcut"/> : popupPage(600,750,'<%=resourcebaseurl+"Support"%>'); return false; //run code for 'H'elp
! case <bean:message key="global.ticklerShortcut"/> : popupPage2('../Tickler.do','<bean:message key="global.tickler"/>'); return false; //run code for t'I'ckler **to do allow for Tickler +**
! case <bean:message key="global.labShortcut"/> : popupPage2('../oscarMDS/Index.jsp?providerNo=<%=curUser_no%>', '<bean:message key="global.lab"/>'); return false; //run code for 'L'ab
! case <bean:message key="global.msgShortcut"/> : popupOscarRx(600,900,'../oscarMessenger/DisplayMessages.do?providerNo=<%=curUser_no%>&userName=<%=URLEncoder.encode(userfirstname+" "+userlastname)%>'); return false; //run code for 'M'essage
! case <bean:message key="global.monthShortcut"/> : window.open("providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=1&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=month&dboperation=searchappointmentmonth","_self"); return false ; //run code for Mo'n'th
! case <bean:message key="global.conShortcut"/> : popupOscarRx(625,900,'../oscarEncounter/IncomingConsultation.do?providerNo=<%=curUser_no%>&userName=<%=URLEncoder.encode(userfirstname+" "+userlastname)%>'); return false; //run code for c'O'nsultation
! case <bean:message key="global.prefShortcut"/> : popupPage(400,680,'providerpreference.jsp?provider_no=<%=curUser_no%>&start_hour=<%=startHour%>&end_hour=<%=endHour%>&every_min=<%=everyMin%>&mygroup_no=<%=mygroupno%>&new_tickler_warning_window=<%=newticklerwarningwindow%>&default_pmm=<%=default_pmm%>'); return false; //run code for 'P'references **todo note that there may be 2 of em!**
! case <bean:message key="global.reportShortcut"/> : popupPage2('../report/reportindex.jsp','reportPage'); return false; //run code for 'R'eports
! case <bean:message key="global.searchShortcut"/> : popupPage2('../demographic/search.jsp'); return false; //run code for 'S'earch
! case <bean:message key="global.dayShortcut"/> : window.open("providercontrol.jsp?year=<%=curYear%>&month=<%=curMonth%>&day=<%=curDay%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday","_self") ; return false; //run code for 'T'oday
! case <bean:message key="global.viewShortcut"/> : {
! <% if(request.getParameter("viewall")!=null && request.getParameter("viewall").equals("1") ) { %>
! review('0'); return false; //scheduled providers 'V'iew
! <% } else { %>
! review('1'); return false; //all providers 'V'iew
! <% } %>
! }
! case <bean:message key="global.workflowShortcut"/> : popup(700,1000,'../oscarWorkflow/WorkFlowList.jsp','<bean:message key="global.workflow"/>'); return false ; //code for 'W'orkflow
! case <bean:message key="global.myoscarShortcut"/> : popup('600', '900','../phr/PhrMessage.do?method=viewMessages','INDIVOMESSENGER2<%=curUser_no%>')
default : return;
}
***************
*** 1235,1245 ****
if (evt.ctrlKey) {
switch(evt.keyCode) {
! case 81 : window.open('../logout.jsp','_self'); return false; // 'Q'uit/log out
default : return;
}
}
- }
}
</script>
</html:html>
--- 1222,1232 ----
if (evt.ctrlKey) {
switch(evt.keyCode) {
! case <bean:message key="global.btnLogoutShortcut"/> : window.open('../logout.jsp','_self'); return false; // 'Q'uit/log out
default : return;
}
}
}
+
</script>
</html:html>
|