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: Peter HC <pet...@us...> - 2010-12-05 03:20:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6444 Modified Files: Tag: RELEASE_10_12 oscarResources_en.properties Log Message: Resources tag for the tab and the tooltip were reversed, better now Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.357.2.1 retrieving revision 1.357.2.2 diff -C2 -d -r1.357.2.1 -r1.357.2.2 *** oscarResources_en.properties 4 Dec 2010 19:09:06 -0000 1.357.2.1 --- oscarResources_en.properties 5 Dec 2010 03:20:34 -0000 1.357.2.2 *************** *** 659,663 **** global.report=<u>R</u>eport global.reportShortcut=82 ! global.resources=R<u>e</u>sources global.resourcesShortcut=69 global.rx=Rx --- 659,663 ---- global.report=<u>R</u>eport global.reportShortcut=82 ! global.resources=Clinical Resources global.resourcesShortcut=69 global.rx=Rx *************** *** 697,701 **** oscarEncounter.Index.calculators=calculators oscarEncounter.Index.clinicalModules=Clinical Modules ! oscarEncounter.Index.clinicalResources=Clinical Resources oscarEncounter.Index.closeEncounterWindowConfirm=Are you sure you wish to exit oscarEncounter without saving? oscarEncounter.Index.confirmExit=Are you sure you wish to exit oscarEncounter without saving? --- 697,701 ---- oscarEncounter.Index.calculators=calculators oscarEncounter.Index.clinicalModules=Clinical Modules ! oscarEncounter.Index.clinicalResources=R<u>e</u>sources oscarEncounter.Index.closeEncounterWindowConfirm=Are you sure you wish to exit oscarEncounter without saving? oscarEncounter.Index.confirmExit=Are you sure you wish to exit oscarEncounter without saving? |
|
From: Peter HC <pet...@us...> - 2010-12-04 19:10:59
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23630 Modified Files: oscar_mcmaster.properties Log Message: export/import demographic files fails if the TMP_DIR is commented out. Set to the manual install Ubuntu default of TMP_DIR: /var/lib/tomcat6/webapps/OscarDocument/oscar_mcmaster/export/ Index: oscar_mcmaster.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar_mcmaster.properties,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** oscar_mcmaster.properties 30 Nov 2010 08:25:47 -0000 1.76 --- oscar_mcmaster.properties 4 Dec 2010 19:10:51 -0000 1.77 *************** *** 112,117 **** # Demographic export/import ! # TeMPorary DIRectory for export/import files ! #TMP_DIR: /usr/local/tomcat/webapps/OscarDocument/oscar_mcmaster/export/ #PGP BINary executable (with full path) for export files encryption --- 112,117 ---- # Demographic export/import ! # TeMPorary DIRectory for export/import demographic files ! TMP_DIR: /var/lib/tomcat6/webapps/OscarDocument/oscar_mcmaster/export/ #PGP BINary executable (with full path) for export files encryption |
|
From: Peter HC <pet...@us...> - 2010-12-04 19:09:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22861 Modified Files: Tag: RELEASE_10_12 oscarResources_en.properties Log Message: changed Trunk label to 10_12 Alpha Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.357 retrieving revision 1.357.2.1 diff -C2 -d -r1.357 -r1.357.2.1 *** oscarResources_en.properties 29 Nov 2010 18:53:27 -0000 1.357 --- oscarResources_en.properties 4 Dec 2010 19:09:06 -0000 1.357.2.1 *************** *** 44,48 **** loginApplication.fullSite=Full Site loginApplication.gpltext=gpl.txt ! loginApplication.alert=OSCAR McMaster Trunk loginApplication.alert2=QuatroShelter Ver 1.2 --- 44,48 ---- loginApplication.fullSite=Full Site loginApplication.gpltext=gpl.txt ! loginApplication.alert=OSCAR McMaster 10_12 Alpha loginApplication.alert2=QuatroShelter Ver 1.2 *************** *** 2647,2651 **** oscarEncounter.formRourke2009_4.formupDownStairs=Walks up/down stairs alternating feet oscarEncounter.formRourke2009_4.formundoesZippers=Undoes buttons and zippers ! oscarEncounter.formRourke2009_4.form2Directions=Understands 2 and 3 step directions (eg. \u201cPick up your hat and shoes and put them in the closet.\u201d) oscarEncounter.formRourke2009_4.form5ormoreWords= Uses sentences with 5 or more words oscarEncounter.formRourke2009_4.formwalksUpStairs=Walks up stairs using handrail --- 2647,2651 ---- oscarEncounter.formRourke2009_4.formupDownStairs=Walks up/down stairs alternating feet oscarEncounter.formRourke2009_4.formundoesZippers=Undoes buttons and zippers ! oscarEncounter.formRourke2009_4.form2Directions=Understands 2 and 3 step directions (eg. \u201CPick up your hat and shoes and put them in the closet.\u201D) oscarEncounter.formRourke2009_4.form5ormoreWords= Uses sentences with 5 or more words oscarEncounter.formRourke2009_4.formwalksUpStairs=Walks up stairs using handrail *************** *** 4578,4582 **** pager.header.title=Resultado: pager.max.page.index=10 ! pager.next.desc=Pr\u00f3ximo pager.prev.desc=Anterior --- 4578,4582 ---- pager.header.title=Resultado: pager.max.page.index=10 ! pager.next.desc=Pr\u00F3ximo pager.prev.desc=Anterior |
|
From: Peter HC <pet...@us...> - 2010-12-04 19:04:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21623 Modified Files: Tag: RELEASE_10_12 oscar_mcmaster.properties Log Message: id 3127535 fixed inport export error by setting TMP_DIR to the default for the ubuntu manual install instructions at new.oscarmanaul.org Index: oscar_mcmaster.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar_mcmaster.properties,v retrieving revision 1.75 retrieving revision 1.75.2.1 diff -C2 -d -r1.75 -r1.75.2.1 *** oscar_mcmaster.properties 26 Nov 2010 19:01:53 -0000 1.75 --- oscar_mcmaster.properties 4 Dec 2010 19:04:20 -0000 1.75.2.1 *************** *** 112,117 **** # Demographic export/import ! # TeMPorary DIRectory for export/import files ! #TMP_DIR: /usr/local/tomcat/webapps/OscarDocument/oscar_mcmaster/export/ #PGP BINary executable (with full path) for export files encryption --- 112,117 ---- # Demographic export/import ! # TeMPorary DIRectory for export/import demographic files ! TMP_DIR: /var/lib/tomcat6/webapps/OscarDocument/oscar_mcmaster/export/ #PGP BINary executable (with full path) for export files encryption *************** *** 205,209 **** ## yes : TURNS ON NEW BC BILLING ## no : TURNS OFF NEW BC BILLING ! NEW_BC_TELEPLAN=yes ## yes: turn on the default BC alt billing --- 205,209 ---- ## yes : TURNS ON NEW BC BILLING ## no : TURNS OFF NEW BC BILLING ! NEW_BC_TELEPLA9N=yes ## yes: turn on the default BC alt billing *************** *** 492,496 **** ## false : disable the password field casemgmt.note.password.enabled=true ! ## Client referral has the option of temporary admission ## true : enable temporary admission --- 492,496 ---- ## false : disable the password field casemgmt.note.password.enabled=true ! 9 ## Client referral has the option of temporary admission ## true : enable temporary admission |
|
From: Marc D. <hex...@us...> - 2010-12-03 17:43:07
|
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-serv26041/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: MacroAction.java Log Message: eyeform macro form workflow fixed Index: MacroAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/MacroAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MacroAction.java 29 Nov 2010 19:02:34 -0000 1.2 --- MacroAction.java 3 Dec 2010 17:42:59 -0000 1.3 *************** *** 62,65 **** --- 62,68 ---- MacroDao dao = (MacroDao)SpringUtils.getBean("MacroDAO"); + if(macro.getId()!=null && macro.getId()==0) { + macro.setId(null); + } dao.save(macro); |
|
From: Marc D. <hex...@us...> - 2010-12-03 17:43:07
|
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-serv26041/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil Modified Files: EctDisplayMacroAction.java Log Message: eyeform macro form workflow fixed Index: EctDisplayMacroAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayMacroAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EctDisplayMacroAction.java 3 Dec 2010 16:04:07 -0000 1.5 --- EctDisplayMacroAction.java 3 Dec 2010 17:42:59 -0000 1.6 *************** *** 68,73 **** pathview = request.getContextPath() + "/eyeform/Macro.do?method=list"; ! pathedit = request.getContextPath() + "/eyeform/Macro.do?method=list"; ! String url = "popupPage(500,900,'" + winName + "','" + pathview + "')"; --- 68,74 ---- pathview = request.getContextPath() + "/eyeform/Macro.do?method=list"; ! //pathedit = request.getContextPath() + "/eyeform/Macro.do?method=list"; ! pathedit = request.getContextPath() + "/eyeform/Macro.do?method=addMacro"; ! String url = "popupPage(500,900,'" + winName + "','" + pathview + "')"; |
|
From: Marc D. <hex...@us...> - 2010-12-03 17:43:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26041/web/eyeform Modified Files: macro.jsp macro_list.jsp Log Message: eyeform macro form workflow fixed Index: macro_list.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/macro_list.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** macro_list.jsp 1 Oct 2010 14:10:52 -0000 1.1 --- macro_list.jsp 3 Dec 2010 17:42:59 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + <%@ include file="/taglibs.jsp"%> <html> <head> *************** *** 10,13 **** --- 11,24 ---- <h1>Eyeform Macros</h1> + <table border="0"> + <tr> + <td>Name</td> + </tr> + <c:forEach var="macro" items="${macros}"> + <tr> + <td><a href="<html:rewrite action="/eyeform/Macro.do?method=form¯o.id="/><c:out value="${macro.id}"/>"><c:out value="${macro.label }"/></a></td> + </tr> + </c:forEach> + </table> <table style="border:0px"> Index: macro.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/macro.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** macro.jsp 1 Oct 2010 14:10:52 -0000 1.1 --- macro.jsp 3 Dec 2010 17:42:59 -0000 1.2 *************** *** 76,80 **** <input name="method" value="save" type="hidden"> <table style="border: 0px none;"> ! <tbody><tr> <td> --- 76,80 ---- <input name="method" value="save" type="hidden"> <table style="border: 0px none;"> ! <html:hidden property="macro.id"/> <tbody><tr> <td> |
|
From: Marc D. <hex...@us...> - 2010-12-03 16:34:04
|
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-serv30250/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: OcularProcAction.java SpecsHistoryAction.java Log Message: list view of ocular procs/specs history for eyeform Index: SpecsHistoryAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/SpecsHistoryAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SpecsHistoryAction.java 15 Nov 2010 01:27:35 -0000 1.2 --- SpecsHistoryAction.java 3 Dec 2010 16:04:07 -0000 1.3 *************** *** 14,18 **** --- 14,20 ---- import org.apache.struts.validator.DynaValidatorForm; import org.oscarehr.PMmodule.dao.ProviderDao; + import org.oscarehr.eyeform.dao.OcularProcDao; import org.oscarehr.eyeform.dao.SpecsHistoryDao; + import org.oscarehr.eyeform.model.OcularProc; import org.oscarehr.eyeform.model.SpecsHistory; import org.oscarehr.util.LoggedInInfo; *************** *** 28,31 **** --- 30,43 ---- return form(mapping, form, request, response); } + + public ActionForward list(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String demographicNo = request.getParameter("demographicNo"); + SpecsHistoryDao dao = (SpecsHistoryDao)SpringUtils.getBean("SpecsHistoryDAO"); + + List<SpecsHistory> specs = dao.getByDemographicNo(Integer.parseInt(demographicNo)); + request.setAttribute("specs", specs); + + return mapping.findForward("list"); + } public ActionForward form(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { Index: OcularProcAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/OcularProcAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OcularProcAction.java 4 Nov 2010 06:25:16 -0000 1.2 --- OcularProcAction.java 3 Dec 2010 16:04:07 -0000 1.3 *************** *** 1,4 **** --- 1,6 ---- package org.oscarehr.eyeform.web; + import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; *************** *** 25,28 **** --- 27,40 ---- } + public ActionForward list(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + OcularProcDao dao = (OcularProcDao)SpringUtils.getBean("OcularProcDAO"); + String demographicNo = request.getParameter("demographicNo"); + + List<OcularProc> procs = dao.getByDemographicNo(Integer.parseInt(demographicNo)); + request.setAttribute("procs", procs); + + return mapping.findForward("list"); + } + public ActionForward form(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao"); |
|
From: Marc D. <hex...@us...> - 2010-12-03 16:04:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30250/web/js/custom Modified Files: eyeform-cme.js Log Message: list view of ocular procs/specs history for eyeform Index: eyeform-cme.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** eyeform-cme.js 2 Dec 2010 04:04:31 -0000 1.5 --- eyeform-cme.js 3 Dec 2010 16:04:07 -0000 1.6 *************** *** 81,84 **** --- 81,89 ---- removeNavDiv('issues'); removeNavDiv('Guidelines'); + removeNavDiv('RiskFactors'); + + //addRightNavDiv("OcularMeds"); + //popColumn(ctx + "/oscarEncounter/displayMacro.do?hC=009999&appointment_no="+appointmentNo,"OcularMeds","OcularMeds", "rightNavBar", this); + }); |
|
From: Marc D. <hex...@us...> - 2010-12-03 16:04:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30250/web/eyeform Added Files: ocular_proc_list.jsp specs_history_list.jsp Log Message: list view of ocular procs/specs history for eyeform --- NEW FILE: ocular_proc_list.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 University * Hamilton * Ontario, Canada */ --> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%> <%@page import="oscar.oscarEncounter.pageUtil.*,oscar.oscarEncounter.data.*,java.util.List,org.oscarehr.eyeform.model.OcularProc"%> <% if(session.getAttribute("user") == null) response.sendRedirect("../logout.jsp"); String demo = request.getParameter("demographicNo"); String proNo = (String) session.getAttribute("user"); oscar.oscarDemographic.data.DemographicData demoData=null; oscar.oscarDemographic.data.DemographicData.Demographic demographic=null; oscar.oscarProvider.data.ProviderData pdata = new oscar.oscarProvider.data.ProviderData(proNo); String team = pdata.getTeam(); if (demo != null ){ demoData = new oscar.oscarDemographic.data.DemographicData(); demographic = demoData.getDemographic(demo); } else response.sendRedirect("../error.jsp"); List<OcularProc> procs = (List<OcularProc>)request.getAttribute("procs"); %> <html:html locale="true"> <head> <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script> <title>Ocular Procedures </title> <html:base /> <!--META HTTP-EQUIV="Refresh" CONTENT="20;"--> <link rel="stylesheet" type="text/css" media="all" href="../share/css/extractedFromPages.css" /> </head> <script language="javascript"> function BackToOscar() { window.close(); } </script> <link rel="stylesheet" type="text/css" href="../oscarEncounter/encounterStyles.css"> <body class="BodyStyle" vlink="#0000FF" onload="window.focus()"> <!-- --> <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> <td class="MainTableTopRowLeftColumn">Ocular Procedure</td> <td class="MainTableTopRowRightColumn"> <table class="TopStatusBar"> <tr> <td class="Header" NOWRAP>Ocular Procedures <%=demographic.getLastName() %>, <%=demographic.getFirstName()%> <%=demographic.getSex()%> <%=demographic.getAge()%></td> <td></td> </tr> </table> </td> </tr> <tr style="vertical-align: top"> <td class="MainTableLeftColumn"> </td> <td class="MainTableRightColumn"> <table border="0" width="80%" cellspacing="1"> <tr> <th align="left" class="VCRheads">Procedure Name</th> <th align="left" class="VCRheads">Location</th> <th align="left" class="VCRheads">Date</th> </tr> <% for (int i = 0; i < procs.size(); i++){ String name = (String) procs.get(i).getProcedureName(); String type = (String) procs.get(i).getProcedureType(); String location = (String) procs.get(i).getLocation(); String status = (String) procs.get(i).getStatus(); String date = (String)procs.get(i).getDateStr(); %> <tr> <td ><%=name %></td> <td ><%=location %></td> <td ><%=date %></td> </tr> <%}%> </table> </td> </tr> <tr> <td class="MainTableBottomRowLeftColumn"></td> <td class="MainTableBottomRowRightColumn"></td> </tr> </table> </body> </html:html> --- NEW FILE: specs_history_list.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 University * Hamilton * Ontario, Canada */ --> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%> <%@page import="oscar.oscarEncounter.pageUtil.*,oscar.oscarEncounter.data.*,java.util.List,org.oscarehr.eyeform.model.SpecsHistory"%> <% if(session.getAttribute("user") == null) response.sendRedirect("../logout.jsp"); String demo = request.getParameter("demographicNo"); String proNo = (String) session.getAttribute("user"); oscar.oscarDemographic.data.DemographicData demoData=null; oscar.oscarDemographic.data.DemographicData.Demographic demographic=null; oscar.oscarProvider.data.ProviderData pdata = new oscar.oscarProvider.data.ProviderData(proNo); String team = pdata.getTeam(); if (demo != null ){ demoData = new oscar.oscarDemographic.data.DemographicData(); demographic = demoData.getDemographic(demo); } else response.sendRedirect("../error.jsp"); List<SpecsHistory> specs = (List<SpecsHistory>)request.getAttribute("specs"); %> <html:html locale="true"> <head> <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script> <title>Ocular Procedures </title> <html:base /> <!--META HTTP-EQUIV="Refresh" CONTENT="20;"--> <link rel="stylesheet" type="text/css" media="all" href="../share/css/extractedFromPages.css" /> </head> <script language="javascript"> function BackToOscar() { window.close(); } </script> <link rel="stylesheet" type="text/css" href="../oscarEncounter/encounterStyles.css"> <body class="BodyStyle" vlink="#0000FF" onload="window.focus()"> <!-- --> <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> <td class="MainTableTopRowLeftColumn">Specs History</td> <td class="MainTableTopRowRightColumn"> <table class="TopStatusBar"> <tr> <td class="Header" NOWRAP>Specs History <%=demographic.getLastName() %>, <%=demographic.getFirstName()%> <%=demographic.getSex()%> <%=demographic.getAge()%></td> <td></td> </tr> </table> </td> </tr> <tr style="vertical-align: top"> <td class="MainTableLeftColumn"> </td> <td class="MainTableRightColumn"> <table border="0" width="80%" cellspacing="1"> <tr> <th align="left" class="VCRheads">Type</th> <th align="left" class="VCRheads">Data</th> <th align="left" class="VCRheads">Date</th> </tr> <% for (int i = 0; i < specs.size(); i++){ String type = (String) specs.get(i).getType(); String date = specs.get(i).getDateStr(); %> <tr> <td ><%=type %></td> <td >TODO</td> <td ><%=date%></td> </tr> <%}%> </table> </td> </tr> <tr> <td class="MainTableBottomRowLeftColumn"></td> <td class="MainTableBottomRowRightColumn"></td> </tr> </table> </body> </html:html> |
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-serv30250/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil Modified Files: EctDisplayMacroAction.java EctDisplayOcularProcedureAction.java EctDisplaySpecsHistoryAction.java Log Message: list view of ocular procs/specs history for eyeform Index: EctDisplaySpecsHistoryAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplaySpecsHistoryAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EctDisplaySpecsHistoryAction.java 4 Nov 2010 06:25:16 -0000 1.3 --- EctDisplaySpecsHistoryAction.java 3 Dec 2010 16:04:07 -0000 1.4 *************** *** 66,70 **** String pathview, pathedit; ! pathview = "javascript:alert('Not yet available');"; pathedit = request.getContextPath() + "/eyeform/SpecsHistory.do?specs.demographicNo=" + bean.demographicNo + "&specs.appointmentNo=" + appointmentNo; --- 66,70 ---- String pathview, pathedit; ! pathview = request.getContextPath() + "/eyeform/SpecsHistory.do?method=list&demographicNo=" + bean.demographicNo; pathedit = request.getContextPath() + "/eyeform/SpecsHistory.do?specs.demographicNo=" + bean.demographicNo + "&specs.appointmentNo=" + appointmentNo; Index: EctDisplayMacroAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayMacroAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctDisplayMacroAction.java 29 Nov 2010 19:02:35 -0000 1.4 --- EctDisplayMacroAction.java 3 Dec 2010 16:04:07 -0000 1.5 *************** *** 67,71 **** String pathview, pathedit; ! pathview = "javascript:alert('Not yet available');"; pathedit = request.getContextPath() + "/eyeform/Macro.do?method=list"; --- 67,71 ---- String pathview, pathedit; ! pathview = request.getContextPath() + "/eyeform/Macro.do?method=list"; pathedit = request.getContextPath() + "/eyeform/Macro.do?method=list"; Index: EctDisplayOcularProcedureAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayOcularProcedureAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctDisplayOcularProcedureAction.java 4 Nov 2010 06:25:16 -0000 1.4 --- EctDisplayOcularProcedureAction.java 3 Dec 2010 16:04:07 -0000 1.5 *************** *** 66,70 **** String pathview, pathedit; ! pathview = "javascript:alert('Not yet available');"; pathedit = request.getContextPath() + "/eyeform/OcularProc.do?proc.demographicNo=" + bean.demographicNo + "&proc.appointmentNo=" + appointmentNo; --- 66,70 ---- String pathview, pathedit; ! pathview = request.getContextPath() + "/eyeform/OcularProc.do?method=list&demographicNo=" + bean.demographicNo; pathedit = request.getContextPath() + "/eyeform/OcularProc.do?proc.demographicNo=" + bean.demographicNo + "&proc.appointmentNo=" + appointmentNo; |
|
From: Marc D. <hex...@us...> - 2010-12-03 16:04:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30250/web/WEB-INF Modified Files: struts-config.xml Log Message: list view of ocular procs/specs history for eyeform Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.359 retrieving revision 1.360 diff -C2 -d -r1.359 -r1.360 *** struts-config.xml 26 Nov 2010 21:38:43 -0000 1.359 --- struts-config.xml 3 Dec 2010 16:04:06 -0000 1.360 *************** *** 1955,1958 **** --- 1955,1959 ---- <action path="/eyeform/OcularProc" type="org.oscarehr.eyeform.web.OcularProcAction" parameter="method" scope="request" validate="false" input="/eyeform/ocular_proc.jsp" name="ocularProcForm"> <forward name="form" path="/eyeform/ocular_proc.jsp" /> + <forward name="list" path="/eyeform/ocular_proc_list.jsp" /> <forward name="success" path="/eyeform/success.jsp" /> </action> *************** *** 1960,1963 **** --- 1961,1965 ---- <action path="/eyeform/SpecsHistory" type="org.oscarehr.eyeform.web.SpecsHistoryAction" parameter="method" scope="request" validate="false" input="/eyeform/specs_history.jsp" name="specsHistoryForm"> <forward name="form" path="/eyeform/specs_history.jsp" /> + <forward name="list" path="/eyeform/specs_history_list.jsp" /> <forward name="success" path="/eyeform/success.jsp" /> </action> |
|
From: Ted L. <ted...@us...> - 2010-12-03 11:39:51
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26421/docs Modified Files: gerrit_working_model.txt Log Message: general outline of review criteria for gerrit Index: gerrit_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** gerrit_working_model.txt 29 Nov 2010 03:46:16 -0000 1.18 --- gerrit_working_model.txt 3 Dec 2010 11:39:43 -0000 1.19 *************** *** 91,94 **** --- 91,105 ---- Reviewer logins in, select one of the branches, click review, if it's good set verified=+1, review=+2, then click publish and submit, and it's into the main branch. + --------------- + Review Criteria + --------------- + The following are guide lines for evaluating submissions. This is in no way an exhaustive list. + - Code must compile and run. + - If the time frame is after code freeze, it must only be bug fixes, features can be submitted but will not be approved till after. + - Is the submission an end user feature, if it is, is the feature outlined in this versions development plan (as per ISO requirement) + - Does the submission include automated tests, i.e. junit tests for DAO's and logic methods, possibly in the future httpUnit for jsp's. + - Should and does the submission include documentation on the feature, applies to all features; end user, administrative, and developer features. + - general sanity of the code itself, i.e. coding standards, reusability, maintainability, readability, industry standards, proper decomosition etc. + ------------------ Server maintenance |
|
From: Victor <vic...@us...> - 2010-12-03 00:36:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23724/web/billing/CA/ON Modified Files: billingONStatus.jsp Log Message: fixed a bug that counts inaccurate invoice totals when filtering by office Index: billingONStatus.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingONStatus.jsp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** billingONStatus.jsp 30 Nov 2010 08:17:55 -0000 1.21 --- billingONStatus.jsp 3 Dec 2010 00:36:14 -0000 1.22 *************** *** 52,55 **** --- 52,56 ---- HashMap<String,String> siteBgColor = new HashMap<String,String>(); HashMap<String,String> siteShortName = new HashMap<String,String>(); + int patientCount = 0; if (bMultisites) { SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao"); *************** *** 622,625 **** --- 623,631 ---- continue; // multisite: skip if the line doesn't belong to the selected clinic + if (bMultisites && selectedSite != null && (!selectedSite.equals(ch1Obj.getClinic()))) + continue; + + patientCount ++; + // ra code if(raCode.trim().length() == 2) { *************** *** 672,677 **** settleDate = settleDate.substring(0, settleDate.indexOf(" ")); } ! if (bMultisites && selectedSite != null && (!selectedSite.equals(ch1Obj.getClinic()))) ! continue; %> <tr <%=color %>> --- 678,682 ---- settleDate = settleDate.substring(0, settleDate.indexOf(" ")); } ! %> <tr <%=color %>> *************** *** 710,715 **** <tr class="myYellow"> <td>Count:</td> ! <td align="center"><%=bList.size()%></td> ! <td align="center"><%=bList.size()%></td> <td> </td> <!--STAT--> <td> </td> --- 715,720 ---- <tr class="myYellow"> <td>Count:</td> ! <td align="center"><%=patientCount%></td> ! <td align="center"><%=patientCount%></td> <td> </td> <!--STAT--> <td> </td> |
|
From: Jay G. <jay...@us...> - 2010-12-02 21:53:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7461 Modified Files: appointmentprovideradminmonth.jsp Log Message: removed System.out Index: appointmentprovideradminmonth.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminmonth.jsp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** appointmentprovideradminmonth.jsp 30 Nov 2010 08:17:56 -0000 1.39 --- appointmentprovideradminmonth.jsp 2 Dec 2010 21:53:06 -0000 1.40 *************** *** 130,135 **** selectedSite = (requestSite == null ? (String)session.getAttribute("site_selected") : requestSite) ; - System.out.println("selectedSite:" + selectedSite + " providerview: " + providerview + " mygroupno: " + mygroupno); - if (isSiteAccessPrivacy || isTeamAccessPrivacy) { //user has Access Privacy, set user provider and group list --- 130,133 ---- |
|
From: Jay G. <jay...@us...> - 2010-12-02 21:46:59
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5204 Modified Files: providerRole.jsp Log Message: removed System.out Index: providerRole.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/providerRole.jsp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** providerRole.jsp 30 Nov 2010 08:17:54 -0000 1.20 --- providerRole.jsp 2 Dec 2010 21:46:51 -0000 1.21 *************** *** 327,331 **** query += " p.provider_no=u.provider_no where p.last_name like '" + lastName + "' and p.first_name like '" + firstName + "' and p.status='1' order by p.first_name, p.last_name, u.role_name"; } ! //System.out.println(query); rs = dbObj.searchDBRecord(query); Vector<Properties> vec = new Vector<Properties>(); --- 327,331 ---- query += " p.provider_no=u.provider_no where p.last_name like '" + lastName + "' and p.first_name like '" + firstName + "' and p.status='1' order by p.first_name, p.last_name, u.role_name"; } ! rs = dbObj.searchDBRecord(query); Vector<Properties> vec = new Vector<Properties>(); |
|
From: annie <ann...@us...> - 2010-12-02 19:46:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28851/database/mysql/caisi Modified Files: Tag: RELEASE_10_06 init_ocan_form_option.sql Log Message: fixed the bug. Index: init_ocan_form_option.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/init_ocan_form_option.sql,v retrieving revision 1.3.4.4 retrieving revision 1.3.4.5 diff -C2 -d -r1.3.4.4 -r1.3.4.5 *** init_ocan_form_option.sql 25 Oct 2010 20:29:23 -0000 1.3.4.4 --- init_ocan_form_option.sql 2 Dec 2010 19:46:07 -0000 1.3.4.5 *************** *** 22,26 **** LOCK TABLES `OcanFormOption` WRITE; /*!40000 ALTER TABLE `OcanFormOption` DISABLE KEYS */; ! INSERT INTO `OcanFormOption` VALUES (33,'1.2','MIS Functional Centre List','725 09 76','CM - Case Management'),(34,'1.2','MIS Functional Centre List','725 10 76 12','C&T - Counseling & Treatment'),(35,'1.2','MIS Functional Centre List','725 10 76 20','ACT - Assertive Community Treatment Teams'),(36,'1.2','MIS Functional Centre List','725 10 76 30','CMH - Community Mental Health Clinic'),(37,'1.2','MIS Functional Centre List','725 10 76 40','EMP - Vocational/Employment'),(38,'1.2','MIS Functional Centre List','725 10 76 41','CLU - Clubhouses'),(39,'1.2','MIS Functional Centre List','725 10 76 45','CON - Concurrent Disorders'),(40,'1.2','MIS Functional Centre List','725 10 76 50','CHI - Child / Adolescent'),(41,'1.2','MIS Functional Centre List','725 10 76 51','EAR - Early Intervention'),(42,'1.2','MIS Functional Centre List','725 10 76 55','FOR - Forensic'),(43,'1.2','MIS Functional Centre List','725 10 76 56','DCS - Diversion & Court Support'),(44,'1.2','MIS Functional Centre List','725 10 76 60','AS - Abuse Services'),(45,'1.2','MIS Functional Centre List','725 10 76 70','EAT - Eating Disorder'),(46,'1.2','MIS Functional Centre List','725 10 76 81','SR - Social Rehabilitation/Recreation'),(47,'1.2','MIS Functional Centre List','725 10 76 95','DDx - Dual Diagnosis'),(48,'1.2','MIS Functional Centre List','725 10 76 96','GER - Psycho-geriatric'),(49,'1.2','MIS Functional Centre List','725 15 76','CRI - Mental Health Crisis Intervention'),(50,'1.2','MIS Functional Centre List','725 20 76','DN - Primary Day/Night Care'),(51,'1.2','MIS Functional Centre List','725 40 76 10','HSC - Homes for Special Care'),(52,'1.2','MIS Functional Centre List','725 40 76 30','SH - Supportive within Housing'),(53,'1.2','MIS Functional Centre List','725 40 76 60','CSB - Short term Res.Crisis Support Beds'),(54,'1.2','MIS Functional Centre List','725 70 11','I&R - Community Service Information and Referral'),(55,'1.2','MIS Functional Centre List','725 50 76 10','HPA - Health Promotion / Education - Awareness'),(56,'1.2','MIS Functional Centre List','725 50 76 30','HPW - Health Promotion / Education - Women\'s Health (MH)'),(57,'1.2','MIS Functional Centre List','725 50 76 40','CD - Community Development'),(58,'1.2','MIS Functional Centre List','725 51 76 11','PSH - Peer / Self-help Initiatives'),(59,'1.2','MIS Functional Centre List','725 51 76 12','AB - Alternative Businesses'),(60,'1.2','MIS Functional Centre List','725 51 76 20','FI - Family Initiatives'),(61,'1.2','Aboriginal Origin','011-01','Aboriginal'),(62,'1.2','Aboriginal Origin','011-02','Non-aboriginal'),(63,'1.2','Aboriginal Origin','UNK','Unknown'),(64,'1.2','Aboriginal Origin','CDA','Consumer Declined to Answer'),(65,'1.2','Action List','0AS','Abuse Services'),(66,'1.2','Action List','ADD','Addictions'),(67,'1.2','Action List','0AB','Alternative Businesses'),(68,'1.2','Action List','ACT','Assertive Community Treatment Teams'),(69,'1.2','Action List','0CM','Mental Health Case Management'),(70,'1.2','Action List','CHI','Child/Adolescent'),(71,'1.2','Action List','CLU','Clubhouses'),(72,'1.2','Action List','0CD','Community Development'),(73,'1.2','Action List','CMH ','Community Mental Health Clinic'),(74,'1.2','Action List','0IR ','Community Service Information and Referral'),(75,'1.2','Action List','CON','Concurrent Disorders'),(76,'1.2','Action List','C&T','Counseling & Treatment'),(77,'1.2','Action List','DDx ','Dual Diagnosis'),(78,'1.2','Action List','EAR ','Early Intervention'),(79,'1.2','Action List','EAT','Eating Disorder'),(80,'1.2','Action List','0FI ','Family Initiatives'),(81,'1.2','Action List','FOR','Forensic DCS Diversion & Court Support'),(82,'1.2','Action List','HPA ','Health Promotion/Education Awareness'),(83,'1.2','Action List','HPW','Health Promotion/Education Women\'s Mental Health'),(84,'1.2','Action List','HSC','Homes for Special Care'),(85,'1.2','Action List','CRI ','Mental Health Crisis Intervention'),(86,'1.2','Action List','PSH','Peer/Self-help Initiatives'),(87,'1.2','Action List','0DN','Primary Day/Night Care'),(88,'1.2','Action List','GER','Psycho-geriatric'),(89,'1.2','Action List','CSB','Short term Res. Crisis Support Beds'),(90,'1.2','Action List','0SR','Social Rehabilitation/Recreation'),(91,'1.2','Action List','0SH','Support within Housing'),(92,'1.2','Action List','EMP','Vocational/Employment'),(93,'1.2','Action List','CAC','CCAC'),(94,'1.2','Action List','CMS','Church, mosque, synagogue, etc.'),(95,'1.2','Action List','DNT','Dentist'),(96,'1.2','Action List','FHG','Family help groups (Other than MH)'),(97,'1.2','Action List','AGS','Older adult & geriatric services'),(98,'1.2','Action List','OPT','Optometrists'),(99,'1.2','Action List','POL','Police'),(100,'1.2','Action List','PRI','Primary care CHC, FHT, FHG, FHN, GP'),(101,'1.2','Action List','SCH','School'),(102,'1.2','Action List','SHG','Self help groups (Other than MH)'),(103,'1.2','Action List','0SC','Service clubs'),(104,'1.2','Action List','SSs','Social Services - ODSP, CPP, EI, etc.'),(105,'1.2','Action List','YSs','Youth services'),(106,'1.2','Action List','0CP','Community psychiatry'),(107,'1.2','Action List','0PP','Private practitioners'),(108,'1.2','Action List','FBS','Food bank/soup kitchens'),(109,'1.2','Action List','0LC','Legal counsel'),(110,'1.2','Action List','0IS','Immigration services'),(111,'1.2','Action List','FCP','Financial-credit counseling, financial planning'),(112,'1.2','Action List','FIT','Fitness'),(113,'1.2','Action List','AHO','Alternative healing options: chiropractic, acupuncture, meditation, herbalist, etc.'),(114,'1.2','Action List','PSC','Parenting supports: child care'),(115,'1.2','Action List','CAS','CAS, CCAS, JCFS'),(116,'1.2','Action List','HOS','Hospital'),(117,'1.2','Addiction Type','105523009','Gambling'),(118,'1.2','Addiction Type','56294008','Nicotine'),(119,'1.2','Addiction Type','OTH','Other'),(120,'1.2','Age Category','184099003','Date of Birth'),(122,'1.2','Assessment Status','Active','In Progress'),(123,'1.2','Assessment Status','Complete','Completed'),(124,'1.2','Citizenship Status','CDN','Canadian Citizen'),(125,'1.2','Citizenship Status','PR','Permanent Resident'),(126,'1.2','Citizenship Status','TR','Temporary Resident'),(127,'1.2','Citizenship Status','REF','Refugee'),(128,'1.2','Citizenship Status','UNK','Unknown'),(129,'1.2','Citizenship Status','CDA','Consumer Declined to Answer'),(130,'1.2','Client Capacity','TRUE','Yes'),(131,'1.2','Client Capacity','FALSE','No'),(132,'1.2','Client Capacity','UNK','Unknown'),(133,'1.2','Client Capacity','CDA','Consumer Declined to Answer'),(134,'1.2','Community Treatment Orders','015-01','Issued CTO'),(135,'1.2','Community Treatment Orders','015-02','No CTO'),(136,'1.2','Community Treatment Orders','UNK','Unknown'),(137,'1.2','Community Treatment Orders','015-04','Consumer Declined to Answer'),(138,'1.2','Concerns Detail','118254002','Head and neck'),(139,'1.2','Concerns Detail','279084009','Chest'),(140,'1.2','Concerns Detail','119415007','Abdomen'),(141,'1.2','Concerns Detail','302293008','Extremities (arms, legs, hands, feet)'),(142,'1.2','Concerns Detail','300479008','Genital/ urinary'),(143,'1.2','Concerns Detail','106076001','Skin'),(144,'1.2','Concerns Detail','118952005','Joints'),(145,'1.2','Concerns Detail','365092005','Mobility'),(146,'1.2','Concerns Detail','102957003','Neurological'),(147,'1.2','Concerns Detail','118230007','Hearing'),(148,'1.2','Concerns Detail','118235002','Vision'),(149,'1.2','Concerns Detail','410515003','Other'),(150,'1.2','Diagnostic Categories','17226007','Adjustment Disorders'),(151,'1.2','Diagnostic Categories','197480006','Anxiety Disorder'),(152,'1.2','Diagnostic Categories','2776000','Delirium, Dementia, and Amnestic and Cognitive Disorders'),(153,'1.2','Diagnostic Categories','DCA','Disorder of Childhood/Adolescence'),(154,'1.2','Diagnostic Categories','44376007','Dissociative Disorders'),(155,'1.2','Diagnostic Categories','72366004','Eating Disorders'),(156,'1.2','Diagnostic Categories','50705009','Factitious Disorders '),(157,'1.2','Diagnostic Categories','66347000','Impulse Control Disorders not elsewhere classified'),(158,'1.2','Diagnostic Categories','MDGMC','Mental Disorders due to General Medical Conditions'),(159,'1.2','Diagnostic Categories','46206005','Mood Disorder'),(160,'1.2','Diagnostic Categories','33449004','Personality Disorders'),(161,'1.2','Diagnostic Categories','58214004','Schizophrenia other Psychotic Disorders'),(162,'1.2','Diagnostic Categories','39898005','Sexual and Gender Identity Disorders'),(163,'1.2','Diagnostic Categories','31297008','Sleep Disorders'),(164,'1.2','Diagnostic Categories','87858002','Somatoform Disorders '),(165,'1.2','Diagnostic Categories','SRD','Substance Related Disorders, Developmental Handicap'),(166,'1.2','Diagnostic Categories','0DH','Developmental Handicap'),(167,'1.2','Diagnostic Categories','UNK','Unknown'),(168,'1.2','Diagnostic Categories','CDA','Consumer Declined to Answer'),(169,'1.2','Diagnostic - Other Illness','016A-01','Concurrent Disorder (Substance Abuse)'),(170,'1.2','Diagnostic - Other Illness','016A-02','Dual Diagnosis (Development Disability)'),(171,'1.2','Diagnostic - Other Illness','OPD','Other Physical Disabilities'),(172,'1.2','Discrimination Experience','21134002','Disability'),(173,'1.2','Discrimination Experience','397731000','Ethnicity'),(174,'1.2','Discrimination Experience','365873007','Gender'),(175,'1.2','Discrimination Experience','IMGR','Immigration'),(176,'1.2','Discrimination Experience','74732009','Mental Illness'),(177,'1.2','Discrimination Experience','415229000','Race'),(178,'1.2','Discrimination Experience','365577002','Religion'),(179,'1.2','Discrimination Experience','365956009','Sexual Orientation'),(180,'1.2','Discrimination Experience','OTH','Other'),(181,'1.2','Discrimination Experience','UNK','Unknown'),(182,'1.2','Discrimination Experience','CDA','Consumer Declined to Answer'),(183,'1.2','Doctor Psychiatrist','TRUE','Yes'),(184,'1.2','Doctor Psychiatrist','FALSE','No'),(185,'1.2','Doctor Psychiatrist','NOTAVAIL','None Available'),(186,'1.2','Drug List','398705004','Marijuana'),(187,'1.2','Drug List','288453002','Cocaine (crack)'),(188,'1.2','Drug List','229005006','Hallucinogens (e.g. LSD, PCP)'),(189,'1.2','Drug List','226059005','Stimulants (e.g. amphetamines)'),(190,'1.2','Drug List','226044004','Opiates (e.g. heroin)'),(191,'1.2','Drug List','372614000','Sedatives (not prescribed or not taken as prescribed e.g. Valium)'),(192,'1.2','Drug List','80288002','Over-the-counter'),(193,'1.2','Drug List','61010005','Solvents'),(194,'1.2','Drug List','OTH','Other'),(195,'1.2','Education Level','224294005','No Formal Schooling'),(196,'1.2','Education Level','HLES-2','Some Elementary/Junior High School'),(197,'1.2','Education Level','224295006','Elementary/Junior High School'),(198,'1.2','Education Level','HLES-4','Some Secondary/High School'),(199,'1.2','Education Level','224297003','Secondary/High School'),(200,'1.2','Education Level','HLES-6','Some College / University'),(201,'1.2','Education Level','224302000','College / University'),(202,'1.2','Education Level','UNK','Unknown'),(203,'1.2','Education Level','CDA','Consumer Declined to Answer'),(204,'1.2','Education Program Status','224304004','Not in school'),(205,'1.2','Education Program Status','224306002','Elementary/Junior High School'),(206,'1.2','Education Program Status','224308001','Secondary/High School'),(207,'1.2','Education Program Status','224860003','Trade School'),(208,'1.2','Education Program Status','54106008','Vocational/Training Centre'),(209,'1.2','Education Program Status','161125007','Adult education'),(210,'1.2','Education Program Status','224870001','Community College'),(211,'1.2','Education Program Status','224871002','University'),(212,'1.2','Education Program Status','OTH','Other'),(213,'1.2','Education Program Status','UNK','Unknown'),(214,'1.2','Education Program Status','CDA','Consumer Declined to Answer'),(215,'1.2','Employment Status','224363007','Independent/Competitive'),(216,'1.2','Employment Status','ES-1','Assisted/Supported'),(217,'1.2','Employment Status','ES-2','Alternative businesses'),(218,'1.2','Employment Status','224366004','Sheltered Workshop'),(219,'1.2','Employment Status','276061003','Non-paid work experience'),(220,'1.2','Employment Status','ES-3','No employment - other activity'),(221,'1.2','Employment Status','224364001','Casual/Sporadic'),(222,'1.2','Employment Status','73438004','No employment - of any kind'),(223,'1.2','Employment Status','UNK','Unknown'),(224,'1.2','Employment Status','CDA','Consumer Declined to Answer'),(225,'1.2','Ethniticity','88790004','Abyssinians (Amharas) '),(226,'1.2','Ethniticity','15086000','African American '),(227,'1.2','Ethniticity','413465009','Afro-Caribbean'),(228,'1.2','Ethniticity','413466005','Afro-Caucasian'),(229,'1.2','Ethniticity','66920001','Amerind'),(230,'1.2','Ethniticity','413569000','Arab'),(231,'1.2','Ethniticity','113169009','Armenians'),(232,'1.2','Ethniticity','315280000','Asian'),(233,'1.2','Ethniticity','43608005','Australian aborigine'),(234,'1.2','Ethniticity','68486007','Austrian'),(235,'1.2','Ethniticity','67931002','Aztec '),(236,'1.2','Ethniticity','186003008','Bangladeshi '),(237,'1.2','Ethniticity','45465003','Basque'),(238,'1.2','Ethniticity','56056003','Belgian'),(239,'1.2','Ethniticity','2852001','Bhutanese '),(240,'1.2','Ethniticity','315240009','Black'),(241,'1.2','Ethniticity','185993005','Black - other African country '),(242,'1.2','Ethniticity','185996002','Black - other Asian '),(243,'1.2','Ethniticity','275587000','Black Arab '),(244,'1.2','Ethniticity','185988007','Black Caribbean '),(245,'1.2','Ethniticity','275589002','Black East African'),(246,'1.2','Ethniticity','185995003','Black Indian sub-continent '),(247,'1.2','Ethniticity','275586009','Black North African '),(248,'1.2','Ethniticity','309644006','Black West Indian '),(249,'1.2','Ethniticity','185989004','Black, other, non-mixed origin '),(250,'1.2','Ethniticity','72337002','Brazilian Indians '),(251,'1.2','Ethniticity','47250000','Bruneians '),(252,'1.2','Ethniticity','29343004','Bulgarian'),(253,'1.2','Ethniticity','14045001','Caucasian'),(254,'1.2','Ethniticity','33897005','Chinese '),(255,'1.2','Ethniticity','52075006','Congolese '),(256,'1.2','Ethniticity','286009','Czech'),(257,'1.2','Ethniticity','14176005','Danish'),(258,'1.2','Ethniticity','9533000','Dutch'),(259,'1.2','Ethniticity','1919006','Egyptian'),(260,'1.2','Ethniticity','25804004','English'),(261,'1.2','Ethniticity','18583004','Estonian'),(262,'1.2','Ethniticity','414152003','European'),(263,'1.2','Ethniticity','69865008','Fijian '),(264,'1.2','Ethniticity','76768002','Filipinos '),(265,'1.2','Ethniticity','10117001','Finnish'),(266,'1.2','Ethniticity','19434008','French'),(267,'1.2','Ethniticity','90822005','Gambians '),(268,'1.2','Ethniticity','32045009','Georgian'),(269,'1.2','Ethniticity','7695005','German'),(270,'1.2','Ethniticity','7474002','Ghanaians '),(271,'1.2','Ethniticity','1451003','Greek'),(272,'1.2','Ethniticity','40182006','Gypsy'),(273,'1.2','Ethniticity','20140003','Hawaiians '),(274,'1.2','Ethniticity','64693008','Hungarian'),(275,'1.2','Ethniticity','2720008','Hututu '),(276,'1.2','Ethniticity','72809004','Icelandic'),(277,'1.2','Ethniticity','55990000','Inca '),(278,'1.2','Ethniticity','186001005','Indian (East Indian) '),(279,'1.2','Ethniticity','64483007','Indian (Hindi-speaking) '),(280,'1.2','Ethniticity','21993009','Indonesians '),(281,'1.2','Ethniticity','69983001','Irani '),(282,'1.2','Ethniticity','27700004','Iraqi '),(283,'1.2','Ethniticity','31637002','Italian'),(284,'1.2','Ethniticity','414551003','Japanese '),(285,'1.2','Ethniticity','20449009','Javanese '),(286,'1.2','Ethniticity','11794009','Kenyans '),(287,'1.2','Ethniticity','53195006','Kirghiz '),(288,'1.2','Ethniticity','38361009','Koreans '),(289,'1.2','Ethniticity','67165000','Lapps '),(290,'1.2','Ethniticity','9158000','Liberians '),(291,'1.2','Ethniticity','21868006','Madagascans '),(292,'1.2','Ethniticity','1340002','Malayans '),(293,'1.2','Ethniticity','73736004','Maori '),(294,'1.2','Ethniticity','63457007','Maya '),(295,'1.2','Ethniticity','414661004','Melanesian'),(296,'1.2','Ethniticity','47327008','Mexican Indians '),(297,'1.2','Ethniticity','3698008','Micronesians '),(298,'1.2','Ethniticity','315239007','Mixed ethnic group'),(299,'1.2','Ethniticity','24812003','Mongoloid'),(300,'1.2','Ethniticity','41076003','Mozambiquans '),(301,'1.2','Ethniticity','186036009','New Zealand European'),(302,'1.2','Ethniticity','186039002','New Zealand Maori'),(303,'1.2','Ethniticity','88934004','Nigerians '),(304,'1.2','Ethniticity','17095009','Norwegian'),(305,'1.2','Ethniticity','18575005','Oceanic'),(306,'1.2','Ethniticity','414978006','Oriental '),(307,'1.2','Ethniticity','315281001','Other Asian ethnic group '),(308,'1.2','Ethniticity','186005001','Other ethnic non-mixed group'),(309,'1.2','Ethniticity','401214002','Other white British ethnic group '),(310,'1.2','Ethniticity','186002003','Pakistani '),(311,'1.2','Ethniticity','28562006','Polish'),(312,'1.2','Ethniticity','23517005','Polynesians '),(313,'1.2','Ethniticity','80208004','Portuguese'),(314,'1.2','Ethniticity','85163001','Russian'),(315,'1.2','Ethniticity','86275006','Samoan '),(316,'1.2','Ethniticity','3818007','Senegalese '),(317,'1.2','Ethniticity','50405005','Senoy '),(318,'1.2','Ethniticity','53460002','Serbian'),(319,'1.2','Ethniticity','28796001','Siamese '),(320,'1.2','Ethniticity','36329002','Slovakian'),(321,'1.2','Ethniticity','46110004','Somalis '),(322,'1.2','Ethniticity','108342005','South Asian'),(323,'1.2','Ethniticity','186044009','South East Asian'),(324,'1.2','Ethniticity','28409002','Spanish'),(325,'1.2','Ethniticity','88839008','Sudanese '),(326,'1.2','Ethniticity','81403004','Swedish'),(327,'1.2','Ethniticity','76574004','Swiss'),(328,'1.2','Ethniticity','59487007','Syrian'),(329,'1.2','Ethniticity','63736003','Taiwanese '),(330,'1.2','Ethniticity','12556008','Tamils '),(331,'1.2','Ethniticity','91066000','Tatars '),(332,'1.2','Ethniticity','83365001','Thais '),(333,'1.2','Ethniticity','44460002','Turks '),(334,'1.2','Ethniticity','14470009','Tutsi '),(335,'1.2','Ethniticity','76775001','Ugandans '),(336,'1.2','Ethniticity','62598008','Venezuelan Indians '),(337,'1.2','Ethniticity','312859007','Vietnamese '),(338,'1.2','Ethniticity','14999008','Welsh'),(339,'1.2','Ethniticity','8124001','West Africans '),(340,'1.2','Ethniticity','160531006','West indian '),(341,'1.2','Ethniticity','185984009','White'),(342,'1.2','Exit Disposition','019-01','Completion without referral'),(343,'1.2','Exit Disposition','019-02','Completion with referral'),(344,'1.2','Exit Disposition','019-03','Suicides'),(345,'1.2','Exit Disposition','019-04','Death'),(346,'1.2','Exit Disposition','019-05','Relocation'),(347,'1.2','Exit Disposition','019-06','Withdrawal'),(348,'1.2','Frequency of Alcohol Use','1','Daily'),(349,'1.2','Frequency of Alcohol Use','2','2-3 times weekly'),(350,'1.2','Frequency of Alcohol Use','3','once a week'),(351,'1.2','Frequency of Alcohol Use','4','monthly'),(352,'1.2','Frequence of Drug Use','5','Past 6 months'),(353,'1.2','Frequence of Drug Use','6','Ever'),(354,'1.2','Administrative Gender','M','Male'),(355,'1.2','Administrative Gender','F','Female'),(356,'1.2','Administrative Gender','OTH','Other'),(357,'1.2','Administrative Gender','UNK','Unknown'),(358,'1.2','Administrative Gender','CDA','Consumer Declined to answer'),(359,'1.2','Help Provided Needed','TRUE','Yes'),(360,'1.2','Help Provided Needed','FALSE','No'),(361,'1.2','Help Provided Needed','UNK','Unknown'),(362,'1.2','Hospitalized Mental Illness','TRUE','Yes'),(363,'1.2','Hospitalized Mental Illness','FALSE','No'),(364,'1.2','Hospitalized Mental Illness','UNK','Unknown'),(365,'1.2','Hospitalized Mental Illness','CDA','Consumer Declined to Answer'),(366,'1.2','Income Source Type','031-01','Employment'),(367,'1.2','Income Source Type','031-02','Employment Insurance'),(368,'1.2','Income Source Type','031-03','Pension'),(369,'1.2','Income Source Type','031-04','ODSP'),(370,'1.2','Income Source Type','031-05','Social Assistance'),(371,'1.2','Income Source Type','031-06','Disability Assistance'),(372,'1.2','Income Source Type','031-07','Family'),(373,'1.2','Income Source Type','031-08','No source of income'),(374,'1.2','Income Source Type','OTH','Other'),(375,'1.2','Income Source Type','UNK','Unknown'),(376,'1.2','Income Source Type','CDA','Consumer Declined to Answer'),(377,'1.2','Language','eng','English'),(378,'1.2','Language','fra','French'),(379,'1.2','Language','alq','Algonquin'),(380,'1.2','Language','atj','Atikamekw'),(381,'1.2','Language','bla','Blackfoot'),(382,'1.2','Language','crx','Carrier'),(383,'1.2','Language','clc','Chilcotin'),(384,'1.2','Language','chp','Chipewyan'),(385,'1.2','Language','cre','Cree'),(386,'1.2','Language','dak','Siouan languages (Dakota/Sioux)'),(387,'1.2','Language','ath','Athapaskan languages'),(388,'1.2','Language','dgr','Dogrib'),(389,'1.2','Language','git','Gitksan'),(390,'1.2','Language','ikt','Inuinnaqtun'),(391,'1.2','Language','iku','Inuktitut, n.i.e.'),(392,'1.2','Language','gwi','Kutchin-Gwich\'in (Loucheux)'),(393,'1.2','Language','pqm','Malecite'),(394,'1.2','Language','mic','Mi\'kmaq'),(395,'1.2','Language','moh','Mohawk'),(396,'1.2','Language','moe','Montagnais'),(397,'1.2','Language','nks','Naskapi'),(398,'1.2','Language','ncg','Nisga\'a'),(399,'1.2','Language','scs','North Slave (Hare)'),(400,'1.2','Language','oji','Ojibway'),(401,'1.2','Language','alg','Oji-Cree'),(402,'1.2','Language','shs','Shuswap'),(403,'1.2','Language','xsl','South Slave'),(404,'1.2','Language','tli','Tlingit'),(405,'1.2','Language','ita','Italian'),(406,'1.2','Language','por','Portuguese'),(407,'1.2','Language','ron','Romanian'),(408,'1.2','Language','spa','Spanish'),(409,'1.2','Language','dan','Danish'),(410,'1.2','Language','nld','Dutch'),(411,'1.2','Language','vls','Flemish'),(412,'1.2','Language','fry','Frisian'),(413,'1.2','Language','deu','German'),(414,'1.2','Language','nor','Norwegian'),(415,'1.2','Language','swe','Swedish'),(416,'1.2','Language','yid','Yiddish'),(417,'1.2','Language','bos','Bosnian'),(418,'1.2','Language','bul','Bulgarian'),(419,'1.2','Language','hrv','Croatian'),(420,'1.2','Language','ces','Czech'),(421,'1.2','Language','mkd','Macedonian'),(422,'1.2','Language','pol','Polish'),(423,'1.2','Language','prg','Russian'),(424,'1.2','Language','srp','Serbian'),(425,'1.2','Language','hbs','Serbo-Croatian'),(426,'1.2','Language','slk','Slovak'),(427,'1.2','Language','slv','Slovenian'),(428,'1.2','Language','ukr','Ukrainian'),(429,'1.2','Language','lav','Latvian'),(430,'1.2','Language','lit','Lithuanian'),(431,'1.2','Language','est','Estonian'),(432,'1.2','Language','fin','Finnish'),(433,'1.2','Language','hun','Hungarian'),(434,'1.2','Language','ell','Greek'),(435,'1.2','Language','hye','Armenian'),(436,'1.2','Language','tur','Turkish'),(437,'1.2','Language','amh','Amharic'),(438,'1.2','Language','ara','Arabic'),(439,'1.2','Language','heb','Hebrew'),(440,'1.2','Language','mlt','Maltese'),(441,'1.2','Language','som','Somali'),(442,'1.2','Language','tir','Tigrinya'),(443,'1.2','Language','ben','Bengali'),(444,'1.2','Language','guj','Gujarati'),(445,'1.2','Language','hin','Hindi'),(446,'1.2','Language','kur','Kurdish'),(447,'1.2','Language','pan','Panjabi (Punjabi)'),(448,'1.2','Language','pus','Pashto'),(449,'1.2','Language','fas','Persian (Farsi)'),(450,'1.2','Language','snd','Sindhi'),(451,'1.2','Language','sin','Sinhala (Sinhalese)'),(452,'1.2','Language','urd','Urdu'),(453,'1.2','Language','mal','Malayalam'),(454,'1.2','Language','tam','Tamil'),(455,'1.2','Language','tel','Telugu'),(456,'1.2','Language','jpn','Japanese'),(457,'1.2','Language','kor','Korean'),(458,'1.2','Language','yue','Cantonese'),(459,'1.2','Language','zho','Chinese, n.o.s. [2]'),(460,'1.2','Language','cmn','Mandarin '),(461,'1.2','Language','nan','Taiwanese'),(462,'1.2','Language','lao','Lao'),(463,'1.2','Language','khm','Khmer (Cambodian)'),(464,'1.2','Language','khn','Khmer (Cambodian)'),(465,'1.2','Language','vie','Vietnamese'),(466,'1.2','Language','bsb','Bisayan languages'),(467,'1.2','Language','bsy','Bisayan languages'),(468,'1.2','Language','ilo','ilocano'),(469,'1.2','Language','zsm','Malay'),(470,'1.2','Language','tgl','Tagalog (Pilipino, Filipino)'),(471,'1.2','Language','aka','Akan (Twi)'),(472,'1.2','Language','swh','Swahili'),(473,'1.2','Language','crp','Creoles'),(474,'1.2','Last Seen','LS-1','Within the last month'),(475,'1.2','Last Seen','LS-6','Within the last six months'),(476,'1.2','Last Seen','LS-12','Within the last year'),(477,'1.2','Last Seen','LS-13','More than a year ago'),(478,'1.2','Legal History Type','013-01','Pre-charge Diversion'),(479,'1.2','Legal History Type','013-02','Court Diversion Program'),(480,'1.2','Legal History Type','013-03','Awaiting fitness assessment'),(481,'1.2','Legal History Type','013-04','Awaiting trial (with or without bail)'),(482,'1.2','Legal History Type','013-05','Awaiting Criminal Responsibility Assessment (NCR)'),(483,'1.2','Legal History Type','013-06','In community on own recognizance'),(484,'1.2','Legal History Type','013-07','Unfit to stand trial'),(485,'1.2','Legal History Type','013-08','Charges withdrawn'),(486,'1.2','Legal History Type','013-09','Stay of proceedings'),(487,'1.2','Legal History Type','013-10','Awaiting sentence'),(488,'1.2','Legal History Type','013-11','NCR'),(489,'1.2','Legal History Type','013-12','Conditional discharge'),(490,'1.2','Legal History Type','013-13','Conditional sentence'),(491,'1.2','Legal History Type','013-14','Restraining order'),(492,'1.2','Legal History Type','013-15','Peace bond'),(493,'1.2','Legal History Type','013-16','suspended sentence'),(494,'1.2','Legal History Type','013-17','ORB detained - community access'),(495,'1.2','Legal History Type','013-18','ORB conditional discharge'),(496,'1.2','Legal History Type','013-19','On parole'),(497,'1.2','Legal History Type','013-20','On probation'),(498,'1.2','Legal History Type','013-21','No legal problems (includes absolute discharge and end of sentence)'),(499,'1.2','Legal History Type','UNK','Unknown'),(500,'1.2','Legal History Type','CDA','Consumer Declined to Answer'),(501,'1.2','Legal Issues','Civil','Civil'),(502,'1.2','Legal Issues','Criminal','Criminal'),(503,'1.2','Legal Issues','None','None'),(504,'1.2','Legal Issues','UNK','Unknown'),(505,'1.2','Legal Issues','CDA','Consumer Declined to Answer'),(506,'1.2','LHIN code','1','Erie St.Clair'),(507,'1.2','LHIN code','2','South West'),(508,'1.2','LHIN code','3','Waterloo Wellington'),(509,'1.2','LHIN code','4','Hamilton Niagara Haldimand Brant'),(510,'1.2','LHIN code','5','Central West'),(511,'1.2','LHIN code','6','Mississauga-Halton'),(512,'1.2','LHIN code','7','Toronto Central'),(513,'1.2','LHIN code','8','Central'),(514,'1.2','LHIN code','9','Central East'),(515,'1.2','LHIN code','10','South East'),(516,'1.2','LHIN code','11','Champlain'),(517,'1.2','LHIN code','12','North Simcoe Muskoka'),(518,'1.2','LHIN code','13','North East'),(519,'1.2','LHIN code','14','North West'),(520,'1.2','Living Arrangement Type','023-01','Self'),(521,'1.2','Living Arrangement Type','023-02','Spouse/Partner'),(522,'1.2','Living Arrangement Type','023-03','Spouse/Partner and Others'),(523,'1.2','Living Arrangement Type','023-04','Children'),(524,'1.2','Living Arrangement Type','023-05','Parents'),(525,'1.2','Living Arrangement Type','023-06','Relatives'),(526,'1.2','Living Arrangement Type','023-07','Non-relatives'),(527,'1.2','Living Arrangement Type','UNK','Unknown'),(528,'1.2','Living Arrangement Type','023-09','Consumer Declined to Answer'),(529,'1.2','Marital Status','125681006','Single'),(530,'1.2','Marital Status','87915002','Married or in common-law relationship'),(531,'1.2','Marital Status','42120006','Partner or significant other'),(532,'1.2','Marital Status','33553000','Widowed'),(533,'1.2','Marital Status','13184001','Separated'),(534,'1.2','Marital Status','20295000','Divorced'),(535,'1.2','Marital Status','UNK','Unknown'),(536,'1.2','Marital Status','CDA','Consumer Declined to answer'),(537,'1.2','Medical Conditions','127294003','Acquired Brain Injury (ABI)'),(538,'1.2','Medical Conditions','3723001','Arthritis'),(539,'1.2','Medical Conditions','408856003','Autism'),(540,'1.2','Medical Conditions','386813002','Breathing problems'),(541,'1.2','Medical Conditions','363346000','Cancer'),(542,'1.2','Medical Conditions','19943007','Cirrhosis'),(543,'1.2','Medical Conditions','191415002','Communicable disease'),(544,'1.2','Medical Conditions','46635009','Diabetes Type 1'),(545,'1.2','Medical Conditions','44054006','Diabetes Type 2'),(546,'1.2','Medical Conditions','359939009','Diabetes Type 3'),(547,'1.2','Medical Conditions','73211009','Diabetes Other'),(548,'1.2','Medical Conditions','72366004','Eating disorder'),(549,'1.2','Medical Conditions','84757009','Epilepsy'),(550,'1.2','Medical Conditions','15188001','Hearing impairment'),(551,'1.2','Medical Conditions','301095005','Heart condition'),(552,'1.2','Medical Conditions','40468003','Hepatitis A'),(553,'1.2','Medical Conditions','66071002','Hepatitis B'),(554,'1.2','Medical Conditions','50711007','Hepatitis C'),(555,'1.2','Medical Conditions','86406008','HIV'),(556,'1.2','Medical Conditions','38341003','High blood pressure'),(557,'1.2','Medical Conditions','13644009','High cholesterol'),(558,'1.2','Medical Conditions','228156007','Intellectual disability'),(559,'1.2','Medical Conditions','45007003','Low blood pressure'),(561,'1.2','Medical Conditions','414916001','Obesity'),(562,'1.2','Medical Conditions','64859006','Osteoporosis'),(563,'1.2','Medical Conditions','118185001','Pregnancy'),(564,'1.2','Medical Conditions','128613002','Seizure'),(565,'1.2','Medical Conditions','8098009','Sexually Transmitted Infection (STI)'),(566,'1.2','Medical Conditions','95320005','Skin conditions'),(567,'1.2','Medical Conditions','230690007','Stroke'),(568,'1.2','Medical Conditions','14304000','Thyroid'),(569,'1.2','Medical Conditions','397540003','Vision impairment'),(570,'1.2','Medical Conditions','OTH','Other'),(571,'1.2','Medical Conditions','UNK','Unknown'),(572,'1.2','Medical Conditions','CDA','Consumer Declined to Answer'),(573,'1.2','Own Safety Concerns','TRUE','Yes'),(574,'1.2','Own Safety Concerns','FALSE','No'),(575,'1.2','Own Safety Concerns','UNK','Unknown'),(576,'1.2','Own Safety Concerns','CDA','Consumer Declined to Answer'),(581,'1.2','Practioner List','3111','Specialist Physicians'),(582,'1.2','Practioner List','3112','General Practitioners and Family Physicians'),(583,'1.2','Practioner List','3113','Dentists'),(584,'1.2','Practioner List','3121','Optometrists'),(585,'1.2','Practioner List','3122','Chiropractors'),(586,'1.2','Practioner List','3123','Other Professional Occupations in Health Diagnosing and Treating'),(587,'1.2','Practioner List','3131','Pharmacists'),(588,'1.2','Practioner List','3132','Dieticians and Nutritionists'),(589,'1.2','Practioner List','3141','Audiologists and Speech-Language Pathologists'),(590,'1.2','Practioner List','3142','Physiotherapists'),(591,'1.2','Practioner List','3143','Occupational Therapists'),(592,'1.2','Practioner List','3144','Other Professional Occupations in Therapy and Assessment'),(593,'1.2','Practioner List','3152','Registered Nurses'),(594,'1.2','Practioner List','3214','Respiratory Therapists, Clinical Perfusionists and Cardio-Pulmonary Technologists'),(595,'1.2','Practioner List','3221','Denturists'),(596,'1.2','Practioner List','3222','Dental Hygienists and Dental Therapists'),(597,'1.2','Practioner List','3231','Opticians'),(598,'1.2','Practioner List','3232','Midwives and Practitioners of Natural Healing'),(599,'1.2','Practioner List','3233','Licensed Practical Nurses'),(600,'1.2','Practioner List','3235','Other Technical Occupations in Therapy and Assessment'),(601,'1.2','Practioner List','4151','Psychologists'),(602,'1.2','Practioner List','4152','Social Workers'),(603,'1.2','Practioner List','4153','Family, Marriage and Other Related Counsellors'),(604,'1.2','Practioner List','4154','Ministers of Religion'),(605,'1.2','Practioner List','4167','Recreation, Sports and Fitness Program Supervisors and Consultants'),(606,'1.2','Practioner List','4212','Community and Social Service Workers'),(607,'1.2','Practioner List','4213','Employment Counsellors'),(608,'1.2','Practioner List','4215','Instructors and Teachers of Persons with Disabilities'),(609,'1.2','Practioner List','4217','Other Religious Occupations'),(610,'1.2','Presenting Issues','TTO','Threat to other / attempted suicide'),(611,'1.2','Presenting Issues','017-02','specific symptom of serious mental illness'),(612,'1.2','Presenting Issues','SEXAB','Sexual Abuse'),(613,'1.2','Presenting Issues','017-04','Educational'),(614,'1.2','Presenting Issues','017-05','Occupational / Employment / Vocational'),(615,'1.2','Presenting Issues','017-06','Housing '),(616,'1.2','Presenting Issues','017-07','Financial'),(617,'1.2','Presenting Issues','017-08','Legal'),(618,'1.2','Presenting Issues','017-09','Problems with relationships'),(619,'1.2','Presenting Issues','PWSA','Problems with Substance Abuse'),(620,'1.2','Presenting Issues','017-11','Activities of daily living'),(621,'1.2','Presenting Issues','OTH','Other'),(622,'1.2','Province List','AB','AB'),(623,'1.2','Province List','BC','BC'),(624,'1.2','Province List','MB','MB'),(625,'1.2','Province List','NB','NB'),(626,'1.2','Province List','NL','NL'),(627,'1.2','Province List','NT','NT'),(628,'1.2','Province List','NS','NS'),(629,'1.2','Province List','NU','NU'),(630,'1.2','Province List','ON','ON'),(631,'1.2','Province List','PE','PE'),(632,'1.2','Province List','QC','QC'),(633,'1.2','Province List','SK','SK'),(634,'1.2','Province List','YT','YT'),(635,'1.2','Reason for OCAN','IA','Initial OCAN'),(636,'1.2','Reason for OCAN','RA','Reassessment'),(637,'1.2','Reason for OCAN','DIS','(Prior to) discharge'),(638,'1.2','Reason for OCAN','OTHR','Other (e.g. consumer request)'),(639,'1.2','Reason for Difference','RD-1','Service does not exist'),(640,'1.2','Reason for Difference','RD-2','Service not available locally'),(641,'1.2','Reason for Difference','RD-3','Service not available due to language issues'),(642,'1.2','Reason for Difference','RD-4','Service not available due to financial issues'),(643,'1.2','Reason for Difference','RD-5','Service not available due to physical barriers physical, vision, hearing'),(644,'1.2','Reason for Difference','RD-6','Exclusionary criteria'),(645,'1.2','Reason for Difference','RD-7','Excessive wait times for service'),(646,'1.2','Reason for Difference','RD-8','Wait list closed'),(647,'1.2','Reason for Difference','RD-9','Need exists but service not identified by client/staff'),(648,'1.2','Reason for Difference','RD-10','Service available but only partially meets client\'s need'),(649,'1.2','Recipient Location','010-01','Algoma District '),(650,'1.2','Recipient Location','010-02','Brant '),(651,'1.2','Recipient Location','010-03','Bruce '),(652,'1.2','Recipient Location','010-04','Cochrane District '),(653,'1.2','Recipient Location','010-05','Dufferin '),(654,'1.2','Recipient Location','010-06','Durham '),(655,'1.2','Recipient Location','010-07','Elgin '),(656,'1.2','Recipient Location','010-08','Essex '),(657,'1.2','Recipient Location','010-09','Frontenac '),(658,'1.2','Recipient Location','010-10','Grey '),(659,'1.2','Recipient Location','010-11','Haldimand-Norfolk'),(660,'1.2','Recipient Location','010-12','Haliburton '),(661,'1.2','Recipient Location','010-13','Halton'),(662,'1.2','Recipient Location','010-14','Hamilton '),(663,'1.2','Recipient Location','010-15','Hastings '),(664,'1.2','Recipient Location','010-16','Huron '),(665,'1.2','Recipient Location','010-17','Kenora & Kenora P.P.'),(666,'1.2','Recipient Location','010-18','Chatham-Kent '),(667,'1.2','Recipient Location','010-19','Lambton '),(668,'1.2','Recipient Location','010-20','Lanark '),(669,'1.2','Recipient Location','010-21','Leeds & Grenville '),(670,'1.2','Recipient Location','010-22','Lennox & Addington '),(671,'1.2','Recipient Location','010-23','Manitoulin District '),(672,'1.2','Recipient Location','010-24','Middlesex '),(673,'1.2','Recipient Location','010-25','Muskoka District Mun'),(674,'1.2','Recipient Location','010-26','Niagara'),(675,'1.2','Recipient Location','010-27','Nipissing District '),(676,'1.2','Recipient Location','010-28','Northumberland '),(677,'1.2','Recipient Location','010-29','Ottawa '),(678,'1.2','Recipient Location','010-30','Out Of Province '),(679,'1.2','Recipient Location','010-31','Oxford '),(680,'1.2','Recipient Location','010-32','Parry Sound District '),(681,'1.2','Recipient Location','010-33','Peel '),(682,'1.2','Recipient Location','010-34','Perth '),(683,'1.2','Recipient Location','010-35','Peterborough '),(684,'1.2','Recipient Location','010-36','Prescott & Russell '),(685,'1.2','Recipient Location','010-37','Prince Edward '),(686,'1.2','Recipient Location','010-38','Rainy River District '),(687,'1.2','Recipient Location','010-39','Renfrew'),(688,'1.2','Recipient Location','010-40','Simcoe'),(689,'1.2','Recipient Location','010-41','Stormont Dundas & Glengarry'),(690,'1.2','Recipient Location','010-42','Sudbury District'),(691,'1.2','Recipient Location','010-43','Sudbury Region'),(692,'1.2','Recipient Location','010-44','Thunder Bay District'),(693,'1.2','Recipient Location','010-45','Timiskaming District'),(694,'1.2','Recipient Location','010-46','Toronto'),(695,'1.2','Recipient Location','UNK','Unknown'),(696,'1.2','Recipient Location','010-48','Victoria'),(697,'1.2','Recipient Location','010-49','Waterloo'),(698,'1.2','Recipient Location','010-50','Wellington'),(699,'1.2','Recipient Location','010-51','York'),(700,'1.2','Recipient Location','010-52','Out of Country'),(701,'1.2','Referral Source','018-01','General Hospital'),(702,'1.2','Referral Source','018-02','Psychiatric Hospital'),(703,'1.2','Referral Source','018-03','Other institution'),(704,'1.2','Referral Source','018-04','Community Mental Health and Addiction Organization'),(705,'1.2','Referral Source','018-05','Other Community Agencies'),(706,'1.2','Referral Source','018-06','Family Physicians'),(707,'1.2','Referral Source','018-07','Psychiatrists'),(708,'1.2','Referral Source','018-08','Mental Health Worker'),(709,'1.2','Referral Source','018-09','Criminal Justice System'),(710,'1.2','Referral Source','018-10','Self, Family or Friend'),(711,'1.2','Referral Source','OTH','Other'),(712,'1.2','Referral Status','RS-1','Received'),(713,'1.2','Referral Status','RS-2','Accepted onto waitlist'),(714,'1.2','Referral Status','RS-3','Accepted into service'),(715,'1.2','Referral Status','RS-4','Rejected'),(716,'1.2','Referral Status','RS-5','Withdrawn (by the client)'),(717,'1.2','Residential Support','24A-01','Independent '),(718,'1.2','Residential Support','24A-02','Assisted/Supported'),(719,'1.2','Residential Support','24A-03','Supervised Nonfacility'),(720,'1.2','Residential Support','24A-04','Supervised-Facility'),(721,'1.2','Residential Support','UNK','Unknown'),(722,'1.2','Residential Support','24A-06','Consumer Declined to Answer'),(723,'1.2','Residence Type','024-01','Approved Homes & Homes for Special Care'),(724,'1.2','Residence Type','024-02','Correctional/Probation Facility'),(725,'1.2','Residence Type','024-03','Domicillary Hostel'),(726,'1.2','Residence Type','024-04','General Hospital'),(727,'1.2','Residence Type','024-05','Psychiatric Hospital'),(728,'1.2','Residence Type','024-06','Other Specialty Hospital'),(729,'1.2','Residence Type','024-07','No fixed address'),(730,'1.2','Residence Type','024-08','Hostel/Shelter'),(731,'1.2','Residence Type','024-09','Long term care facility/Nursing Home'),(732,'1.2','Residence Type','024-10','Municipal Non-Profit Housing'),(733,'1.2','Residence Type','024-11','Private Non-Profit Housing'),(734,'1.2','Residence Type','024-12','Private House/Apt. SR Owned/Market Rent'),(735,'1.2','Residence Type','024-13','Private House/Apt. Other/Subsidized'),(736,'1.2','Residence Type','024-14','Retirement Home/Senior\'s Residence'),(737,'1.2','Residence Type','024-15','Rooming/Boarding House'),(738,'1.2','Residence Type','024-16','Supportive Housing Congregate Living'),(739,'1.2','Residence Type','024-17','Supportive Housing - Assisted Living'),(740,'1.2','Residence Type','OTH','Other'),(741,'1.2','Residence Type','UNK','Unknown'),(742,'1.2','Residence Type','CDA','Consumer Declined to Answer'),(743,'1.2','Risks List','225915006','Abuse / Neglect'),(744,'1.2','Risks List','242056005','Accidental self-harm'),(745,'1.2','Risks List','401206008','Deliberate self-harm'),(746,'1.2','Risks List','417430008','Exploitation risk'),(747,'1.2','Risks List','OTH','Other'),(772,'1.2','Social Patterns Changes','TRUE','Yes'),(773,'1.2','Social Patterns Changes','FALSE','No'),(774,'1.2','Social Patterns Changes','UNK','Unknown'),(775,'1.2','Social Patterns Changes','CDA','Consumer Declined to Answer'),(776,'1.2','Stage of Change - Alcohol','1','Pre-contemplation'),(777,'1.2','Stage of Change - Alcohol','2','Contemplation'),(778,'1.2','Stage of Change - Alcohol','3','Action'),(779,'1.2','Stage of Change - Alcohol','4','Maintenance'),(780,'1.2','Stage of Change - Alcohol','5','Relapse Prevention'),(781,'1.2','Suicidal Thoughts','TRUE','Yes'),(782,'1.2','Suicidal Thoughts','FALSE','No'),(783,'1.2','Suicidal Thoughts','UNK','Unknown'),(784,'1.2','Suicidal Thoughts','CDA','Consumer Declined to Answer'),(785,'1.2','Suicide in Past','TRUE','Yes'),(786,'1.2','Suicide in Past','FALSE','No'),(787,'1.2','Suicide in Past','UNK','Unknown'),(788,'1.2','Suicide in Past','CDA','Consumer Declined to Answer'),(820,'1.2','Taking as Prescribed','TRUE','Yes'),(821,'1.2','Taking as Prescribed','FALSE','No'),(822,'1.2','Taking as Prescribed','UNK','Unknown'),(830,'1.2','Camberwell Need','0','0 - No problem'),(831,'1.2','Camberwell Need','1','1 - No/Moderate problem due to help'),(832,'1.2','Camberwell Need','2','2 - Serious problem'),(833,'1.2','Camberwell Need','9','9 - Not known'),(835,'1.2','Camberwell Help','0','0 - None'),(836,'1.2','Camberwell Help','1','1 - Low help'),(837,'1.2','Camberwell Help','2','2 - Moderate help'),(838,'1.2','Camberwell Help','3','3 - High help'),(839,'1.2','Camberwell Help','9','9 - Unknown'),(841,'1.2','Immigration Experience','','None'),(842,'1.2','Immigration Experience','1','Lack of understanding of the Canadian system/resources'),(843,'1.2','Immigration Experience','2','Applying previous work experience/professional qualifications'),(844,'1.2','Immigration Experience','3','Separation from family members/significant others'),(845,'1.2','Immigration Experience','4','Family left behind in refugee camp'),(846,'1.2','Immigration Experience','5','Experience with war/incarceration/torture'),(847,'1.2','Immigration Experience','6','Refugee camp'),(848,'1.2','Immigration Experience','7','Experience with other trauma'),(849,'1.2','Immigration Experience','OTH','Other'),(850,'1.2','Immigration Experience','UNK','Unknown'),(851,'1.2','Immigration Experience','10','Consumer Declined to Answer'),(853,'1.2','Years in Canada','0','0'),(854,'1.2','Years in Canada','1','1'),(855,'1.2','Years in Canada','2','2'),(856,'1.2','Years in Canada','3','3'),(857,'1.2','Years in Canada','4','4'),(858,'1.2','Years in Canada','5','5'),(859,'1.2','Years in Canada','6','6'),(860,'1.2','Years in Canada','7','7'),(861,'1.2','Years in Canada','8','8'),(862,'1.2','Years in Canada','9','9'),(863,'1.2','Years in Canada','10','10'),(864,'1.2','Years in Canada','11','11'),(865,'1.2','Years in Canada','12','12'),(866,'1.2','Years in Canada','13','13'),(867,'1.2','Years in Canada','14','14'),(868,'1.2','Years in Canada','15','15'),(869,'1.2','Years in Canada','16','16'),(870,'1.2','Years in Canada','17','17'),(871,'1.2','Years in Canada','18','18'),(872,'1.2','Years in Canada','19','19'),(873,'1.2','Years in Canada','20','20'),(874,'1.2','Years in Canada','21','21'),(875,'1.2','Years in Canada','22','22'),(876,'1.2','Years in Canada','23','23'),(877,'1.2','Years in Canada','24','24'),(878,'1.2','Years in Canada','25','25'),(879,'1.2','Months in Canada','0','0'),(880,'1.2','Months in Canada','1','1'),(881,'1.2','Months in Canada','2','2'),(882,'1.2','Months in Canada','3','3'),(883,'1.2','Months in Canada','4','4'),(884,'1.2','Months in Canada','5','5'),(885,'1.2','Months in Canada','6','6'),(886,'1.2','Months in Canada','7','7'),(887,'1.2','Months in Canada','8','8'),(888,'1.2','Months in Canada','9','9'),(889,'1.2','Months in Canada','10','10'),(890,'1.2','Months in Canada','11','11'),(895,'1.2','Physical Health Concerns','TRUE','Yes'),(896,'1.2','Physical Health Concerns','FALSE','No'),(897,'1.2','Physical Health Concerns','UNK','Unknown'),(898,'1.2','Physical Health Concerns','CDA','Consumer Declined to Answer'),(928,'1.2','Domain','1','Accommodation'),(929,'1.2','Domain','2','Food'),(930,'1.2','Domain','3','Looking after the home'),(931,'1.2','Domain','4','Self-care'),(932,'1.2','Domain','5','Daytime activities'),(933,'1.2','Domain','6','Physical health'),(934,'1.2','Domain','7','Psychotic Symptoms'),(935,'1.2','Domain','8','Information on condition and treatment'),(936,'1.2','Domain','9','Psychological Distress'),(937,'1.2','Domain','10','Safefy to self'),(938,'1.2','Domain','11','Safefy to others'),(939,'1.2','Domain','12','Alcohol'),(940,'1.2','Domain','13','Drugs'),(941,'1.2','Domain','14','Other Addictions'),(942,'1.2','Domain','15','Company'),(943,'1.2','Domain','16','Intimate relationships'),(944,'1.2','Domain','17','Sexual Expression'),(945,'1.2','Domain','18','Child care'),(946,'1.2','Domain','19','Other dependents'),(947,'1.2','Domain','20','Basic education'),(948,'1.2','Domain','21','Telephone'),(949,'1.2','Domain','22','Transport'),(950,'1.2','Domain','23','Money'),(951,'1.2','Domain','24','Benefits'),(1000,'1.2','Reason for OCAN','SC','Significant Change'),(1001,'1.2','Reason for OCAN','REV','Review'),(1002,'1.2','Reason for OCAN','REK','Re-key'),(1003,'1.2','OCAN Lead Assessment','TRUE','Yes'),(1004,'1.2','OCAN Lead Assessment','FALSE','No'),(1005,'1.2','Consumer Self-Assessment completed','TRUE','Yes'),(1006,'1.2','Consumer Self-Assessment completed','FALSE','No'),(1007,'1.2','Consumer Self-Assessment incompleted','CMFLVL','Comfort Level'),(1008,'1.2','Consumer Self-Assessment incompleted','LOA','Length of Assessment'),(1009,'1.2','Consumer Self-Assessment incompleted','LIT','Literacy'),(1010,'1.2','Consumer Self-Assessment incompleted','MHC','Mental Health Condition'),(1011,'1.2','Consumer Self-Assessment incompleted','PYSCON','Physical Condition'),(1012,'1.2','Consumer Self-Assessment incompleted','LANG','Language Barrier'),(1013,'1.2','Consumer Self-Assessment incompleted','OTH','Other'),(1014,'1.2','client DOB Type','EST','Estimate'),(1015,'1.2','client DOB Type','UNK','Unknown'),(1016,'1.2','LHIN code','010-30','Out Of Province'),(1017,'1.2','LHIN code','010-52','Out of Country'),(1018,'1.2','LHIN code','UNK','Unknown'),(1019,'1.2','MIS Functional Centre List','725 107 699','OTH - Other MH services not elsewhere classified'),(1020,'1.2','Referral Source','0AS','Abuse Services'),(1021,'1.2','Referral Source','0AB','Alternative Businesses'),(1022,'1.2','Referral Source','ACT','Assertive Community Treatment Teams'),(1023,'1.2','Referral Source','0CM','Case Management'),(1024,'1.2','Referral Source','CHI','Child/Adolescent'),(1025,'1.2','Referral Source','CLU','Clubhouses'),(1026,'1.2','Referral Source','0CD','Community Development'),(1027,'1.2','Referral Source','CMH ','Community Mental Health Clinic'),(1028,'1.2','Referral Source','0IR ','Community Service Information and Referral'),(1029,'1.2','Referral Source','CON','Concurrent Disorders'),(1030,'1.2','Referral Source','0CT','Counseling & Treatment'),(1031,'1.2','Referral Source','DCS','Diversion & Court Support'),(1032,'1.2','Referral Source','DDx ','Dual Diagnosis'),(1033,'1.2','Referral Source','EAR ','Early Intervention'),(1034,'1.2','Referral Source','EAT','Eating Disorder'),(1035,'1.2','Referral Source','0FI ','Family Initiatives'),(1036,'1.2','Referral Source','FOR','Forensic'),(1037,'1.2','Referral Source','HPA ','Health Promotion/Education - Awareness'),(1038,'1.2','Referral Source','HPW','Health Promotion/Education - Women\'s Health (MH)'),(1039,'1.2','Referral Source','HSC','Homes for Special Care'),(1040,'1.2','Referral Source','CRI ','Mental Health Crisis Intervention'),(1041,'1.2','Referral Source','PSH','Peer/Self-help Initiatives'),(1042,'1.2','Referral Source','0DN','Primary Day/Night Care'),(1043,'1.2','Referral Source','GER','Psycho-Geriatric'),(1044,'1.2','Referral Source','0SR','Social Rehabilitation/Recreation'),(1045,'1.2','Referral Source','0SH','Supports within Housing'),(1046,'1.2','Referral Source','EMP','Vocational/Employment'),(1047,'1.2','Referral Source','OMHS','Other Mental Health Services'),(1048,'1.2','Referral Source','OAS','Other Addiction Services'),(1049,'1.2','Referral Source','PSOR','Police'),(1050,'1.2','Referral Source','COLA','Courts (includes jails and detention centres)'),(1051,'1.2','Referral Source','CSOR','Correctional Facilities (includes jails and detention centres)'),(1052,'1.2','Referral Source','4155.1.PPOF','Probation/Parole Officers'),(1053,'1.2','Referral Source','CSB','Short Term Residential Crisis Support Beds'),(1054,'1.2','Referral Source','CJSS','Criminal Justice System Source breakdown not available (use this category if above detailed breakdown is not available)'),(1055,'1.2','Yes No','TRUE','Yes'),(1056,'1.2','Yes No','FALSE','No'),(1063,'1.2','Doctor Psychiatrist','CDA','Consumer declined to answer'),(1064,'1.2','Doctor Psychiatrist','UNK','Unknown'),(1065,'1.2','Other Contacts Agency','TRUE','Yes'),(1066,'1.2','Other Contacts Agency','FALSE','No'),(1067,'1.2','Other Contacts Agency','CDA','Consumer declined to answer'),(1068,'1.2','Other Contacts Agency','UNK','Unknown'),(1069,'1.2','Areas Of Concern','TRUE','Yes'),(1070,'1.2','Areas Of Concern','FALSE','No'),(1071,'1.2','Areas Of Concern','UNK','Unknown'),(1073,'1.2','Age of Onset','EST','Estimate'),(1074,'1.2','Age of Onset','CDA','Consumer declined to answer'),(1075,'1.2','Age of Onset','UNK','Unknown'),(1076,'1.2','Age of Onset','NA','N/A'),(1077,'1.2','Age of Entry To Org','EST','Estimate'),(1078,'1.2','Age of Entry To Org','CDA','Consumer declined to answer'),(1079,'1.2','Age of Entry To Org','UNK','Unknown'),(1080,'1.2','Age of Entry To Org','NA','N/A'),(1081,'1.2','Ethniticity','CDA','Consumer Declined to Answer'),(1082,'1.2','Ethniticity','UNK','Unknown'),(1083,'1.2','Language','CDA','Consumer Declined to Answer'),(1084,'1.2','Language','UNK','Unknown'),(1085,'1.2','Barriers','ADD','Addictions'),(1086,'1.2','Barriers','CAB','Cognitive Abilities'),(1087,'1.2','Barriers','CON','Confidence'),(1088,'1.2','Barriers','CTM','Contemplative'),(1089,'1.2','Barriers','DIS','Disclosure'),(1090,'1.2','Barriers','FOC','Financial ODSP cut off'),(1091,'1.2','Barriers','FFT','Funding for Training'),(1092,'1.2','Barriers','LOR','Lack of Resume'),(1093,'1.2','Barriers','LGC','Language Comprehension'),(1094,'1.2','Barriers','LIT','Literacy'),(1095,'1.2','Barriers','MSE','Medication Side Effects'),(1096,'1.2','Barriers','PHY','Physical Health'),(1097,'1.2','Barriers','PCO','Pre-contemplative'),(1098,'1.2','Barriers','STG','Stigma'),(1099,'1.2','Barriers','SYM','Symptoms'),(1100,'1.2','Barriers','TRN','Transportation'),(1101,'1.2','Barriers','OTH','Other'),(1102,'1.2','Barriers','CDA','Consumer declined to answer'),(1103,'1.2','Medical Conditions','26929004','Alzheimer\'s'),(1104,'1.2','Medical Conditions','424460009','Hepatitis D'),(1105,'1.2','Medical Conditions','44186003','Sleep Problems (e.g. Insomnia)'),(1106,'1.2','Source of Information','116154003','Consumer'),(1107,'1.2','Source of Information','HLTHP','Health Provider'),(1108,'1.2','Source of Information','42665001','Homes of the Aged'),(1109,'1.2','Source of Information','22232009','Hospital (at discharge or hospital record)'),(1110,'1.2','Source of Information','JUST','Justice (e.g. Probation Order)'),(1111,'1.2','Source of Information','LTCH','Long Term Care Home'),(1112,'1.2','Source of Information','264372000','Pharmacy'),(1113,'1.2','Source of Information','309343006','Physician'),(1114,'1.2','Source of Information','42120006','Significant Other'),(1115,'1.2','Emergency Department','None','None'),(1116,'1.2','Emergency Department','ED-1','1'),(1117,'1.2','Emergency Department','ED-2','2-5'),(1118,'1.2','Emergency Department','ED-6','6+'),(1119,'1.2','Emergency Department','CDA','Consumer Declined to Answer'),(1120,'1.2','Emergency Department','UNK','Unknown'),(1121,'1.2','Symptoms Checklist','24199005','Agitation'),(1122,'1.2','Symptoms Checklist','20602000','Apathy'),(1123,'1.2','Symptoms Checklist','424100000','Difficulty in Abstract Thinking'),(1124,'1.2','Symptoms Checklist','247640008','Disorganized Thinking'),(1125,'1.2','Symptoms Checklist','225652009','Emotional Unresponsiveness'),(1126,'1.2','Symptoms Checklist','79351003','Hostility'),(1127,'1.2','Symptoms Checklist','276306002','Lack of Drive or Initiative'),(1128,'1.2','Symptoms Checklist','247905005','Lack of Spontaneity'),(1129,'1.2','Symptoms Checklist','43994002','Physical Symptoms '),(1130,'1.2','Symptoms Checklist','422517004','Poor Communication Skills'),(1131,'1.2','Symptoms Checklist','105411000','Social Withdrawal'),(1132,'1.2','Symptoms Checklist','78205008','Stereotype Thinking'),(1133,'1.2','Symptoms Checklist','22927000','Suspiciousness'),(1134,'1.2','Diagnostic Categories','228156007','Intellectual Disability or Impairment'),(1135,'1.2','Presenting Issues','TTS','Threat to Self'),(1136,'1.2','Presenting Issues','ATMPS','Attempted Suicide'),(1137,'1.2','Presenting Issues','PHYSAB','Physical Abuse'),(1138,'1.2','Presenting Issues','PWA','Problems with Addictions'),(1139,'1.2','Year of First Entry Date','2000','2000'),(1140,'1.2','Year of First Entry Date','2001','2001'),(1141,'1.2','Year of First Entry Date','2002','2002'),(1142,'1.2','Year of First Entry Date','2003','2003'),(1143,'1.2','Year of First Entry Date','2004','2004'),(1144,'1.2','Year of First Entry Date','2005','2005'),(1145,'1.2','Year of First Entry Date','2006','2006'),(1146,'1.2','Year of First Entry Date','2007','2007'),(1147,'1.2','Year of First Entry Date','2008','2008'),(1148,'1.2','Year of First Entry Date','2009','2009'),(1149,'1.2','Year of First Entry Date','2010','2010'),(1150,'1.2','Year of First Entry Date','2011','2011'),(1151,'1.2','Year of First Entry Date','2012','2012'),(1152,'1.2','Year of First Entry Date','2013','2013'),(1153,'1.2','Year of First Entry Date','2014','2014'),(1154,'1.2','Year of First Entry Date','2015','2015'),(1155,'1.2','Year of First Entry Date','2016','2016'),(1156,'1.2','Year of First Entry Date','2017','2017'),(1157,'1.2','Year of First Entry Date','2018','2018'),(1158,'1.2','Year of First Entry Date','2019','2019'),(1159,'1.2','Year of First Entry Date','2020','2020'),(1160,'1.2','Year of First Entry Date','2021','2021'),(1161,'1.2','Year of First Entry Date','2022','2022'),(1162,'1.2','Year of First Entry Date','2023','2023'),(1163,'1.2','Year of First Entry Date','2024','2024'),(1164,'1.2','Year of First Entry Date','2025','2025'),(1165,'1.2','Year of First Entry Date','2026','2026'),(1166,'1.2','Year of First Entry Date','2027','2027'),(1167,'1.2','Year of First Entry Date','2028','2028'),(1168,'1.2','Year of First Entry Date','2020','2029'),(1169,'1.2','Year of First Entry Date','2030','2030'),(1170,'1.2','Month of First Entry Date','01','01'),(1171,'1.2','Month of First Entry Date','02','02'),(1172,'1.2','Month of First Entry Date','03','03'),(1173,'1.2','Month of First Entry Date','04','04'),(1174,'1.2','Month of First Entry Date','05','05'),(1175,'1.2','Month of First Entry Date','06','06'),(1176,'1.2','Month of First Entry Date','07','07'),(1177,'1.2','Month of First Entry Date','08','08'),(1178,'1.2','Month of First Entry Date','09','09'),(1179,'1.2','Month of First Entry Date','10','10'),(1180,'1.2','Month of First Entry Date','11','11'),(1181,'1.2','Month of First Entry Date','12','12'),(1182,'1.2','Frequency of Drug Use','5','Past 6 months'),(1183,'1.2','Frequency of Drug Use','6','Ever'),(1184,'1.2','Number Of Centres','1','1'),(1185,'1.2','Number Of Centres','2','2'),(1186,'1.2','Number Of Centres','3','3'),(1187,'1.2','Number Of Centres','4','4'),(1188,'1.2','Age in Months','0','0'),(1189,'1.2','Age in Months','1','1'),(1190,'1.2','Age in Months','2','2'),(1191,'1.2','Age in Months','3','3'),(1192,'1.2','Age in Months','4','4'),(1193,'1.2','Age in Months','5','5'),(1194,'1.2','Age in Months','6','6'),(1195,'1.2','Age in Months','7','7'),(1196,'1.2','Age in Months','8','8'),(1197,'1.2','Age in Months','9','9'),(1198,'1.2','Age in Months','10','10'),(1199,'1.2','Age in Months','11','11'),(1200,'1.2','OCAN Type','CORE','CORE OCAN'),(1201,'1.2','OCAN Type','SELF','CORE + SELF OCAN'),(1202,'1.2','OCAN Type','FULL','FULL OCAN'); INSERT INTO `OcanFormOption` VALUES (1203,'1.2','Number Of Centres','5','5'), (1204,'1.2','Number Of Centres','6','6'),(1205,'1.2','Number Of Centres','7','7'),(1206,'1.2','Number Of Centres','8','8'),(1207,'1.2','Number Of Centres','9','9'),(1208,'1.2','Number Of Centres','10','10'); --- 22,26 ---- LOCK TABLES `OcanFormOption` WRITE; /*!40000 ALTER TABLE `OcanFormOption` DISABLE KEYS */; ! INSERT INTO `OcanFormOption` VALUES (33,'1.2','MIS Functional Centre List','725 09 76','CM - Case Management'),(34,'1.2','MIS Functional Centre List','725 10 76 12','C&T - Counseling & Treatment'),(35,'1.2','MIS Functional Centre List','725 10 76 20','ACT - Assertive Community Treatment Teams'),(36,'1.2','MIS Functional Centre List','725 10 76 30','CMH - Community Mental Health Clinic'),(37,'1.2','MIS Functional Centre List','725 10 76 40','EMP - Vocational/Employment'),(38,'1.2','MIS Functional Centre List','725 10 76 41','CLU - Clubhouses'),(39,'1.2','MIS Functional Centre List','725 10 76 45','CON - Concurrent Disorders'),(40,'1.2','MIS Functional Centre List','725 10 76 50','CHI - Child / Adolescent'),(41,'1.2','MIS Functional Centre List','725 10 76 51','EAR - Early Intervention'),(42,'1.2','MIS Functional Centre List','725 10 76 55','FOR - Forensic'),(43,'1.2','MIS Functional Centre List','725 10 76 56','DCS - Diversion & Court Support'),(44,'1.2','MIS Functional Centre List','725 10 76 60','AS - Abuse Services'),(45,'1.2','MIS Functional Centre List','725 10 76 70','EAT - Eating Disorder'),(46,'1.2','MIS Functional Centre List','725 10 76 81','SR - Social Rehabilitation/Recreation'),(47,'1.2','MIS Functional Centre List','725 10 76 95','DDx - Dual Diagnosis'),(48,'1.2','MIS Functional Centre List','725 10 76 96','GER - Psycho-geriatric'),(49,'1.2','MIS Functional Centre List','725 15 76','CRI - Mental Health Crisis Intervention'),(50,'1.2','MIS Functional Centre List','725 20 76','DN - Primary Day/Night Care'),(51,'1.2','MIS Functional Centre List','725 40 76 10','HSC - Homes for Special Care'),(52,'1.2','MIS Functional Centre List','725 40 76 30','SH - Supportive within Housing'),(53,'1.2','MIS Functional Centre List','725 40 76 60','CSB - Short term Res.Crisis Support Beds'),(54,'1.2','MIS Functional Centre List','725 70 10','I&R - Community Service Information and Referral'),(55,'1.2','MIS Functional Centre List','725 50 76 10','HPA - Health Promotion / Education - Awareness'),(56,'1.2','MIS Functional Centre List','725 50 76 30','HPW - Health Promotion / Education - Women\'s Health (MH)'),(57,'1.2','MIS Functional Centre List','725 50 76 40','CD - Community Development'),(58,'1.2','MIS Functional Centre List','725 51 76 11','PSH - Peer / Self-help Initiatives'),(59,'1.2','MIS Functional Centre List','725 51 ... [truncated message content] |
|
From: annie <ann...@us...> - 2010-12-02 19:46:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28851/database/mysql/caisi/updates Added Files: Tag: RELEASE_10_06 patch-2010-11-26.sql Log Message: fixed the bug. --- NEW FILE: patch-2010-11-26.sql --- update OcanFormOption set ocanDataCategoryValue="725 10 76 99" where id=1019; update OcanFormOption set ocanDataCategoryValue="725 70 10" where id=54; |
|
From: Marc D. <hex...@us...> - 2010-12-02 04:04:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18151/web/eyeform Modified Files: current_note.jsp Log Message: eyeform bug fixes / enhancements Index: current_note.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/current_note.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** current_note.jsp 29 Nov 2010 19:02:35 -0000 1.4 --- current_note.jsp 2 Dec 2010 04:04:31 -0000 1.5 *************** *** 62,66 **** }}); ! alert(notetext); } --- 62,71 ---- }}); ! ! var noteTa = document.getElementById('caseNote_note<%=request.getParameter("noteId") %>'); ! var noteTaVal = noteTa.value; ! noteTaVal = noteTaVal + '\n' + notetext; ! noteTa.value = noteTaVal; ! } *************** *** 70,75 **** //do the ajax call to save form values saveFlags(); ! } --- 75,103 ---- //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';} + }}); + + var ticklerRecip = document.getElementById('ticklerRecip'); ! jQuery.ajax({ url: ctx+"/eyeform/NoteData.do?method=sendTickler&appointmentNo="+<%=aptNo%>+"&text="+notetext+"&recip=" + ticklerRecip.value +"&demographicNo=<%=demographicNo %>", async:false, success: function(data){ ! alert('tickler sent'); ! }}); } *************** *** 283,287 **** ! <select name="front" tabindex="250" class="special2"> <c:forEach var="item" items="${internalList}"> <option value="<c:out value="${item.providerNo}"/>"><c:out value="${item.formattedName}"/></option> --- 311,315 ---- ! <select name="front" tabindex="250" class="special2" id="ticklerRecip"> <c:forEach var="item" items="${internalList}"> <option value="<c:out value="${item.providerNo}"/>"><c:out value="${item.formattedName}"/></option> *************** *** 294,298 **** <td width="15%"> ! <input tabindex="251" value="Send Tickler" onclick="saveNoteAndSendTickler();return false;" id="stickler" style="color: black;" type="submit"> </td> --- 322,326 ---- <td width="15%"> ! <input tabindex="251" value="Send Tickler" onclick="saveNoteAndSendTickler();return false;" id="stickler" style="color: black;" type="button"> </td> |
|
From: Marc D. <hex...@us...> - 2010-12-02 04:04:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18151/web/js/custom Modified Files: eyeform-cme.js Log Message: eyeform bug fixes / enhancements Index: eyeform-cme.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** eyeform-cme.js 29 Nov 2010 19:02:35 -0000 1.4 --- eyeform-cme.js 2 Dec 2010 04:04:31 -0000 1.5 *************** *** 60,64 **** init(); ! jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getCurrentNoteData&demographicNo="+demographicNo+"¬eId="+savedNoteId+"&appointmentNo="+appointmentNo,dataType: "html",success: function(data) { jQuery("#current_note_addon").append(data); --- 60,65 ---- init(); ! ! jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getCurrentNoteData&demographicNo="+demographicNo+"¬eId="+savedNoteId+"&appointmentNo="+appointmentNo,dataType: "html",success: function(data) { jQuery("#current_note_addon").append(data); *************** *** 77,80 **** --- 78,85 ---- popColumn(ctx + "/oscarEncounter/displayMacro.do?hC=009999&appointment_no="+appointmentNo,"macro","macro", "leftNavBar", this); + + removeNavDiv('issues'); + removeNavDiv('Guidelines'); + }); |
|
From: Marc D. <hex...@us...> - 2010-12-02 04:04:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18151/web/casemgmt Modified Files: newEncounterLayout.jsp Log Message: eyeform bug fixes / enhancements Index: newEncounterLayout.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newEncounterLayout.jsp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** newEncounterLayout.jsp 24 Nov 2010 03:59:41 -0000 1.56 --- newEncounterLayout.jsp 2 Dec 2010 04:04:31 -0000 1.57 *************** *** 170,173 **** --- 170,188 ---- } + function addRightNavDiv(name) { + var div = document.createElement("div"); + div.className = "leftBox"; + div.style.display = "block"; + div.style.visiblity = "hidden"; + div.id = name; + $("rightNavBar").appendChild(div); + + } + + function removeNavDiv(name) { + var tmpEl = document.getElementById(name); + tmpEl.parentNode.removeChild(tmpEl); + } + var appointmentNo = <%=request.getParameter("appointmentNo")%>; |
|
From: Marc D. <hex...@us...> - 2010-12-02 04:04:38
|
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-serv18151/web/WEB-INF/classes/src/org/oscarehr/eyeform/web Modified Files: NoteAddonAction.java Log Message: eyeform bug fixes / enhancements Index: NoteAddonAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** NoteAddonAction.java 29 Nov 2010 20:11:18 -0000 1.9 --- NoteAddonAction.java 2 Dec 2010 04:04:30 -0000 1.10 *************** *** 13,16 **** --- 13,18 ---- import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.DispatchAction; + import org.caisi.model.Tickler; + import org.caisi.service.TicklerManager; import org.oscarehr.PMmodule.dao.ProviderDao; import org.oscarehr.common.dao.DemographicDao; *************** *** 23,26 **** --- 25,29 ---- import org.oscarehr.eyeform.model.ProcedureBook; import org.oscarehr.eyeform.model.TestBookRecord; + import org.oscarehr.util.LoggedInInfo; import org.oscarehr.util.SpringUtils; *************** *** 135,137 **** --- 138,175 ---- return null; } + + /* + * appointmentNo + * test + * recip + */ + + public ActionForward sendTickler(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + String aptNo = request.getParameter("appointmentNo"); + String text = request.getParameter("text"); + String recipient = request.getParameter("recip"); + String demographicNo = request.getParameter("demographicNo"); + + + Tickler t = new Tickler(); + t.setAssignee(providerDao.getProvider(recipient)); + //t.setDemographic(demographic) + t.setDemographic_no(demographicNo); + t.setMessage(text); + t.setPriority("Normal"); + t.setProvider(LoggedInInfo.loggedInInfo.get().loggedInProvider); + //t.setProgram(program); + t.setProgram_id(Integer.valueOf((String)request.getSession().getAttribute("programId_oscarView"))); + t.setService_date(new Date()); + t.setStatus('A'); + t.setTask_assigned_to(recipient); + t.setUpdate_date(new Date()); + + TicklerManager ticklerMgr = (TicklerManager)SpringUtils.getBean("ticklerManagerT"); + ticklerMgr.addTickler(t); + + + + return null; + } } |
|
From: Ted L. <ted...@us...> - 2010-12-02 01:07:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9404/build/tasks/src Modified Files: GrepStuffDirectoryWalker.java Log Message: removed ostermiller check for now until commons-csv becomes mature. Index: GrepStuffDirectoryWalker.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffDirectoryWalker.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** GrepStuffDirectoryWalker.java 30 Nov 2010 10:22:37 -0000 1.20 --- GrepStuffDirectoryWalker.java 2 Dec 2010 01:07:00 -0000 1.21 *************** *** 78,82 **** checkContains(relativePath, fileContents, "WeakHashMap()", "use generics"); checkContains(relativePath, fileContents, "StringBuffer", "very very rare that this is required, usually StringBuilder is the better choice"); ! checkContains(relativePath, fileContents, "com.Ostermiller", "use org.apache libraries instead, duplicated libs and apache is... more standard (if that's a word)"); checkContains(relativePath, fileContents, "BaseGenericIntakeAction", "do not use the BaseAction concept, just extends struts directly, no mass imports should be done like that, no one can tell what is used when that happens."); checkContains(relativePath, fileContents, "BaseAction", "do not use the BaseAction concept, just extends struts directly, no mass imports should be done like that, no one can tell what is used when that happens."); --- 78,82 ---- checkContains(relativePath, fileContents, "WeakHashMap()", "use generics"); checkContains(relativePath, fileContents, "StringBuffer", "very very rare that this is required, usually StringBuilder is the better choice"); ! // checkContains(relativePath, fileContents, "com.Ostermiller", "use org.apache libraries instead, duplicated libs and apache is... more standard (if that's a word)"); checkContains(relativePath, fileContents, "BaseGenericIntakeAction", "do not use the BaseAction concept, just extends struts directly, no mass imports should be done like that, no one can tell what is used when that happens."); checkContains(relativePath, fileContents, "BaseAction", "do not use the BaseAction concept, just extends struts directly, no mass imports should be done like that, no one can tell what is used when that happens."); |
|
From: Jay G. <jay...@us...> - 2010-12-01 15:30:16
|
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-serv22888 Modified Files: SiteDao.java Log Message: changed printStackTrace to logging statements Index: SiteDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/SiteDao.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SiteDao.java 30 Nov 2010 17:32:02 -0000 1.8 --- SiteDao.java 1 Dec 2010 15:30:08 -0000 1.9 *************** *** 155,164 **** } catch (Exception e) { ! e.printStackTrace(); } finally { try { sess.close(); } catch (HibernateException e) { ! e.printStackTrace(); } } --- 155,164 ---- } catch (Exception e) { ! MiscUtils.getLogger().error("Error", e); } finally { try { sess.close(); } catch (HibernateException e) { ! MiscUtils.getLogger().error("Error", e); } } *************** *** 181,190 **** } catch (Exception e) { ! e.printStackTrace(); } finally { try { sess.close(); } catch (HibernateException e) { ! e.printStackTrace(); } } --- 181,190 ---- } catch (Exception e) { ! MiscUtils.getLogger().error("Error", e); } finally { try { sess.close(); } catch (HibernateException e) { ! MiscUtils.getLogger().error("Error", e); } } *************** *** 205,214 **** pList = q.list(); } catch (Exception e) { ! e.printStackTrace(); } finally { try { sess.close(); } catch (HibernateException e) { ! e.printStackTrace(); } } --- 205,214 ---- pList = q.list(); } catch (Exception e) { ! MiscUtils.getLogger().error("Error", e); } finally { try { sess.close(); } catch (HibernateException e) { ! MiscUtils.getLogger().error("Error", e); } } *************** *** 230,239 **** } catch (Exception e) { ! e.printStackTrace(); } finally { try { sess.close(); } catch (HibernateException e) { ! e.printStackTrace(); } } --- 230,239 ---- } catch (Exception e) { ! MiscUtils.getLogger().error("Error", e); } finally { try { sess.close(); } catch (HibernateException e) { ! MiscUtils.getLogger().error("Error", e); } } *************** *** 251,260 **** } catch (Exception e) { ! e.printStackTrace(); } finally { try { sess.close(); } catch (HibernateException e) { ! e.printStackTrace(); } } --- 251,260 ---- } catch (Exception e) { ! MiscUtils.getLogger().error("Error", e); } finally { try { sess.close(); } catch (HibernateException e) { ! MiscUtils.getLogger().error("Error", e); } } |
|
From: Victor <vic...@us...> - 2010-11-30 18:38:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4941/web/schedule Modified Files: scheduleMainBeanConn.jspf Log Message: resolve naming conflict Index: scheduleMainBeanConn.jspf =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule/scheduleMainBeanConn.jspf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** scheduleMainBeanConn.jspf 30 Nov 2010 18:18:55 -0000 1.2 --- scheduleMainBeanConn.jspf 30 Nov 2010 18:38:41 -0000 1.3 *************** *** 26,34 **** <% //operation available to the client -- dboperation String [][] dbQueries=new String[][] { {"search_provider", "select provider_no, first_name, last_name from provider where status='1' and provider_type=? order by last_name" }, ! {"site_search_provider", "select provider_no, first_name, last_name from provider p where status='1' and provider_type=? and exists(select * from providersite s where p.provider_no = s.provider_no and s.site_id IN (SELECT site_id from providersite where provider_no=" + curProvider_no + ")) order by last_name" }, ! {"team_search_provider", "select provider_no, first_name, last_name from provider p where status='1' and provider_type=? and team in (select team from provider where provider_no=" + curProvider_no + ") and (not(team is null or team = '') or provider_no=" + curProvider_no + ") order by last_name" }, // {"search_provider", "select provider_no, first_name, last_name from provider where provider_type='doctor' order by ?" }, --- 26,36 ---- <% + String curProv_no = (String) session.getAttribute("user"); + //operation available to the client -- dboperation String [][] dbQueries=new String[][] { {"search_provider", "select provider_no, first_name, last_name from provider where status='1' and provider_type=? order by last_name" }, ! {"site_search_provider", "select provider_no, first_name, last_name from provider p where status='1' and provider_type=? and exists(select * from providersite s where p.provider_no = s.provider_no and s.site_id IN (SELECT site_id from providersite where provider_no=" + curProv_no + ")) order by last_name" }, ! {"team_search_provider", "select provider_no, first_name, last_name from provider p where status='1' and provider_type=? and team in (select team from provider where provider_no=" + curProv_no + ") and (not(team is null or team = '') or provider_no=" + curProv_no + ") order by last_name" }, // {"search_provider", "select provider_no, first_name, last_name from provider where provider_type='doctor' order by ?" }, |
