You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ronnie C. <cr...@us...> - 2011-01-20 21:14:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4038 Modified Files: Tag: RELEASE_9_12 EForm.java Log Message: ID: 3162848 appointment_no and appt_provider is forcibly assigned a value ("", "-1" or new value) when setAppointmentNo(..) or setApptProvider(...) is called Index: EForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data/EForm.java,v retrieving revision 1.10.4.11 retrieving revision 1.10.4.12 diff -C2 -d -r1.10.4.11 -r1.10.4.12 *** EForm.java 25 Oct 2010 14:18:41 -0000 1.10.4.11 --- EForm.java 20 Jan 2011 21:14:49 -0000 1.10.4.12 *************** *** 105,115 **** } ! public void setAppointmentNo(String appointment_no) { ! if (!blank(appointment_no)) this.appointment_no = appointment_no; ! } ! public void setApptProvider(String appt_provider) { ! if (!blank(appt_provider)) this.appt_provider = appt_provider; ! } public void setAction(String pAjaxId) { --- 105,115 ---- } ! public void setAppointmentNo(String appt_no) { ! this.appointment_no = blank(appt_no) ? "-1" : appt_no; ! } ! public void setApptProvider(String appt_prvd) { ! this.appt_provider = blank(appt_prvd) ? "" : appt_prvd; ! } public void setAction(String pAjaxId) { *************** *** 499,503 **** pointer++; } else { ! html.insert(pointer, " value=\"" + output + "\""); } return(html); --- 499,504 ---- pointer++; } else { ! String quote = output.contains("\"") ? "'" : "\""; ! html.insert(pointer, " value="+quote+output+quote); } return(html); *************** *** 523,528 **** private String getSqlParams(String key) { ! if (sql_params.containsKey(key)) return (String)sql_params.get(key); ! else return ""; } --- 524,532 ---- private String getSqlParams(String key) { ! if (sql_params.containsKey(key)) { ! String val = (String) sql_params.get(key); ! return val==null ? "" : val.replace("\"", "\\\""); ! } ! return ""; } |
|
From: Ronnie C. <cr...@us...> - 2011-01-20 20:59:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32198 Modified Files: Tag: RELEASE_10_06 EForm.java Log Message: ID: 3162848 appointment_no and appt_provider is forcibly assigned a value ("", "-1" or new value) when setAppointmentNo(..) or setApptProvider(...) is called Index: EForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data/EForm.java,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -C2 -d -r1.17.2.5 -r1.17.2.6 *** EForm.java 25 Oct 2010 14:25:18 -0000 1.17.2.5 --- EForm.java 20 Jan 2011 20:59:22 -0000 1.17.2.6 *************** *** 105,115 **** } ! public void setAppointmentNo(String appointment_no) { ! if (!blank(appointment_no)) this.appointment_no = appointment_no; ! } ! public void setApptProvider(String appt_provider) { ! if (!blank(appt_provider)) this.appt_provider = appt_provider; ! } public void setAction(String pAjaxId) { --- 105,115 ---- } ! public void setAppointmentNo(String appt_no) { ! this.appointment_no = blank(appt_no) ? "-1" : appt_no; ! } ! public void setApptProvider(String appt_prvd) { ! this.appt_provider = blank(appt_prvd) ? "" : appt_prvd; ! } public void setAction(String pAjaxId) { *************** *** 499,503 **** pointer++; } else { ! html.insert(pointer, " value=\"" + output + "\""); } return(html); --- 499,504 ---- pointer++; } else { ! String quote = output.contains("\"") ? "'" : "\""; ! html.insert(pointer, " value=" + quote + output + quote); } return(html); *************** *** 522,529 **** } ! private String getSqlParams(String key) { ! if (sql_params.containsKey(key)) return (String)sql_params.get(key); ! else return ""; ! } private void setSqlParams(String key, String value) { --- 523,533 ---- } ! private String getSqlParams(String key) { ! if (sql_params.containsKey(key)) { ! String val = (String) sql_params.get(key); ! return val==null ? "" : val.replace("\"", "\\\""); ! } ! return ""; ! } private void setSqlParams(String key, String value) { |
|
From: Ronnie C. <cr...@us...> - 2011-01-20 17:25:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31459 Modified Files: EForm.java Log Message: ID: 3162848 appointment_no and appt_provider is forcibly assigned a value ("", "-1" or new value) when setAppointmentNo(..) or setApptProvider(...) is called Index: EForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data/EForm.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** EForm.java 15 Nov 2010 01:27:37 -0000 1.27 --- EForm.java 20 Jan 2011 17:25:47 -0000 1.28 *************** *** 117,126 **** } ! public void setAppointmentNo(String appointment_no) { ! if (!blank(appointment_no)) this.appointment_no = appointment_no; } ! public void setApptProvider(String appt_provider) { ! if (!blank(appt_provider)) this.appt_provider = appt_provider; } --- 117,126 ---- } ! public void setAppointmentNo(String appt_no) { ! this.appointment_no = blank(appt_no) ? "-1" : appt_no; } ! public void setApptProvider(String appt_prvd) { ! this.appt_provider = blank(appt_prvd) ? "" : appt_prvd; } *************** *** 500,504 **** pointer++; } else { ! html.insert(pointer, " value=\"" + output + "\""); } return (html); --- 500,505 ---- pointer++; } else { ! String quote = output.contains("\"") ? "'" : "\""; ! html.insert(pointer, " value="+quote+output+quote); } return (html); *************** *** 524,529 **** private String getSqlParams(String key) { ! if (sql_params.containsKey(key)) return (String) sql_params.get(key); ! else return ""; } --- 525,533 ---- private String getSqlParams(String key) { ! if (sql_params.containsKey(key)) { ! String val = (String) sql_params.get(key); ! return val==null ? "" : val.replace("\"", "\\\""); ! } ! return ""; } |
|
From: Randy J. <rj...@us...> - 2011-01-19 19:54:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21836 Modified Files: Tag: RELEASE_10_06 appointmentprovideradminday.jsp Log Message: - ID: 3161931 grab viewall from request and set URL for calendar to this value Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.179.2.8 retrieving revision 1.179.2.9 diff -C2 -d -r1.179.2.8 -r1.179.2.9 *** appointmentprovideradminday.jsp 14 Jan 2011 20:42:01 -0000 1.179.2.8 --- appointmentprovideradminday.jsp 19 Jan 2011 19:54:19 -0000 1.179.2.9 *************** *** 680,684 **** } ! String _scheduleDate = strYear+"-"+strMonth+"-"+strDay; --- 680,687 ---- } ! String viewall = request.getParameter("viewall"); ! if( viewall == null ) { ! viewall = "0"; ! } String _scheduleDate = strYear+"-"+strMonth+"-"+strDay; *************** *** 940,949 **** <tr> <td BGCOLOR="ivory" width="33%"> ! <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day-7):(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=1"> <img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a> <b><span CLASS=title><% if (isWeekView) { %><bean:message key="provider.appointmentProviderAdminDay.week"/> <%=week%><% } else { %><%=formatDate%><% } %></span></b> ! <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day+7):(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=1"> <img src="../images/next.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewNextDay"/>" vspace="2"> </a> ! <a href=# onClick ="popupPage(425,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday&viewall=1","UTF-8")%><%=isWeekView?URLEncoder.encode("&provider_no="+provNum, "UTF-8"):""%>')"><bean:message key="global.calendar"/></a> <% boolean anonymousEnabled = LoggedInInfo.loggedInInfo.get().currentFacility.isEnableAnonymous(); --- 943,952 ---- <tr> <td BGCOLOR="ivory" width="33%"> ! <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day-7):(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=<%=viewall%>"> <img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a> <b><span CLASS=title><% if (isWeekView) { %><bean:message key="provider.appointmentProviderAdminDay.week"/> <%=week%><% } else { %><%=formatDate%><% } %></span></b> ! <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day+7):(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=<%=viewall%>"> <img src="../images/next.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewNextDay"/>" vspace="2"> </a> ! <a href=# onClick ="popupPage(425,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday&viewall="+viewall,"UTF-8")%><%=isWeekView?URLEncoder.encode("&provider_no="+provNum, "UTF-8"):""%>')"><bean:message key="global.calendar"/></a> <% boolean anonymousEnabled = LoggedInInfo.loggedInInfo.get().currentFacility.isEnableAnonymous(); |
|
From: Randy J. <rj...@us...> - 2011-01-19 19:50:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20931 Modified Files: Tag: RELEASE_10_12 appointmentprovideradminday.jsp Log Message: - ID: 3161931 grab viewall from request and set URL for calendar to this value Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.199.2.1 retrieving revision 1.199.2.2 diff -C2 -d -r1.199.2.1 -r1.199.2.2 *** appointmentprovideradminday.jsp 14 Dec 2010 22:56:34 -0000 1.199.2.1 --- appointmentprovideradminday.jsp 19 Jan 2011 19:50:21 -0000 1.199.2.2 *************** *** 655,659 **** } ! String _scheduleDate = strYear+"-"+strMonth+"-"+strDay; --- 655,662 ---- } ! String viewall = request.getParameter("viewall"); ! if( viewall == null ) { ! viewall = "0"; ! } String _scheduleDate = strYear+"-"+strMonth+"-"+strDay; *************** *** 925,934 **** <tr id="ivoryBar"> <td id="dateAndCalendar" BGCOLOR="ivory" width="33%"> ! <a class="redArrow" href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day-7):(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=1"> <img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a> <b><span class="dateAppointment"><% if (isWeekView) { %><bean:message key="provider.appointmentProviderAdminDay.week"/> <%=week%><% } else { %><%=formatDate%><% } %></span></b> ! <a class="redArrow" href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day+7):(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=1"> <img src="../images/next.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewNextDay"/>" vspace="2"> </a> ! <a id="calendarLink" href=# onClick ="popupPage(425,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday&viewall=1","UTF-8")%><%=isWeekView?URLEncoder.encode("&provider_no="+provNum, "UTF-8"):""%>')"><bean:message key="global.calendar"/></a> <% boolean anonymousEnabled = LoggedInInfo.loggedInInfo.get().currentFacility.isEnableAnonymous(); --- 928,937 ---- <tr id="ivoryBar"> <td id="dateAndCalendar" BGCOLOR="ivory" width="33%"> ! <a class="redArrow" href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day-7):(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=<%=viewall%>"> <img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a> <b><span class="dateAppointment"><% if (isWeekView) { %><bean:message key="provider.appointmentProviderAdminDay.week"/> <%=week%><% } else { %><%=formatDate%><% } %></span></b> ! <a class="redArrow" href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day+7):(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=<%=viewall%>"> <img src="../images/next.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewNextDay"/>" vspace="2"> </a> ! <a id="calendarLink" href=# onClick ="popupPage(425,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday&viewall="+viewall,"UTF-8")%><%=isWeekView?URLEncoder.encode("&provider_no="+provNum, "UTF-8"):""%>')"><bean:message key="global.calendar"/></a> <% boolean anonymousEnabled = LoggedInInfo.loggedInInfo.get().currentFacility.isEnableAnonymous(); |
|
From: Randy J. <rj...@us...> - 2011-01-19 19:50:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20405 Modified Files: appointmentprovideradminday.jsp Log Message: - ID: 3161931 grab viewall from request and set URL for calendar to this value Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.204 retrieving revision 1.205 diff -C2 -d -r1.204 -r1.205 *** appointmentprovideradminday.jsp 14 Jan 2011 21:36:51 -0000 1.204 --- appointmentprovideradminday.jsp 19 Jan 2011 19:50:03 -0000 1.205 *************** *** 715,719 **** } ! String _scheduleDate = strYear+"-"+strMonth+"-"+strDay; --- 715,722 ---- } ! String viewall = request.getParameter("viewall"); ! if( viewall == null ) { ! viewall = "0"; ! } String _scheduleDate = strYear+"-"+strMonth+"-"+strDay; *************** *** 987,996 **** <tr id="ivoryBar"> <td id="dateAndCalendar" BGCOLOR="ivory" width="33%"> ! <a class="redArrow" href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day-7):(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=1"> <img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a> <b><span class="dateAppointment"><% if (isWeekView) { %><bean:message key="provider.appointmentProviderAdminDay.week"/> <%=week%><% } else { %><%=formatDate%><% } %></span></b> ! <a class="redArrow" href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day+7):(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=1"> <img src="../images/next.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewNextDay"/>" vspace="2"> </a> ! <a id="calendarLink" href=# onClick ="popupPage(425,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday&viewall=1","UTF-8")%><%=isWeekView?URLEncoder.encode("&provider_no="+provNum, "UTF-8"):""%>')"><bean:message key="global.calendar"/></a> <% boolean anonymousEnabled = LoggedInInfo.loggedInInfo.get().currentFacility.isEnableAnonymous(); --- 990,999 ---- <tr id="ivoryBar"> <td id="dateAndCalendar" BGCOLOR="ivory" width="33%"> ! <a class="redArrow" href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day-7):(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=<%=viewall%>"> <img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a> <b><span class="dateAppointment"><% if (isWeekView) { %><bean:message key="provider.appointmentProviderAdminDay.week"/> <%=week%><% } else { %><%=formatDate%><% } %></span></b> ! <a class="redArrow" href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=isWeekView?(day+7):(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday<%=isWeekView?"&provider_no="+provNum:""%>&viewall=<%=viewall%>"> <img src="../images/next.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewNextDay"/>" vspace="2"> </a> ! <a id="calendarLink" href=# onClick ="popupPage(425,430,'../share/CalendarPopup.jsp?urlfrom=../provider/providercontrol.jsp&year=<%=strYear%>&month=<%=strMonth%>¶m=<%=URLEncoder.encode("&view=0&displaymode=day&dboperation=searchappointmentday&viewall="+viewall,"UTF-8")%><%=isWeekView?URLEncoder.encode("&provider_no="+provNum, "UTF-8"):""%>')"><bean:message key="global.calendar"/></a> <% boolean anonymousEnabled = LoggedInInfo.loggedInInfo.get().currentFacility.isEnableAnonymous(); |
|
From: Jay G. <jay...@us...> - 2011-01-18 21:39:05
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6263 Modified Files: Change_Request_Template.txt Log Message: Simplified Change Request v1.2 Index: Change_Request_Template.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/Change_Request_Template.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Change_Request_Template.txt 18 Jan 2011 20:31:05 -0000 1.1 --- Change_Request_Template.txt 18 Jan 2011 21:38:57 -0000 1.2 *************** *** 1,4 **** ! OSCAR Change Request ! ==================== Change Description (incl. Benefits) --- 1,4 ---- ! OSCAR Change Request v1.2 ! ========================= Change Description (incl. Benefits) *************** *** 7,23 **** - Risk analysis results - --------------------- - - - - Design verification results - --------------------------- - - - - Change Risk Analysis and reporting - ================================== - OSCAR Interaction points ------------------------ --- 7,10 ---- *************** *** 35,41 **** - Design Verification (Testing) Process and reporting - =================================================== - Minimum testing requirements/process ------------------------------------ --- 22,25 ---- *************** *** 43,69 **** - Report structure/content - ------------------------ - - - - OSCAR McMaster Response - ======================= - - Response timing requirements - ---------------------------- - - - - Response format and methodology - ------------------------------- - - - - Training - ======== - Training requirements to support changes ---------------------------------------- --- 27,33 ---- Training requirements to support changes ---------------------------------------- + |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:21:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2613 Added Files: update-2011-01-18.1.sql Log Message: Set legacy data to sane values so consults will display properly --- NEW FILE: update-2011-01-18.1.sql --- update consultationRequests c left outer join professionalSpecialists p on p.specId = c.specId set c.specId = NULL where p.specId is null; update consultationRequests set patientWillBook = false where patientWillBook != true and patientWillBook != false; |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:20:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/config In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1983 Modified Files: EditSpecialists.jsp Log Message: - ID: 3160248 Remove ability to delete specialists as this actually removed record from db. Fix involves change to database table professionalSpecialists Index: EditSpecialists.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/config/EditSpecialists.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EditSpecialists.jsp 15 Nov 2010 03:26:14 -0000 1.7 --- EditSpecialists.jsp 18 Jan 2011 21:19:53 -0000 1.8 *************** *** 78,83 **** <!----Start new rows here--> <tr> ! <td><bean:message ! key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.msgCheckOff" /><br> <bean:message key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.msgClickOn" /><br> --- 78,83 ---- <!----Start new rows here--> <tr> ! <td><%--bean:message ! key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.msgCheckOff" /--%><br> <bean:message key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.msgClickOn" /><br> *************** *** 88,93 **** <tr> <td><html:form action="/oscarEncounter/EditSpecialists"> ! <input type="submit" name="delete" ! value="<bean:message key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.btnDeleteSpecialist"/>"> <div class="ChooseRecipientsBox1"> <table> --- 88,93 ---- <tr> <td><html:form action="/oscarEncounter/EditSpecialists"> ! <%-- input type="submit" name="delete" ! value="<bean:message key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.btnDeleteSpecialist"/>"--%> <div class="ChooseRecipientsBox1"> <table> |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:17:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1719 Modified Files: EctViewRequestAction.java Log Message: - ID: 3160248 fix time calculation between 12 am and 12 pm and format patient address and provider name Index: EctViewRequestAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewRequestAction.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** EctViewRequestAction.java 15 Nov 2010 01:27:31 -0000 1.23 --- EctViewRequestAction.java 18 Jan 2011 21:17:42 -0000 1.24 *************** *** 51,57 **** import java.io.IOException; import java.io.UnsupportedEncodingException; - import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import javax.servlet.ServletException; --- 51,57 ---- import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Date; import java.util.GregorianCalendar; + import java.util.Calendar; import javax.servlet.ServletException; *************** *** 124,127 **** --- 124,128 ---- Integer hr = cal.get(Calendar.HOUR_OF_DAY); hr = hr == 0 ? 12 : hr; + hr = hr > 12 ? hr - 12: hr; thisForm.setAppointmentHour(String.valueOf(hr)); thisForm.setAppointmentMinute(String.valueOf(cal.get(Calendar.MINUTE))); *************** *** 164,168 **** ProviderDao provDao = (ProviderDao)SpringUtils.getBean("providerDao"); ! Provider prov = provDao.getProvider(demo.getProviderNo()); thisForm.setProviderName(prov.getFormattedName()); --- 165,169 ---- ProviderDao provDao = (ProviderDao)SpringUtils.getBean("providerDao"); ! Provider prov = provDao.getProvider(consult.getProviderNo()); thisForm.setProviderName(prov.getFormattedName()); |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:16:44
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1622 Modified Files: EctViewConsultationRequestsUtil.java Log Message: - ID: 3160248 Allow for null providers and specialists Index: EctViewConsultationRequestsUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** EctViewConsultationRequestsUtil.java 30 Nov 2010 17:56:50 -0000 1.21 --- EctViewConsultationRequestsUtil.java 18 Jan 2011 21:16:36 -0000 1.22 *************** *** 96,108 **** Calendar cal = Calendar.getInstance(); Date date1, date2; ! List consultList = consultReqDao.getConsults(team, showCompleted, startDate, endDate, orderby, desc, searchDate); for( int idx = 0; idx < consultList.size(); ++idx ) { consult = (ConsultationRequest)consultList.get(idx); demo = demoDao.getDemographicById(consult.getDemographicId()); - prov = providerDao.getProvider(demo.getProviderNo()); - specialist = specialistDao.find(consult.getSpecialistId()); services = serviceDao.find(consult.getServiceId()); demographicNo.add(consult.getDemographicId().toString()); date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getReferralDate())); --- 96,126 ---- Calendar cal = Calendar.getInstance(); Date date1, date2; ! String providerId, providerName, specialistName; List consultList = consultReqDao.getConsults(team, showCompleted, startDate, endDate, orderby, desc, searchDate); + for( int idx = 0; idx < consultList.size(); ++idx ) { consult = (ConsultationRequest)consultList.get(idx); demo = demoDao.getDemographicById(consult.getDemographicId()); services = serviceDao.find(consult.getServiceId()); + providerId = demo.getProviderNo(); + if( providerId != null && !providerId.equals("")) { + prov = providerDao.getProvider(demo.getProviderNo()); + providerName = prov.getFormattedName(); + providerNo.add(prov.getProviderNo()); + } + else { + providerName = "N/A"; + providerNo.add("-1"); + } + + if( consult.getProfessionalSpecialist() == null ) { + specialistName = "N/A"; + } + else { + specialist = consult.getProfessionalSpecialist(); + specialistName = specialist.getLastName() + ", " + specialist.getFirstName(); + } + demographicNo.add(consult.getDemographicId().toString()); date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getReferralDate())); *************** *** 110,119 **** status.add(consult.getStatus()); patient.add(demo.getFormattedName()); ! provider.add(prov.getFormattedName()); service.add(services.getServiceDesc()); ! vSpecialist.add(specialist.getLastName() + ", " + specialist.getFirstName()); urgency.add(consult.getUrgency()); ! providerNo.add(prov.getProviderNo()); ! siteName.add(consult.getSiteName()); teams.add(consult.getSendTo()); cal.setTime(consult.getAppointmentDate()); --- 128,136 ---- status.add(consult.getStatus()); patient.add(demo.getFormattedName()); ! provider.add(providerName); service.add(services.getServiceDesc()); ! vSpecialist.add(specialistName); urgency.add(consult.getUrgency()); ! siteName.add(consult.getSiteName()); teams.add(consult.getSendTo()); cal.setTime(consult.getAppointmentDate()); *************** *** 161,166 **** Provider prov; Demographic demo; - ProfessionalSpecialist specialist; ConsultationServices services; List consultList = consultReqDao.getConsults(demoNo); --- 178,183 ---- Provider prov; Demographic demo; ConsultationServices services; + String providerId, providerName; List consultList = consultReqDao.getConsults(demoNo); *************** *** 168,173 **** consult = (ConsultationRequest)consultList.get(idx); demo = demoDao.getDemographicById(consult.getDemographicId()); prov = providerDao.getProvider(demo.getProviderNo()); ! specialist = specialistDao.find(consult.getSpecialistId()); services = serviceDao.find(consult.getServiceId()); --- 185,197 ---- consult = (ConsultationRequest)consultList.get(idx); demo = demoDao.getDemographicById(consult.getDemographicId()); + providerId = demo.getProviderNo(); + if( providerId != null && !providerId.equals("")) { prov = providerDao.getProvider(demo.getProviderNo()); ! providerName = prov.getFormattedName(); ! } ! else { ! providerName = "N/A"; ! } ! services = serviceDao.find(consult.getServiceId()); *************** *** 175,183 **** status.add(consult.getStatus()); patient.add(demo.getFormattedName()); ! provider.add(prov.getFormattedName()); service.add(services.getServiceDesc()); urgency.add(consult.getUrgency()); patientWillBook.add(""+consult.isPatientWillBook()); ! date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getAppointmentDate())); } } catch(Exception e) { --- 199,207 ---- status.add(consult.getStatus()); patient.add(demo.getFormattedName()); ! provider.add(providerName); service.add(services.getServiceDesc()); urgency.add(consult.getUrgency()); patientWillBook.add(""+consult.isPatientWillBook()); ! date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getReferralDate())); } } catch(Exception e) { |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:16:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1517 Modified Files: EctConsultationFormRequestAction.java Log Message: - ID: 3160248 Changed logic to persist and merge consults depending on whether a professional specialist is present Index: EctConsultationFormRequestAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** EctConsultationFormRequestAction.java 18 Jan 2011 19:48:26 -0000 1.41 --- EctConsultationFormRequestAction.java 18 Jan 2011 21:15:58 -0000 1.42 *************** *** 111,114 **** --- 111,115 ---- ConsultationRequestDao consultationRequestDao=(ConsultationRequestDao)SpringUtils.getBean("consultationRequestDao"); ConsultationRequestExtDao consultationRequestExtDao=(ConsultationRequestExtDao)SpringUtils.getBean("consultationRequestExtDao"); + ProfessionalSpecialistDao professionalSpecialistDao=(ProfessionalSpecialistDao)SpringUtils.getBean("professionalSpecialistDao"); String[] format = new String[] {"yyyy-MM-dd","yyyy/MM/dd"}; *************** *** 121,130 **** consult.setReferralDate(date); consult.setServiceId(new Integer(frm.getService())); ! consult.setSpecialistId(new Integer(frm.getSpecialist())); ! date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format); ! consult.setAppointmentDate(date); ! date = DateUtils.setHours(date, new Integer(appointmentHour)); ! date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute())); ! consult.setAppointmentTime(date); consult.setReasonForReferral(frm.getReasonForConsultation()); consult.setClinicalInfo(frm.getClinicalInformation()); --- 122,133 ---- consult.setReferralDate(date); consult.setServiceId(new Integer(frm.getService())); ! ! if( frm.getAppointmentYear() != null && !frm.getAppointmentYear().equals("") ) { ! date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format); ! consult.setAppointmentDate(date); ! date = DateUtils.setHours(date, new Integer(appointmentHour)); ! date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute())); ! consult.setAppointmentTime(date); ! } consult.setReasonForReferral(frm.getReasonForConsultation()); consult.setClinicalInfo(frm.getClinicalInformation()); *************** *** 138,143 **** consult.setConcurrentProblems(frm.getConcurrentProblems()); consult.setUrgency(frm.getUrgency()); ! consult.setSiteName(frm.getSiteName()); ! consult.setPatientWillBook(new Boolean(frm.getPatientWillBook())); if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) { date = DateUtils.parseDate(frm.getFollowUpDate(), format); --- 141,151 ---- consult.setConcurrentProblems(frm.getConcurrentProblems()); consult.setUrgency(frm.getUrgency()); ! consult.setSiteName(frm.getSiteName()); ! Boolean pWillBook = false; ! if( frm.getPatientWillBook() != null ) { ! pWillBook = frm.getPatientWillBook().equals("1"); ! } ! consult.setPatientWillBook(pWillBook); ! if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) { date = DateUtils.parseDate(frm.getFollowUpDate(), format); *************** *** 145,150 **** --- 153,166 ---- } + consultationRequestDao.persist(consult); + Integer specId = new Integer(frm.getSpecialist()); + ProfessionalSpecialist professionalSpecialist=professionalSpecialistDao.find(specId); + if( professionalSpecialist != null ) { + consult.setProfessionalSpecialist(professionalSpecialist); + consultationRequestDao.merge(consult); + } + MiscUtils.getLogger().info("saved new consult id "+ consult.getId()); requestId = String.valueOf(consult.getId()); *************** *** 186,200 **** consult.setReferralDate(date); consult.setServiceId(new Integer(frm.getService())); ! consult.setSpecialistId(new Integer(frm.getSpecialist())); ! date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format); ! consult.setAppointmentDate(date); ! date = DateUtils.setHours(date, new Integer(appointmentHour)); ! date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute())); ! consult.setAppointmentTime(date); consult.setReasonForReferral(frm.getReasonForConsultation()); consult.setClinicalInfo(frm.getClinicalInformation()); consult.setCurrentMeds(frm.getCurrentMedications()); consult.setAllergies(frm.getAllergies()); - consult.setProviderNo(frm.getProviderNo()); consult.setDemographicId(new Integer(frm.getDemographicNo())); consult.setStatus(frm.getStatus()); --- 202,220 ---- consult.setReferralDate(date); consult.setServiceId(new Integer(frm.getService())); ! ! Integer specId = new Integer(frm.getSpecialist()); ! ProfessionalSpecialist professionalSpecialist=professionalSpecialistDao.find(specId); ! consult.setProfessionalSpecialist(professionalSpecialist); ! if( frm.getAppointmentYear() != null && !frm.getAppointmentYear().equals("") ) { ! date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format); ! consult.setAppointmentDate(date); ! date = DateUtils.setHours(date, new Integer(appointmentHour)); ! date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute())); ! consult.setAppointmentTime(date); ! } consult.setReasonForReferral(frm.getReasonForConsultation()); consult.setClinicalInfo(frm.getClinicalInformation()); consult.setCurrentMeds(frm.getCurrentMedications()); consult.setAllergies(frm.getAllergies()); consult.setDemographicId(new Integer(frm.getDemographicNo())); consult.setStatus(frm.getStatus()); *************** *** 203,208 **** consult.setConcurrentProblems(frm.getConcurrentProblems()); consult.setUrgency(frm.getUrgency()); ! consult.setSiteName(frm.getSiteName()); ! consult.setPatientWillBook(new Boolean(frm.getPatientWillBook())); if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) { date = DateUtils.parseDate(frm.getFollowUpDate(), format); --- 223,233 ---- consult.setConcurrentProblems(frm.getConcurrentProblems()); consult.setUrgency(frm.getUrgency()); ! consult.setSiteName(frm.getSiteName()); ! Boolean pWillBook = false; ! if( frm.getPatientWillBook() != null ) { ! pWillBook = frm.getPatientWillBook().equals("1"); ! } ! consult.setPatientWillBook(pWillBook); ! if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) { date = DateUtils.parseDate(frm.getFollowUpDate(), format); |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:15:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1460 Modified Files: Demographic.java Log Message: - ID: 3160248 Add provider member so we can left outer join in HQL Index: Demographic.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Demographic.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Demographic.java 3 Jan 2011 23:51:17 -0000 1.21 --- Demographic.java 18 Jan 2011 21:15:20 -0000 1.22 *************** *** 97,100 **** --- 97,102 ---- private String displayName=null; + private Provider provider; + /** * @return the rosterDate *************** *** 970,972 **** --- 972,988 ---- } + /** + * @return the provider + */ + public Provider getProvider() { + return provider; + } + + /** + * @param provider the provider to set + */ + public void setProvider(Provider provider) { + this.provider = provider; + } + } |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:14:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv826 Modified Files: Demographic.hbm.xml Log Message: - ID: 3160248 Left outer join professional specialists and providers as we are not guaranteed they are present Index: Demographic.hbm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Demographic.hbm.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Demographic.hbm.xml 12 Nov 2010 19:06:37 -0000 1.8 --- Demographic.hbm.xml 18 Jan 2011 21:14:25 -0000 1.9 *************** *** 66,69 **** --- 66,73 ---- </set> + <many-to-one name="provider" class="org.oscarehr.common.model.Provider" + column="provider_no" update="false" not-found='ignore' insert="false" + lazy="false" /> + </class> </hibernate-mapping> |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:13:54
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv731 Modified Files: ConsultationRequestDao.java Log Message: - ID: 3160248 Left outer join professional specialists and providers as we are not guaranteed they are present Index: ConsultationRequestDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/ConsultationRequestDao.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ConsultationRequestDao.java 18 Jan 2011 19:48:25 -0000 1.5 --- ConsultationRequestDao.java 18 Jan 2011 21:13:46 -0000 1.6 *************** *** 67,71 **** public List getConsults(String team, boolean showCompleted, Date startDate, Date endDate, String orderby, String desc, String searchDate) { ! StringBuilder sql = new StringBuilder("select cr from ConsultationRequest cr, Demographic d, Provider p, ProfessionalSpecialist specialist, ConsultationServices service where d.DemographicNo = cr.demographicId and p.ProviderNo = d.ProviderNo and specialist.id = cr.specialistId and service.id = cr.serviceId "); if( !showCompleted ) { --- 67,71 ---- public List getConsults(String team, boolean showCompleted, Date startDate, Date endDate, String orderby, String desc, String searchDate) { ! StringBuilder sql = new StringBuilder("select cr from ConsultationRequest cr left outer join cr.professionalSpecialist specialist, ConsultationServices service, Demographic d left outer join d.provider p where d.DemographicNo = cr.demographicId and service.id = cr.serviceId "); if( !showCompleted ) { |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:13:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv624 Modified Files: ConsultationRequest.java Log Message: - ID: 3160248 Added professionalSpecialist member so we can left outer join in HQL, allows null values for professionalSpecialists Index: ConsultationRequest.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/ConsultationRequest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ConsultationRequest.java 30 Nov 2010 08:17:56 -0000 1.4 --- ConsultationRequest.java 18 Jan 2011 21:13:00 -0000 1.5 *************** *** 36,39 **** --- 36,43 ---- import javax.persistence.Temporal; import javax.persistence.TemporalType; + import javax.persistence.JoinColumn; + import javax.persistence.ManyToOne; + import javax.persistence.FetchType; + import javax.persistence.CascadeType; import org.apache.commons.lang.StringUtils; *************** *** 54,59 **** private Integer serviceId; ! @Column(name = "specId") ! private Integer specialistId; @Temporal(TemporalType.DATE) --- 58,64 ---- private Integer serviceId; ! @ManyToOne(fetch=FetchType.EAGER, cascade=CascadeType.ALL) ! @JoinColumn(name="specId") ! private ProfessionalSpecialist professionalSpecialist; @Temporal(TemporalType.DATE) *************** *** 107,118 **** } - public Integer getSpecialistId() { - return specialistId; - } - - public void setSpecialistId(Integer specialistId) { - this.specialistId = specialistId; - } - public Date getAppointmentDate() { return appointmentDate; --- 112,115 ---- *************** *** 248,250 **** --- 245,265 ---- this.followUpDate = followUpDate; } + + /** + * @return the professionalSpecialist + */ + public ProfessionalSpecialist getProfessionalSpecialist() { + return professionalSpecialist; + } + + /** + * @param professionalSpecialist the professionalSpecialist to set + */ + public void setProfessionalSpecialist(ProfessionalSpecialist professionalSpecialist) { + this.professionalSpecialist = professionalSpecialist; + } + + public Integer getSpecialistId() { + return this.professionalSpecialist.getId(); + } } |
|
From: Randy J. <rj...@us...> - 2011-01-18 21:12:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv523 Modified Files: ConsultationFormRequest.jsp Log Message: - ID: 3160248 Restored buttons to top of consult and changed how javascript cycles through specialist objects when populating list box Index: ConsultationFormRequest.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormRequest.jsp,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** ConsultationFormRequest.jsp 18 Jan 2011 19:48:26 -0000 1.73 --- ConsultationFormRequest.jsp 18 Jan 2011 21:12:11 -0000 1.74 *************** *** 262,266 **** <script language="JavaScript" type="text/javascript"> ! var servicesName = new Array(); // used as a cross reference table for name and number var services = new Array(); // the following are used as a 2D table for makes and models var specialists = new Array(); --- 262,266 ---- <script language="JavaScript" type="text/javascript"> ! var servicesName = new Object(); // used as a cross reference table for name and number var services = new Array(); // the following are used as a 2D table for makes and models var specialists = new Array(); *************** *** 281,285 **** function K( serviceNumber, service ){ ! servicesName[service] = new ServicesName(serviceNumber); services[serviceNumber] = new Service( ); } --- 281,286 ---- function K( serviceNumber, service ){ ! //servicesName[service] = new ServicesName(serviceNumber); ! servicesName[service] = serviceNumber; services[serviceNumber] = new Service( ); } *************** *** 500,504 **** var strSer = new String(ser); ! for (aIdx in servicesName){ var serNBR = servicesName[aIdx].serviceNumber; document.EctConsultationFormRequestForm.service.options[ i ] = new Option( aIdx, serNBR ); --- 501,517 ---- var strSer = new String(ser); ! $H(servicesName).each(function(pair){ ! var opt = document.createElement("option"); ! opt.textContent = pair.key; ! opt.value = pair.value; ! if( pair.value == strSer ) { ! opt.selected = true; ! fillSpecialistSelect1( pair.value ); ! } ! $("service").options.add(opt); ! ! }); ! ! /* for (aIdx in servicesName){ var serNBR = servicesName[aIdx].serviceNumber; document.EctConsultationFormRequestForm.service.options[ i ] = new Option( aIdx, serNBR ); *************** *** 514,519 **** } i++; } - } //------------------------------------------------------------------- --- 527,532 ---- } i++; + }*/ } //------------------------------------------------------------------- *************** *** 583,586 **** --- 596,604 ---- button=form.submitAndSendElectronically; if (button!=null) button.disabled=disabled; + + var button=form.updateAndSendElectronicallyTop; + if (button!=null) button.disabled=disabled; + button=form.submitAndSendElectronicallyTop; + if (button!=null) button.disabled=disabled; } *************** *** 638,641 **** --- 656,660 ---- return false; } + $("saved").value = "true"; document.forms[formName].submission.value=submissionVal; document.forms[formName].submit(); *************** *** 875,878 **** --- 894,898 ---- <input type="hidden" name="requestId" value="<%=requestId%>"> <input type="hidden" name="documents" value=""> + <input type="hidden" id="saved" value="false"> <!-- --> <table class="MainTable" id="scrollNumber1" name="encounterTable"> *************** *** 1009,1012 **** --- 1029,1077 ---- <!----Start new rows here--> <tr> + <td class="tite4" colspan=2> + <% + if (request.getAttribute("id") != null) + { + %> + <input name="update" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnUpdate"/>" onclick="return checkForm('Update Consultation Request','EctConsultationFormRequestForm');" /> + <input name="updateAndPrint" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnUpdateAndPrint"/>" onclick="return checkForm('Update Consultation Request And Print Preview','EctConsultationFormRequestForm');" /> + <input name="updateAndSendElectronicallyTop" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnUpdateAndSendElectronicReferral"/>" onclick="return checkForm('Update_esend','EctConsultationFormRequestForm');" /> + <% + if (props.getProperty("faxEnable", "").equalsIgnoreCase("yes")) + { + %> + <input name="updateAndFax" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnUpdateAndFax"/>" onclick="return checkForm('Update And Fax','EctConsultationFormRequestForm');" /> + <% + } + %> + <% + } + else + { + %> + <input name="submitSaveOnly" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmit"/>" onclick="return checkForm('Submit Consultation Request','EctConsultationFormRequestForm'); " /> + <input name="submitAndPrint" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmitAndPrint"/>" onclick="return checkForm('Submit Consultation Request And Print Preview','EctConsultationFormRequestForm'); " /> + <input name="submitAndSendElectronicallyTop" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmitAndSendElectronicReferral"/>" onclick="return checkForm('Submit_esend','EctConsultationFormRequestForm');" /> + <% + if (props.getProperty("faxEnable", "").equalsIgnoreCase("yes")) + { + %> + <input name="submitAndFax" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmitAndFax"/>" onclick="return checkForm('Submit And Fax','EctConsultationFormRequestForm');" /> + <% + } + %> + <% + } + + if (thisForm.iseReferral()) + { + %> + <input type="button" value="Send eResponse" onclick="$('saved').value='true';document.location='<%=thisForm.getOruR01UrlString(request)%>'" /> + <% + } + %> + </td> + </tr> + <tr> <td> *************** *** 1032,1036 **** </td> <td align="right" class="tite1"> ! <html:select property="service" onchange="fillSpecialistSelect(this);"> <!-- <option value="-1">------ <bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formServSelect"/> ------</option> <option/> --- 1097,1101 ---- </td> <td align="right" class="tite1"> ! <html:select styleId="service" property="service" onchange="fillSpecialistSelect(this);"> <!-- <option value="-1">------ <bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formServSelect"/> ------</option> <option/> *************** *** 1502,1506 **** { %> ! <input type="button" value="Send eResponse" onclick="document.location='<%=thisForm.getOruR01UrlString(request)%>'" /> <% } --- 1567,1571 ---- { %> ! <input type="button" value="Send eResponse" onclick="$('saved').value='true';document.location='<%=thisForm.getOruR01UrlString(request)%>'" /> <% } |
|
From: Jay G. <jay...@us...> - 2011-01-18 20:31:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23374 Added Files: Change_Request_Template.txt Log Message: Initial Change Request --- NEW FILE: Change_Request_Template.txt --- OSCAR Change Request ==================== Change Description (incl. Benefits) ----------------------------------- Risk analysis results --------------------- Design verification results --------------------------- Change Risk Analysis and reporting ================================== OSCAR Interaction points ------------------------ Integration risks ----------------- Risk if not incorporated ------------------------ Design Verification (Testing) Process and reporting =================================================== Minimum testing requirements/process ------------------------------------ Report structure/content ------------------------ OSCAR McMaster Response ======================= Response timing requirements ---------------------------- Response format and methodology ------------------------------- Training ======== Training requirements to support changes ---------------------------------------- |
|
From: Marc D. <hex...@us...> - 2011-01-18 19:48:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8099/web/oscarEncounter/oscarConsultationRequest Modified Files: ConsultationFormRequest.jsp Log Message: consulation request adding cc Index: ConsultationFormRequest.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormRequest.jsp,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** ConsultationFormRequest.jsp 30 Nov 2010 08:17:55 -0000 1.72 --- ConsultationFormRequest.jsp 18 Jan 2011 19:48:26 -0000 1.73 *************** *** 142,145 **** --- 142,150 ---- OscarProperties props = OscarProperties.getInstance(); %><head> + <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/> + <script> + var ctx = '<%=request.getContextPath()%>'; + var requestId = '<%=request.getParameter("requestId")%>'; + </script> <script type="text/javascript" src="<%=request.getContextPath()%>/js/global.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/js/jquery.js"></script> *************** *** 157,160 **** --- 162,182 ---- <script type="text/javascript" src="<%=request.getContextPath()%>/share/calendar/calendar-setup.js"></script> + + <script src="<c:out value="${ctx}/js/jquery.js"/>"></script> + <script> + jQuery.noConflict(); + </script> + + + <% + + String customScript = OscarProperties.getInstance().getProperty("cme_js"); + if(customScript != null && customScript.length()>0) { + %> + <script src="<c:out value="${ctx}"/>/js/custom/<%=customScript%>-conreq.js"></script> + <% + } + %> + <title><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.title" /> *************** *** 778,781 **** --- 800,809 ---- } + function addCCName(){ + if (document.EctConsultationFormRequestForm.ext_cc.value.length<=0) + document.EctConsultationFormRequestForm.ext_cc.value=document.EctConsultationFormRequestForm.docName.value; + else document.EctConsultationFormRequestForm.ext_cc.value+="; "+document.EctConsultationFormRequestForm.docName.value; + } + </script> <%=WebUtils.popErrorMessagesAsAlert(session)%> *************** *** 1259,1263 **** </td> </tr> ! <tr> <td class="tite4"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgSendTo" />: --- 1287,1291 ---- </td> </tr> ! <tr id="conReqSendTo"> <td class="tite4"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgSendTo" />: *************** *** 1277,1281 **** </html:select></td> </tr> ! <!--add for special encounter--> <plugin:hideWhenCompExists componentName="specialencounterComp" reverse="true"> --- 1305,1309 ---- </html:select></td> </tr> ! <!--add for special encounter--> <plugin:hideWhenCompExists componentName="specialencounterComp" reverse="true"> *************** *** 1374,1378 **** </td> </tr> ! <tr> <td colspan=2><html:textarea cols="90" rows="3" property="concurrentProblems"> --- 1402,1406 ---- </td> </tr> ! <tr id="trConcurrentProblems"> <td colspan=2><html:textarea cols="90" rows="3" property="concurrentProblems"> *************** *** 1431,1434 **** --- 1459,1465 ---- property="allergies"></html:textarea></td> </tr> + + + <tr> |
|
From: Marc D. <hex...@us...> - 2011-01-18 19:48:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8099/web/eyeform Added Files: conreqcc.jsp Log Message: consulation request adding cc --- NEW FILE: conreqcc.jsp --- <%@page import="org.oscarehr.common.model.ProfessionalSpecialist"%> <tr> <td class="tite4"> CC: <select name="docName" id="docName"> <%java.util.List<ProfessionalSpecialist> dc=(java.util.List<ProfessionalSpecialist>)request.getAttribute("professionalSpecialists"); for (int i=0;i<dc.size();i++){ ProfessionalSpecialist lb=(ProfessionalSpecialist)dc.get(i);%> <option value="<%=lb.getId() %>"><%=lb.getLastName() %>,<%=lb.getFirstName() %></option> <%} %> </select> <input type="button" value="add" onclick="addCCName()"> </td> <td class="tite3"><input style="with:100%" name="ext_cc" value="<%=request.getAttribute("requestCc") %>"></td> </tr> |
|
From: Marc D. <hex...@us...> - 2011-01-18 19:48:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8099/web/js/custom Modified Files: eyeform-cme.js Added Files: eyeform-conreq.js Log Message: consulation request adding cc --- NEW FILE: eyeform-conreq.js --- jQuery(document).ready(function(){ jQuery.ajax({url:ctx+"/eyeform/Eyeform.do?method=getConReqCC&requestId="+requestId,dataType: "html",success: function(data) { jQuery("#conReqSendTo").after(data); }}); }); Index: eyeform-cme.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** eyeform-cme.js 14 Jan 2011 19:37:31 -0000 1.15 --- eyeform-cme.js 18 Jan 2011 19:48:26 -0000 1.16 *************** *** 19,23 **** jQuery("#save_measurements").live('click',function(e){ e.preventDefault(); ! touchColor(); //save all measurements --- 19,23 ---- jQuery("#save_measurements").live('click',function(e){ e.preventDefault(); ! touchColor(); //save all measurements *************** *** 27,31 **** ! if(className == 'examfieldwhite') { if(postData.length > 0) { postData += "&"; --- 27,31 ---- ! if(className == 'examfieldwhite') { if(postData.length > 0) { postData += "&"; *************** *** 48,52 **** postData += data; } ! }); jQuery.ajax({type:'POST',url:ctx+'/oscarEncounter/MeasurementData.do?action=saveValues&demographicNo='+demographicNo,data:postData,success: function(){ //alert('Saved.'); --- 48,52 ---- postData += data; } ! }); jQuery.ajax({type:'POST',url:ctx+'/oscarEncounter/MeasurementData.do?action=saveValues&demographicNo='+demographicNo,data:postData,success: function(){ //alert('Saved.'); |
|
From: Marc D. <hex...@us...> - 2011-01-18 19:48:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8099/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil Modified Files: EctConsultationFormRequestAction.java Log Message: consulation request adding cc Index: EctConsultationFormRequestAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** EctConsultationFormRequestAction.java 30 Nov 2010 08:17:55 -0000 1.40 --- EctConsultationFormRequestAction.java 18 Jan 2011 19:48:26 -0000 1.41 *************** *** 33,36 **** --- 33,37 ---- import java.util.ArrayList; import java.util.Date; + import java.util.Enumeration; import javax.crypto.BadPaddingException; *************** *** 50,53 **** --- 51,55 ---- import org.oscarehr.common.dao.ClinicDAO; import org.oscarehr.common.dao.ConsultationRequestDao; + import org.oscarehr.common.dao.ConsultationRequestExtDao; import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.common.dao.Hl7TextInfoDao; *************** *** 59,62 **** --- 61,65 ---- import org.oscarehr.common.model.Clinic; import org.oscarehr.common.model.ConsultationRequest; + import org.oscarehr.common.model.ConsultationRequestExt; import org.oscarehr.common.model.Demographic; import org.oscarehr.common.model.Hl7TextInfo; *************** *** 107,110 **** --- 110,115 ---- ConsultationRequestDao consultationRequestDao=(ConsultationRequestDao)SpringUtils.getBean("consultationRequestDao"); + ConsultationRequestExtDao consultationRequestExtDao=(ConsultationRequestExtDao)SpringUtils.getBean("consultationRequestExtDao"); + String[] format = new String[] {"yyyy-MM-dd","yyyy/MM/dd"}; *************** *** 143,146 **** --- 148,160 ---- requestId = String.valueOf(consult.getId()); + + Enumeration e = request.getParameterNames(); + while(e.hasMoreElements()) { + String name = (String)e.nextElement(); + if(name.startsWith("ext_")) { + String value = request.getParameter(name); + consultationRequestExtDao.persist(createExtEntry(requestId,name.substring(name.indexOf("_")+1),value)); + } + } // now that we have consultation id we can save any attached docs as well // format of input is D2|L2 for doc and lab *************** *** 196,199 **** --- 210,223 ---- } consultationRequestDao.merge(consult); + + consultationRequestExtDao.clear(Integer.parseInt(requestId)); + Enumeration e = request.getParameterNames(); + while(e.hasMoreElements()) { + String name = (String)e.nextElement(); + if(name.startsWith("ext_")) { + String value = request.getParameter(name); + consultationRequestExtDao.persist(createExtEntry(requestId,name.substring(name.indexOf("_")+1),value)); + } + } } *************** *** 251,255 **** return forward; } ! private void doHl7Send(Integer consultationRequestId) throws InvalidKeyException, SignatureException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidKeySpecException, IOException, HL7Exception, ServletException { --- 275,287 ---- return forward; } ! ! private ConsultationRequestExt createExtEntry(String requestId, String name,String value) { ! ConsultationRequestExt obj = new ConsultationRequestExt(); ! obj.setDateCreated(new Date()); ! obj.setKey(name); ! obj.setValue(value); ! obj.setRequestId(Integer.parseInt(requestId)); ! return obj; ! } private void doHl7Send(Integer consultationRequestId) throws InvalidKeyException, SignatureException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidKeySpecException, IOException, HL7Exception, ServletException { |
|
From: Marc D. <hex...@us...> - 2011-01-18 19:48:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8099/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Added Files: EyeformAction.java Log Message: consulation request adding cc --- NEW FILE: EyeformAction.java --- package org.oscarehr.eyeform.web; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.DispatchAction; import org.oscarehr.common.dao.ConsultationRequestExtDao; import org.oscarehr.common.dao.ProfessionalSpecialistDao; import org.oscarehr.common.model.ProfessionalSpecialist; import org.oscarehr.util.SpringUtils; public class EyeformAction extends DispatchAction { public ActionForward getConReqCC(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { String requestId = request.getParameter("requestId"); ConsultationRequestExtDao dao = (ConsultationRequestExtDao)SpringUtils.getBean("consultationRequestExtDao"); String cc = ""; if(requestId != null) { try { int reqId = Integer.parseInt(requestId); String value = dao.getConsultationRequestExtsByKey(reqId,"cc"); if(value!=null) cc = value; } catch(NumberFormatException e){} } request.setAttribute("requestCc", cc); ProfessionalSpecialistDao professionalSpecialistDao=(ProfessionalSpecialistDao)SpringUtils.getBean("professionalSpecialistDao"); List<ProfessionalSpecialist> psList = professionalSpecialistDao.findAll(); request.setAttribute("professionalSpecialists",psList); return mapping.findForward("conreqcc"); } } |
|
From: Marc D. <hex...@us...> - 2011-01-18 19:48:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8099/web/WEB-INF/classes/src/org/oscarehr/common/dao Modified Files: ConsultationRequestDao.java Added Files: ConsultationRequestExtDao.java Log Message: consulation request adding cc Index: ConsultationRequestDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/ConsultationRequestDao.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ConsultationRequestDao.java 29 Nov 2010 17:20:23 -0000 1.4 --- ConsultationRequestDao.java 18 Jan 2011 19:48:25 -0000 1.5 *************** *** 32,35 **** --- 32,36 ---- import org.apache.commons.lang.time.DateFormatUtils; import org.oscarehr.common.model.ConsultationRequest; + import org.oscarehr.common.model.ConsultationRequestExt; import org.springframework.stereotype.Repository; *************** *** 120,123 **** return query.getResultList(); ! } } --- 121,125 ---- return query.getResultList(); ! } ! } --- NEW FILE: ConsultationRequestExtDao.java --- package org.oscarehr.common.dao; import java.util.List; import javax.persistence.Query; import org.oscarehr.common.model.ConsultationRequestExt; import org.springframework.stereotype.Repository; @Repository public class ConsultationRequestExtDao extends AbstractDao<ConsultationRequestExt> { public ConsultationRequestExtDao() { super(ConsultationRequestExt.class); } public List<ConsultationRequestExt> getConsultationRequestExts(int requestId) { Query query = entityManager.createQuery("select cre from ConsultationRequestExt cre where cre.requestId=?1"); query.setParameter(1, new Integer(requestId)); return query.getResultList(); } public String getConsultationRequestExtsByKey(int requestId,String key) { Query query = entityManager.createQuery("select cre.value from ConsultationRequestExt cre where cre.requestId=?1 and cre.key=?2"); query.setParameter(1, new Integer(requestId)); query.setParameter(2, key); List<String> results = query.getResultList(); if(results.size()>0) return results.get(0); return null; } public void clear(int requestId) { Query query = entityManager.createQuery("delete from ConsultationRequestExt cre where cre.requestId = ?1"); query.setParameter(1, new Integer(requestId)); query.executeUpdate(); } } |
|
From: Marc D. <hex...@us...> - 2011-01-18 19:48:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8099/web/WEB-INF Modified Files: struts-config.xml Log Message: consulation request adding cc Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.367 retrieving revision 1.368 diff -C2 -d -r1.367 -r1.368 *** struts-config.xml 17 Jan 2011 20:38:22 -0000 1.367 --- struts-config.xml 18 Jan 2011 19:48:25 -0000 1.368 *************** *** 479,483 **** <form-property name="data" type="org.oscarehr.eyeform.model.TestBookRecord" /> </form-bean> ! <form-bean name="followUpForm2" type="org.apache.struts.validator.DynaValidatorForm"> <form-property name="followup" type="org.oscarehr.eyeform.model.FollowUp" /> --- 479,483 ---- <form-property name="data" type="org.oscarehr.eyeform.model.TestBookRecord" /> </form-bean> ! <form-bean name="followUpForm2" type="org.apache.struts.validator.DynaValidatorForm"> <form-property name="followup" type="org.oscarehr.eyeform.model.FollowUp" /> *************** *** 1991,1994 **** --- 1991,1998 ---- <forward name="success" path="/eyeform/success.jsp" /> </action> + + <action path="/eyeform/Eyeform" type="org.oscarehr.eyeform.web.EyeformAction" parameter="method" scope="request" validate="false" input="/eyeform/followup.jsp" name="followUpForm2"> + <forward name="conreqcc" path="/eyeform/conreqcc.jsp" /> + </action> <action path="/casemgmt/ExtPrintRegistry" type="org.oscarehr.casemgmt.web.ExtPrintRegistryAction" parameter="method" scope="request"> |
