Menu
▾
▴
oscarmcmaster-cvscommit
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: annie <ann...@us...> - 2011-01-14 21:36:59
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21679/web/provider Modified Files: appointmentprovideradminday.jsp Log Message: add pop up message to alert the provider if there are any OCAN reassessment need to be done. Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.203 retrieving revision 1.204 diff -C2 -d -r1.203 -r1.204 *** appointmentprovideradminday.jsp 2 Jan 2011 20:58:20 -0000 1.203 --- appointmentprovideradminday.jsp 14 Jan 2011 21:36:51 -0000 1.204 *************** *** 186,193 **** String default_pmm=null; String programId_oscarView=null; ! if (org.oscarehr.common.IsPropertiesOn.isCaisiEnable() && org.oscarehr.common.IsPropertiesOn.isTicklerPlusEnable()){ newticklerwarningwindow = (String) session.getAttribute("newticklerwarningwindow"); default_pmm = (String)session.getAttribute("default_pmm"); //Disable schedule view associated with the program //Made the default program id "0"; --- 186,196 ---- String default_pmm=null; String programId_oscarView=null; ! String ocanWarningWindow=null; ! if (org.oscarehr.common.IsPropertiesOn.isCaisiEnable() && org.oscarehr.common.IsPropertiesOn.isTicklerPlusEnable()){ newticklerwarningwindow = (String) session.getAttribute("newticklerwarningwindow"); default_pmm = (String)session.getAttribute("default_pmm"); + ocanWarningWindow = (String)session.getAttribute("ocanWarningWindow"); + //Disable schedule view associated with the program //Made the default program id "0"; *************** *** 608,622 **** //popup a new tickler warning window function load() { ! if ("<%=newticklerwarningwindow%>"=="enabled") { ! if (IsPopupBlocker()) { ! alert("You have a popup blocker, so you can not see the new tickler warning window. Please disable the pop blocker in your google bar, yahoo bar or IE ..."); ! } else{ ! var pu=window.open("../UnreadTickler.do",'viewUnreadTickler',"height=120,width=250,location=no,scrollbars=no,menubars=no,toolbars=no,resizable=yes,top=500,left=700"); ! if(window.focus) ! pu.focus(); ! } ! } ! popupPageOfChangePassword(); ! refreshAllTabAlerts(); } --- 611,630 ---- //popup a new tickler warning window function load() { ! var ocan = "<%=ocanWarningWindow%>"; ! if(ocan!="null") { ! alert(ocan); ! } ! if ("<%=newticklerwarningwindow%>"=="enabled") { ! if (IsPopupBlocker()) { ! alert("You have a popup blocker, so you can not see the new tickler warning window. Please disable the pop blocker in your google bar, yahoo bar or IE ..."); ! } else{ ! var pu=window.open("../UnreadTickler.do",'viewUnreadTickler',"height=120,width=250,location=no,scrollbars=no,menubars=no,toolbars=no,resizable=yes,top=500,left=700"); ! if(window.focus) ! pu.focus(); ! } ! } ! ! popupPageOfChangePassword(); ! refreshAllTabAlerts(); } |
|
From: annie <ann...@us...> - 2011-01-14 21:35:25
|
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-serv21186/web/WEB-INF/classes/src/org/oscarehr/common/dao Modified Files: OcanStaffFormDao.java Log Message: add pop up message to alert the provider after login if there are any OCAN reassessment need to be done. Index: OcanStaffFormDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/OcanStaffFormDao.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** OcanStaffFormDao.java 13 Jan 2011 04:25:30 -0000 1.9 --- OcanStaffFormDao.java 14 Jan 2011 21:35:18 -0000 1.10 *************** *** 36,42 **** } ! public List<OcanStaffForm> findCompletedInitialOcan(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); --- 36,42 ---- } ! public OcanStaffForm findLatestCompletedInitialOcan(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by created desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); *************** *** 46,58 **** query.setParameter(4, "IA"); ! @SuppressWarnings("unchecked") ! List<OcanStaffForm> results=query.getResultList(); ! ! return (results); } public OcanStaffForm findLatestCompletedReassessment(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); --- 46,57 ---- query.setParameter(4, "IA"); ! return getSingleResultOrNull(query); } + + public OcanStaffForm findLatestCompletedReassessment(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by created desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); *************** *** 67,71 **** public OcanStaffForm findLatestCompletedDischargedAssessment(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); --- 66,70 ---- public OcanStaffForm findLatestCompletedDischargedAssessment(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by created desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); *************** *** 144,146 **** --- 143,160 ---- */ } + + public List<OcanStaffForm> findAllByFacility(Integer facilityId) { + + String sqlCommand = "select x from OcanStaffForm x where x.facilityId=?1 order by x.created desc"; + + Query query = entityManager.createQuery(sqlCommand); + query.setParameter(1, facilityId); + + @SuppressWarnings("unchecked") + List<OcanStaffForm> results=query.getResultList(); + + return (results); + } + + } |
|
From: annie <ann...@us...> - 2011-01-14 21:35:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21186/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web Modified Files: OcanFormAction.java OcanForm.java Log Message: add pop up message to alert the provider after login if there are any OCAN reassessment need to be done. Index: OcanFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanFormAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OcanFormAction.java 13 Jan 2011 04:25:30 -0000 1.5 --- OcanFormAction.java 14 Jan 2011 21:35:17 -0000 1.6 *************** *** 139,144 **** LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! List<OcanStaffForm> ocanStaffForm = ocanStaffFormDao.findCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); ! if(ocanStaffForm.isEmpty()) { result = true; } --- 139,144 ---- LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! OcanStaffForm ocanStaffForm = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); ! if(ocanStaffForm!=null) { result = true; } *************** *** 147,156 **** if(ocanStaffForm1!=null) { Date completionDate = OcanForm.getAssessmentCompletionDate(ocanStaffForm1.getCompletionDate(),ocanStaffForm1.getClientCompletionDate()); ! ! Calendar cal = Calendar.getInstance(); ! cal.add(Calendar.MONTH,-3); ! if(cal.getTime().after(completionDate)) { ! result = true; ! } } --- 147,151 ---- if(ocanStaffForm1!=null) { Date completionDate = OcanForm.getAssessmentCompletionDate(ocanStaffForm1.getCompletionDate(),ocanStaffForm1.getClientCompletionDate()); ! result = OcanForm.afterCurrentDateAddMonth(completionDate, -3); } *************** *** 164,168 **** LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! List<OcanStaffForm> ocanStaffFormList1 = ocanStaffFormDao.findCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); OcanStaffForm ocanStaffForm = null; --- 159,163 ---- LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); OcanStaffForm ocanStaffForm = null; *************** *** 172,177 **** if(ocanStaffForm!=null) { startDate = OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate()); ! } else if(ocanStaffFormList1.size()>0) { ! OcanStaffForm ocanStaffForm1 = ocanStaffFormList1.get(0); startDate = OcanForm.getAssessmentStartDate(ocanStaffForm1.getStartDate(),ocanStaffForm1.getClientStartDate()); } else { --- 167,171 ---- if(ocanStaffForm!=null) { startDate = OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate()); ! } else if(ocanStaffForm1!=null) { startDate = OcanForm.getAssessmentStartDate(ocanStaffForm1.getStartDate(),ocanStaffForm1.getClientStartDate()); } else { *************** *** 179,189 **** } ! Calendar cal = Calendar.getInstance(); ! cal.add(Calendar.MONTH, -6); ! if(cal.getTime().after(startDate)) { ! result = true; ! } ! ! return result; } } --- 173,178 ---- } ! return OcanForm.afterCurrentDateAddMonth(startDate, -6); ! } } Index: OcanForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanForm.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** OcanForm.java 13 Jan 2011 04:25:30 -0000 1.16 --- OcanForm.java 14 Jan 2011 21:35:17 -0000 1.17 *************** *** 2,5 **** --- 2,6 ---- import java.util.ArrayList; + import java.util.Calendar; import java.util.Date; import java.util.HashMap; *************** *** 777,781 **** --- 778,837 ---- } + public static boolean afterCurrentDateAddMonth(Date date1, int month) { + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH,month); + if(cal.getTime().after(date1)) { + return true; + } else { + return false; + } + + } + + public static String getOcanWarningMessage(Integer facilityId) { + + StringBuffer messages = new StringBuffer(); + messages.append("You need to do OCAN reassessment for the clients whose IDs are: "); + + int doReassessment = 0; + + List<Demographic> demographicList = demographicDao.getDemographics(); + ocanStaffFormDao.findAllByFacility(facilityId); + for(Demographic demographic: demographicList) { + Integer clientId = demographic.getDemographicNo(); + if(isItTimeToDoReassessment(facilityId, clientId)){ + messages.append(clientId+" , "); + doReassessment ++; + } + } + if(doReassessment>0) { + messages.delete(messages.length()-3, messages.length()); + return messages.toString(); + } else { + return null; + } + } + public static boolean isItTimeToDoReassessment(Integer facilityId,Integer clientId) { + + boolean result = false; + + OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedInitialOcan(facilityId,clientId); + + OcanStaffForm ocanStaffForm = null; + ocanStaffForm = ocanStaffFormDao.findLatestCompletedReassessment(facilityId,clientId); + + Date startDate = null; + if(ocanStaffForm!=null) { + startDate = OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate()); + } else if(ocanStaffForm1!=null) { + startDate = OcanForm.getAssessmentStartDate(ocanStaffForm1.getStartDate(),ocanStaffForm1.getClientStartDate()); + } else { + return result; + } + + return OcanForm.afterCurrentDateAddMonth(startDate, -6); + + } } |
|
From: annie <ann...@us...> - 2011-01-14 21:35:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21186/web/WEB-INF/classes/src/oscar/login Modified Files: LoginAction.java Log Message: add pop up message to alert the provider after login if there are any OCAN reassessment need to be done. Index: LoginAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login/LoginAction.java,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** LoginAction.java 20 Sep 2010 16:28:26 -0000 1.62 --- LoginAction.java 14 Jan 2011 21:35:17 -0000 1.63 *************** *** 31,36 **** --- 31,38 ---- import org.oscarehr.PMmodule.dao.ProviderDao; import org.oscarehr.PMmodule.service.ProviderManager; + import org.oscarehr.PMmodule.web.OcanForm; import org.oscarehr.common.dao.FacilityDao; import org.oscarehr.common.dao.ProviderPreferenceDao; + import org.oscarehr.common.dao.OcanStaffFormDao; import org.oscarehr.common.dao.UserPropertyDAO; import org.oscarehr.common.model.Facility; *************** *** 39,42 **** --- 41,45 ---- import org.oscarehr.common.model.UserProperty; import org.oscarehr.decisionSupport.service.DSService; + import org.oscarehr.util.LoggedInInfo; import org.oscarehr.util.SessionConstants; import org.oscarehr.util.SpringUtils; *************** *** 65,68 **** --- 68,72 ---- private FacilityDao facilityDao = (FacilityDao) SpringUtils.getBean("facilityDao"); private ProviderPreferenceDao providerPreferenceDao = (ProviderPreferenceDao) SpringUtils.getBean("providerPreferenceDao"); + private static OcanStaffFormDao ocanStaffFormDao = (OcanStaffFormDao) SpringUtils.getBean("ocanStaffFormDao"); public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { *************** *** 79,82 **** --- 83,89 ---- String username=(String)request.getSession().getAttribute("user"); LogAction.addLog(username, LogConst.LOGIN, LogConst.CON_LOGIN, "facilityId="+facilityIdString, ip); + if(facility.isEnableOcanForms()) { + request.getSession().setAttribute("ocanWarningWindow", OcanForm.getOcanWarningMessage(facility.getId())); + } return mapping.findForward(nextPage); } *************** *** 237,240 **** --- 244,250 ---- request.getSession().setAttribute("currentFacility", facility); LogAction.addLog(strAuth[0], LogConst.LOGIN, LogConst.CON_LOGIN, "facilityId="+facilityIds.get(0), ip); + if(facility.isEnableOcanForms()) { + request.getSession().setAttribute("ocanWarningWindow", OcanForm.getOcanWarningMessage(facility.getId())); + } } else { |
|
From: annie <ann...@us...> - 2011-01-14 20:44:31
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28620/web/WEB-INF/classes/src/oscar/login Modified Files: Tag: RELEASE_10_06 LoginAction.java Log Message: add pop up message to alert the provider that there are OCAN reassessments need to be done. Index: LoginAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login/LoginAction.java,v retrieving revision 1.57 retrieving revision 1.57.4.1 diff -C2 -d -r1.57 -r1.57.4.1 *** LoginAction.java 16 Apr 2010 01:41:39 -0000 1.57 --- LoginAction.java 14 Jan 2011 20:44:21 -0000 1.57.4.1 *************** *** 34,38 **** --- 34,40 ---- import org.oscarehr.PMmodule.dao.ProviderDao; import org.oscarehr.PMmodule.service.ProviderManager; + import org.oscarehr.PMmodule.web.OcanForm; import org.oscarehr.common.dao.FacilityDao; + import org.oscarehr.common.dao.OcanStaffFormDao; import org.oscarehr.common.dao.UserPropertyDAO; import org.oscarehr.common.model.Facility; *************** *** 40,43 **** --- 42,46 ---- import org.oscarehr.common.model.UserProperty; import org.oscarehr.decisionSupport.service.DSService; + import org.oscarehr.util.LoggedInInfo; import org.oscarehr.util.SessionConstants; import org.oscarehr.util.SpringUtils; *************** *** 66,70 **** private ProviderManager providerManager = (ProviderManager) SpringUtils.getBean("providerManager"); private FacilityDao facilityDao = (FacilityDao) SpringUtils.getBean("facilityDao"); ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { --- 69,74 ---- private ProviderManager providerManager = (ProviderManager) SpringUtils.getBean("providerManager"); private FacilityDao facilityDao = (FacilityDao) SpringUtils.getBean("facilityDao"); ! private static OcanStaffFormDao ocanStaffFormDao = (OcanStaffFormDao) SpringUtils.getBean("ocanStaffFormDao"); ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { *************** *** 80,83 **** --- 84,90 ---- String username=(String)request.getSession().getAttribute("user"); LogAction.addLog(username, LogConst.LOGIN, LogConst.CON_LOGIN, "facilityId="+facilityIdString, ip); + if(facility.isEnableOcanForms()) { + request.getSession().setAttribute("ocanWarningWindow", OcanForm.getOcanWarningMessage(facility.getId())); + } return mapping.findForward(nextPage); } *************** *** 176,179 **** --- 183,187 ---- session.setAttribute("CaseMgmtUsers", newDocArr); } + } } *************** *** 240,243 **** --- 248,254 ---- request.getSession().setAttribute("currentFacility", facility); LogAction.addLog(strAuth[0], LogConst.LOGIN, LogConst.CON_LOGIN, "facilityId="+facilityIds.get(0), ip); + if(facility.isEnableOcanForms()) { + request.getSession().setAttribute("ocanWarningWindow", OcanForm.getOcanWarningMessage(facility.getId())); + } } else { *************** *** 252,256 **** } } ! if( pvar.getProperty("LOGINTEST","").equalsIgnoreCase("yes")) { String proceedURL = mapping.findForward(where).getPath(); --- 263,267 ---- } } ! if( pvar.getProperty("LOGINTEST","").equalsIgnoreCase("yes")) { String proceedURL = mapping.findForward(where).getPath(); *************** *** 280,282 **** --- 291,295 ---- return WebApplicationContextUtils.getWebApplicationContext(getServlet().getServletContext()); } + + } |
|
From: annie <ann...@us...> - 2011-01-14 20:44:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28620/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web Modified Files: Tag: RELEASE_10_06 OcanFormAction.java OcanForm.java Log Message: add pop up message to alert the provider that there are OCAN reassessments need to be done. Index: OcanFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanFormAction.java,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** OcanFormAction.java 13 Jan 2011 03:52:55 -0000 1.4.4.1 --- OcanFormAction.java 14 Jan 2011 20:44:21 -0000 1.4.4.2 *************** *** 139,144 **** LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! List<OcanStaffForm> ocanStaffForm = ocanStaffFormDao.findCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); ! if(ocanStaffForm.isEmpty()) { result = true; } --- 139,144 ---- LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! OcanStaffForm ocanStaffForm = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); ! if(ocanStaffForm!=null) { result = true; } *************** *** 147,156 **** if(ocanStaffForm1!=null) { Date completionDate = OcanForm.getAssessmentCompletionDate(ocanStaffForm1.getCompletionDate(),ocanStaffForm1.getClientCompletionDate()); ! ! Calendar cal = Calendar.getInstance(); ! cal.add(Calendar.MONTH,-3); ! if(cal.getTime().after(completionDate)) { ! result = true; ! } } --- 147,151 ---- if(ocanStaffForm1!=null) { Date completionDate = OcanForm.getAssessmentCompletionDate(ocanStaffForm1.getCompletionDate(),ocanStaffForm1.getClientCompletionDate()); ! result = OcanForm.afterCurrentDateAddMonth(completionDate, -3); } *************** *** 164,168 **** LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! List<OcanStaffForm> ocanStaffFormList1 = ocanStaffFormDao.findCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); OcanStaffForm ocanStaffForm = null; --- 159,163 ---- LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedInitialOcan(loggedInInfo.currentFacility.getId(),clientId); OcanStaffForm ocanStaffForm = null; *************** *** 172,177 **** if(ocanStaffForm!=null) { startDate = OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate()); ! } else if(ocanStaffFormList1.size()>0) { ! OcanStaffForm ocanStaffForm1 = ocanStaffFormList1.get(0); startDate = OcanForm.getAssessmentStartDate(ocanStaffForm1.getStartDate(),ocanStaffForm1.getClientStartDate()); } else { --- 167,171 ---- if(ocanStaffForm!=null) { startDate = OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate()); ! } else if(ocanStaffForm1!=null) { startDate = OcanForm.getAssessmentStartDate(ocanStaffForm1.getStartDate(),ocanStaffForm1.getClientStartDate()); } else { *************** *** 179,189 **** } ! Calendar cal = Calendar.getInstance(); ! cal.add(Calendar.MONTH, -6); ! if(cal.getTime().after(startDate)) { ! result = true; ! } ! ! return result; } } --- 173,178 ---- } ! return OcanForm.afterCurrentDateAddMonth(startDate, -6); ! } } Index: OcanForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanForm.java,v retrieving revision 1.9.4.7 retrieving revision 1.9.4.8 diff -C2 -d -r1.9.4.7 -r1.9.4.8 *** OcanForm.java 13 Jan 2011 03:52:55 -0000 1.9.4.7 --- OcanForm.java 14 Jan 2011 20:44:21 -0000 1.9.4.8 *************** *** 2,5 **** --- 2,6 ---- import java.util.ArrayList; + import java.util.Calendar; import java.util.Date; import java.util.HashMap; *************** *** 777,781 **** --- 778,837 ---- } + public static boolean afterCurrentDateAddMonth(Date date1, int month) { + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH,month); + if(cal.getTime().after(date1)) { + return true; + } else { + return false; + } + + } + + public static String getOcanWarningMessage(Integer facilityId) { + + StringBuffer messages = new StringBuffer(); + messages.append("You need to do OCAN reassessment for the clients whose IDs are: "); + + int doReassessment = 0; + + List<Demographic> demographicList = demographicDao.getDemographics(); + ocanStaffFormDao.findAllByFacility(facilityId); + for(Demographic demographic: demographicList) { + Integer clientId = demographic.getDemographicNo(); + if(isItTimeToDoReassessment(facilityId, clientId)){ + messages.append(clientId+" , "); + doReassessment ++; + } + } + if(doReassessment>0) { + messages.delete(messages.length()-3, messages.length()); + return messages.toString(); + } else { + return null; + } + } + public static boolean isItTimeToDoReassessment(Integer facilityId,Integer clientId) { + + boolean result = false; + + OcanStaffForm ocanStaffForm1 = ocanStaffFormDao.findLatestCompletedInitialOcan(facilityId,clientId); + + OcanStaffForm ocanStaffForm = null; + ocanStaffForm = ocanStaffFormDao.findLatestCompletedReassessment(facilityId,clientId); + + Date startDate = null; + if(ocanStaffForm!=null) { + startDate = OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate()); + } else if(ocanStaffForm1!=null) { + startDate = OcanForm.getAssessmentStartDate(ocanStaffForm1.getStartDate(),ocanStaffForm1.getClientStartDate()); + } else { + return result; + } + + return OcanForm.afterCurrentDateAddMonth(startDate, -6); + + } } |
|
From: annie <ann...@us...> - 2011-01-14 20:44:29
|
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-serv28620/web/WEB-INF/classes/src/org/oscarehr/common/dao Modified Files: Tag: RELEASE_10_06 OcanStaffFormDao.java Log Message: add pop up message to alert the provider that there are OCAN reassessments need to be done. Index: OcanStaffFormDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/OcanStaffFormDao.java,v retrieving revision 1.3.4.5 retrieving revision 1.3.4.6 diff -C2 -d -r1.3.4.5 -r1.3.4.6 *** OcanStaffFormDao.java 13 Jan 2011 03:52:56 -0000 1.3.4.5 --- OcanStaffFormDao.java 14 Jan 2011 20:44:21 -0000 1.3.4.6 *************** *** 36,42 **** } ! public List<OcanStaffForm> findCompletedInitialOcan(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); --- 36,42 ---- } ! public OcanStaffForm findLatestCompletedInitialOcan(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by created desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); *************** *** 46,58 **** query.setParameter(4, "IA"); ! @SuppressWarnings("unchecked") ! List<OcanStaffForm> results=query.getResultList(); ! ! return (results); } public OcanStaffForm findLatestCompletedReassessment(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); --- 46,57 ---- query.setParameter(4, "IA"); ! return getSingleResultOrNull(query); } + + public OcanStaffForm findLatestCompletedReassessment(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by created desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); *************** *** 67,71 **** public OcanStaffForm findLatestCompletedDischargedAssessment(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); --- 66,70 ---- public OcanStaffForm findLatestCompletedDischargedAssessment(Integer facilityId, Integer clientId) { ! String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by created desc limit 1"; Query query = entityManager.createNativeQuery(sqlCommand, modelClass); *************** *** 144,146 **** --- 143,160 ---- */ } + + public List<OcanStaffForm> findAllByFacility(Integer facilityId) { + + String sqlCommand = "select x from OcanStaffForm x where x.facilityId=?1 order by x.created desc"; + + Query query = entityManager.createQuery(sqlCommand); + query.setParameter(1, facilityId); + + @SuppressWarnings("unchecked") + List<OcanStaffForm> results=query.getResultList(); + + return (results); + } + + } |
|
From: annie <ann...@us...> - 2011-01-14 20:42:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27669/web/provider Modified Files: Tag: RELEASE_10_06 appointmentprovideradminday.jsp Log Message: add pop up message to alert the provider that there is a reassessment ocan needs to be done. Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.179.2.7 retrieving revision 1.179.2.8 diff -C2 -d -r1.179.2.7 -r1.179.2.8 *** appointmentprovideradminday.jsp 16 Sep 2010 21:30:52 -0000 1.179.2.7 --- appointmentprovideradminday.jsp 14 Jan 2011 20:42:01 -0000 1.179.2.8 *************** *** 145,152 **** String default_pmm=null; String programId_oscarView=null; ! if (org.oscarehr.common.IsPropertiesOn.isCaisiEnable() && org.oscarehr.common.IsPropertiesOn.isTicklerPlusEnable()){ newticklerwarningwindow = (String) session.getAttribute("newticklerwarningwindow"); default_pmm = (String)session.getAttribute("default_pmm"); //Disable schedule view associated with the program //Made the default program id "0"; --- 145,155 ---- String default_pmm=null; String programId_oscarView=null; ! String ocanWarningWindow=null; ! if (org.oscarehr.common.IsPropertiesOn.isCaisiEnable() && org.oscarehr.common.IsPropertiesOn.isTicklerPlusEnable()){ newticklerwarningwindow = (String) session.getAttribute("newticklerwarningwindow"); default_pmm = (String)session.getAttribute("default_pmm"); + ocanWarningWindow = (String)session.getAttribute("ocanWarningWindow"); + //Disable schedule view associated with the program //Made the default program id "0"; *************** *** 554,568 **** //popup a new tickler warning window function load() { ! if ("<%=newticklerwarningwindow%>"=="enabled") { ! if (IsPopupBlocker()) { ! alert("You have a popup blocker, so you can not see the new tickler warning window. Please disable the pop blocker in your google bar, yahoo bar or IE ..."); ! } else{ ! var pu=window.open("../UnreadTickler.do",'viewUnreadTickler',"height=120,width=250,location=no,scrollbars=no,menubars=no,toolbars=no,resizable=yes,top=500,left=700"); ! if(window.focus) ! pu.focus(); ! } ! } ! popupPageOfChangePassword(); ! refreshAllTabAlerts(); } --- 557,576 ---- //popup a new tickler warning window function load() { ! var ocan = "<%=ocanWarningWindow%>"; ! if(ocan!="null") { ! alert(ocan); ! } ! if ("<%=newticklerwarningwindow%>"=="enabled") { ! if (IsPopupBlocker()) { ! alert("You have a popup blocker, so you can not see the new tickler warning window. Please disable the pop blocker in your google bar, yahoo bar or IE ..."); ! } else{ ! var pu=window.open("../UnreadTickler.do",'viewUnreadTickler',"height=120,width=250,location=no,scrollbars=no,menubars=no,toolbars=no,resizable=yes,top=500,left=700"); ! if(window.focus) ! pu.focus(); ! } ! } ! ! popupPageOfChangePassword(); ! refreshAllTabAlerts(); } |
|
From: Marc D. <hex...@us...> - 2011-01-14 19:37:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27696/web/WEB-INF Modified Files: struts-config.xml Log Message: made cpp codes modifiable Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.365 retrieving revision 1.366 diff -C2 -d -r1.365 -r1.366 *** struts-config.xml 5 Jan 2011 19:35:04 -0000 1.365 --- struts-config.xml 14 Jan 2011 19:37:31 -0000 1.366 *************** *** 2000,2003 **** --- 2000,2007 ---- <action path="/casemgmt/ExtPrintRegistry" type="org.oscarehr.casemgmt.web.ExtPrintRegistryAction" parameter="method" scope="request"> </action> + + <action path="/casemgmt/RegisterCppCode" type="org.oscarehr.casemgmt.web.RegisterCppCode" parameter="method" scope="request"> + </action> + <!-- END OSCAR Report By Template --> |
|
From: Marc D. <hex...@us...> - 2011-01-14 19:37:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27696/web/WEB-INF/classes/src/org/oscarehr/util Modified Files: CppUtils.java Log Message: made cpp codes modifiable Index: CppUtils.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util/CppUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CppUtils.java 29 Aug 2010 01:50:39 -0000 1.1 --- CppUtils.java 14 Jan 2011 19:37:31 -0000 1.2 *************** *** 1,5 **** package org.oscarehr.util; ! public final class CppUtils { ! public static final String cppCodes[] = {"OMeds", "SocHistory", "MedHistory", "Concerns", "FamHistory", "Reminders", "RiskFactors"}; } --- 1,13 ---- package org.oscarehr.util; ! import java.util.Arrays; ! ! public class CppUtils { ! public static String cppCodes[] = {"OMeds", "SocHistory", "MedHistory", "Concerns", "FamHistory", "Reminders", "RiskFactors"}; ! ! public static void addCppCode(String code) { ! String[] result = Arrays.copyOf(cppCodes, cppCodes.length+1); ! result[result.length-1] = code; ! cppCodes = result; ! } } |
|
From: Marc D. <hex...@us...> - 2011-01-14 19:37:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27696/web/js/custom Modified Files: eyeform-cme.js Log Message: made cpp codes modifiable Index: eyeform-cme.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** eyeform-cme.js 13 Jan 2011 21:44:56 -0000 1.14 --- eyeform-cme.js 14 Jan 2011 19:37:31 -0000 1.15 *************** *** 8,11 **** --- 8,14 ---- divR2I2: ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=PastOcularHistory&title=" + pastOcularHistoryLabel + "&cmd=divR2I2" + "&appointment_no="+appointmentNo, }; + // jQuery.ajax({url:ctx+"/casemgmt/RegisterCppCode.do?method=register&code=CurrentHistory,DiagnosticNotes,PastOcularHistory",dataType: "html",success: function(data) { + // }}); + //add diagnostic notes, past ocular history, patient log, ocular medications |
|
From: Marc D. <hex...@us...> - 2011-01-14 19:37:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27696/web/WEB-INF/classes/src/org/oscarehr/eyeform Added Files: EyeformInit.java Log Message: made cpp codes modifiable --- NEW FILE: EyeformInit.java --- package org.oscarehr.eyeform; import org.oscarehr.util.CppUtils; public class EyeformInit { static boolean isInit = false; public static void init() { if(isInit)return; CppUtils.addCppCode("CurrentHistory"); CppUtils.addCppCode("DiagnosticNotes"); CppUtils.addCppCode("PastOcularHistory"); isInit=true; } } |
|
From: Marc D. <hex...@us...> - 2011-01-14 19:37:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27696/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web Modified Files: CaseManagementViewAction.java Added Files: RegisterCppCode.java Log Message: made cpp codes modifiable --- NEW FILE: RegisterCppCode.java --- package org.oscarehr.casemgmt.web; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.DispatchAction; import org.oscarehr.util.CppUtils; import org.oscarehr.util.MiscUtils; public class RegisterCppCode extends DispatchAction { static Logger logger = MiscUtils.getLogger(); public ActionForward register(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { String code = request.getParameter("code"); String[] codes = code.split(","); for(String c:codes) { if(!exists(c)) { logger.info("adding " + c + " to cpp codes"); CppUtils.addCppCode(c); } } return null; } private boolean exists(String c) { for(String s:CppUtils.cppCodes) { if(s.equals(c)) return true; } return false; } } Index: CaseManagementViewAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web/CaseManagementViewAction.java,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** CaseManagementViewAction.java 11 Jan 2011 16:39:08 -0000 1.141 --- CaseManagementViewAction.java 14 Jan 2011 19:37:31 -0000 1.142 *************** *** 87,90 **** --- 87,91 ---- import org.oscarehr.common.model.UserProperty; import org.oscarehr.dx.model.DxResearch; + import org.oscarehr.eyeform.EyeformInit; import org.oscarehr.eyeform.dao.FollowUpDao; import org.oscarehr.eyeform.dao.MacroDao; *************** *** 117,120 **** --- 118,125 ---- private DemographicDao demographicDao = (DemographicDao) SpringUtils.getBean("demographicDao"); + static { + //temporary..need something generic; + EyeformInit.init(); + } public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { CaseManagementViewFormBean caseForm = (CaseManagementViewFormBean) form; *************** *** 1572,1575 **** --- 1577,1581 ---- else if ("Concerns".equals(caseManagementIssue.getIssue().getCode())) return (Colour.ongoingConcerns); else if ("Reminders".equals(caseManagementIssue.getIssue().getCode())) return (Colour.reminders); + else return Colour.prevention; } |
|
From: Ronnie C. <cr...@us...> - 2011-01-14 17:09:26
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9224 Modified Files: Tag: RELEASE_10_12 efmformadd_data.jsp Log Message: ID: 3090983 Rollback to 1.9 ApptProvider is NOT logged-in provider. Changed in 1.10 should not be applied. Index: efmformadd_data.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmformadd_data.jsp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** efmformadd_data.jsp 21 Oct 2010 00:39:33 -0000 1.10 --- efmformadd_data.jsp 14 Jan 2011 17:09:18 -0000 1.10.2.1 *************** *** 30,35 **** if (request.getAttribute("page_errors") != null) { %> ! ! <%@page import="org.oscarehr.util.LoggedInInfo"%><script language=javascript type='text/javascript'> function hideDiv() { if (document.getElementById) { // DOM3 = IE5, NS6 --- 30,34 ---- if (request.getAttribute("page_errors") != null) { %> ! <script language=javascript type='text/javascript'> function hideDiv() { if (document.getElementById) { // DOM3 = IE5, NS6 *************** *** 67,73 **** thisEForm.setAppointmentNo(request.getParameter("appointment")); ! ! LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! thisEForm.setApptProvider(loggedInInfo.loggedInProvider.getProviderNo()); thisEForm.setContextPath(request.getContextPath()); --- 66,70 ---- thisEForm.setAppointmentNo(request.getParameter("appointment")); ! thisEForm.setApptProvider(request.getParameter("apptProvider")); thisEForm.setContextPath(request.getContextPath()); *************** *** 76,78 **** thisEForm.setAction(); out.print(thisEForm.getFormHtml()); ! %> \ No newline at end of file --- 73,75 ---- thisEForm.setAction(); out.print(thisEForm.getFormHtml()); ! %> |
|
From: Ronnie C. <cr...@us...> - 2011-01-14 16:56:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6020 Modified Files: efmformadd_data.jsp Log Message: ID: 3090983 Rollback to 1.9 ApptProvider is NOT logged-in provider. Changed in 1.10 should not be applied. Index: efmformadd_data.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/efmformadd_data.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** efmformadd_data.jsp 21 Oct 2010 00:39:33 -0000 1.10 --- efmformadd_data.jsp 14 Jan 2011 16:56:28 -0000 1.11 *************** *** 30,35 **** if (request.getAttribute("page_errors") != null) { %> ! ! <%@page import="org.oscarehr.util.LoggedInInfo"%><script language=javascript type='text/javascript'> function hideDiv() { if (document.getElementById) { // DOM3 = IE5, NS6 --- 30,34 ---- if (request.getAttribute("page_errors") != null) { %> ! <script language=javascript type='text/javascript'> function hideDiv() { if (document.getElementById) { // DOM3 = IE5, NS6 *************** *** 67,73 **** thisEForm.setAppointmentNo(request.getParameter("appointment")); ! ! LoggedInInfo loggedInInfo=LoggedInInfo.loggedInInfo.get(); ! thisEForm.setApptProvider(loggedInInfo.loggedInProvider.getProviderNo()); thisEForm.setContextPath(request.getContextPath()); --- 66,70 ---- thisEForm.setAppointmentNo(request.getParameter("appointment")); ! thisEForm.setApptProvider(request.getParameter("apptProvider")); thisEForm.setContextPath(request.getContextPath()); *************** *** 76,78 **** thisEForm.setAction(); out.print(thisEForm.getFormHtml()); ! %> \ No newline at end of file --- 73,75 ---- thisEForm.setAction(); out.print(thisEForm.getFormHtml()); ! %> |
|
From: Marc D. <hex...@us...> - 2011-01-14 15:40:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17641/caisi Modified Files: initcaisi.sql Log Message: moved the issue table from caisi to oscar Index: initcaisi.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/initcaisi.sql,v retrieving revision 1.164 retrieving revision 1.165 diff -C2 -d -r1.164 -r1.165 *** initcaisi.sql 13 Jan 2011 04:40:25 -0000 1.164 --- initcaisi.sql 14 Jan 2011 15:40:17 -0000 1.165 *************** *** 1589,1604 **** -- - CREATE TABLE `issue` ( - `issue_id` int(10) NOT NULL auto_increment, - `code` varchar(20) NOT NULL default '', - `description` varchar(255) NOT NULL default '', - `role` varchar(100) NOT NULL default '', - `update_date` datetime NOT NULL default '0000-00-00 00:00:00', - `priority` CHAR(10) DEFAULT NULL, - `type` VARCHAR(32) DEFAULT NULL, - PRIMARY KEY (`issue_id`), - index(code) - ); - -- -- Table structure for table `program` --- 1589,1592 ---- *************** *** 2781,2783 **** programName varchar(100) NOT NULL, programNumber varchar(5) NOT NULL ! ); \ No newline at end of file --- 2769,2771 ---- programName varchar(100) NOT NULL, programNumber varchar(5) NOT NULL ! ); |
|
From: Marc D. <hex...@us...> - 2011-01-14 15:40:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17641 Modified Files: oscarinit.sql Log Message: moved the issue table from caisi to oscar Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.276 retrieving revision 1.277 diff -C2 -d -r1.276 -r1.277 *** oscarinit.sql 14 Jan 2011 15:25:19 -0000 1.276 --- oscarinit.sql 14 Jan 2011 15:40:17 -0000 1.277 *************** *** 8268,8269 **** --- 8268,8283 ---- PRIMARY KEY (`id`) ); + + + CREATE TABLE `issue` ( + `issue_id` int(10) NOT NULL auto_increment, + `code` varchar(20) NOT NULL, + `description` varchar(255) NOT NULL, + `role` varchar(100) NOT NULL, + `update_date` datetime NOT NULL, + `priority` CHAR(10) DEFAULT NULL, + `type` VARCHAR(32) DEFAULT NULL, + PRIMARY KEY (`issue_id`), + index(code) + ); + |
|
From: Marc D. <hex...@us...> - 2011-01-14 15:25:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13178 Modified Files: oscarinit.sql Log Message: removed the collate utf8_bin Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.275 retrieving revision 1.276 diff -C2 -d -r1.275 -r1.276 *** oscarinit.sql 11 Jan 2011 16:39:07 -0000 1.275 --- oscarinit.sql 14 Jan 2011 15:25:19 -0000 1.276 *************** *** 8166,8195 **** CREATE TABLE `eyeform_macro` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, ! `label` varchar(255) COLLATE utf8_bin NOT NULL, `display_order` tinyint(4) NOT NULL, ! `impression` text COLLATE utf8_bin, `followup_no` smallint(5), ! `followup_unit` varchar(50) COLLATE utf8_bin , ! `followup_doctor` varchar(6) COLLATE utf8_bin , ! `followup_reason` varchar(255) COLLATE utf8_bin , ! `tickler_staff` varchar(6) COLLATE utf8_bin , ! `billing_visit_type` varchar(50) COLLATE utf8_bin, ! `billing_visit_location` varchar(50) COLLATE utf8_bin , ! `billing_codes` text COLLATE utf8_bin, ! `billing_dxcode` varchar(50) COLLATE utf8_bin , ! `billing_total` varchar(50) COLLATE utf8_bin , ! `billing_comment` varchar(255) COLLATE utf8_bin , ! `billing_billtype` varchar(50) COLLATE utf8_bin , ! `billing_pay_method` varchar(50) COLLATE utf8_bin , ! `billing_billto` varchar(50) COLLATE utf8_bin , ! `billing_remitto` varchar(50) COLLATE utf8_bin , ! `billing_gstBilledTotal` varchar(50) COLLATE utf8_bin , ! `billing_payment` varchar(50) COLLATE utf8_bin , ! `billing_refund` varchar(50) COLLATE utf8_bin , ! `billing_gst` varchar(50) COLLATE utf8_bin , ! `test_records` text COLLATE utf8_bin, ! `discharge` varchar(20) COLLATE uft8_bin, ! `stat` varchar(20) COLLATE uft8_bin, ! `opt` varchar(20) COLLATE uft8_bin, PRIMARY KEY (`id`) ); --- 8166,8195 ---- CREATE TABLE `eyeform_macro` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, ! `label` varchar(255) NOT NULL, `display_order` tinyint(4) NOT NULL, ! `impression` text, `followup_no` smallint(5), ! `followup_unit` varchar(50), ! `followup_doctor` varchar(6), ! `followup_reason` varchar(255) , ! `tickler_staff` varchar(6) , ! `billing_visit_type` varchar(50) , ! `billing_visit_location` varchar(50) , ! `billing_codes` text, ! `billing_dxcode` varchar(50), ! `billing_total` varchar(50) , ! `billing_comment` varchar(255), ! `billing_billtype` varchar(50) , ! `billing_pay_method` varchar(50) , ! `billing_billto` varchar(50) , ! `billing_remitto` varchar(50) , ! `billing_gstBilledTotal` varchar(50) , ! `billing_payment` varchar(50), ! `billing_refund` varchar(50), ! `billing_gst` varchar(50), ! `test_records` text, ! `discharge` varchar(20), ! `stat` varchar(20), ! `opt` varchar(20), PRIMARY KEY (`id`) ); |
|
From: Marc D. <hex...@us...> - 2011-01-14 14:53:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1726/web/eyeform Modified Files: current_note.jsp Log Message: eyeform update - reformatting output Index: current_note.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/current_note.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** current_note.jsp 2 Dec 2010 04:04:31 -0000 1.5 --- current_note.jsp 14 Jan 2011 14:53:12 -0000 1.6 *************** *** 47,63 **** 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';} }}); --- 47,63 ---- 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';} }}); |
|
From: Marc D. <hex...@us...> - 2011-01-14 14:53:20
|
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-serv1726/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: NoteAddonAction.java Log Message: eyeform update - reformatting output Index: NoteAddonAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NoteAddonAction.java 4 Jan 2011 19:30:52 -0000 1.11 --- NoteAddonAction.java 14 Jan 2011 14:53:12 -0000 1.12 *************** *** 122,136 **** 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"); } --- 122,136 ---- if(eyeform != null) { if(eyeform.getDischarge()!=null&&eyeform.getDischarge().equals("true")) { ! sb.append("Patient is discharged from my active care."); sb.append("\n"); } if(eyeform.getStat()!=null&&eyeform.getStat().equals("true")) { ! sb.append("Follow up as needed with me STAT or PRN if symptoms are worse."); sb.append("\n"); } if(eyeform.getOpt()!=null&&eyeform.getOpt().equals("true")) { ! sb.append("Routine eye care by an optometrist is recommended."); sb.append("\n"); } |
|
From: Ted L. <ted...@us...> - 2011-01-14 02:01:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10496/docs/git_gerrit Modified Files: git_eclipse_working_model.txt Log Message: updated documentation Index: git_eclipse_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/git_eclipse_working_model.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** git_eclipse_working_model.txt 13 Jan 2011 00:20:22 -0000 1.6 --- git_eclipse_working_model.txt 14 Jan 2011 02:01:08 -0000 1.7 *************** *** 23,26 **** --- 23,28 ---- At this point you will have an account but to prevent spam/bots we have to manually enable write access to each account. You will need to email devel so we know you've signed up for an account so we can give you write access. You may wish to say hi to everyone and give a brief into into who you are too so we all have a better idea as to who everyone else is. :) + On the top right of the gerrit web pages there's a "Settings" option. In settings, the lest menu will have a "watched projects" option. This will allow you to receive emails when ever anyone commits to the selected projects. This is also a convenient place to see a list of available projects on the system. + At this point, if your eclipse was already running, you need to stop it and start it again. Eclipse caches ssh key information. (really, it does) |
|
From: Jay G. <jay...@us...> - 2011-01-14 01:59:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9800 Modified Files: ocan_form_action.jsp Log Message: Removed system.out Index: ocan_form_action.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_action.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ocan_form_action.jsp 13 Jan 2011 04:07:23 -0000 1.9 --- ocan_form_action.jsp 14 Jan 2011 01:59:07 -0000 1.10 *************** *** 92,96 **** for (Map.Entry<String, String[]> entry : parameters.entrySet()) { - System.out.println(entry.getKey()); if (entry.getValue()!=null) { --- 92,95 ---- |
|
From: Jay G. <jay...@us...> - 2011-01-14 01:13:35
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3222 Removed Files: providertemplatecontent.jsp providertemplatearray.jsp Log Message: REMOVED TO FIX BUILD ERROR #8354 JSPs won't compile --- providertemplatearray.jsp DELETED --- --- providertemplatecontent.jsp DELETED --- |
|
From: Amarjeet S. <ama...@ho...> - 2011-01-13 23:19:52
|
Hi Today, I first time install OSCAR on Ubuntu 10 server and getting following database error after login to browser, do you have any idea why I am getting this error and based on this error I verified mysql username and password using sudo -u mysql root -p command Database connection error: Cannot create PoolableConnectionFactory(Invalid authorization specification, message from server. "Access denied for user root@localhost'(using password YES) Best Regards, Amarjeet Saini |
|
From: Marc D. <hex...@us...> - 2011-01-13 21:45:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26703/web/js Modified Files: newCaseManagementView.js.jsp Log Message: measurement save fixed Index: newCaseManagementView.js.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/newCaseManagementView.js.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** newCaseManagementView.js.jsp 13 Jan 2011 17:11:01 -0000 1.8 --- newCaseManagementView.js.jsp 13 Jan 2011 21:44:56 -0000 1.9 *************** *** 1978,1982 **** jQuery("[submit_addon]").each(function() ! { jQuery("#"+jQuery(this).attr('submit_addon')).click(); } --- 1978,1982 ---- jQuery("[submit_addon]").each(function() ! { jQuery("#"+jQuery(this).attr('submit_addon')).click(); } |
38 messages has been excluded from this view by a project administrator.
