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: jai <yg...@us...> - 2010-11-29 20:20:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3351 Modified Files: setShowPatientDOB.jsp Log Message: - ID: 3122337 -remove violation Index: setShowPatientDOB.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/setShowPatientDOB.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** setShowPatientDOB.jsp 26 Nov 2010 21:40:53 -0000 1.2 --- setShowPatientDOB.jsp 29 Nov 2010 20:20:06 -0000 1.3 *************** *** 23,31 **** * Ontario, Canada */ ! --> ! ! <%@page contentType="text/html"%> ! <%@page pageEncoding="UTF-8"%> ! <%@ include file="/casemgmt/taglibs.jsp"%> <%@page import="java.util.*" %> <% --- 23,27 ---- * Ontario, Canada */ ! --><%@ include file="/casemgmt/taglibs.jsp"%> <%@page import="java.util.*" %> <% *************** *** 44,48 **** <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script> <html:base /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><bean-el:message key="${providertitle}" /></title> --- 40,43 ---- |
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-serv1698/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: FollowUpAction.java NoteAddonAction.java ProcedureBookAction.java TestBookAction.java Log Message: switched to direct log4j Index: NoteAddonAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** NoteAddonAction.java 29 Nov 2010 19:50:30 -0000 1.8 --- NoteAddonAction.java 29 Nov 2010 20:11:18 -0000 1.9 *************** *** 8,13 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 8,12 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 28,32 **** public class NoteAddonAction extends DispatchAction { ! static Log logger = LogFactory.getLog(NoteAddonAction.class); private static ProviderDao providerDao = (ProviderDao) SpringUtils.getBean("providerDao"); --- 27,32 ---- public class NoteAddonAction extends DispatchAction { ! static Logger logger = Logger.getLogger(NoteAddonAction.class); ! private static ProviderDao providerDao = (ProviderDao) SpringUtils.getBean("providerDao"); Index: ProcedureBookAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/ProcedureBookAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ProcedureBookAction.java 29 Nov 2010 19:50:30 -0000 1.3 --- ProcedureBookAction.java 29 Nov 2010 20:11:18 -0000 1.4 *************** *** 7,12 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 7,11 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 21,25 **** public class ProcedureBookAction extends DispatchAction { ! static Log logger = LogFactory.getLog(ProcedureBookAction.class); public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { --- 20,24 ---- public class ProcedureBookAction extends DispatchAction { ! static Logger logger = Logger.getLogger(ProcedureBookAction.class); public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { Index: TestBookAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/TestBookAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestBookAction.java 29 Nov 2010 19:50:30 -0000 1.3 --- TestBookAction.java 29 Nov 2010 20:11:18 -0000 1.4 *************** *** 7,12 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 7,11 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 21,25 **** public class TestBookAction extends DispatchAction { ! static Log logger = LogFactory.getLog(TestBookAction.class); public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { --- 20,24 ---- public class TestBookAction extends DispatchAction { ! static Logger logger = Logger.getLogger(TestBookAction.class); public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { Index: FollowUpAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/FollowUpAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FollowUpAction.java 29 Nov 2010 19:50:30 -0000 1.4 --- FollowUpAction.java 29 Nov 2010 20:11:18 -0000 1.5 *************** *** 7,12 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 7,11 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 22,26 **** public class FollowUpAction extends DispatchAction { ! static Log logger = LogFactory.getLog(FollowUpAction.class); public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { --- 21,25 ---- public class FollowUpAction extends DispatchAction { ! static Logger logger = Logger.getLogger(FollowUpAction.class); public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { |
|
From: Randy J. <rj...@us...> - 2010-11-29 20:07:01
|
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-serv366 Modified Files: EctConsultationFormRequestAction.java Log Message: - ID: 3108150 Fixed setting appointment time to 12:00pm versus 12:00am Index: EctConsultationFormRequestAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** EctConsultationFormRequestAction.java 29 Nov 2010 18:58:29 -0000 1.38 --- EctConsultationFormRequestAction.java 29 Nov 2010 20:06:53 -0000 1.39 *************** *** 95,99 **** appointmentHour = Integer.toString(Integer.parseInt(appointmentHour) + 12); } ! else if( appointmentHour.equals("12") ) { appointmentHour = "0"; } --- 95,99 ---- appointmentHour = Integer.toString(Integer.parseInt(appointmentHour) + 12); } ! else if( appointmentHour.equals("12") && appointmentPm.equals("AM") ) { appointmentHour = "0"; } |
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-serv29218/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: FollowUpAction.java NoteAddonAction.java ProcedureBookAction.java TestBookAction.java Log Message: fixed violations Index: NoteAddonAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NoteAddonAction.java 29 Nov 2010 19:02:34 -0000 1.7 --- NoteAddonAction.java 29 Nov 2010 19:50:30 -0000 1.8 *************** *** 8,11 **** --- 8,13 ---- import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 14,18 **** import org.oscarehr.PMmodule.dao.ProviderDao; import org.oscarehr.common.dao.DemographicDao; - import org.oscarehr.common.model.Provider; import org.oscarehr.eyeform.dao.EyeFormDao; import org.oscarehr.eyeform.dao.FollowUpDao; --- 16,19 ---- *************** *** 27,30 **** --- 28,32 ---- public class NoteAddonAction extends DispatchAction { + static Log logger = LogFactory.getLog(NoteAddonAction.class); private static ProviderDao providerDao = (ProviderDao) SpringUtils.getBean("providerDao"); *************** *** 130,134 **** try { response.getWriter().print(sb.toString()); ! }catch(IOException e) {e.printStackTrace();} return null; } --- 132,136 ---- try { response.getWriter().print(sb.toString()); ! }catch(IOException e) {logger.error(e);} return null; } Index: ProcedureBookAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/ProcedureBookAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProcedureBookAction.java 29 Nov 2010 19:02:34 -0000 1.2 --- ProcedureBookAction.java 29 Nov 2010 19:50:30 -0000 1.3 *************** *** 7,10 **** --- 7,12 ---- import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 12,18 **** import org.apache.struts.actions.DispatchAction; import org.apache.struts.validator.DynaValidatorForm; - import org.oscarehr.common.model.Provider; import org.oscarehr.eyeform.dao.ProcedureBookDao; - import org.oscarehr.eyeform.model.FollowUp; import org.oscarehr.eyeform.model.ProcedureBook; import org.oscarehr.util.LoggedInInfo; --- 14,18 ---- *************** *** 21,24 **** --- 21,26 ---- public class ProcedureBookAction extends DispatchAction { + static Log logger = LogFactory.getLog(ProcedureBookAction.class); + public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { return form(mapping, form, request, response); *************** *** 71,75 **** try { response.getWriter().print(sb.toString()); ! }catch(IOException e) {e.printStackTrace();} return null; --- 73,77 ---- try { response.getWriter().print(sb.toString()); ! }catch(IOException e) {logger.error(e);} return null; Index: TestBookAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/TestBookAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestBookAction.java 29 Nov 2010 19:02:34 -0000 1.2 --- TestBookAction.java 29 Nov 2010 19:50:30 -0000 1.3 *************** *** 7,10 **** --- 7,12 ---- import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 12,18 **** import org.apache.struts.actions.DispatchAction; import org.apache.struts.validator.DynaValidatorForm; - import org.oscarehr.eyeform.dao.ProcedureBookDao; import org.oscarehr.eyeform.dao.TestBookRecordDao; - import org.oscarehr.eyeform.model.ProcedureBook; import org.oscarehr.eyeform.model.TestBookRecord; import org.oscarehr.util.LoggedInInfo; --- 14,18 ---- *************** *** 21,24 **** --- 21,26 ---- public class TestBookAction extends DispatchAction { + static Log logger = LogFactory.getLog(TestBookAction.class); + public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { return form(mapping, form, request, response); *************** *** 71,75 **** try { response.getWriter().print(sb.toString()); ! }catch(IOException e) {e.printStackTrace();} return null; --- 73,77 ---- try { response.getWriter().print(sb.toString()); ! }catch(IOException e) {logger.error(e);} return null; Index: FollowUpAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/FollowUpAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FollowUpAction.java 29 Nov 2010 19:02:34 -0000 1.3 --- FollowUpAction.java 29 Nov 2010 19:50:30 -0000 1.4 *************** *** 7,10 **** --- 7,12 ---- import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 20,23 **** --- 22,27 ---- public class FollowUpAction extends DispatchAction { + static Log logger = LogFactory.getLog(FollowUpAction.class); + public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { return form(mapping, form, request, response); *************** *** 81,85 **** try { response.getWriter().print(sb.toString()); ! }catch(IOException e) {e.printStackTrace();} return null; } --- 85,89 ---- try { response.getWriter().print(sb.toString()); ! }catch(IOException e) {logger.error(e);} return null; } |
|
From: Randy J. <rj...@us...> - 2010-11-29 19:42:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27524 Modified Files: ConsultationFormRequest.jsp Log Message: Fixed spelling mistake in language key Index: ConsultationFormRequest.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormRequest.jsp,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** ConsultationFormRequest.jsp 29 Nov 2010 18:56:33 -0000 1.70 --- ConsultationFormRequest.jsp 29 Nov 2010 19:42:16 -0000 1.71 *************** *** 1001,1005 **** <tr> <td class="tite4"> ! <bean:message key="ooscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formInstructions" /> </td> <td align="right" class="tite2"> --- 1001,1005 ---- <tr> <td class="tite4"> ! <bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formInstructions" /> </td> <td align="right" class="tite2"> |
|
From: Randy J. <rj...@us...> - 2010-11-29 19:14:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21209 Modified Files: Tag: RELEASE_10_06 FluReport.java Log Message: - ID: 3122624 Removed ineligible logic from Flu Report as it is not rerlevant to OHIP billing Index: FluReport.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/FluReport.java,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -d -r1.9.2.1 -r1.9.2.2 *** FluReport.java 27 Sep 2010 15:48:22 -0000 1.9.2.1 --- FluReport.java 29 Nov 2010 19:13:54 -0000 1.9.2.2 *************** *** 95,106 **** prd.numMonths = "------"; prd.color = "grey"; ! inList++; ! }else if(ineligible(prevs)){ ! prd.rank = 5; ! prd.lastDate = "------"; ! prd.state = "Ineligible"; ! prd.numMonths = "------"; ! prd.color = "grey"; ! inList++; }else if (noFutureItems.size() == 0){// no info prd.rank = 1; --- 95,99 ---- prd.numMonths = "------"; prd.color = "grey"; ! inList++; }else if (noFutureItems.size() == 0){// no info prd.rank = 1; *************** *** 116,122 **** ! if ( h.get("refused") != null && ((String) h.get("refused")).equals("1")){ ! refused = true; ! } String prevDateStr = (String) h.get("prevention_date"); --- 109,115 ---- ! // if ( h.get("refused") != null && ((String) h.get("refused")).equals("1")){ ! // refused = true; ! // } String prevDateStr = (String) h.get("prevention_date"); *************** *** 293,297 **** bonusEl.setTime(asofDate); int year = bonusEl.get(Calendar.YEAR); ! Calendar cal = new GregorianCalendar(year, Calendar.JANUARY, 1); cal.add(Calendar.YEAR,-65); Date cutoff = cal.getTime(); --- 286,290 ---- bonusEl.setTime(asofDate); int year = bonusEl.get(Calendar.YEAR); ! Calendar cal = new GregorianCalendar(year, Calendar.DECEMBER, 31); cal.add(Calendar.YEAR,-65); Date cutoff = cal.getTime(); |
|
From: Randy J. <rj...@us...> - 2010-11-29 19:13:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21107 Modified Files: FluReport.java Log Message: - ID: 3122624 Removed ineligible logic from Flu Report as it is not rerlevant to OHIP billing Index: FluReport.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/FluReport.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FluReport.java 15 Nov 2010 01:27:32 -0000 1.12 --- FluReport.java 29 Nov 2010 19:13:25 -0000 1.13 *************** *** 95,106 **** prd.numMonths = "------"; prd.color = "grey"; ! inList++; ! }else if(ineligible(prevs)){ ! prd.rank = 5; ! prd.lastDate = "------"; ! prd.state = "Ineligible"; ! prd.numMonths = "------"; ! prd.color = "grey"; ! inList++; }else if (noFutureItems.size() == 0){// no info prd.rank = 1; --- 95,99 ---- prd.numMonths = "------"; prd.color = "grey"; ! inList++; }else if (noFutureItems.size() == 0){// no info prd.rank = 1; *************** *** 116,122 **** ! if ( h.get("refused") != null && ((String) h.get("refused")).equals("1")){ ! refused = true; ! } String prevDateStr = (String) h.get("prevention_date"); --- 109,115 ---- ! // if ( h.get("refused") != null && ((String) h.get("refused")).equals("1")){ ! // refused = true; ! // } String prevDateStr = (String) h.get("prevention_date"); *************** *** 293,297 **** bonusEl.setTime(asofDate); int year = bonusEl.get(Calendar.YEAR); ! Calendar cal = new GregorianCalendar(year, Calendar.JANUARY, 1); cal.add(Calendar.YEAR,-65); Date cutoff = cal.getTime(); --- 286,290 ---- bonusEl.setTime(asofDate); int year = bonusEl.get(Calendar.YEAR); ! Calendar cal = new GregorianCalendar(year, Calendar.DECEMBER, 31); cal.add(Calendar.YEAR,-65); Date cutoff = cal.getTime(); |
|
From: Marc D. <hex...@us...> - 2010-11-29 19:02:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/js/custom Modified Files: eyeform-cme.js Log Message: eyeform bug fixes Index: eyeform-cme.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** eyeform-cme.js 15 Nov 2010 05:19:29 -0000 1.3 --- eyeform-cme.js 29 Nov 2010 19:02:35 -0000 1.4 *************** *** 14,35 **** //link save button ! jQuery("#save_measurements").live('click',function(e){ e.preventDefault(); touchColor(); //save all measurements ! var postData = ""; ! jQuery("input[measurement]").each(function() { ! if(postData.length > 0) { ! postData += "&"; } - var name = jQuery(this).attr("measurement"); - var value = jQuery(this).val(); - var data = name + "=" + value; - postData += data; }); jQuery.ajax({type:'POST',url:ctx+'/oscarEncounter/MeasurementData.do?action=saveValues&demographicNo='+demographicNo,data:postData,success: function(){ ! alert('test'); }}); }); --- 14,38 ---- //link save button ! jQuery("#save_measurements").live('click',function(e){ e.preventDefault(); touchColor(); //save all measurements ! var postData = ""; ! jQuery("input[measurement]").each(function() { ! var className = jQuery(this).attr("class"); ! if(className == 'examfieldwhite') { ! if(postData.length > 0) { ! postData += "&"; ! } ! var name = jQuery(this).attr("measurement"); ! var value = jQuery(this).val(); ! var data = name + "=" + value; ! 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...> - 2010-11-29 19:02:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/js Modified Files: newCaseManagementView.js.jsp Log Message: eyeform bug fixes Index: newCaseManagementView.js.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/newCaseManagementView.js.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** newCaseManagementView.js.jsp 1 Oct 2010 14:10:52 -0000 1.3 --- newCaseManagementView.js.jsp 29 Nov 2010 19:02:35 -0000 1.4 *************** *** 485,489 **** var editElem = "showEditNote"; var pgHeight = pageHeight(); ! var coords = Position.page($("topContent")); var top = coords[1]; var right = Math.round(coords[0]/0.66); --- 485,497 ---- var editElem = "showEditNote"; var pgHeight = pageHeight(); ! ! var coords = null; ! if(document.getElementById("measurements_div") == null) { ! coords = Position.page($("topContent")); ! } else { ! coords = Position.page($("measurements_div")); ! } ! ! // var coords = Position.page($("topContent")); var top = coords[1]; var right = Math.round(coords[0]/0.66); |
|
From: Marc D. <hex...@us...> - 2010-11-29 19:02:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/eyeform Modified Files: current_note.jsp exam.jsp followup.jsp Log Message: eyeform bug fixes Index: current_note.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/current_note.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** current_note.jsp 15 Nov 2010 05:19:28 -0000 1.3 --- current_note.jsp 29 Nov 2010 19:02:35 -0000 1.4 *************** *** 41,52 **** //alert("save function called for eyeform - " + savedNoteId); //do the ajax call to save form values ! jQuery.ajax({ ! type: 'POST', ! url: ctx+'/eyeform/NoteData.do?method=save', ! data: jQuery("form[name='caseManagementEntryForm']").serialize(), ! success: function (){}, ! dataType: 'html' ! }); ! } --- 41,66 ---- //alert("save function called for eyeform - " + savedNoteId); //do the ajax call to save form values ! saveFlags(); ! ! var notetext = ''; ! //get consults/procedures/tests/checkboxes to generate text ! jQuery.ajax({ url: ctx+"/eyeform/FollowUp.do?method=getNoteText&appointmentNo="+<%=aptNo%>, async:false, success: function(data){ ! notetext += data; ! if(data.length>0) {notetext+='\n';} ! }}); ! jQuery.ajax({ url: ctx+"/eyeform/ProcedureBook.do?method=getNoteText&appointmentNo="+<%=aptNo%>, async:false, success: function(data){ ! notetext += data; ! if(data.length>0) {notetext+='\n';} ! }}); ! jQuery.ajax({ url: ctx+"/eyeform/TestBook.do?method=getNoteText&appointmentNo="+<%=aptNo%>, async:false, success: function(data){ ! notetext += data; ! if(data.length>0) {notetext+='\n';} ! }}); ! jQuery.ajax({ url: ctx+"/eyeform/NoteData.do?method=getNoteText&appointmentNo="+<%=aptNo%>, async:false, success: function(data){ ! notetext += data; ! if(data.length>0) {notetext+='\n';} ! }}); ! ! alert(notetext); } *************** *** 54,66 **** function saveNoteAndSendTickler() { //alert("save function called for eyeform - " + savedNoteId); ! //do the ajax call to save form values - jQuery.ajax({ - type: 'POST', - url: ctx+'/eyeform/NoteData.do?method=save', - data: jQuery("form[name='caseManagementEntryForm']").serialize(), - success: function (){alert('saved');}, - dataType: 'html' - }); --- 68,74 ---- function saveNoteAndSendTickler() { //alert("save function called for eyeform - " + savedNoteId); ! //do the ajax call to save form values ! saveFlags(); *************** *** 76,80 **** jQuery.ajax({ type: 'GET', ! url: ctx+'/eyeform/NoteData.do?method=saveFlags&ack1_checked=' + ack1El.checked + '&ack2_checked=' + ack2El.checked + '&ack3_checked=' + ack3El.checked + '&appointmentNo=' + <%=aptNo%> , success: function (){}, dataType: 'html' --- 84,88 ---- jQuery.ajax({ type: 'GET', ! url: ctx+'/eyeform/NoteData.do?method=save&ack1_checked=' + ack1El.checked + '&ack2_checked=' + ack2El.checked + '&ack3_checked=' + ack3El.checked + '&appointmentNo=' + <%=aptNo%> , success: function (){}, dataType: 'html' *************** *** 102,106 **** <span> </span> ! <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/FollowUp.do?method=form&followup.demographicNo=<%=demographicNo %>&noteId=<%=noteId%>&followup.appointmentNo=<%=aptNo%>','eyeFollowUp');">[arrange follow up/consult]</a> </div> --- 110,114 ---- <span> </span> ! <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/FollowUp.do?method=form&followup.demographicNo=<%=demographicNo %>&noteId=<%=noteId%>&followup.appointmentNo=<%=aptNo%>','eyeFollowUp');">[arrange]</a> </div> *************** *** 229,242 **** <tr><td> </td></tr> ! <tr> <td> ! <input type="checkbox" style="width: 10%;" value="checked" id="ack1" onchange="setDischarge()" /> ! Discharge ! <br> ! <input type="checkbox" style="width: 10%;" id="ack2" value="checked" onchange="setStat();" /> STAT/PRN <br> ! <input type="checkbox" style="width: 10%;" value="checked" id="ack3" onchange="setOpt();" /> optom routine </td> --- 237,267 ---- <tr><td> </td></tr> ! <% ! org.oscarehr.eyeform.model.EyeForm eyeform = (org.oscarehr.eyeform.model.EyeForm)request.getAttribute("eyeform"); ! String a1c = (eyeform!=null&&eyeform.getDischarge()!=null&&eyeform.getDischarge().equals("true"))?"checked":""; ! String a2c = (eyeform!=null&&eyeform.getStat() != null&&eyeform.getStat().equals("true"))?"checked":""; ! String a3c = (eyeform!=null&&eyeform.getOpt() != null&&eyeform.getOpt().equals("true"))?"checked":""; ! %> <tr> <td> ! <%if(a1c.equals("checked")) { %> ! <input type="checkbox" style="width: 10%;" value="true" id="ack1" onchange="setDischarge()" checked="checked"/> ! <%} else { %> ! <input type="checkbox" style="width: 10%;" value="true" id="ack1" onchange="setDischarge()" /> ! <% } %> ! Discharge ! <br> ! <%if(a2c.equals("checked")) { %> ! <input type="checkbox" style="width: 10%;" id="ack2" value="true" onchange="setStat();" checked="checked"/> ! <% } else { %> ! <input type="checkbox" style="width: 10%;" id="ack2" value="true" onchange="setStat();"/> ! <% } %> STAT/PRN <br> ! <%if(a3c.equals("checked")) { %> ! <input type="checkbox" style="width: 10%;" value="true" id="ack3" onchange="setOpt();" checked="checked" /> ! <%} else { %> ! <input type="checkbox" style="width: 10%;" value="true" id="ack3" onchange="setOpt();" /> ! <% } %> optom routine </td> *************** *** 285,289 **** <tr> <td nowrap="nowrap" width="40%"> ! <input tabindex="251" value="Generate Note" onclick="AjaxSubmitAction('sendEyeNoTickler');return false;" id="stickler0" style="color: black;" type="submit"> </td> </tr> --- 310,314 ---- <tr> <td nowrap="nowrap" width="40%"> ! <input tabindex="251" value="Generate Note" onclick="saveEyeformNote();return false;" id="stickler0" style="color: black;" type="button"> </td> </tr> Index: exam.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/exam.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** exam.jsp 4 Nov 2010 06:25:16 -0000 1.2 --- exam.jsp 29 Nov 2010 19:02:35 -0000 1.3 *************** *** 12,16 **** //if have value under slidy block set the color to brown function touchColor() { ! var divs = getElementsByClassName(document, "div", "slidey"); for (var i=0; i<divs.length; i++) { var inputs = divs[i].getElementsByTagName("INPUT"); --- 12,16 ---- //if have value under slidy block set the color to brown function touchColor() { ! var divs = document.getElementsByClassName(document, "div", "slidey"); for (var i=0; i<divs.length; i++) { var inputs = divs[i].getElementsByTagName("INPUT"); *************** *** 59,63 **** function setfieldvalue(name,value) { jQuery("input[measurement='"+name+"']").each(function() { ! jQuery(this).val(value); }); } --- 59,64 ---- function setfieldvalue(name,value) { jQuery("input[measurement='"+name+"']").each(function() { ! jQuery(this).val(value); ! whiteField(this); }); } *************** *** 266,278 **** </tr> <tr> ! <td><input type="text" tabindex="32" class="examfieldgrey" size="10" measurement="od_ar_sph" onfocus="whiteField(this);"/></td> ! <td><input type="text" tabindex="33" class="examfieldgrey" size="10" measurement="od_ar_cyl" onfocus="whiteField(this);"/></td> ! <td><input type="text" tabindex="34" class="examfieldgrey" size="10" measurement="od_ar_axis" onfocus="whiteField(this);"/></td> <td >AR</td> ! <td ><input type="text" tabindex="35" class="examfieldgrey" size="10" measurement="os_ar_sph" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="36" class="examfieldgrey" size="10" measurement="os_ar_cyl" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="37" class="examfieldgrey" size="10" measurement="os_ar_axis" onfocus="whiteField(this);"/></td> </tr> --- 267,279 ---- </tr> <tr> ! <td><input type="text" tabindex="32" class="examfieldgrey" size="6" measurement="od_ar_sph" onfocus="whiteField(this);"/></td> ! <td><input type="text" tabindex="33" class="examfieldgrey" size="6" measurement="od_ar_cyl" onfocus="whiteField(this);"/></td> ! <td><input type="text" tabindex="34" class="examfieldgrey" size="6" measurement="od_ar_axis" onfocus="whiteField(this);"/></td> <td >AR</td> ! <td ><input type="text" tabindex="35" class="examfieldgrey" size="6" measurement="os_ar_sph" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="36" class="examfieldgrey" size="6" measurement="os_ar_cyl" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="37" class="examfieldgrey" size="6" measurement="os_ar_axis" onfocus="whiteField(this);"/></td> </tr> *************** *** 287,299 **** </tr> <tr> ! <td ><input type="text" tabindex="38" class="examfieldgrey" size="10" measurement="od_k1" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="39" class="examfieldgrey" size="10" measurement="od_k2" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="40" class="examfieldgrey" size="10" measurement="od_k2_axis" onfocus="whiteField(this);"/></td> <td >K</td> ! <td ><input type="text" tabindex="41" class="examfieldgrey" size="10" measurement="os_k1" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="42" class="examfieldgrey" size="10" measurement="os_k2" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="43" class="examfieldgrey" size="10" measurement="os_k2_axis" onfocus="whiteField(this);"/></td> </tr> --- 288,300 ---- </tr> <tr> ! <td ><input type="text" tabindex="38" class="examfieldgrey" size="6" measurement="od_k1" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="39" class="examfieldgrey" size="6" measurement="od_k2" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="40" class="examfieldgrey" size="6" measurement="od_k2_axis" onfocus="whiteField(this);"/></td> <td >K</td> ! <td ><input type="text" tabindex="41" class="examfieldgrey" size="6" measurement="os_k1" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="42" class="examfieldgrey" size="6" measurement="os_k2" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="43" class="examfieldgrey" size="6" measurement="os_k2_axis" onfocus="whiteField(this);"/></td> </tr> *************** *** 308,328 **** </tr> <tr> ! <td ><input type="text" tabindex="44" class="examfieldgrey" size="10" measurement="od_sc_distance" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="45" class="examfieldgrey" size="10" measurement="od_cc_distance" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="46" class="examfieldgrey" size="10" measurement="od_ph_distance" onfocus="whiteField(this);"/></td> <td >Distance</td> ! <td ><input type="text" tabindex="47" class="examfieldgrey" size="10" measurement="os_sc_distance" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="48" class="examfieldgrey" size="10" measurement="os_cc_distance" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="49" class="examfieldgrey" size="10" measurement="os_ph_distance" onfocus="whiteField(this);"/></td> </tr> <tr> ! <td><input type="text" tabindex="50" class="examfieldgrey" size="10" measurement="od_sc_near" onfocus="whiteField(this);"/></td> ! <td><input type="text" tabindex="51" class="examfieldgrey" size="10" measurement="od_cc_near" onfocus="whiteField(this);"/></td> <td></td> <td>Near</td> ! <td><input type="text" tabindex="52" class="examfieldgrey" size="10" measurement="os_sc_near" onfocus="whiteField(this);"/></td> ! <td><input type="text" tabindex="53" class="examfieldgrey" size="10" measurement="os_cc_near" onfocus="whiteField(this);"/></td> <td></td> </tr> --- 309,329 ---- </tr> <tr> ! <td ><input type="text" tabindex="44" class="examfieldgrey" size="6" measurement="od_sc_distance" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="45" class="examfieldgrey" size="6" measurement="od_cc_distance" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="46" class="examfieldgrey" size="6" measurement="od_ph_distance" onfocus="whiteField(this);"/></td> <td >Distance</td> ! <td ><input type="text" tabindex="47" class="examfieldgrey" size="6" measurement="os_sc_distance" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="48" class="examfieldgrey" size="6" measurement="os_cc_distance" onfocus="whiteField(this);"/></td> ! <td ><input type="text" tabindex="49" class="examfieldgrey" size="6" measurement="os_ph_distance" onfocus="whiteField(this);"/></td> </tr> <tr> ! <td><input type="text" tabindex="50" class="examfieldgrey" size="6" measurement="od_sc_near" onfocus="whiteField(this);"/></td> ! <td><input type="text" tabindex="51" class="examfieldgrey" size="6" measurement="od_cc_near" onfocus="whiteField(this);"/></td> <td></td> <td>Near</td> ! <td><input type="text" tabindex="52" class="examfieldgrey" size="6" measurement="os_sc_near" onfocus="whiteField(this);"/></td> ! <td><input type="text" tabindex="53" class="examfieldgrey" size="6" measurement="os_cc_near" onfocus="whiteField(this);"/></td> <td></td> </tr> *************** *** 375,393 **** </tr> <tr> ! <td><input type="text" size="10" tabindex="63" measurement="od_manifest_refraction_sph" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="64" measurement="od_manifest_refraction_cyl" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td><input type="text" size="10" tabindex="65" measurement="od_manifest_refraction_axis" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="66" measurement="od_manifest_refraction_add" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td ></td> ! <td><input type="text" size="10" tabindex="67" measurement="od_manifest_distance" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td><input type="text" size="10" tabindex="68" measurement="od_manifest_near" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td >Manifest</td> ! <td><input type="text" size="10" tabindex="69" measurement="os_manifest_refraction_sph" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="70" measurement="os_manifest_refraction_cyl" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td><input type="text" size="10" tabindex="71" measurement="os_manifest_refraction_axis" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="72" measurement="os_manifest_refraction_add" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td ></td> ! <td><input type="text" size="10" tabindex="73" measurement="os_manifest_distance" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="74" measurement="os_manifest_near" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> --- 376,394 ---- </tr> <tr> ! <td><input type="text" size="5" tabindex="63" measurement="od_manifest_refraction_sph" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="64" measurement="od_manifest_refraction_cyl" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td><input type="text" size="5" tabindex="65" measurement="od_manifest_refraction_axis" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="66" measurement="od_manifest_refraction_add" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td ></td> ! <td><input type="text" size="5" tabindex="67" measurement="od_manifest_distance" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td><input type="text" size="5" tabindex="68" measurement="od_manifest_near" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td >Manifest</td> ! <td><input type="text" size="5" tabindex="69" measurement="os_manifest_refraction_sph" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="70" measurement="os_manifest_refraction_cyl" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td><input type="text" size="5" tabindex="71" measurement="os_manifest_refraction_axis" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="72" measurement="os_manifest_refraction_add" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td ></td> ! <td><input type="text" size="5" tabindex="73" measurement="os_manifest_distance" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="74" measurement="os_manifest_near" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> *************** *** 395,412 **** <tr> ! <td ><input type="text" size="10" tabindex="75" measurement="od_cycloplegic_refraction_sph" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="76" measurement="od_cycloplegic_refraction_cyl" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="77" measurement="od_cycloplegic_refraction_axis" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td><input type="text" size="10" tabindex="78" measurement="od_cycloplegic_refraction_add" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td ></td> ! <td ><input type="text" size="10" tabindex="79" measurement="od_cycloplegic_distance" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> <td >Cycloplegic</td> ! <td ><input type="text" size="10" tabindex="80" measurement="os_cycloplegic_refraction_sph" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="81" measurement="os_cycloplegic_refraction_cyl" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="82" measurement="os_cycloplegic_refraction_axis" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="10" tabindex="83" measurement="os_cycloplegic_refraction_add" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td ></td> ! <td ><input type="text" size="10" tabindex="84" measurement="os_cycloplegic_distance" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </tr> --- 396,413 ---- <tr> ! <td ><input type="text" size="5" tabindex="75" measurement="od_cycloplegic_refraction_sph" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="76" measurement="od_cycloplegic_refraction_cyl" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="77" measurement="od_cycloplegic_refraction_axis" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td><input type="text" size="5" tabindex="78" measurement="od_cycloplegic_refraction_add" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td ></td> ! <td ><input type="text" size="5" tabindex="79" measurement="od_cycloplegic_distance" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> <td >Cycloplegic</td> ! <td ><input type="text" size="5" tabindex="80" measurement="os_cycloplegic_refraction_sph" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="81" measurement="os_cycloplegic_refraction_cyl" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="82" measurement="os_cycloplegic_refraction_axis" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td ><input type="text" size="5" tabindex="83" measurement="os_cycloplegic_refraction_add" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td ></td> ! <td ><input type="text" size="5" tabindex="84" measurement="os_cycloplegic_distance" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </tr> *************** *** 560,576 **** </tr> <tr> ! <td><input type="text" size="10" tabindex="130" measurement="od_cornea" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Cornea</td> ! <td><input type="text" size="10" tabindex="131" measurement="os_cornea" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> <tr> ! <td><input type="text" size="10" tabindex="132" measurement="od_conjuctiva_sclera" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Conjuctiva/Sclera</td> ! <td><input type="text" size="10" tabindex="133" measurement="os_conjuctiva_sclera" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> <tr> ! <td><input type="text" size="10" tabindex="134" measurement="od_anterior_chamber" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Anterior Chamber</td> ! <td><input type="text" size="10" tabindex="135" measurement="os_anterior_chamber" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> <tr> --- 561,577 ---- </tr> <tr> ! <td><input type="text" size="6" tabindex="130" measurement="od_cornea" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Cornea</td> ! <td><input type="text" size="6" tabindex="131" measurement="os_cornea" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> <tr> ! <td><input type="text" size="6" tabindex="132" measurement="od_conjuctiva_sclera" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Conjuctiva/Sclera</td> ! <td><input type="text" size="6" tabindex="133" measurement="os_conjuctiva_sclera" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> <tr> ! <td><input type="text" size="6" tabindex="134" measurement="od_anterior_chamber" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Anterior Chamber</td> ! <td><input type="text" size="6" tabindex="135" measurement="os_anterior_chamber" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> <tr> *************** *** 579,583 **** <tr> <td></td> ! <td width="20%"><input type="text" size="10" tabindex="136" measurement="od_angle_up" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </tr> --- 580,584 ---- <tr> <td></td> ! <td width="20%"><input type="text" size="6" tabindex="136" measurement="od_angle_up" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </tr> *************** *** 586,592 **** <table class="exam"> <tr> ! <td width="20%"><input size="10" type="text" tabindex="137" measurement="od_angle_middle0" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td width="60%"><input size="10" type="text" tabindex="138" measurement="od_angle_middle1" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td width="20%"><input size="10" type="text" tabindex="139" measurement="od_angle_middle2" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> </tr> </table> --- 587,593 ---- <table class="exam"> <tr> ! <td width="20%"><input size="6" type="text" tabindex="137" measurement="od_angle_middle0" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td width="60%"><input size="6" type="text" tabindex="138" measurement="od_angle_middle1" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td width="20%"><input size="6" type="text" tabindex="139" measurement="od_angle_middle2" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> </tr> </table> *************** *** 595,599 **** <tr> <td></td> ! <td><input type="text" size="10" tabindex="140" measurement="od_angle_down" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </tr> --- 596,600 ---- <tr> <td></td> ! <td><input type="text" size="6" tabindex="140" measurement="od_angle_down" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </tr> *************** *** 605,609 **** <tr> <td></td> ! <td width="20%"><input size="10" type="text" tabindex="141" measurement="os_angle_up" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </tr> --- 606,610 ---- <tr> <td></td> ! <td width="20%"><input size="6" type="text" tabindex="141" measurement="os_angle_up" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </tr> *************** *** 612,618 **** <table class="exam"> <tr> ! <td width="20%"><input size="10" type="text" tabindex="142" measurement="os_angle_middle0" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td width="60%"><input size="10" type="text" tabindex="143" measurement="os_angle_middle1" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td width="20%"><input size="10" type="text" tabindex="144" measurement="os_angle_middle2" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> </tr> </table> --- 613,619 ---- <table class="exam"> <tr> ! <td width="20%"><input size="6" type="text" tabindex="142" measurement="os_angle_middle0" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td width="60%"><input size="6" type="text" tabindex="143" measurement="os_angle_middle1" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> ! <td width="20%"><input size="6" type="text" tabindex="144" measurement="os_angle_middle2" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> </tr> </table> *************** *** 621,625 **** <tr> <td></td> ! <td><input type="text" size="10" tabindex="145" measurement="os_angle_down" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </table> --- 622,626 ---- <tr> <td></td> ! <td><input type="text" size="6" tabindex="145" measurement="os_angle_down" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td></td> </table> *************** *** 628,640 **** <tr> ! <td><input type="text" size="10" tabindex="146" measurement="od_iris" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Iris</td> ! <td><input type="text" size="10" tabindex="147" measurement="os_iris" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> <tr> ! <td><input type="text" size="10" tabindex="148" measurement="od_lens" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Lens</td> ! <td><input type="text" size="10" tabindex="149" measurement="os_lens" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> --- 629,641 ---- <tr> ! <td><input type="text" size="6" tabindex="146" measurement="od_iris" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Iris</td> ! <td><input type="text" size="6" tabindex="147" measurement="os_iris" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> <tr> ! <td><input type="text" size="6" tabindex="148" measurement="od_lens" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/></td> <td>Lens</td> ! <td><input type="text" size="6" tabindex="149" measurement="os_lens" onchange="syncFields(this)" class="examfieldgrey" onfocus="whiteField(this);"/><td> </tr> Index: followup.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/followup.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** followup.jsp 15 Nov 2010 05:19:28 -0000 1.3 --- followup.jsp 29 Nov 2010 19:02:35 -0000 1.4 *************** *** 37,42 **** --- 37,56 ---- <html:option value="consult">Consult</html:option> </html:select> + </td> + <td width="25%"> + Doctor: + <html:select property="followup.followupProvider"> + <c:forEach var="item" items="${providers}"> + <option value="<c:out value="${item.providerNo}"/>"><c:out value="${item.formattedName}"/></option> + </c:forEach> + </html:select> + </td> + </tr> + <tr> + <td colspan="2"> + <html:text property="followup.timespan" size="4" styleId="width: 25px;" styleClass="special"/> + <html:select property="followup.timeframe" styleId="width: 50px;" styleClass="special"> <html:option value="days">days</html:option> *************** *** 44,60 **** <html:option value="months">months</html:option> </html:select> ! </td> ! <td width="45%"> ! Doctor: ! ! <html:select property="followup.followupProvider"> ! <c:forEach var="item" items="${providers}"> ! <option value="<c:out value="${item.providerNo}"/>"><c:out value="${item.formattedName}"/></option> ! </c:forEach> ! </html:select> ! ! </td> </tr> ! <tr> <td><br/><html:submit value="submit"/></td> --- 58,76 ---- <html:option value="months">months</html:option> </html:select> ! </td> </tr> ! <tr> ! <td> ! <html:select property="followup.urgency" styleId="width: 50px;" styleClass="special"> ! <html:option value="routine">routine</html:option> ! <html:option value="asap">ASAP</html:option> ! </html:select> ! </td> ! </tr> ! <tr> ! <td> ! Comment:<html:textarea rows="5" cols="40" property="followup.comment"></html:textarea> ! </td> ! </tr> <tr> <td><br/><html:submit value="submit"/></td> |
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-serv17941/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: FollowUpAction.java MacroAction.java NoteAddonAction.java ProcedureBookAction.java TestBookAction.java Log Message: eyeform bug fixes Index: MacroAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/MacroAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MacroAction.java 1 Oct 2010 14:10:51 -0000 1.1 --- MacroAction.java 29 Nov 2010 19:02:34 -0000 1.2 *************** *** 39,53 **** public ActionForward form(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); request.setAttribute("providers",providerDao.getActiveProviders()); DynaValidatorForm f = (DynaValidatorForm)form; ! /* ! OcularProc procedure = (OcularProc)f.get("proc"); ! if(procedure.getId() != null && procedure.getId().intValue()>0) { ! procedure = dao.find(procedure.getId()); } ! f.set("proc", procedure); ! */ return mapping.findForward("form"); } --- 39,55 ---- public ActionForward form(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); + MacroDao dao = (MacroDao)SpringUtils.getBean("MacroDAO"); + request.setAttribute("providers",providerDao.getActiveProviders()); DynaValidatorForm f = (DynaValidatorForm)form; ! ! Macro macro = (Macro)f.get("macro"); ! if(macro.getId() != null && macro.getId().intValue()>0) { ! macro = dao.find(macro.getId()); } ! f.set("macro", macro); ! return mapping.findForward("form"); } Index: NoteAddonAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NoteAddonAction.java 15 Nov 2010 06:16:26 -0000 1.6 --- NoteAddonAction.java 29 Nov 2010 19:02:34 -0000 1.7 *************** *** 1,4 **** --- 1,6 ---- package org.oscarehr.eyeform.web; + import java.io.IOException; + import java.util.Date; import java.util.List; *************** *** 12,15 **** --- 14,18 ---- import org.oscarehr.PMmodule.dao.ProviderDao; import org.oscarehr.common.dao.DemographicDao; + import org.oscarehr.common.model.Provider; import org.oscarehr.eyeform.dao.EyeFormDao; import org.oscarehr.eyeform.dao.FollowUpDao; *************** *** 37,41 **** TestBookRecordDao testDao = (TestBookRecordDao)SpringUtils.getBean("TestBookDAO"); ProcedureBookDao procedureBookDao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO"); ! ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); DemographicDao demographicDao = (DemographicDao)SpringUtils.getBean("demographicDao"); --- 40,44 ---- TestBookRecordDao testDao = (TestBookRecordDao)SpringUtils.getBean("TestBookDAO"); ProcedureBookDao procedureBookDao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO"); ! EyeFormDao eyeformDao = (EyeFormDao)SpringUtils.getBean("eyeFormDao"); ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); DemographicDao demographicDao = (DemographicDao)SpringUtils.getBean("demographicDao"); *************** *** 54,57 **** --- 57,62 ---- request.setAttribute("procedures",procedures); + EyeForm eyeform = eyeformDao.getByAppointmentNo(Integer.parseInt(appointmentNo)); + request.setAttribute("eyeform", eyeform); *************** *** 68,77 **** * * procedure/test ! */ ! public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { ! return null; ! } ! public ActionForward saveFlags(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { String appointmentNo = request.getParameter("appointmentNo"); --- 73,79 ---- * * procedure/test ! */ ! public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { String appointmentNo = request.getParameter("appointmentNo"); *************** *** 85,90 **** --- 87,135 ---- EyeForm eyeform = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); + if(eyeform == null) { + eyeform = new EyeForm(); + eyeform.setDate(new Date()); + eyeform.setAppointmentNo(Integer.parseInt(appointmentNo)); + } + + eyeform.setDischarge(ack1Checked); + eyeform.setStat(ack2Checked); + eyeform.setOpt(ack3Checked); + + dao.save(eyeform); return null; } + + public ActionForward getNoteText(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String appointmentNo = request.getParameter("appointmentNo"); + + EyeFormDao dao = (EyeFormDao)SpringUtils.getBean("EyeFormDao"); + + EyeForm eyeform = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); + StringBuilder sb = new StringBuilder(); + + if(eyeform != null) { + if(eyeform.getDischarge()!=null&&eyeform.getDischarge().equals("true")) { + sb.append("Discharge"); + sb.append("\n"); + } + + if(eyeform.getStat()!=null&&eyeform.getStat().equals("true")) { + sb.append("Stat"); + sb.append("\n"); + } + + if(eyeform.getOpt()!=null&&eyeform.getOpt().equals("true")) { + sb.append("Opt"); + sb.append("\n"); + } + + } + + try { + response.getWriter().print(sb.toString()); + }catch(IOException e) {e.printStackTrace();} + return null; + } } Index: ProcedureBookAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/ProcedureBookAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProcedureBookAction.java 1 Oct 2010 14:10:51 -0000 1.1 --- ProcedureBookAction.java 29 Nov 2010 19:02:34 -0000 1.2 *************** *** 1,4 **** --- 1,7 ---- package org.oscarehr.eyeform.web; + import java.io.IOException; + import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; *************** *** 9,13 **** --- 12,18 ---- import org.apache.struts.actions.DispatchAction; import org.apache.struts.validator.DynaValidatorForm; + import org.oscarehr.common.model.Provider; import org.oscarehr.eyeform.dao.ProcedureBookDao; + import org.oscarehr.eyeform.model.FollowUp; import org.oscarehr.eyeform.model.ProcedureBook; import org.oscarehr.util.LoggedInInfo; *************** *** 52,54 **** --- 57,77 ---- } + public ActionForward getNoteText(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String appointmentNo = request.getParameter("appointmentNo"); + ProcedureBookDao dao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO"); + + List<ProcedureBook> procedures = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); + StringBuilder sb = new StringBuilder(); + + for(ProcedureBook f:procedures) { + sb.append(f.getProcedureName()).append(" ").append(f.getEye()).append(" ").append(f.getLocation()); + sb.append("\n"); + } + + try { + response.getWriter().print(sb.toString()); + }catch(IOException e) {e.printStackTrace();} + + return null; + } } Index: TestBookAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/TestBookAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestBookAction.java 1 Oct 2010 14:10:51 -0000 1.1 --- TestBookAction.java 29 Nov 2010 19:02:34 -0000 1.2 *************** *** 1,4 **** --- 1,7 ---- package org.oscarehr.eyeform.web; + import java.io.IOException; + import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; *************** *** 9,13 **** --- 12,18 ---- import org.apache.struts.actions.DispatchAction; import org.apache.struts.validator.DynaValidatorForm; + import org.oscarehr.eyeform.dao.ProcedureBookDao; import org.oscarehr.eyeform.dao.TestBookRecordDao; + import org.oscarehr.eyeform.model.ProcedureBook; import org.oscarehr.eyeform.model.TestBookRecord; import org.oscarehr.util.LoggedInInfo; *************** *** 51,53 **** --- 56,77 ---- return mapping.findForward("success"); } + + public ActionForward getNoteText(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String appointmentNo = request.getParameter("appointmentNo"); + TestBookRecordDao dao = (TestBookRecordDao)SpringUtils.getBean("TestBookDAO"); + + List<TestBookRecord> tests = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); + StringBuilder sb = new StringBuilder(); + + for(TestBookRecord f:tests) { + sb.append(f.getTestname()).append(" ").append(f.getEye()).append(" ").append(f.getUrgency()); + sb.append("\n"); + } + + try { + response.getWriter().print(sb.toString()); + }catch(IOException e) {e.printStackTrace();} + + return null; + } } Index: FollowUpAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/FollowUpAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FollowUpAction.java 15 Nov 2010 01:27:35 -0000 1.2 --- FollowUpAction.java 29 Nov 2010 19:02:34 -0000 1.3 *************** *** 1,4 **** --- 1,7 ---- package org.oscarehr.eyeform.web; + import java.io.IOException; + import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; *************** *** 10,13 **** --- 13,17 ---- import org.apache.struts.validator.DynaValidatorForm; import org.oscarehr.PMmodule.dao.ProviderDao; + import org.oscarehr.common.model.Provider; import org.oscarehr.eyeform.dao.FollowUpDao; import org.oscarehr.eyeform.model.FollowUp; *************** *** 57,59 **** --- 61,86 ---- return mapping.findForward("success"); } + + public ActionForward getNoteText(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String appointmentNo = request.getParameter("appointmentNo"); + + FollowUpDao dao = (FollowUpDao)SpringUtils.getBean("FollowUpDAO"); + ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); + + + List<FollowUp> followUps = dao.getByAppointmentNo(Integer.parseInt(appointmentNo)); + StringBuilder sb = new StringBuilder(); + + for(FollowUp f:followUps) { + Provider p = providerDao.getProvider(f.getFollowupProvider()); + sb.append(f.getType()).append(" ").append(f.getTimespan()).append(" ").append(f.getTimeframe()); + sb.append(" ").append(p.getFormattedName()).append(" ").append(f.getUrgency()); + sb.append("\n"); + } + + try { + response.getWriter().print(sb.toString()); + }catch(IOException e) {e.printStackTrace();} + return null; + } } |
|
From: Marc D. <hex...@us...> - 2010-11-29 19:02:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/WEB-INF Modified Files: applicationContext.xml Log Message: eyeform bug fixes Index: applicationContext.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/applicationContext.xml,v retrieving revision 1.177 retrieving revision 1.178 diff -C2 -d -r1.177 -r1.178 *** applicationContext.xml 4 Nov 2010 06:25:15 -0000 1.177 --- applicationContext.xml 29 Nov 2010 19:02:34 -0000 1.178 *************** *** 111,115 **** <bean id="FollowUpDAO" class="org.oscarehr.eyeform.dao.FollowUpDao" autowire="byName" /> <bean id="rourke2009Dao" class="oscar.form.dao.Rourke2009DAO" autowire="byName" /> ! <!-- configure the scratch pad --> <bean id="scratchPadDao" class="com.quatro.dao.ScratchPadDao" autowire="byName" /> --- 111,116 ---- <bean id="FollowUpDAO" class="org.oscarehr.eyeform.dao.FollowUpDao" autowire="byName" /> <bean id="rourke2009Dao" class="oscar.form.dao.Rourke2009DAO" autowire="byName" /> ! <bean id="EyeFormDao" class="org.oscarehr.eyeform.dao.EyeFormDao" autowire="byName" /> ! <!-- configure the scratch pad --> <bean id="scratchPadDao" class="com.quatro.dao.ScratchPadDao" autowire="byName" /> |
|
From: Marc D. <hex...@us...> - 2010-11-29 19:02:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil Modified Files: EctDisplayMacroAction.java Log Message: eyeform bug fixes Index: EctDisplayMacroAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayMacroAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EctDisplayMacroAction.java 4 Nov 2010 06:25:16 -0000 1.3 --- EctDisplayMacroAction.java 29 Nov 2010 19:02:35 -0000 1.4 *************** *** 88,92 **** NavBarDisplayDAO.Item item = Dao.Item(); item.setDate(new Date()); ! String itemHeader = StringUtils.maxLenString("Macro", MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES); item.setLinkTitle(itemHeader); item.setTitle(itemHeader); --- 88,92 ---- NavBarDisplayDAO.Item item = Dao.Item(); item.setDate(new Date()); ! String itemHeader = StringUtils.maxLenString(sh.getLabel(), MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES); item.setLinkTitle(itemHeader); item.setTitle(itemHeader); |
|
From: Marc D. <hex...@us...> - 2010-11-29 19:02:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao Modified Files: EyeFormDao.java Log Message: eyeform bug fixes Index: EyeFormDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao/EyeFormDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EyeFormDao.java 15 Nov 2010 05:20:57 -0000 1.1 --- EyeFormDao.java 29 Nov 2010 19:02:34 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- package org.oscarehr.eyeform.dao; + import javax.persistence.NoResultException; import javax.persistence.Query; *************** *** 26,31 **** query.setParameter(1, appointmentNo); ! return (EyeForm)query.getSingleResult(); } --- 27,37 ---- query.setParameter(1, appointmentNo); + EyeForm eyeform = null; ! try { ! eyeform = (EyeForm)query.getSingleResult(); ! } catch(NoResultException e) {} ! ! return eyeform; } |
|
From: Marc D. <hex...@us...> - 2010-11-29 19:02:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17941/web/WEB-INF/classes/src/org/oscarehr/eyeform/model Modified Files: EyeForm.java FollowUp.java Log Message: eyeform bug fixes Index: FollowUp.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/FollowUp.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FollowUp.java 15 Nov 2010 05:19:28 -0000 1.3 --- FollowUp.java 29 Nov 2010 19:02:34 -0000 1.4 *************** *** 49,52 **** --- 49,54 ---- private String type; + private String urgency; + private String comment; *************** *** 131,134 **** --- 133,149 ---- this.demographicNo = demographicNo; } + public String getUrgency() { + return urgency; + } + public void setUrgency(String urgency) { + this.urgency = urgency; + } + public String getComment() { + return comment; + } + public void setComment(String comment) { + this.comment = comment; + } + Index: EyeForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/EyeForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EyeForm.java 15 Nov 2010 05:20:57 -0000 1.1 --- EyeForm.java 29 Nov 2010 19:02:34 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; *************** *** 21,24 **** --- 22,26 ---- private Integer id; + @Column(name="appointment_no") private int appointmentNo; |
|
From: Randy J. <rj...@us...> - 2010-11-29 18:59:53
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16832 Modified Files: ViewConsultationRequests.jsp Log Message: - ID: 3108150 Set sort ids so proper columns are sorted Index: ViewConsultationRequests.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ViewConsultationRequests.jsp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ViewConsultationRequests.jsp 15 Nov 2010 03:26:16 -0000 1.19 --- ViewConsultationRequests.jsp 29 Nov 2010 18:59:45 -0000 1.20 *************** *** 246,286 **** </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('3'); return false;"> ! Team </a> </th> <th align="left" class="VCRheads" width="75"> ! <a href=# onclick="setOrder('2'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgPatient"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('3'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgProvider"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('4'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgService"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('5'); return false;"> ! Consultant </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('6'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgRefDate"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('7'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgAppointmentDate"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('8'); return false;"> ! Last Followup </a> </th> --- 246,286 ---- </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('2'); return false;"> ! <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgTeam"/> </a> </th> <th align="left" class="VCRheads" width="75"> ! <a href=# onclick="setOrder('3'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgPatient"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('4'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgProvider"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('5'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgService"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('6'); return false;"> ! <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgConsultant"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('7'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgRefDate"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('8'); return false;"> <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgAppointmentDate"/> </a> </th> <th align="left" class="VCRheads"> ! <a href=# onclick="setOrder('9'); return false;"> ! <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgFollowUpDate"/> </a> </th> |
|
From: Randy J. <rj...@us...> - 2010-11-29 18:58:37
|
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-serv16527 Modified Files: EctConsultationFormRequestAction.java Log Message: - ID: 3108150 Check that there is a followup date before trying to set it in form Index: EctConsultationFormRequestAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** EctConsultationFormRequestAction.java 15 Nov 2010 01:27:31 -0000 1.37 --- EctConsultationFormRequestAction.java 29 Nov 2010 18:58:29 -0000 1.38 *************** *** 134,139 **** consult.setUrgency(frm.getUrgency()); consult.setPatientWillBook(new Boolean(frm.getPatientWillBook())); ! date = DateUtils.parseDate(frm.getFollowUpDate(), format); ! consult.setFollowUpDate(date); consultationRequestDao.persist(consult); --- 134,141 ---- consult.setUrgency(frm.getUrgency()); consult.setPatientWillBook(new Boolean(frm.getPatientWillBook())); ! if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) { ! date = DateUtils.parseDate(frm.getFollowUpDate(), format); ! consult.setFollowUpDate(date); ! } consultationRequestDao.persist(consult); *************** *** 187,192 **** consult.setUrgency(frm.getUrgency()); consult.setPatientWillBook(new Boolean(frm.getPatientWillBook())); ! date = DateUtils.parseDate(frm.getFollowUpDate(), format); ! consult.setFollowUpDate(date); consultationRequestDao.merge(consult); } --- 189,196 ---- consult.setUrgency(frm.getUrgency()); consult.setPatientWillBook(new Boolean(frm.getPatientWillBook())); ! if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) { ! date = DateUtils.parseDate(frm.getFollowUpDate(), format); ! consult.setFollowUpDate(date); ! } consultationRequestDao.merge(consult); } |
|
From: Randy J. <rj...@us...> - 2010-11-29 18:56:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16195 Modified Files: ConsultationFormRequest.jsp Log Message: - ID: 3108150 Added keys for consult report Index: ConsultationFormRequest.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormRequest.jsp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** ConsultationFormRequest.jsp 24 Nov 2010 04:30:22 -0000 1.69 --- ConsultationFormRequest.jsp 29 Nov 2010 18:56:33 -0000 1.70 *************** *** 1000,1004 **** </tr> <tr> ! <td class="tite4">Referrer Instructions</td> <td align="right" class="tite2"> <textarea id="annotation" style="color: blue;" readonly></textarea> --- 1000,1006 ---- </tr> <tr> ! <td class="tite4"> ! <bean:message key="ooscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formInstructions" /> ! </td> <td align="right" class="tite2"> <textarea id="annotation" style="color: blue;" readonly></textarea> |
|
From: Randy J. <rj...@us...> - 2010-11-29 18:53:35
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15189 Modified Files: oscarResources_en.properties Log Message: - ID: 3108150 Added keys for consult report Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.356 retrieving revision 1.357 diff -C2 -d -r1.356 -r1.357 *** oscarResources_en.properties 26 Nov 2010 21:39:12 -0000 1.356 --- oscarResources_en.properties 29 Nov 2010 18:53:27 -0000 1.357 *************** *** 1596,1599 **** --- 1596,1600 ---- oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formSelectSpec=Select Specialist oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formUrgency=Urgency + oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formInstructions=Referrer Instructions oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgUrgent=Urgent oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgNUrgent=Non-Urgent *************** *** 1743,1746 **** --- 1744,1750 ---- oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgUrgency=Urgency oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgAppointmentDate=Appointment Date + oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgTeam=Team + oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgConsultant=Consultant + oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgFollowUpDate=Last Followup oscarEncounter.RemoteAttachments.title=oscarComm |
|
From: Randy J. <rj...@us...> - 2010-11-29 18:51:39
|
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-serv14850 Modified Files: ConsultationServices.java Log Message: - ID: 3108150 Added collection of professional specialists to make class more complete Index: ConsultationServices.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/ConsultationServices.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConsultationServices.java 15 Nov 2010 01:27:32 -0000 1.2 --- ConsultationServices.java 29 Nov 2010 18:51:31 -0000 1.3 *************** *** 35,38 **** --- 35,44 ---- import javax.persistence.Id; import javax.persistence.Table; + import javax.persistence.JoinTable; + import javax.persistence.JoinColumn; + import javax.persistence.ManyToMany; + import javax.persistence.FetchType; + + import java.util.List; /** *************** *** 54,57 **** --- 60,67 ---- private String active; + @ManyToMany(fetch=FetchType.EAGER) + @JoinTable( name="serviceSpecialists", joinColumns=@JoinColumn(name="serviceId"), inverseJoinColumns = @JoinColumn(name="specId") ) + private List<ProfessionalSpecialist> specialists; + public ConsultationServices() { } *************** *** 114,116 **** --- 124,140 ---- } + /** + * @return the specialists + */ + public List<ProfessionalSpecialist> getSpecialists() { + return specialists; + } + + /** + * @param specialists the specialists to set + */ + public void setSpecialists(List<ProfessionalSpecialist> specialists) { + this.specialists = specialists; + } + } |
|
From: Randy J. <rj...@us...> - 2010-11-29 17:20:31
|
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-serv18717 Modified Files: ConsultationRequestDao.java Log Message: - ID: 3108150 Completed sorting logic for consult reports Index: ConsultationRequestDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/ConsultationRequestDao.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConsultationRequestDao.java 15 Nov 2010 01:27:31 -0000 1.3 --- ConsultationRequestDao.java 29 Nov 2010 17:20:23 -0000 1.4 *************** *** 66,70 **** 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 where d.DemographicNo = cr.demographicId and p.ProviderNo = cr.providerNo "); if( !showCompleted ) { --- 66,70 ---- 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 ) { *************** *** 97,108 **** }else if(orderby.equals("1")){ //1 = msgStatus sql.append("order by cr.status " + orderDesc); ! }else if(orderby.equals("2")){ //2 = msgPatient ! sql.append("order by d.LastName, d.FirstName " + orderDesc); ! }else if(orderby.equals("3")){ //3 = msgProvider ! sql.append("order by p.LastName, p.FirstName " + orderDesc); ! }else if(orderby.equals("6")){ //5 = msgRefDate sql.append("order by cr.referralDate " + orderDesc); ! }else if(orderby.equals("7")){ //6 = Appointment Date sql.append("order by cr.appointmentDate " + orderDesc); }else{ sql.append("order by cr.referralDate desc"); --- 97,116 ---- }else if(orderby.equals("1")){ //1 = msgStatus sql.append("order by cr.status " + orderDesc); ! }else if(orderby.equals("2")){ //2 = msgTeam ! sql.append("order by cr.sendTo " + orderDesc); ! }else if(orderby.equals("3")){ //3 = msgPatient ! sql.append("order by d.LastName " + orderDesc); ! }else if(orderby.equals("4")){ //4 = msgProvider ! sql.append("order by p.LastName " + orderDesc); ! }else if(orderby.equals("5")){ //5 = msgService Desc ! sql.append("order by service.serviceDesc " + orderDesc); ! }else if(orderby.equals("6")){ //6 = msgSpecialist Name ! sql.append("order by specialist.lastName " + orderDesc); ! }else if(orderby.equals("7")){ //7 = msgRefDate sql.append("order by cr.referralDate " + orderDesc); ! }else if(orderby.equals("8")){ //8 = Appointment Date sql.append("order by cr.appointmentDate " + orderDesc); + }else if(orderby.equals("9")){ //9 = FollowUp Date + sql.append("order by cr.followUpDate " + orderDesc); }else{ sql.append("order by cr.referralDate desc"); |
|
From: Ted L. <ted...@us...> - 2010-11-29 03:46:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20425/docs Modified Files: gerrit_working_model.txt Log Message: updated gerrit config Index: gerrit_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** gerrit_working_model.txt 25 Nov 2010 22:56:42 -0000 1.17 --- gerrit_working_model.txt 29 Nov 2010 03:46:16 -0000 1.18 *************** *** 40,44 **** - change your linux to start gerrit upon boot up. To start gerrit : "cd ~/review_site", "./bin/gerrit.sh start". Note the funny directory change / reference in the preceeding 2 commands, it has to be that way or gerrit doesn't figure out where it's installed. (You can configure more to make it work but the prior 2 commands is the easiest way). - Note that we have accepted the default ports 8080 and 29418, I see no reason to change these. ! - edit the file review_site/etc/gerrit.config, in the seciont "ssdh" add "threads=8" - At this point, gerrit may or may not have auto started itself, you need to either start or restart gerrit because of the above configuration change. --- 40,46 ---- - change your linux to start gerrit upon boot up. To start gerrit : "cd ~/review_site", "./bin/gerrit.sh start". Note the funny directory change / reference in the preceeding 2 commands, it has to be that way or gerrit doesn't figure out where it's installed. (You can configure more to make it work but the prior 2 commands is the easiest way). - Note that we have accepted the default ports 8080 and 29418, I see no reason to change these. ! - edit the file review_site/etc/gerrit.config ! - in the section "ssdh" add "threads=8" ! - in the section "container" add "heapLimit=384m" - At this point, gerrit may or may not have auto started itself, you need to either start or restart gerrit because of the above configuration change. |
|
From: Ted L. <ted...@us...> - 2010-11-27 00:37:03
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12549/build Modified Files: grep_check_web.data Log Message: reset the codeCheck data to match the new narrowed http-equiv checking Index: grep_check_web.data =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/grep_check_web.data,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvsg2NLbE and /tmp/cvsIojuJQ differ |
|
From: Ted L. <ted...@us...> - 2010-11-27 00:32:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11382/build/tasks/src Modified Files: GrepStuffDirectoryWalker.java Log Message: narrowed disallow types for http-equiv Index: GrepStuffDirectoryWalker.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffDirectoryWalker.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** GrepStuffDirectoryWalker.java 24 Nov 2010 02:38:37 -0000 1.18 --- GrepStuffDirectoryWalker.java 27 Nov 2010 00:32:26 -0000 1.19 *************** *** 89,93 **** checkContains(relativePath, fileContentsLowered, "ascii", "use utf-8"); checkContains(relativePath, fileContentsLowered, "8859-1", "use utf-8"); ! checkContains(relativePath, fileContentsLowered, "http-equiv", "http headers instead"); } --- 89,94 ---- checkContains(relativePath, fileContentsLowered, "ascii", "use utf-8"); checkContains(relativePath, fileContentsLowered, "8859-1", "use utf-8"); ! checkContains(relativePath, fileContentsLowered, "http-equiv=\"content-type\"", "http headers instead"); ! checkContains(relativePath, fileContentsLowered, "http-equiv=\"Cache-Control\"", "http headers instead"); } |
|
From: jai <yg...@us...> - 2010-11-26 21:41:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27261 Added Files: setShowPatientDOB.jsp Log Message: -ID: 3119838 -set preference to show patient's DOB --- NEW FILE: setShowPatientDOB.jsp --- <!-- /* * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * <OSCAR TEAM> * * This software was written for the * Department of Family Medicine * McMaster Unviersity * Hamilton * Ontario, Canada */ --> <%@page contentType="text/html"%> <%@page pageEncoding="UTF-8"%> <%@ include file="/casemgmt/taglibs.jsp"%> <%@page import="java.util.*" %> <% if(session.getValue("user") == null) response.sendRedirect("../logout.htm"); String curUser_no; curUser_no = (String) session.getAttribute("user"); String tite = (String) request.getAttribute("provider.title"); %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request" /> <html:html> <head> <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script> <html:base /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><bean-el:message key="${providertitle}" /></title> <link rel="stylesheet" type="text/css" href="../oscarEncounter/encounterStyles.css"> <!-- calendar stylesheet --> <link rel="stylesheet" type="text/css" media="all" href="<c:out value="${ctx}"/>/share/calendar/calendar.css" title="win2k-cold-1"> <script src="<c:out value="${ctx}"/>/share/javascript/prototype.js" type="text/javascript"></script> <script src="<c:out value="${ctx}"/>/share/javascript/scriptaculous.js" type="text/javascript"></script> <!-- main calendar program --> <script type="text/javascript" src="<c:out value="${ctx}"/>/share/calendar/calendar.js"></script> <!-- language for the calendar --> <script type="text/javascript" src="<c:out value="${ctx}"/>/share/calendar/lang/<bean:message key="global.javascript.calendar"/>"></script> <!-- the following script defines the Calendar.setup helper function, which makes adding a calendar a matter of 1 or 2 lines of code. --> <script type="text/javascript" src="<c:out value="${ctx}"/>/share/calendar/calendar-setup.js"></script> <script type="text/javascript"> function setup() { Calendar.setup({ inputField : "staleDate", ifFormat : "%Y-%m-%d", showsTime :false, button : "staleDate_cal", singleClick : true, step : 1 }); } function validate() { var date = document.getElementById("staleDate"); if( date.value == "" ) { alert("Please select a date before saving"); return false; } return true; } </script> </head> <body class="BodyStyle" vlink="#0000FF"> <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> <td class="MainTableTopRowLeftColumn"><bean-el:message key="${providermsgPrefs}" /></td> <td style="color: white" class="MainTableTopRowRightColumn"><bean-el:message key="${providermsgProvider}" /></td> </tr> <tr> <td class="MainTableLeftColumn"> </td> <td class="MainTableRightColumn"> <%if( request.getAttribute("status") == null ){%> <bean-el:message key="${providermsgEdit}" /> <c:out value="${rxPageSizeProperty.value}" /> <html:form action="/setProviderStaleDate.do"> <input type="hidden" name="method" value="<c:out value="${method}"/>"> <html:checkbox property="rxShowPatientDOBProperty.checked">Show patient's date of birth</html:checkbox> <br/> <html:submit property="btnApply"/> </html:form> <%}else {%> <bean-el:message key="${providermsgSuccess}" /> <br> <%}%> </td> </tr> <tr> <td class="MainTableBottomRowLeftColumn"></td> <td class="MainTableBottomRowRightColumn"></td> </tr> </table> </body> </html:html> |
