oscarmcmaster-cvscommit Mailing List for OSCARMcMaster (Page 7)

open source web-based Electronic Medical Record (EMR) system

Brought to you by: davidhcchan, jaygallagher

oscarmcmaster-cvscommit

You can subscribe to this list here.

2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (95)	Dec (207)
2005	Jan (106)	Feb (69)	Mar (78)	Apr (65)	May (118)	Jun (121)	Jul (190)	Aug (95)	Sep (160)	Oct (114)	Nov (85)	Dec (79)
2006	Jan (103)	Feb (89)	Mar (41)	Apr (122)	May (94)	Jun (62)	Jul (491)	Aug (95)	Sep (279)	Oct (167)	Nov (156)	Dec (624)
2007	Jan (364)	Feb (271)	Mar (315)	Apr (378)	May (193)	Jun (235)	Jul (548)	Aug (388)	Sep (725)	Oct (369)	Nov (322)	Dec (487)
2008	Jan (552)	Feb (628)	Mar (817)	Apr (746)	May (1224)	Jun (1971)	Jul (1191)	Aug (876)	Sep (491)	Oct (267)	Nov (354)	Dec (747)
2009	Jan (322)	Feb (442)	Mar (573)	Apr (303)	May (401)	Jun (340)	Jul (403)	Aug (238)	Sep (267)	Oct (347)	Nov (456)	Dec (184)
2010	Jan (246)	Feb (432)	Mar (598)	Apr (250)	May (498)	Jun (715)	Jul (1282)	Aug (350)	Sep (504)	Oct (632)	Nov (870)	Dec (170)
2011	Jan (206)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (4)	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 1175 > >> (Page 7 of 1175)

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs/git_gerrit git_eclipse_working_model.txt, 1.3, 1.4

From: Ted L. <ted...@us...> - 2011-01-06 05:59:22

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14225/docs/git_gerrit

Modified Files:
	git_eclipse_working_model.txt 
Log Message:
updated info on eclipse changeId's

Index: git_eclipse_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/git_eclipse_working_model.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** git_eclipse_working_model.txt	29 Dec 2010 04:39:56 -0000	1.3
--- git_eclipse_working_model.txt	6 Jan 2011 05:59:14 -0000	1.4
***************
*** 100,106 ****
  ChangeId Hooks
  --------------
! Change ID Hook will add a change ID to every commit you make. The benefit of this is if you change / fix a commit and resubmit it, gerrit will use the changeId to replace the previous commit. The problem with this is that it only works on the command line git for now, eclipse does not yet support hooks. 
  
- To install the changeId hook, you need to first grab a copy from the test project. On the command line, while in the test repository do "scp -p -P 29418 r6s...@so...:hooks/commit-msg .git/hooks/commit-msg". This will effecitvely enable the changeId hook for the test project. Now to make it work for any other project just copy the .git/hooks/commit-msg to the other projects. You need to make sure the file is chmoded +x as it's a shell script.
  
  
--- 100,109 ----
  ChangeId Hooks
  --------------
! Change ID Hook will add a change ID to every commit you make. The benefit of this is if you change / fix a commit and resubmit it, gerrit will use the changeId to replace the previous commit. 
! 
! To install the changeId hook for git command line usage, you need to first grab a copy from the test project. On the command line, while in the test repository do "scp -p -P 29418 r6s...@so...:hooks/commit-msg .git/hooks/commit-msg". This will effecitvely enable the changeId hook for the test project. Now to make it work for any other project just copy the .git/hooks/commit-msg to the other projects. You need to make sure the file is chmoded +x as it's a shell script.
! 
! For Eclipse, the newer versions of the git plugin has a check box option on the commit screen to auto generate changeId's - cool eh?

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/mymeds/casemgmt index.jsp, 1.1, 1.2

From: jai <yg...@us...> - 2011-01-05 20:18:06

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/casemgmt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32253

Modified Files:
	index.jsp 
Log Message:
-ID: 3150681
-remove violation

Index: index.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/casemgmt/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.jsp	5 Jan 2011 19:35:18 -0000	1.1
--- index.jsp	5 Jan 2011 20:17:58 -0000	1.2
***************
*** 31,35 ****
  <html>
      <head>
-         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
          <title  >MyMeds Case Management</title>
          <script language="javascript" type="text/javascript">
--- 31,34 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/mymeds/casemgmt index.jsp, NONE, 1.1

From: jai <yg...@us...> - 2011-01-05 19:35:26

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/casemgmt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17856/casemgmt

Added Files:
	index.jsp 
Log Message:
-ID: 3150681
-take care of displaying mymeds casemgmt

--- NEW FILE: index.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
 */
-->


<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
   "http://www.w3.org/TR/html4/loose.dtd">

<html>
    <head>
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
        <title  >MyMeds Case Management</title>
        <script language="javascript" type="text/javascript">
            var Dom = {
                 get: function(e) {
                     if (typeof e === 'string') {
                        return document.getElementById(e);
                     } else {
                        return e;
                     }
                 },
                 add: function(e, d) {
                     var e = this.get(e);
                     var d = this.get(d);
                     d.appendChild(e);
                     e.focus();
                 },
                 remove: function(e) {
                     var e = this.get(e);
                     e.parentNode.removeChild(e);
                 },
                 expand: function(e){
                     document.getElementById('contentdisplay').innerHTML='';
                     var e=this.get(e);
                     document.getElementById('contentdisplay').appendChild(e);
                     e.setAttribute('height','100%');

                 }

            };
            var Event = {
                 add: function() {
                     if (window.addEventListener) {
                         return function(el, type, fn) {
                            Dom.get(el).addEventListener(type, fn, false);
                         };
                     } else if (window.attachEvent) {
                         return function(el, type, fn) {
                             var f = function() {
                                fn.call(Dom.get(el), window.event);
                             };
                                Dom.get(el).attachEvent('on' + type, f);
                         };
                     }
                 }()
            };

            ///////////////////////////////////////////////////////////////////////////////////////////
            Event.add(window, 'load', function() {
                //PERSONAL INFORMATION
                 Event.add('personalinfo', 'click', function() {
                     var existing=document.getElementById('pi_display');
                     if(existing){}
                     else{
                             var el = document.createElement('div');
                             el.setAttribute('id','pi_display');
                             el.innerHTML = "<a id='pi_close' href='javascript:void(0);'>Hide Personal Info</a>\n\
         <a id='pi_expand' href='javascript:void(0);'>Expand Personal Info</a><iframe src='./casemgmt/test.jsp' width='100%' height='300'>\n\
             <p>Your browser doesn't support iframe.</p></iframe>"
                             Dom.add(el, 'contentdisplay');
                             var close=document.getElementById('pi_close');
                             Event.add(close, 'click', function(e) {
                                Dom.remove(el);
                             });
                             var expand=document.getElementById('pi_expand');
                             Event.add(expand,'click',function(){
                                Dom.expand(el);
                             })
                    }
                 });
                 //MESSAGES
                 Event.add('msg', 'click', function() {
                     var existing=document.getElementById('msg_display');
                     if(existing){}
                     else{
                     var el = document.createElement('div');
                     el.setAttribute('id', 'msg_display');
                     el.innerHTML = "<a id='msg_close' href='javascript:void(0);'>Hide Messages</a>\n\
<a id='msg_expand' href='javascript:void(0);'>Expand Message</a> <iframe src='./casemgmt/test.jsp' width='100%' height='300'>\n\
     <p>Your browser doesn't support iframe.</p></iframe>"
                     Dom.add(el, 'contentdisplay');
                     var close=document.getElementById('msg_close');
                     Event.add(close, 'click', function(e) {
                        Dom.remove(el);
                     });
                             var expand=document.getElementById('msg_expand');
                             Event.add(expand,'click',function(){
                                Dom.expand(el);
                             })
                     }
                 });
                 //DOCUMENTS
                 Event.add('documents', 'click', function() {
                     var existing=document.getElementById('documents_display');
                     if(existing){}
                     else{
                     var el = document.createElement('div');
                     el.setAttribute('id','documents_display');
                     el.innerHTML = "<a id='documents_close' href='javascript:void(0);'>Hide Documents</a>\n\
<a id='documents_expand' href='javascript:void(0);'>Expand Documents</a>  <iframe src='./casemgmt/test.jsp' width='100%' height='300'>\n\
     <p>Your browser doesn't support iframe.</p></iframe>"
                     Dom.add(el, 'contentdisplay');
                     var close=document.getElementById('documents_close');
                     Event.add(close, 'click', function(e) {
                        Dom.remove(el);
                     });
                             var expand=document.getElementById('documents_expand');
                             Event.add(expand,'click',function(){
                                Dom.expand(el);
                             })
                     }
                 });
                 //MEDICATION
                 Event.add('med', 'click', function() {
                     var existing=document.getElementById('med_display');
                     if(existing){}
                     else{
                     var el = document.createElement('div');
                     el.setAttribute('id', 'med_display');
                     el.innerHTML = "<a id='med_close' href='javascript:void(0);'>Hide Medication</a>\n\
<a id='med_expand' href='javascript:void(0);'>Expand Medication</a>   <iframe src='./casemgmt/test.jsp' width='100%' height='300'>\n\
     <p>Your browser doesn't support iframe.</p></iframe>"
                     Dom.add(el, 'contentdisplay');
                     var close=document.getElementById('med_close');
                     Event.add(close, 'click', function(e) {
                        Dom.remove(el);
                     });
                             var expand=document.getElementById('med_expand');
                             Event.add(expand,'click',function(){
                                Dom.expand(el);
                             })
                     }
                 });
                 //MEASUREMENT
                 Event.add('meas', 'click', function() {
                     var existing=document.getElementById('meas_display');
                     if(existing){}
                     else{
                     var el = document.createElement('div');
                     el.setAttribute('id', 'meas_display');
                     el.innerHTML = "<a id='meas_close' href='javascript:void(0);'>Hide Measurements</a>\n\
<a id='meas_expand' href='javascript:void(0);'>Expand Measurements</a>   <iframe src='./casemgmt/test.jsp' width='100%' height='300'>\n\
     <p>Your browser doesn't support iframe.</p></iframe>"
                     Dom.add(el, 'contentdisplay');
                     var close=document.getElementById('meas_close');
                     Event.add(close, 'click', function(e) {
                        Dom.remove(el);
                     });
                             var expand=document.getElementById('meas_expand');
                             Event.add(expand,'click',function(){
                                Dom.expand(el);
                             })
                     }});
                 //BLOOD PRESSURE
                 Event.add('bp', 'click', function() {
                     var existing=document.getElementById('bp_display');
                     if(existing){}
                     else{
                     var el = document.createElement('div');
                     el.setAttribute('id', 'bp_display');
                     el.innerHTML = "<a id='bp_close' href='javascript:void(0);'>Hide Blood Pressure</a>\n\
<a id='bp_expand' href='javascript:void(0);'>Expand Blood Pressure</a>   <iframe src='./casemgmt/test.jsp' width='100%' height='300'>\n\
     <p>Your browser doesn't support iframe.</p></iframe>"
                     Dom.add(el, 'contentdisplay');
                     var close=document.getElementById('bp_close');
                     Event.add(close, 'click', function(e) {
                        Dom.remove(el);
                     });
                             var expand=document.getElementById('bp_expand');
                             Event.add(expand,'click',function(){
                                Dom.expand(el);
                             })
                     }});
                 //SURVEYS
                 Event.add('surveys', 'click', function() {
                     var existing=document.getElementById('surveys_display');
                     if(existing){}
                     else{
                     var el = document.createElement('div');
                     el.setAttribute('id', 'surveys_display');
                     el.innerHTML = "<a id='surveys_close' href='javascript:void(0);'>Hide Surveys</a>\n\
<a id='surveys_expand' href='javascript:void(0);'>Expand Surveys</a>   <iframe src='./casemgmt/test.jsp' width='100%' height='300'>\n\
     <p>Your browser doesn't support iframe.</p></iframe>"
                     Dom.add(el, 'contentdisplay');
                     var close=document.getElementById('surveys_close');
                     Event.add(close, 'click', function(e) {
                        Dom.remove(el);
                     });
                             var expand=document.getElementById('surveys_expand');
                             Event.add(expand,'click',function(){
                                Dom.expand(el);
                             })
                    }
                 });
            });

        </script>
    </head>
    <body>
        <h2 align="center" >MyMeds Case Management</h2>
        <table width="100%">
            <tr>
                <td width="30%" >
                    <table>
                        <tr><td><a id="personalinfo" href="javascript:void(0);" onclick="">Personal Info</a></td></tr>
                        <tr><td><a id="msg" href="javascript:void(0);" onclick="">Messages</a></td></tr>
                        <tr><td><a id="documents" href="javascript:void(0);" onclick="">Documents</a></td></tr>
                        <tr><td><a id="med" href="javascript:void(0);" onclick="">Medication</a></td></tr>
                        <tr><td><a id="meas" href="javascript:void(0);" onclick="">Measurements</a></td></tr>
                        <tr><td><a id="bp" href="javascript:void(0);" onclick="">Blood Pressure</a></td></tr>
                        <tr><td><a id="surveys" href="javascript:void(0);" onclick="">Surveys</a></td></tr>
                    </table>
                </td>
                <td width="70%">
                    <table id="contentdisplay" width="100%"></table>
                </td>
            </tr>
        </table>
    </body>
</html>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/mymeds/casemgmt - New directory

From: jai <yg...@us...> - 2011-01-05 19:35:22

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/casemgmt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17815/casemgmt

Log Message:
Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/casemgmt added to the repository

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF struts-config.xml, 1.364, 1.365

From: jai <yg...@us...> - 2011-01-05 19:35:12

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17297

Modified Files:
	struts-config.xml 
Log Message:
-ID: 3150681
-add mymeds casemgmt path

Index: struts-config.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v
retrieving revision 1.364
retrieving revision 1.365
diff -C2 -d -r1.364 -r1.365
*** struts-config.xml	3 Jan 2011 23:51:02 -0000	1.364
--- struts-config.xml	5 Jan 2011 19:35:04 -0000	1.365
***************
*** 1265,1268 ****
--- 1265,1271 ----
  			<forward name="providerLogin" path="/mymeds/login/providerLogin.jsp" />
  		</action>
+                 <action  path="/mymeds/casemgmt" scope="request" parameter="method" type="org.mymeds.casemanagement.CaseMgmtAction">
+ 			<forward name="casemgmt" path="/mymeds/casemgmt/index.jsp" />
+ 		</action>
                  <action input="/oscarEncounter/Index.jsp" path="/oscarResearch/oscarDxResearch/setupDxResearch" scope="request" type="oscar.oscarResearch.oscarDxResearch.pageUtil.dxSetupResearchAction">
  			<forward name="success" path="/oscarResearch/oscarDxResearch/dxResearch.jsp" />

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/mymeds/login providerLogin.jsp, 1.1, 1.2

From: jai <yg...@us...> - 2011-01-05 19:34:50

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/login
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17138

Modified Files:
	providerLogin.jsp 
Log Message:
-ID: 3150681
-add link to open casemgmt
-change display text

Index: providerLogin.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/mymeds/login/providerLogin.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** providerLogin.jsp	3 Jan 2011 23:49:32 -0000	1.1
--- providerLogin.jsp	5 Jan 2011 19:34:42 -0000	1.2
***************
*** 45,48 ****
--- 45,49 ----
          <script type="text/javascript" src="<c:out value="${ctx}/share/javascript/controls.js"/>"></script>
          <script type="text/javascript" src="<c:out value="${ctx}/share/javascript/Oscar.js"/>"></script>
+         <script type="text/javascript" src="<c:out value="${ctx}/web/js/global.js"/>"></script>
          <script type="text/javascript">
              function backToOscar(providerNo){
***************
*** 78,82 ****
                          <option>DOB(yyyy/mm/dd)</option>
                          <option>Address</option>
!                         <option>Health Ins.No.</option>
                          <option>Chart No.</option>
                      </select>
--- 79,83 ----
                          <option>DOB(yyyy/mm/dd)</option>
                          <option>Address</option>
!                         <option>Patient No.</option>
                          <option>Chart No.</option>
                      </select>
***************
*** 93,97 ****
                      <table>
                          <tr><td align="center" colspan="7">Patients</td></tr>
!                         <tr><td class="colname" align="center">HIN</td><td  class="colname" align="center">Name</td>
                              <td  class="colname" align="center">Gender</td><td  class="colname" id="dobname" align="center">DOB (yyyy/mm/dd)</td>
                              <td  class="colname" align="center">Doctor</td><td  class="colname" align="center">Pat Status</td>
--- 94,98 ----
                      <table>
                          <tr><td align="center" colspan="7">Patients</td></tr>
!                         <tr><td class="colname" align="center">Patient No.</td><td  class="colname" align="center">Name</td>
                              <td  class="colname" align="center">Gender</td><td  class="colname" id="dobname" align="center">DOB (yyyy/mm/dd)</td>
                              <td  class="colname" align="center">Doctor</td><td  class="colname" align="center">Pat Status</td>
***************
*** 109,113 ****
                                  String tel=demo.getPhone();
                                  %>
!                                 <tr><td align="center"><%=hin%></td><td align="left" ><a href="javascript:void(0);" onclick=""><%=demographic_name%></a></td><td align="center" ><%=gender%></td><td align="center" ><%=dob%></td><td align="left" ><%=pName%></td><td align="center" ><%=pStatus%></td><td align="center" ><%=tel%></td></tr>
                          <%}%>
                      </table>
--- 110,114 ----
                                  String tel=demo.getPhone();
                                  %>
!                                 <tr><td align="center"><%=hin%></td><td align="left" ><a href="javascript:void(0);" onclick="popupFocusPage(360,780,('../mymeds/casemgmt.do'));"><%=demographic_name%></a></td><td align="center" ><%=gender%></td><td align="center" ><%=dob%></td><td align="left" ><%=pName%></td><td align="center" ><%=pStatus%></td><td align="center" ><%=tel%></td></tr>
                          <%}%>
                      </table>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/js global.js,1.8,1.9

From: jai <yg...@us...> - 2011-01-05 19:34:38

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17074

Modified Files:
	global.js 
Log Message:
-ID: 3150681
-add popupFocusPage method

Index: global.js
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/global.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** global.js	30 Sep 2010 15:37:48 -0000	1.8
--- global.js	5 Jan 2011 19:34:31 -0000	1.9
***************
*** 35,39 ****
    }
  }
! 
  // Prompt user if exiting without saving
  function onExit() {
--- 35,52 ----
    }
  }
! //popup and focus
! //allow to specify pageTitle
! function popupFocusPage(vheight,vwidth,varpage,pageTitle){
!             var page = "" + varpage;
!             var windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,"+
!                 "screenX=50,screenY=50,top=0,left=0";
!             var popup=window.open(page, pageTitle, windowprops);
!             if (popup != null) {
!                         if (popup.opener == null) {
!                             popup.opener = self;
!                         }
!                         popup.focus();
!             }
! }
  // Prompt user if exiting without saving
  function onExit() {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/casemanagement CaseMgmtAction.java, NONE, 1.1

From: jai <yg...@us...> - 2011-01-05 19:34:21

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/casemanagement
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16985/casemanagement

Added Files:
	CaseMgmtAction.java 
Log Message:
-ID: 3150681
-take care of logic for mymeds casemgmt window

--- NEW FILE: CaseMgmtAction.java ---
/*
 * To change this template, choose Tools | Templates
 * and open the template in the editor.
 */

package org.mymeds.casemanagement;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.actions.DispatchAction;

/**
 *
 * @author jackson
 */
public class CaseMgmtAction extends DispatchAction {
    Logger logger = Logger.getLogger(CaseMgmtAction.class);
    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {

            return mapping.findForward("casemgmt");
       }
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/casemanagement - New directory

From: jai <yg...@us...> - 2011-01-05 19:34:18

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/casemanagement
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16944/casemanagement

Log Message:
Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/casemanagement added to the repository

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql, 1.273, 1.274

From: Marc D. <hex...@us...> - 2011-01-05 19:24:56

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13834

Modified Files:
	oscarinit.sql 
Log Message:
added missing column


Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.273
retrieving revision 1.274
diff -C2 -d -r1.273 -r1.274
*** oscarinit.sql	5 Jan 2011 19:22:02 -0000	1.273
--- oscarinit.sql	5 Jan 2011 19:24:48 -0000	1.274
***************
*** 281,284 ****
--- 281,285 ----
    patientWillBook tinyint(1),
    followUpDate date default NULL,
+   site_name varchar(255),
    PRIMARY KEY  (requestId)
  ) ;

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql, 1.272, 1.273

From: Marc D. <hex...@us...> - 2011-01-05 19:22:11

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13084

Modified Files:
	oscarinit.sql 
Log Message:
added misssing columns for eyeform


Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -d -r1.272 -r1.273
*** oscarinit.sql	16 Dec 2010 04:52:42 -0000	1.272
--- oscarinit.sql	5 Jan 2011 19:22:02 -0000	1.273
***************
*** 8157,8160 ****
--- 8157,8162 ----
    `date` timestamp ,
    `type` varchar(25),
+   `urgency` varchar(50),
+   `comment` text,
    PRIMARY KEY (`id`)
  );

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs/git_gerrit automated_deploy_cron_logger.sh, NONE, 1.1 automated_deploy.sh, 1.5, 1.6 automated_deploys.txt, 1.3, 1.4

From: Ted L. <ted...@us...> - 2011-01-05 01:45:56

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29623/docs/git_gerrit

Modified Files:
	automated_deploy.sh automated_deploys.txt 
Added Files:
	automated_deploy_cron_logger.sh 
Log Message:
updated auto_deploy scripts / info

Index: automated_deploy.sh
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/automated_deploy.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** automated_deploy.sh	24 Dec 2010 01:56:37 -0000	1.5
--- automated_deploy.sh	5 Jan 2011 01:45:48 -0000	1.6
***************
*** 50,54 ****
  		# stop tomcat, sleep to allow tomcat to shutdown before restarting
  		catalina.sh stop
! 		sleep 20 
  		
  		# reset database
--- 50,55 ----
  		# stop tomcat, sleep to allow tomcat to shutdown before restarting
  		catalina.sh stop
! 		sleep 20
! 		mv ${CATALINA_BASE}/logs/catalina.out ${CATALINA_BASE}/logs/catalina.out.`date -I` 
  		
  		# reset database

--- NEW FILE: automated_deploy_cron_logger.sh ---
#!/bin/sh
cd /home/oscara/myoscar/
./automated_deploy_myoscar_client.sh>cron_logs/client_`date +%F_%T`.log 2>&1
./automated_deploy_myoscar_server.sh>cron_logs/server_`date +%F_%T`.log 2>&1

Index: automated_deploys.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/automated_deploys.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** automated_deploys.txt	24 Dec 2010 02:05:12 -0000	1.3
--- automated_deploys.txt	5 Jan 2011 01:45:48 -0000	1.4
***************
*** 16,18 ****
  	d) if build succeeds deploy to tomcat
  	
! There's a sample script automated_deploy.sh which can be used as a template for what to do.	
\ No newline at end of file
--- 16,20 ----
  	d) if build succeeds deploy to tomcat
  	
! There's a sample script automated_deploy.sh which can be used as a template for what to do.	
! 
! There's a sample script automated_deploy_cron_logger.sh which is a wrapper which helps log what the cron is doing. It requires the cron_logs directory as per the script contents.
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/ClientManager ocan_form.jsp, 1.28, 1.29

From: annie <ann...@us...> - 2011-01-04 23:25:10

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28777/web/PMmodule/ClientManager

Modified Files:
	ocan_form.jsp 
Log Message:
make "legal issue" mandatory.

Index: ocan_form.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ocan_form.jsp	29 Dec 2010 23:11:09 -0000	1.28
--- ocan_form.jsp	4 Jan 2011 23:25:02 -0000	1.29
***************
*** 1583,1587 ****
  			<td class="genericTableHeader">Do you currently have any legal issues</td>
  			<td class="genericTableData">
! 				<select name="legal_issues">
  					<%=OcanForm.renderAsSelectOptions(ocanStaffForm.getId(), "legal_issues", OcanForm.getOcanFormOptions("Legal Issues"),prepopulationLevel)%>
  				</select>					
--- 1583,1587 ----
  			<td class="genericTableHeader">Do you currently have any legal issues</td>
  			<td class="genericTableData">
! 				<select name="legal_issues" class="{validate: {required:true}}">
  					<%=OcanForm.renderAsSelectOptions(ocanStaffForm.getId(), "legal_issues", OcanForm.getOcanFormOptions("Legal Issues"),prepopulationLevel)%>
  				</select>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/ClientManager ocan_form.jsp, 1.15.4.15, 1.15.4.16

From: annie <ann...@us...> - 2011-01-04 22:38:49

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15237/web/PMmodule/ClientManager

Modified Files:
      Tag: RELEASE_10_06
	ocan_form.jsp 
Log Message:
make "legal issue" field mandatory.

Index: ocan_form.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v
retrieving revision 1.15.4.15
retrieving revision 1.15.4.16
diff -C2 -d -r1.15.4.15 -r1.15.4.16
*** ocan_form.jsp	29 Dec 2010 19:04:00 -0000	1.15.4.15
--- ocan_form.jsp	4 Jan 2011 22:38:41 -0000	1.15.4.16
***************
*** 1583,1587 ****
  			<td class="genericTableHeader">Do you currently have any legal issues</td>
  			<td class="genericTableData">
! 				<select name="legal_issues">
  					<%=OcanForm.renderAsSelectOptions(ocanStaffForm.getId(), "legal_issues", OcanForm.getOcanFormOptions("Legal Issues"),prepopulationLevel)%>
  				</select>					
--- 1583,1587 ----
  			<td class="genericTableHeader">Do you currently have any legal issues</td>
  			<td class="genericTableData">
! 				<select name="legal_issues" class="{validate: {required:true}}">
  					<%=OcanForm.renderAsSelectOptions(ocanStaffForm.getId(), "legal_issues", OcanForm.getOcanFormOptions("Legal Issues"),prepopulationLevel)%>
  				</select>

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/caisi init_ocan_form_connex_option.sql, 1.4, 1.5

From: Jay G. <jay...@us...> - 2011-01-04 22:06:08

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5310

Modified Files:
	init_ocan_form_connex_option.sql 
Log Message:
removed default

Index: init_ocan_form_connex_option.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/init_ocan_form_connex_option.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** init_ocan_form_connex_option.sql	29 Dec 2010 23:03:41 -0000	1.4
--- init_ocan_form_connex_option.sql	4 Jan 2011 22:05:56 -0000	1.5
***************
*** 20,26 ****
  --
  
- DROP TABLE IF EXISTS `OcanConnexOption`;
- SET @saved_cs_client     = @@character_set_client;
- SET character_set_client = utf8;
  CREATE TABLE `OcanConnexOption` (
    `id` int(11) NOT NULL auto_increment,
--- 20,23 ----
***************
*** 32,56 ****
    `programNumber` varchar(5) NOT NULL,
    PRIMARY KEY  (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=555 DEFAULT CHARSET=latin1;
! SET character_set_client = @saved_cs_client;
! 
! --
! -- Dumping data for table `OcanConnexOption`
! --
  
- LOCK TABLES `OcanConnexOption` WRITE;
- /*!40000 ALTER TABLE `OcanConnexOption` DISABLE KEYS */;
  INSERT INTO `OcanConnexOption` VALUES (1,'1','Erie St. Clair','Bluewater Health','966','Bluewater Health Mental Health Program','3029'),(2,'1','Erie St. Clair','Bulimia Anorexia Nervosa Association (BANA)','304','Bulimia Anorexia Nervosa Association (BANA)','3086'),(3,'1','Erie St. Clair','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(4,'1','Erie St. Clair','Canadian Mental Health Association (CMHA) Chatham-Kent Branch','380','Canadian Mental Health Association (CMHA) Chatham-Kent Branch','3039'),(5,'1','Erie St. Clair','Canadian Mental Health Association (CMHA) Chatham-Kent Branch','380','Canadian Mental Health Association (CMHA) Chatham-Kent Branch','3539'),(6,'1','Erie St. Clair','Canadian Mental Health Association (CMHA) Lambton County Branch','388','Canadian Mental Health Association (CMHA) Lambton County Branch','3011'),(7,'1','Erie St. Clair','Canadian Mental Health Association (CMHA) Lambton County Branch','388','Canadian Mental Health Association (CMHA) Lambton County Branch','3511'),(8,'1','Erie St. Clair','Canadian Mental Health Association (CMHA) Windsor-Essex County Branch','403','Canadian Mental Health Association (CMHA) Windsor-Essex County Branch','3025'),(9,'1','Erie St. Clair','Canadian Mental Health Association (CMHA) Windsor-Essex County Branch','403','Canadian Mental Health Association (CMHA) Windsor-Essex County Branch','3525'),(10,'1','Erie St. Clair','Chatham-Kent Health Alliance','995','Chatham-Kent Mental Health and Addictions Program','3007'),(11,'1','Erie St. Clair','Family Counselling Centre','282','Family Counselling Centre','3098'),(12,'1','Erie St. Clair','Hospice of Windsor and Essex County, The','326','Wellness Centre Program and Clinical Services','3084'),(13,'1','Erie St. Clair','Mental Health Connections','447','Mental Health Connections','3012'),(14,'1','Erie St. Clair','Mental Health Consumer/Survivor Employment Association of Essex County','270','Ten Friends Diner','3106'),(15,'1','Erie St. Clair','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(16,'1','Erie St. Clair','Ontario Federation of Indian Friendship Centres','569','Ontario Federation of Indian Friendship Centres','6202'),(17,'1','Erie St. Clair','Religious Hospitallers of the HÃÂ´-Dieu of St. Joseph of the Diocese of London','927','Community Crisis Centre of Windsor-Essex County','3121'),(18,'1','Erie St. Clair','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(19,'1','Erie St. Clair','Sexual Assault Crisis Centre of Essex County Inc.','301','Sexual Assault County Program','3006'),(20,'1','Erie St. Clair','Sexual Assault Crisis Centre of Essex County Inc.','301','Sexual Assault County Program','3094'),(21,'1','Erie St. Clair','St. Joseph\'s Health Care, London','714','Regional Mental Health Care','3118'),(22,'1','Erie St. Clair','Windsor Regional Hospital','933','Windsor Regional Hospital','3006'),(23,'2','South West','Alexandra Marine and General Hospital of Goderich','663','Alexandra Marine and General Hospital of Goderich','3055'),(24,'2','South West','Can-Voice Consumer/Survivor Community Support Services','259','Can-Voice Consumer/Survivor Community Support Services','3102'),(25,'2','South West','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(26,'2','South West','Canadian Mental Health Association (CMHA) Elgin Branch','464','Canadian Mental Health Association (CMHA) Elgin Branch','3004'),(27,'2','South West','Canadian Mental Health Association (CMHA) Elgin Branch','464','Canadian Mental Health Association (CMHA) Elgin Branch','3504'),(28,'2','South West','Canadian Mental Health Association (CMHA) Grey Bruce Branch','407','Canadian Mental Health Association (CMHA) Grey Bruce Branch','3026'),(29,'2','South West','Canadian Mental Health Association (CMHA) Huron-Perth Branch','343','Canadian Mental Health Association (CMHA) Huron-Perth Branch','3068'),(30,'2','South West','Canadian Mental Health Association (CMHA) Huron-Perth Branch','343','Canadian Mental Health Association (CMHA) Huron-Perth Branch','3568'),(31,'2','South West','Canadian Mental Health Association (CMHA) London/Middlesex Branch','350','Canadian Mental Health Association (CMHA) London/Middlesex Branch','3009'),(32,'2','South West','Canadian Mental Health Association (CMHA) London/Middlesex Branch','350','Canadian Mental Health Association (CMHA) London/Middlesex Branch','3112'),(33,'2','South West','Canadian Mental Health Association (CMHA) Oxford County Branch','289','Canadian Mental Health Association (CMHA) Oxford County Branch','3097'),(34,'2','South West','Canadian Mental Health Association (CMHA) Oxford County Branch','289','Canadian Mental Health Association (CMHA) Oxford County Branch','3597'),(35,'2','South West','Crest Support Services','357','Crest Support Services','3066'),(36,'2','South West','Crest Support Services','357','Crest Support Services','3566'),(37,'2','South West','Family Service Thames Valley','450','Family Service Thames Valley','3110'),(38,'2','South West','Grey Bruce Community Health Corporation','377','Grey Bruce Community Health Corporation','3041'),(39,'2','South West','Grey Bruce Community Health Corporation','377','Grey Bruce Community Health Corporation','3541'),(40,'2','South West','Grey Bruce Health Services','955','Grey Bruce Health Services - Mental Health Program','3119'),(41,'2','South West','KiiKeeWanNiiKaan - Southwest Regional Healing Lodge','2010','KiiKeeWanNiiKaan - Southwest Regional Healing Lodge','3125'),(42,'2','South West','London Health Sciences Centre','936','London Health Sciences Centre','3003'),(43,'2','South West','London Health Sciences Centre','936','London Health Sciences Centre','3116'),(44,'2','South West','Mission Services of London','423','Community Mental Health Services','3018'),(45,'2','South West','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(46,'2','South West','Oxford Self-Help Network','267','Oxford Self-Help Network','3104'),(47,'2','South West','Phoenix Survivors Perth County (PSPC)','268','Phoenix Survivors Perth County (PSPC) Mental Health Peer Support Centre','3101'),(48,'2','South West','Psychiatric Survivors Network of Elgin (PSNE)','261','Psychiatric Survivors Network of Elgin (PSNE)','3103'),(49,'2','South West','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(50,'2','South West','Search Community Mental Health Services','443','Search Community Mental Health Services','3016'),(51,'2','South West','Southwest Ontario Aboriginal Health Access Centre','2013','Southwest Ontario Aboriginal Health Access Centre','3124'),(52,'2','South West','St. Joseph\'s Health Care, London','714','Regional Mental Health Care','3118'),(53,'2','South West','Stratford General Hospital','813','Huron Perth Healthcare Alliance - Mental Health Services','3003'),(54,'2','South West','Stratford General Hospital','813','Huron Perth Healthcare Alliance - Mental Health Services','3055'),(55,'2','South West','Stratford General Hospital','813','Huron Perth Healthcare Alliance - Mental Health Services','3083'),(56,'2','South West','Stratford General Hospital','813','Huron Perth Healthcare Alliance - Mental Health Services','3116'),(57,'2','South West','Violence Against Women, Services Elgin County','256','Violence Against Women Services (VAWSEC), Elgin County','3108'),(58,'2','South West','Western Ontario Therapeutic Community Hostel (WOTCH)','470','WOTCH Community Mental Health Services','3009'),(59,'2','South West','Western Ontario Therapeutic Community Hostel (WOTCH)','470','WOTCH Community Mental Health Services','3509'),(60,'2','South West','Women\'s Emergency Centre Oxford','453','Women\'s Emergency Centre Oxford','3109'),(61,'2','South West','Women\'s Shelter, Second Stage Housing and Counselling Services of Huron','293','Women\'s Shelter, Second Stage Housing and Counselling Services of Huron','3095'),(62,'2','South West','Woodstock General Hospital','890','Woodstock General Hospital','3003'),(63,'2','South West','Woodstock General Hospital','890','Woodstock General Hospital','3009'),(64,'3','Waterloo Wellington','Cambridge Memorial Hospital','661','Cambridge Memorial Hospital','4002'),(65,'3','Waterloo Wellington','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(66,'3','Waterloo Wellington','Canadian Mental Health Association (CMHA) Grand River Branch','2005','Canadian Mental Health Association (CMHA) Grand River Branch','4551'),(67,'3','Waterloo Wellington','Canadian Mental Health Association (CMHA) Grand River Branch','2005','Canadian Mental Health Association (CMHA) Grand River Branch','5120'),(68,'3','Waterloo Wellington','Dunara Homes for Recovery, Inc.','368','Dunara Homes for Recovery','4064'),(69,'3','Waterloo Wellington','Family Counselling and Support Services for Guelph-Wellington','280','Sexual Abuse Survivor\'s Group','4095'),(70,'3','Waterloo Wellington','Grand River Hospital Corporation','930','Grand River Hospital Corporation - Mental Health and Addictions','4065'),(71,'3','Waterloo Wellington','Homewood Health Centre Inc.','601','Homewood Mental Health Division','4012'),(72,'3','Waterloo Wellington','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(73,'3','Waterloo Wellington','Mosaic Counselling and Family Services','286','Catholic Family Counselling Centre (Region of Waterloo), Sexual Assault Counselling Program','4098'),(74,'3','Waterloo Wellington','Self Help Alliance of Waterloo Wellington, The','272','Waterloo Regional Self Help (WRSH)','4028'),(75,'3','Waterloo Wellington','Self Help Alliance of Waterloo Wellington, The','272','Waterloo Regional Self Help (WRSH)','4105'),(76,'3','Waterloo Wellington','Self Help Alliance of Waterloo Wellington, The','272','Waterloo Regional Self Help (WRSH)','6107'),(77,'3','Waterloo Wellington','St. Joseph\'s Health Care, London','714','Regional Mental Health Care','3118'),(78,'3','Waterloo Wellington','Torchlight Services','313','Community Options Program To Employment (COPE)','4091'),(79,'3','Waterloo Wellington','Trellis Mental Health and Developmental Services','589','Trellis Mental Health and Developmental Services','4009'),(80,'3','Waterloo Wellington','Trellis Mental Health and Developmental Services','589','Trellis Mental Health and Developmental Services','5098'),(81,'3','Waterloo Wellington','Waterloo Regional Homes for Mental Health Inc.','431','Waterloo Regional Homes for Mental Health','4014'),(82,'3','Waterloo Wellington','Waterloo Regional Homes for Mental Health Inc.','431','Waterloo Regional Homes for Mental Health','4514'),(83,'4','Hamilton Niagara Haldimand Brant','Brant Community Healthcare System','970','Brant Community Healthcare System','4017'),(84,'4','Hamilton Niagara Haldimand Brant','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(85,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Brant County Branch','369','Canadian Mental Health Association (CMHA) Brant County Branch','4060'),(86,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Brant County Branch','369','Canadian Mental Health Association (CMHA) Brant County Branch','4560'),(87,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Haldimand-Norfolk Branch','339','Canadian Mental Health Association (CMHA) Haldimand-Norfolk Branch','4071'),(88,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Haldimand-Norfolk Branch','339','Canadian Mental Health Association (CMHA) Haldimand-Norfolk Branch','4571'),(89,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Halton Region Branch','382','Canadian Mental Health Association (CMHA) Halton Region Branch','5103'),(90,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Hamilton Branch','528','Canadian Mental Health Association (CMHA) Hamilton Branch','4005'),(91,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Hamilton Branch','528','Canadian Mental Health Association (CMHA) Hamilton Branch','4505'),(92,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Niagara Branch','402','Canadian Mental Health Association (CMHA) Niagara Branch','4033'),(93,'4','Hamilton Niagara Haldimand Brant','Canadian Mental Health Association (CMHA) Niagara Branch','402','Canadian Mental Health Association (CMHA) Niagara Branch','4533'),(94,'4','Hamilton Niagara Haldimand Brant','City of Hamilton','471','City of Hamilton, Community Mental Health Promotion Program','4048'),(95,'4','Hamilton Niagara Haldimand Brant','Community Addiction and Mental Health Services of Haldimand and Norfolk','449','Community Addiction and Mental Health Services of Haldimand and Norfolk','4010'),(96,'4','Hamilton Niagara Haldimand Brant','Community Addiction and Mental Health Services of Haldimand and Norfolk','449','Community Addiction and Mental Health Services of Haldimand and Norfolk','4013'),(97,'4','Hamilton Niagara Haldimand Brant','Consumer/Survivor Initiative of Niagara','440','Consumer/Survivor Initiative of Niagara','4076'),(98,'4','Hamilton Niagara Haldimand Brant','De Dwa Da Dehs Nye Aboriginal Health Access Centre','2004','De Dwa Da Dehs Nye Aboriginal Health Access Centre','4121'),(99,'4','Hamilton Niagara Haldimand Brant','Gateway Residential and Community Support Services of Niagara','372','Gateway Residential and Community Support Services of Niagara','4063'),(100,'4','Hamilton Niagara Haldimand Brant','Gateway Residential and Community Support Services of Niagara','372','Gateway Residential and Community Support Services of Niagara','4563'),(101,'4','Hamilton Niagara Haldimand Brant','Good Shepherd Non-Profit Homes Inc.','446','Good Shepherd Non-Profit Homes','4088'),(102,'4','Hamilton Niagara Haldimand Brant','Good Shepherd Non-Profit Homes Inc.','446','Good Shepherd Non-Profit Homes','4508'),(103,'4','Hamilton Niagara Haldimand Brant','Haldimand Norfolk Work Group of Simcoe (HNWGS)','399','Haldimand Norfolk Work Group of Simcoe (HNWGS)','4025'),(104,'4','Hamilton Niagara Haldimand Brant','Haldimand-Norfolk Women\'s Services','283','Haldimand-Norfolk Women\'s Services','4096'),(105,'4','Hamilton Niagara Haldimand Brant','Halton Alcohol, Drug and Gambling Assessment, Prevention and Treatment Services','587','Alcohol, Drug and Gambling Assessment Prevention and Treatment (ADAPT)','5098'),(106,'4','Hamilton Niagara Haldimand Brant','Halton Alcohol, Drug and Gambling Assessment, Prevention and Treatment Services','587','Alcohol, Drug and Gambling Assessment Prevention and Treatment (ADAPT)','5100'),(107,'4','Hamilton Niagara Haldimand Brant','Hamilton Health Sciences Corporation','942','Hamilton Health Sciences Corporation','4119'),(108,'4','Hamilton Niagara Haldimand Brant','Hamilton Program for Schizophrenia','468','Hamilton Program for Schizophrenia','4007'),(109,'4','Hamilton Niagara Haldimand Brant','Joseph Brant Memorial Hospital Corporation','718','Joseph Brant Memorial Hospital Mental Health Program','5097'),(110,'4','Hamilton Niagara Haldimand Brant','Joseph Brant Memorial Hospital Corporation','718','Joseph Brant Memorial Hospital Mental Health Program','5098'),(111,'4','Hamilton Niagara Haldimand Brant','Joseph Brant Memorial Hospital Corporation','718','Joseph Brant Memorial Hospital Mental Health Program','5100'),(112,'4','Hamilton Niagara Haldimand Brant','Mental Health Rights Coalition of Hamilton','275','Mental Health Rights Coalition of Hamilton','4104'),(113,'4','Hamilton Niagara Haldimand Brant','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(114,'4','Hamilton Niagara Haldimand Brant','Niagara Health System','962','Niagara Health System','4019'),(115,'4','Hamilton Niagara Haldimand Brant','Oak Centre Alternative Community Support','452','Oak Centre Alternative Community Support','4049'),(116,'4','Hamilton Niagara Haldimand Brant','Ontario Federation of Indian Friendship Centres','569','Ontario Federation of Indian Friendship Centres','6202'),(117,'4','Hamilton Niagara Haldimand Brant','Regional Municipality of Niagara','473','Niagara Region, Community Mental Health Program','4010'),(118,'4','Hamilton Niagara Haldimand Brant','Regional Municipality of Niagara','473','Niagara Region, Community Mental Health Program','4033'),(119,'4','Hamilton Niagara Haldimand Brant','Regional Municipality of Niagara','473','Niagara Region, Community Mental Health Program','4034'),(120,'4','Hamilton Niagara Haldimand Brant','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(121,'4','Hamilton Niagara Haldimand Brant','Six Nations Council','4352','Six Nation Mental Health Services','4006'),(122,'4','Hamilton Niagara Haldimand Brant','St. Joseph\'s Healthcare Hamilton (SJHH)','674','St. Joseph\'s Healthcare Hamilton (SJHH)','4010'),(123,'4','Hamilton Niagara Haldimand Brant','St. Leonard\'s Community Services','566','St. Leonard\'s Community Services','4120'),(124,'4','Hamilton Niagara Haldimand Brant','Summit Housing & Outreach Programs','426','Summit Housing & Outreach Programs','5100'),(125,'4','Hamilton Niagara Haldimand Brant','Summit Housing & Outreach Programs','426','Summit Housing & Outreach Programs','5600'),(126,'4','Hamilton Niagara Haldimand Brant','Support & Housing - Halton (SHH)','405','Support & Housing Halton (SHH)','5100'),(127,'4','Hamilton Niagara Haldimand Brant','Support & Housing - Halton (SHH)','405','Support & Housing Halton (SHH)','5101'),(128,'4','Hamilton Niagara Haldimand Brant','True Experience Supportive Housing and Community Work Program','424','True Experience Supportive Housing and Community Work Program','4022'),(129,'4','Hamilton Niagara Haldimand Brant','True Experience Supportive Housing and Community Work Program','424','True Experience Supportive Housing and Community Work Program','4524'),(130,'4','Hamilton Niagara Haldimand Brant','Wellington Psychiatric Outreach Program','359','Wellington Psychiatric Outreach Program','4062'),(131,'4','Hamilton Niagara Haldimand Brant','West Lincoln Memorial Hospital','664','West Niagara Mental Health Team','4118'),(132,'5','Central West','Canadian Mental Health Association (CMHA) Grand River Branch','2005','Canadian Mental Health Association (CMHA) Grand River Branch','5120'),(133,'5','Central West','Canadian Mental Health Association (CMHA) Peel Branch','434','Canadian Mental Health Association (CMHA) Peel Branch','5002'),(134,'5','Central West','Family Association for Mental Health Everywhere (F.A.M.E.)','425','Family Association for Mental Health Everywhere (F.A.M.E.)','6162'),(135,'5','Central West','Family Transition Place','285','Family Transition Place','4094'),(136,'5','Central West','Friends & Advocates Peel','370','Friends & Advocates Peel -Mental Health Services','5044'),(137,'5','Central West','Peace Ranch','347','Peace Ranch','5049'),(138,'5','Central West','Peace Ranch','347','Peace Ranch','5549'),(139,'5','Central West','Punjabi Community Health Services','2029','Punjabi Community Health Services - Mental Health Services','5004'),(140,'5','Central West','Self Help Alliance of Waterloo Wellington, The','272','Waterloo Regional Self Help (WRSH)','4028'),(141,'5','Central West','Supportive Housing In Peel','257','Supportive Housing In Peel','5002'),(142,'5','Central West','Supportive Housing In Peel','257','Supportive Housing In Peel','5024'),(143,'5','Central West','Supportive Housing In Peel','257','Supportive Housing In Peel','9998'),(144,'5','Central West','Trellis Mental Health and Developmental Services','589','Trellis Mental Health and Developmental Services','4009'),(145,'5','Central West','Trellis Mental Health and Developmental Services','589','Trellis Mental Health and Developmental Services','5098'),(146,'5','Central West','William Osler Health System','951','William Osler Health Centre Mental Health Program','5010'),(147,'5','Central West','William Osler Health System','951','William Osler Health Centre Mental Health Program','5098'),(148,'6','Mississauga Halton','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(149,'6','Mississauga Halton','Canadian Mental Health Association (CMHA) Halton Region Branch','382','Canadian Mental Health Association (CMHA) Halton Region Branch','5103'),(150,'6','Mississauga Halton','Canadian Mental Health Association (CMHA) Peel Branch','434','Canadian Mental Health Association (CMHA) Peel Branch','5002'),(151,'6','Mississauga Halton','Centre for Addiction and Mental Health (CAMH)','948','Centre for Addiction and Mental Health (CAMH)','5113'),(152,'6','Mississauga Halton','Centre for Addiction and Mental Health (CAMH)','948','Centre for Addiction and Mental Health (CAMH)','6046'),(153,'6','Mississauga Halton','Credit Valley Hospital, The','731','Credit Valley Hospital','5073'),(154,'6','Mississauga Halton','Family Association for Mental Health Everywhere (F.A.M.E.)','425','Family Association for Mental Health Everywhere (F.A.M.E.)','6162'),(155,'6','Mississauga Halton','Grace House Inc.','252','Grace House','5104'),(156,'6','Mississauga Halton','Halton Alcohol, Drug and Gambling Assessment, Prevention and Treatment Services','587','Alcohol, Drug and Gambling Assessment Prevention and Treatment (ADAPT)','5098'),(157,'6','Mississauga Halton','Halton Alcohol, Drug and Gambling Assessment, Prevention and Treatment Services','587','Alcohol, Drug and Gambling Assessment Prevention and Treatment (ADAPT)','5100'),(158,'6','Mississauga Halton','Halton Healthcare Services Corporation','950','Halton Healthcare Services','5098'),(159,'6','Mississauga Halton','Halton Healthcare Services Corporation','950','Halton Healthcare Services','5100'),(160,'6','Mississauga Halton','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(161,'6','Mississauga Halton','Region of Halton Health Department-Community Health Services','474','North Halton Mental Health Clinics (NHMHC)','5098'),(162,'6','Mississauga Halton','Region of Halton Health Department-Community Health Services','474','North Halton Mental Health Clinics (NHMHC)','5099'),(163,'6','Mississauga Halton','Region of Halton Health Department-Community Health Services','474','North Halton Mental Health Clinics (NHMHC)','5100'),(164,'6','Mississauga Halton','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(165,'6','Mississauga Halton','Summit Housing & Outreach Programs','426','Summit Housing & Outreach Programs','5100'),(166,'6','Mississauga Halton','Support & Housing - Halton (SHH)','405','Support & Housing Halton (SHH)','5100'),(167,'6','Mississauga Halton','Support & Housing - Halton (SHH)','405','Support & Housing Halton (SHH)','5101'),(168,'6','Mississauga Halton','Support & Housing - Halton (SHH)','405','Support & Housing Halton (SHH)','5601'),(169,'6','Mississauga Halton','Supported Training and Rehabilitation in Diverse Environments (STRIDE)','408','Supported Training and Rehabilitation in Diverse Environments (STRIDE)','5102'),(170,'6','Mississauga Halton','Trillium Health Centre','949','Trillium Health Centre, Mental Health System','5025'),(171,'7','Toronto Central','416 Community Support for Women','315','416 Community Support for Women','6133'),(172,'7','Toronto Central','A-Way Express Courier Service','320','A-Way Express Courier Service','6139'),(173,'7','Toronto Central','Accommodation, Information and Support Inc.','373','Accommodation, Information and Support','6089'),(174,'7','Toronto Central','Accommodation, Information and Support Inc.','373','Accommodation, Information and Support','6589'),(175,'7','Toronto Central','Anishnawbe Health Toronto','2001','Anishnawbe Health Toronto','6201'),(176,'7','Toronto Central','Barbara Schlifer Commemorative Clinic, The','331','Childhood Sexual Abuse and Sexual Assault Programs','6123'),(177,'7','Toronto Central','Baycrest Centre for Geriatric Care','827','Baycrest Centre for Geriatric Care','6098'),(178,'7','Toronto Central','Boundless Adventures','337','Boundless Adventures','6115'),(179,'7','Toronto Central','COTA Health','460','COTA Health','6049'),(180,'7','Toronto Central','COTA Health','460','COTA Health','6549'),(181,'7','Toronto Central','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(182,'7','Toronto Central','Canadian Mental Health Association (CMHA) Ontario Division','456','Canadian Mental Health Association (CMHA) Ontario Division','6001'),(183,'7','Toronto Central','Central Toronto Youth Services','376','New Outlook','6084'),(184,'7','Toronto Central','Centre for Addiction and Mental Health (CAMH)','948','Centre for Addiction and Mental Health (CAMH)','6046'),(185,'7','Toronto Central','Community Outreach Programs in Addictions (COPA)','572','Community Outreach Programs in Addictions (COPA) - Mental Health Services','6046'),(186,'7','Toronto Central','Community Resource Connections of Toronto (CRCT)','459','Community Resource Connections of Toronto (CRCT)','6045'),(187,'7','Toronto Central','Consumer/Survivor Information Resource Centre of Toronto','418','Consumer/Survivor Information Resource Centre of Toronto','6165'),(188,'7','Toronto Central','Cross Toronto Community Development Corporation','269','Fresh Start Cleaning and Maintenance','6150'),(189,'7','Toronto Central','East York Mental Health Counselling Services Agency','287','East York Mental Health Counselling Services Agency','6142'),(190,'7','Toronto Central','Eden Community Homes','412','Eden Community Homes','6020'),(191,'7','Toronto Central','Eden Community Homes','412','Eden Community Homes','6520'),(192,'7','Toronto Central','Family Association for Mental Health Everywhere (F.A.M.E.)','425','Family Association for Mental Health Everywhere (F.A.M.E.)','6162'),(193,'7','Toronto Central','Friends and Advocates Centre','442','Friends and Advocates Centre','6054'),(194,'7','Toronto Central','George Brown College','458','George Brown Toronto City College Redirection Through Education','6048'),(195,'7','Toronto Central','George Herman House','253','George Herman House (GHH)','6187'),(196,'7','Toronto Central','Gerstein Crisis Centre','329','Gerstein Crisis Centre','6125'),(197,'7','Toronto Central','Good Shepherd Non-Profit Homes Inc.','446','Good Shepherd Non-Profit Homes','4508'),(198,'7','Toronto Central','Good Shepherd Non-Profit Homes Inc.','446','Good Shepherd Non-Profit Homes','6121'),(199,'7','Toronto Central','Good Shepherd Non-Profit Homes Inc.','446','Good Shepherd Non-Profit Homes','9999'),(200,'7','Toronto Central','Governing Council of the Salvation Army in Canada, The','513','Salvation Army','6043'),(201,'7','Toronto Central','Habitat Services (Mental Health Program Services of Metropolitan Toronto)','386','Habitat Services (Mental Health Program Services of Metropolitan Toronto)','6127'),(202,'7','Toronto Central','Habitat Services (Mental Health Program Services of Metropolitan Toronto)','386','Habitat Services (Mental Health Program Services of Metropolitan Toronto)','6686'),(203,'7','Toronto Central','Homes First Society','467','Homes First Society, Savards Women\'s Shelter','6195'),(204,'7','Toronto Central','Hong Fook Mental Health Association','422','Hong Fook Mental Health Association','6011'),(205,'7','Toronto Central','Hong Fook Mental Health Association','422','Hong Fook Mental Health Association','6511'),(206,'7','Toronto Central','Hospital for Sick Children, The','837','Eating Disorder Day Treatment Program.','6190'),(207,'7','Toronto Central','Houselink Community Homes','451','Houselink Community Homes','6002'),(208,'7','Toronto Central','Houselink Community Homes','451','Houselink Community Homes','6502'),(209,'7','Toronto Central','Jean Tweed Treatment Centre','568','Jean Tweed Treatment Centre','6080'),(210,'7','Toronto Central','LOFT Community Services','323','LOFT Community Services - Adult Services','5055'),(211,'7','Toronto Central','LOFT Community Services','323','LOFT Community Services - Adult Services','5555'),(212,'7','Toronto Central','LOFT Community Services','323','LOFT Community Services - Adult Services','6130'),(213,'7','Toronto Central','LOFT Community Services','323','LOFT Community Services - Adult Services','6630'),(214,'7','Toronto Central','Lakeshore Area Multi-Service Project Inc. (LAMP)','302','Among Friends','6137'),(215,'7','Toronto Central','Madison Community Services','410','Madison Avenue Housing and Support Services','6017'),(216,'7','Toronto Central','Madison Community Services','410','Madison Avenue Housing and Support Services','6517'),(217,'7','Toronto Central','Mainstay Housing','419','Mainstay Housing, Tenant and Member Services','6035'),(218,'7','Toronto Central','Mainstay Housing','419','Mainstay Housing, Tenant and Member Services','6535'),(219,'7','Toronto Central','Margaret Frazer House','413','Margaret Frazer House','6023'),(220,'7','Toronto Central','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(221,'7','Toronto Central','Mount Sinai Hospital','842','Mount Sinai Hospital Assertive Community Treatment Team','6188'),(222,'7','Toronto Central','Ontario Council of Alternative Businesses','429','Ontario Council of Alternative Businesses','6163'),(223,'7','Toronto Central','Ontario Peer Development Initiative','437','Ontario Peer Development Initiative','6161'),(224,'7','Toronto Central','Opportunity for Advancement','441','Opportunity for Advancement','6053'),(225,'7','Toronto Central','Parkdale Activity - Recreation Centre (PARC), The','438','Parkdale Activity - Recreation Centre (PARC)','6066'),(226,'7','Toronto Central','Pilot Place Society','428','Pilot Place Society','6046'),(227,'7','Toronto Central','Pilot Place Society','428','Pilot Place Society','6120'),(228,'7','Toronto Central','Progress Place','393','Progress Place Mental Health Services','6042'),(229,'7','Toronto Central','Progress Place','393','Progress Place Mental Health Services','6542'),(230,'7','Toronto Central','Reconnect Mental Health Services','385','Reconnect Mental Health Services','6080'),(231,'7','Toronto Central','Regeneration House Inc.','439','Regeneration Community Services','6067'),(232,'7','Toronto Central','Regeneration House Inc.','439','Regeneration Community Services','6567'),(233,'7','Toronto Central','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(234,'7','Toronto Central','Sherbourne Health Centre','398','Sherbourne Health Centre','6196'),(235,'7','Toronto Central','Sistering - A Women\'s Place','394','Sistering - A Women\'s Place','6012'),(236,'7','Toronto Central','Sound Times Support Services of Metropolitan Toronto','461','Sound Times Support Services of Metropolitan Toronto','6047'),(237,'7','Toronto Central','St. Christopher House','314','St. Christopher House','6140'),(238,'7','Toronto Central','St. Joseph\'s Health Centre','898','St. Joseph\'s Health Centre','6040'),(239,'7','Toronto Central','St. Jude Community Homes','348','St. Jude Community Homes','6099'),(240,'7','Toronto Central','St. Jude Community Homes','348','St. Jude Community Homes','6599'),(241,'7','Toronto Central','St. Michael\'s Hospital','852','St. Michael\'s Hospital','6185'),(242,'7','Toronto Central','St. Stephen\'s Community House','517','Corner Drop-In and L. L. Odette Place','6132'),(243,'7','Toronto Central','St. Stephen\'s Community House','517','Corner Drop-In and L. L. Odette Place','6632'),(244,'7','Toronto Central','Street Haven at the Crossroads, The','321','Street Haven Support Housing','6131'),(245,'7','Toronto Central','Street Haven at the Crossroads, The','321','Street Haven Support Housing','6631'),(246,'7','Toronto Central','Street Health Community Nursing Foundation','310','Street Health Community Nursing Foundation','6134'),(247,'7','Toronto Central','Sunnybrook Health Sciences Centre','953','Sunnybrook Health Sciences Centre','6007'),(248,'7','Toronto Central','Sunnybrook Health Sciences Centre','953','Sunnybrook Health Sciences Centre','6180'),(249,'7','Toronto Central','Toronto East General, The','858','Toronto East General Hospital','6038'),(250,'7','Toronto Central','Toronto East General, The','858','Toronto East General Hospital','6193'),(251,'7','Toronto Central','Trinity Square Cafe','395','Trinity Square CafÃÂ©','6037'),(252,'7','Toronto Central','University Health Network','947','University Health Network','6082'),(253,'7','Toronto Central','West Park Healthcare Centre','613','West Park Healthcare Centre Seniors Mental Health Service','6059'),(254,'7','Toronto Central','Women\'s College Hospital','862','Women\'s Mental Health Program','6096'),(255,'7','Toronto Central','Women\'s Counselling Referral And Education Centre (WCREC)','420','Women\'s Counselling Referral And Education Centre','6024'),(256,'7','Toronto Central','WoodGreen Community Services','430','WoodGreen Community Services, Mental Health and Developmental Services','6025'),(257,'7','Toronto Central','WoodGreen Community Services','430','WoodGreen Community Services, Mental Health and Developmental Services','6525'),(258,'7','Toronto Central','YWCA Toronto','435','Choices for Living','6065'),(259,'7','Toronto Central','YWCA Toronto','435','Choices for Living','6914'),(260,'8','Central','Across Boundaries: An Ethnocultural Mental Health Centre','324','Across Boundaries: An Ethnocultural Mental Health Centre','6167'),(261,'8','Central','Addiction Services for York Region','573','Addiction Services for York Region (ASYR)','5152'),(262,'8','Central','Bayview Community Services Inc.','411','Bayview Community Services','6016'),(263,'8','Central','COTA Health','460','COTA Health','6049'),(264,'8','Central','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(265,'8','Central','Canadian Mental Health Association (CMHA) Peel Branch','434','Canadian Mental Health Association (CMHA) Peel Branch','5002'),(266,'8','Central','Canadian Mental Health Association (CMHA) Toronto Branch','361','Canadian Mental Health Association Toronto Branch','6128'),(267,'8','Central','Canadian Mental Health Association (CMHA) Toronto Branch','361','Canadian Mental Health Association Toronto Branch','6628'),(268,'8','Central','Canadian Mental Health Association (CMHA) York Region Branch','352','Canadian Mental Health Association (CMHA) York Region Branch','5046'),(269,'8','Central','Canadian Mental Health Association (CMHA) York Region Branch','352','Canadian Mental Health Association (CMHA) York Region Branch','5511'),(270,'8','Central','Chai-Tikvah Foundation, The','416','Chai-Tikvah Foundation','6034'),(271,'8','Central','Family Association for Mental Health Everywhere (F.A.M.E.)','425','Family Association for Mental Health Everywhere (F.A.M.E.)','6162'),(272,'8','Central','Gerstein Crisis Centre','329','Gerstein Crisis Centre','6125'),(273,'8','Central','Gerstein Crisis Centre','329','Gerstein Crisis Centre','6625'),(274,'8','Central','Governing Council of the Salvation Army in Canada, The','513','Salvation Army','6043'),(275,'8','Central','Humber River Regional Hospital','941','Humber River Regional Hospital, Mental Health & Addictions Program','6062'),(276,'8','Central','Humber River Regional Hospital','941','Humber River Regional Hospital, Mental Health & Addictions Program','6191'),(277,'8','Central','Huronia Transition Homes','381','Athena\'s Sexual Assault Counselling and Advocacy Centre','5078'),(278,'8','Central','Jane/Finch Community and Family Centre','409','Jane/Finch Community and Family Services, Community Mental Health Program','6029'),(279,'8','Central','LOFT Community Services','323','LOFT Community Services - Adult Services','5055'),(280,'8','Central','LOFT Community Services','323','LOFT Community Services - Adult Services','5555'),(281,'8','Central','Lance Krasman Memorial Centre for Community Mental Health','254','Lance Krasman Memorial Centre for Community Mental Health','5095'),(282,'8','Central','Markham Stouffville Hospital','905','Markham Stouffville Hospital, Mental Health System','5105'),(283,'8','Central','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(284,'8','Central','North York General Hospital','632','North York General Hospital, Mental Health Program','6177'),(285,'8','Central','North York General Hospital','632','North York General Hospital, Mental Health Program','6194'),(286,'8','Central','Regeneration House Inc.','439','Regeneration Community Services','6067'),(287,'8','Central','Regeneration House Inc.','439','Regeneration Community Services','6567'),(288,'8','Central','Regional Municipality of York, The','2014','Mental Health Services','5150'),(289,'8','Central','Scarborough Hospital','960','Scarborough Hospital','6094'),(290,'8','Central','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(291,'8','Central','Seneca College','433','Seneca College, Counselling, Learning Centres, Disability and Health Services','6056'),(292,'8','Central','Southlake Regional Health Centre (SRHC)','736','Southlake Regional Health Centre (SRHC)','5094'),(293,'8','Central','Southlake Regional Health Centre (SRHC)','736','Southlake Regional Health Centre (SRHC)','5106'),(294,'8','Central','Stevenson Memorial Hospital','596','Mary McGill Community Mental Health Centre (MMCMHC)','5003'),(295,'8','Central','Toronto North Support Services','457','Toronto North Support Services','6117'),(296,'8','Central','YWCA Toronto','435','Choices for Living','6065'),(297,'8','Central','York Central Hospital','701','York Central Hospital','5020'),(298,'8','Central','York Region Abuse Program','308','York Region Abuse Program','5062'),(299,'8','Central','York Support Services Network','379','York Support Services Network','5035'),(300,'9','Central East','Alzheimer Society of Durham Region','366','Alzheimer Society of Durham Region','5041'),(301,'9','Central East','COTA Health','460','COTA Health','6049'),(302,'9','Central East','COTA Health','460','COTA Health','6549'),(303,'9','Central East','Campbellford Memorial Hospital','624','Campbellford and District Community Mental Health Centre','5001'),(304,'9','Central East','Campbellford Memorial Hospital','624','Campbellford and District Community Mental Health Centre','5060'),(305,'9','Central East','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(306,'9','Central East','Canadian Mental Health Association (CMHA) Durham Branch','466','Canadian Mental Health Association (CMHA) Durham Branch','5018'),(307,'9','Central East','Canadian Mental Health Association (CMHA) Durham Branch','466','Canadian Mental Health Association (CMHA) Durham Branch','5518'),(308,'9','Central East','Canadian Mental Health Association (CMHA) Kawartha Lakes Branch','334','Canadian Mental Health Association (CMHA) Kawartha Lakes Branch','5001'),(309,'9','Central East','Canadian Mental Health Association (CMHA) Kawartha Lakes Branch','334','Canadian Mental Health Association (CMHA) Kawartha Lakes Branch','5053'),(310,'9','Central East','Canadian Mental Health Association (CMHA) Kawartha Lakes Branch','334','Canadian Mental Health Association (CMHA) Kawartha Lakes Branch','5553'),(311,'9','Central East','Canadian Mental Health Association (CMHA) Peterborough Branch','328','Canadian Mental Health Association (CMHA) Peterborough Branch','5001'),(312,'9','Central East','Canadian Mental Health Association (CMHA) Peterborough Branch','328','Canadian Mental Health Association (CMHA) Peterborough Branch','5153'),(313,'9','Central East','Canadian Mental Health Association (CMHA) Peterborough Branch','328','Canadian Mental Health Association (CMHA) Peterborough Branch','5501'),(314,'9','Central East','Canadian Mental Health Association (CMHA) Toronto Branch','361','Canadian Mental Health Association Toronto Branch','6128'),(315,'9','Central East','Community Care Durham','465','COPE Mental Health Program','5019'),(316,'9','Central East','Community Resource Connections of Toronto (CRCT)','459','Community Resource Connections of Toronto (CRCT)','6045'),(317,'9','Central East','Durham Mental Health Services','319','Durham Mental Health Services','5071'),(318,'9','Central East','Durham Mental Health Services','319','Durham Mental Health Services','5571'),(319,'9','Central East','Family Association for Mental Health Everywhere (F.A.M.E.)','425','Family Association for Mental Health Everywhere (F.A.M.E.)','6162'),(320,'9','Central East','Four Counties Addiction Services Team Inc.','543','Four Counties Addiction Services Team (FourCAST)','5153'),(321,'9','Central East','Governing Council of the Salvation Army in Canada, The','513','Salvation Army','6043'),(322,'9','Central East','Haliburton Highlands Health Services Corporation','938','Haliburton Highlands Mental Health Services','5001'),(323,'9','Central East','Haliburton Highlands Health Services Corporation','938','Haliburton Highlands Mental Health Services','5096'),(324,'9','Central East','Haliburton Highlands Health Services Corporation','938','Haliburton Highlands Mental Health Services','5596'),(325,'9','Central East','Hong Fook Mental Health Association','422','Hong Fook Mental Health Association','6011'),(326,'9','Central East','Hong Fook Mental Health Association','422','Hong Fook Mental Health Association','6511'),(327,'9','Central East','Lakeridge Health Corporation','952','Lakeridge Mental Health Program','5013'),(328,'9','Central East','Lakeridge Health Corporation','952','Lakeridge Mental Health Program','5016'),(329,'9','Central East','Lakeridge Health Corporation','952','Lakeridge Mental Health Program','5018'),(330,'9','Central East','Lakeridge Health Corporation','952','Lakeridge Mental Health Program','5075'),(331,'9','Central East','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(332,'9','Central East','Mount Sinai Hospital','842','Mount Sinai Hospital Assertive Community Treatment Team','6188'),(333,'9','Central East','Northumberland Hills Hospital','940','Lakeshore Community Mental Health Services','5001'),(334,'9','Central East','Northumberland Hills Hospital','940','Lakeshore Community Mental Health Services','5021'),(335,'9','Central East','Ontario Federation of Indian Friendship Centres','569','Ontario Federation of Indian Friendship Centres','6202'),(336,'9','Central East','Ontario Shores Centre for Mental Health Sciences','969','Ontario Shores Centre for Mental Health Sciences','5072'),(337,'9','Central East','Peterborough Regional Health Centre','771','Peterborough Regional Health Centre','5001'),(338,'9','Central East','Peterborough Regional Health Centre','771','Peterborough Regional Health Centre','5005'),(339,'9','Central East','Ross Memorial Hospital, The','707','Ross Memorial Hospital, Community Counselling Services','5001'),(340,'9','Central East','Ross Memorial Hospital, The','707','Ross Memorial Hospital, Community Counselling Services','5022'),(341,'9','Central East','Ross Memorial Hospital, The','707','Ross Memorial Hospital, Community Counselling Services','5072'),(342,'9','Central East','Rouge Valley Health System','954','Rouge Valley Health System Mental Health Program','5151'),(343,'9','Central East','Rouge Valley Health System','954','Rouge Valley Health System Mental Health Program','6010'),(344,'9','Central East','Rouge Valley Health System','954','Rouge Valley Health System Mental Health Program','6179'),(345,'9','Central East','Rouge Valley Health System','954','Rouge Valley Health System Mental Health Program','6510'),(346,'9','Central East','Scarborough Hospital','960','Scarborough Hospital','6094'),(347,'9','Central East','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','5001'),(348,'9','Central East','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(349,'9','Central East','Survivors Psychiatric Advocacy Network','266','Survivors Psychiatric Advocacy Network (SPAN)','5083'),(350,'9','Central East','United Survivors Support Centre','263','United Survivors Support Centre','5082'),(351,'9','Central East','Victorian Order of Nurses (VON) Canada - Ontario Branch','312','Victorian Order of Nurses (VON)','5070'),(352,'10','South East','Addictions Centre (Hastings/Prince Edward Counties) Inc.','586','Addictions Centre (Hastings/Prince Edward Counties)','7128'),(353,'10','South East','Brockville and Area Centre for Developmentally Handicapped Persons','255','Distress Centre of Lanark, Leeds and Grenville','7097'),(354,'10','South East','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(355,'10','South East','Canadian Mental Health Association (CMHA) Leeds - Grenville Branch','355','Canadian Mental Health Association (CMHA) Leeds-Grenville Branch','7007'),(356,'10','South East','Frontenac Community Mental Health Services (FCMHS)','421','Frontenac Community Mental Health Services (FCMHS)','7022'),(357,'10','South East','Frontenac Community Mental Health Services (FCMHS)','421','Frontenac Community Mental Health Services (FCMHS)','7522'),(358,'10','South East','Lanark Health and Community Services','400','Mental Health Support Project','7121'),(359,'10','South East','Leeds & Grenville Rehabilitation and Counselling Services','362','Leeds & Grenville Rehabilitation and Counselling Services','7050'),(360,'10','South East','Leeds & Grenville Rehabilitation and Counselling Services','362','Leeds & Grenville Rehabilitation and Counselling Services','7507'),(361,'10','South East','Leeds & Grenville Rehabilitation and Counselling Services','362','Leeds & Grenville Rehabilitation and Counselling Services','7519'),(362,'10','South East','Lennox and Addington Addiction and Community Mental Health Services','2021','Lennox and Addington Addiction and Community Mental Health Services','7046'),(363,'10','South East','Lennox and Addington Addiction and Community Mental Health Services','2021','Lennox and Addington Addiction and Community Mental Health Services','7130'),(364,'10','South East','Mental Health Services Hastings Prince Edward Corporation','247','Mental Health Services Hastings Prince Edward Corporation','7127'),(365,'10','South East','Mental Health Services Hastings Prince Edward Corporation','247','Mental Health Services Hastings Prince Edward Corporation','7573'),(366,'10','South East','Mental Health Support Network South East Ontario Corp.','248','Mental Health Support Network South East Ontario Corp.','7126'),(367,'10','South East','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(368,'10','South East','Ontario Federation of Indian Friendship Centres','569','Ontario Federation of Indian Friendship Centres','6202'),(369,'10','South East','Perth and Smiths Falls District Hospital','928','Lanark County Mental Health','7117'),(370,'10','South East','Perth and Smiths Falls District Hospital','928','Lanark County Mental Health','7515'),(371,'10','South East','Providence Care','695','Providence Care Mental Health Services','7124'),(372,'10','South East','Quinte Health Care','957','Quinte Health Care','7045'),(373,'10','South East','Religious Hospitallers of Saint Joseph of the Hotel Dieu of Kingston','692','Hotel Dieu Hospital','7112'),(374,'10','South East','Royal Ottawa Health Care Group/Services des SantÃÂ©oyal Ottawa','651','Royal Ottawa Health Care Group','7084'),(375,'10','South East','Royal Ottawa Health Care Group/Services des SantÃÂ©oyal Ottawa','651','Royal Ottawa Health Care Group','7132'),(376,'10','South East','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(377,'10','South East','Sexual Assault Centre Kingston','296','Sexual Assault Centre Kingston','7079'),(378,'10','South East','Sexual Assault Centre for Quinte and District','300','Sexual Assault Centre for Quinte and District','7087'),(379,'10','South East','TriCounty Addictions Program','537','TriCounty Addiction Services','7129'),(380,'10','South East','Youth Habilitation (Quinte) Inc.','335','Youth Habilitation (Quinte)','7060'),(381,'10','South East','Youth Habilitation (Quinte) Inc.','335','Youth Habilitation (Quinte)','7560'),(382,'11','Champlain','A Post Psychiatric Leisure Experience','391','A Post Psychiatric Leisure Experience','7093'),(383,'11','Champlain','Brockville and Area Centre for Developmentally Handicapped Persons','255','Distress Centre of Lanark, Leeds and Grenville','7097'),(384,'11','Champlain','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(385,'11','Champlain','Canadian Mental Health Association (CMHA) Champlain East Branch','444','Canadian Mental Health Association (CMHA) Champlain East Branch','7013'),(386,'11','Champlain','Canadian Mental Health Association (CMHA) Champlain East Branch','444','Canadian Mental Health Association (CMHA) Champlain East Branch','7513'),(387,'11','Champlain','Canadian Mental Health Association (CMHA) Ottawa Branch','454','Canadian Mental Health Association (CMHA) Ottawa Branch','7076'),(388,'11','Champlain','Canadian Mental Health Association (CMHA) Ottawa Branch','454','Canadian Mental Health Association (CMHA) Ottawa Branch','7576'),(389,'11','Champlain','Carlington Community Health Centre','365','Carlington Community Health Centre','7131'),(390,'11','Champlain','Causeway Work Centre','427','Causeway Work Centre','7017'),(391,'11','Champlain','Children\'s Hospital of Eastern Ontario (CHEO)','751','Children\'s Hospital of Eastern Ontario (CHEO) Mental Health Patient Service Unit','7114'),(392,'11','Champlain','Cornwall Community Hospital','967','Cornwall Community Hospital','7001'),(393,'11','Champlain','Family Services ÃÂ a famille Ottawa','436','Family Services ÃÂ a famille Ottawa','7011'),(394,'11','Champlain','Geriatric Psychiatry Community Services of Ottawa','371','Geriatric Psychiatry Community Services of Ottawa','7004'),(395,'11','Champlain','Horizons Renaissance Inc.','356','Horizons Renaissance','7054'),(396,'11','Champlain','Horizons Renaissance Inc.','356','Horizons Renaissance','7098'),(397,'11','Champlain','Horizons Renaissance Inc.','356','Horizons Renaissance','7554'),(398,'11','Champlain','HÃÂ´al GÃÂ©ral de Hawkesbury and District General Hospital Inc.','800','Centre Royal-Comtois Center','7005'),(399,'11','Champlain','HÃÂ´al Montfort Hospital','753','HÃÂ´al Montfort Hospital','7049'),(400,'11','Champlain','HÃÂ´al Montfort Hospital','753','HÃÂ´al Montfort Hospital','7120'),(401,'11','Champlain','Lanark County Interval House','307','Lanark County Interval House','7080'),(402,'11','Champlain','Leeds & Grenville Rehabilitation and Counselling Services','362','Leeds & Grenville Rehabilitation and Counselling Services','7050'),(403,'11','Champlain','Maison Baldwin House','284','Sexual Assault Case Management Program','7089'),(404,'11','Champlain','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(405,'11','Champlain','Ottawa Hospital, The','958','Ottawa Hospital, Department of Psychiatry','7120'),(406,'11','Champlain','Ottawa Pinecrest-Queensway CHC','2000','Pinecrest-Queensway Assertive Community Treatment Team','7122'),(407,'11','Champlain','Ottawa Salus Corporation','445','Ottawa Salus Corporation Mental Health Services','7010'),(408,'11','Champlain','Ottawa Salus Corporation','445','Ottawa Salus Corporation Mental Health Services','7510'),(409,'11','Champlain','Pembroke Regional Hospital Community Mental Health Services','763','Community Mental Health Services of Renfrew County','7008'),(410,'11','Champlain','Pembroke Regional Hospital Community Mental Health Services','763','Community Mental Health Services of Renfrew County','7095'),(411,'11','Champlain','Pembroke Regional Hospital Community Mental Health Services','763','Community Mental Health Services of Renfrew County','7120'),(412,'11','Champlain','Pembroke Regional Hospital Community Mental Health Services','763','Community Mental Health Services of Renfrew County','7508'),(413,'11','Champlain','Perth and Smiths Falls District Hospital','928','Lanark County Mental Health','7117'),(414,'11','Champlain','Project Upstream Inc.','327','Project Upstream','7068'),(415,'11','Champlain','Psychiatric Survivors of Ottawa (PSO)','264','Psychiatric Survivors of Ottawa (PSO)','7092'),(416,'11','Champlain','Royal Ottawa Health Care Group/Services des SantÃÂ©oyal Ottawa','651','Royal Ottawa Health Care Group','7049'),(417,'11','Champlain','Royal Ottawa Health Care Group/Services des SantÃÂ©oyal Ottawa','651','Royal Ottawa Health Care Group','7084'),(418,'11','Champlain','Royal Ottawa Health Care Group/Services des SantÃÂ©oyal Ottawa','651','Royal Ottawa Health Care Group','7132'),(419,'11','Champlain','Schizophrenia Society of Ontario','341','Schizophrenia Society of Ontario','6102'),(420,'11','Champlain','Service catholique familial d\'Ottawa/Catholic Family Service Ottawa','281','Programme pour Femmes Francophones Victimes d\'Agressions Sexuelles','7088'),(421,'11','Champlain','Shepherds of Good Hope','292','Shepherds of Good Hope','7086'),(422,'11','Champlain','Shepherds of Good Hope','292','Shepherds of Good Hope','7593'),(423,'11','Champlain','Wabano Centre for Aboriginal Health','2003','Wabano Centre for Aboriginal Health','7135'),(424,'12','North Simcoe Muskoka','Addiction Outreach Muskoka Parry Sound','535','Addiction Outreach Muskoka Parry Sound - Mental Health Services','1104'),(425,'12','North Simcoe Muskoka','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(426,'12','North Simcoe Muskoka','Canadian Mental Health Association (CMHA) Simcoe County Branch','396','Mental Health and Addiction Services of Simcoe County - CMHA Simcoe County','5011'),(427,'12','North Simcoe Muskoka','Canadian Mental Health Association (CMHA) Simcoe County Branch','396','Mental Health and Addiction Services of Simcoe County - CMHA Simcoe County','5511'),(428,'12','North Simcoe Muskoka','Collingwood General and Marine Hospital','640','Collingwood General and Marine Hospital','5011'),(429,'12','North Simcoe Muskoka','Collingwood General and Marine Hospital','640','Collingwood General and Marine Hospital','5043'),(430,'12','North Simcoe Muskoka','Collingwood General and Marine Hospital','640','Collingwood General and Marine Hospital','5511'),(431,'12','North Simcoe Muskoka','Enaahtig Healing Lodge and Learning Centre','509','Enaahtig Healing Lodge and Learning Centre','5015'),(432,'12','North Simcoe Muskoka','Huronia Transition Homes','381','Athena\'s Sexual Assault Counselling and Advocacy Centre','5078'),(433,'12','North Simcoe Muskoka','Mental Health Centre Penetanguishene','992','Mental Health Centre Penetanguishene','5034'),(434,'12','North Simcoe Muskoka','Mental Health Consumer/Survivor Project for Simcoe County','265','Mental Health Consumer/Survivor Project for Simcoe County','5084'),(435,'12','North Simcoe Muskoka','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(436,'12','North Simcoe Muskoka','Muskoka / Parry Sound Sexual Assault Services','303','Sexual Assault Intervention for Living (SAIL)','1078'),(437,'12','North Simcoe Muskoka','Muskoka-Parry Sound Community Mental Health Service','390','Muskoka-Parry Sound Community Mental Health Service','1072'),(438,'12','North Simcoe Muskoka','Orillia Soldiers\' Memorial Hospital','745','Orillia Soldiers` Memorial Hospital, Mental Health Services','5011'),(439,'12','North Simcoe Muskoka','Orillia Soldiers\' Memorial Hospital','745','Orillia Soldiers` Memorial Hospital, Mental Health Services','5014'),(440,'12','North Simcoe Muskoka','Royal Victoria Hospital of Barrie, The','606','Royal Victoria Hospital (RVH) of Barrie','5034'),(441,'12','North Simcoe Muskoka','Wendat Community Programs','349','Wendat Community Programs','5011'),(442,'12','North Simcoe Muskoka','Wendat Community Programs','349','Wendat Community Programs','5050'),(443,'13','North East','Algoma Public Health','472','Algoma Public Health, Community Mental Health Services','1036'),(444,'13','North East','Algoma Public Health','472','Algoma Public Health, Community Mental Health Services','1536'),(445,'13','North East','Canadian Hearing Society, The','374','CONNECT Counseling Services','6088'),(446,'13','North East','Canadian Mental Health Association (CMHA) Cochrane Timiskaming Branch','364','Canadian Mental Health Association (CMHA) Cochrane Timiskaming Branch','1037'),(447,'13','North East','Canadian Mental Health Association (CMHA) Cochrane Timiskaming Branch','364','Canadian Mental Health Association (CMHA) Cochrane Timiskaming Branch','1537'),(448,'13','North East','Canadian Mental Health Association (CMHA) Nipissing Regional Branch','389','Canadian Mental Health Association (CMHA) Nipissing Regional Branch','1012'),(449,'13','North East','Canadian Mental Health Association (CMHA) Nipissing Regional Branch','389','Canadian Mental Health Association (CMHA) Nipissing Regional Branch','1512'),(450,'13','North East','Canadian Mental Health Association (CMHA) Sault Ste Marie Branch','360','Canadian Mental Health Association (CMHA) Sault Ste Marie Branch','1040'),(451,'13','North East','Canadian Mental Health Association (CMHA) Sudbury - Manitoulin Branch','363','Canadian Mental Health Association (CMHA) Sudbury Branch Community Support Services and Housing','1038'),(452,'13','North East','Canadian Mental Health Association (CMHA) Sudbury - Manitoulin Branch','363','Canadian Mental Health Association (CMHA) Sudbury Branch Community Support Services and Housing','1538'),(453,'13','North East','Centre de Reeducation Cor Jesus de Timmins Incorporee','557','Jubilee Centre Mental Health Services','1011'),(454,'13','North East','Centre de Reeducation Cor Jesus de Timmins Incorporee','557','Jubilee Centre Mental Health Services','1105'),(455,'13','North East','Community Counselling Centre of Nipissing','288','Community Counselling Centre of Nipissing, Sexual Assault Services','1091'),(456,'13','North East','Counselling Centre of East Algoma','295','Counselling Centre of East Algoma','1087'),(457,'13','North East','HÃÂ´al rÃÂ©onal de Sudbury Regional Hospital','959','HÃÂ´al rÃÂ©onal de Sudbury Regional Hospital, Mental Health and Addictions Program','1002'),(458,'13','North East','HÃÂ´al rÃÂ©onal de Sudbury Regional Hospital','959','HÃÂ´al rÃÂ©onal de Sudbury Regional Hospital, Mental Health and Addictions Program','1005'),(459,'13','North East','Lady Dunn Health Centre','686','North Algoma Counselling Service','1100'),(460,'13','North East','Mamaweswen, North Shore Tribal Council','2008','N\'Mninoeyaa Aboriginal Mental Health Services','1109'),(461,'13','North East','Manitoulin Family Resources Incorporated','294','Manitoulin Family Resources','1088'),(462,'13','North East','Minto Counselling Centre','354','Minto Counselling Centre','1009'),(463,'13','North East','Mood Disorders Association of Ontario','338','Mood Disorders Association of Ontario','6107'),(464,'13','North East','Muskoka-Parry Sound Community Mental Health Service','390','Muskoka-Parry Sound Community Mental Health Service','1072'),(465,'13','North East','Muskoka-Parry Sound Community Mental Health Service','390','Muskoka-Parry Sound Community Mental Health S...
 
[truncated message content]

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON endYearStatement.jsp, 1.2, 1.3

From: Jay G. <jay...@us...> - 2011-01-04 21:54:49

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1408

Modified Files:
	endYearStatement.jsp 
Log Message:
removed 8859-1 and content-type to fix code check errors

Index: endYearStatement.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/endYearStatement.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** endYearStatement.jsp	4 Jan 2011 21:15:33 -0000	1.2
--- endYearStatement.jsp	4 Jan 2011 21:54:41 -0000	1.3
***************
*** 7,11 ****
  <html>
  <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
  <script type="text/javascript" src="/oscar/js/global.js"></script>
  <title>End Year Statement</title>
--- 7,10 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/web MyMedsLoginAction.java, 1.2, 1.3

From: jai <yg...@us...> - 2011-01-04 21:22:27

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/web
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24924

Modified Files:
	MyMedsLoginAction.java 
Log Message:
- ID: 3150681
-add generics

Index: MyMedsLoginAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/mymeds/web/MyMedsLoginAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MyMedsLoginAction.java	4 Jan 2011 14:34:31 -0000	1.2
--- MyMedsLoginAction.java	4 Jan 2011 21:22:19 -0000	1.3
***************
*** 21,27 ****
  import org.oscarehr.PMmodule.dao.ProviderDao;
  import org.oscarehr.common.dao.DemographicDao;
- import org.oscarehr.common.dao.UserPropertyDAO;
  import org.oscarehr.common.model.Demographic;
- import org.oscarehr.common.model.UserProperty;
  import org.springframework.context.ApplicationContext;
  import org.springframework.web.context.WebApplicationContext;
--- 21,25 ----
***************
*** 69,76 ****
              if(bpm==null)
                  logger.debug("bpm is NULL");
!             List demographicBeans = new ArrayList();
              demographicBeans=bpm.getDemographicByBedProgramIdBeans(programId,dt,archiveView);
!             List<Demographic> ds=new ArrayList();
!             HashMap<String,String> ps=new HashMap();
              DemographicDao demographicDao = (DemographicDao)ctx.getBean("demographicDao");
              ProviderDao providerDao=(ProviderDao)ctx.getBean("providerDao");
--- 67,74 ----
              if(bpm==null)
                  logger.debug("bpm is NULL");
!             List<LabelValueBean> demographicBeans = new ArrayList<LabelValueBean>();
              demographicBeans=bpm.getDemographicByBedProgramIdBeans(programId,dt,archiveView);
!             List<Demographic> ds=new ArrayList<Demographic>();
!             HashMap<String,String> ps=new HashMap<String,String>();
              DemographicDao demographicDao = (DemographicDao)ctx.getBean("demographicDao");
              ProviderDao providerDao=(ProviderDao)ctx.getBean("providerDao");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil PatientEndYearStatementAction.java, 1.1, 1.2

From: Jay G. <jay...@us...> - 2011-01-04 21:21:08

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24617

Modified Files:
	PatientEndYearStatementAction.java 
Log Message:
added generics to hashmap, removed unused import

Index: PatientEndYearStatementAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil/PatientEndYearStatementAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PatientEndYearStatementAction.java	2 Jan 2011 20:58:20 -0000	1.1
--- PatientEndYearStatementAction.java	4 Jan 2011 21:21:00 -0000	1.2
***************
*** 3,18 ****
  import java.util.ArrayList;
  import java.util.HashMap;
- import java.util.Hashtable;
- import java.util.Calendar;
  import java.util.Date;
  import java.util.List;
- import java.io.IOException;
  import java.io.InputStream;
  import java.sql.Connection;
  import java.sql.ResultSet;
  import java.sql.SQLException;
- import java.text.ParseException;
  import java.text.SimpleDateFormat;
- import java.text.DateFormat;
  
  import javax.servlet.ServletOutputStream;
--- 3,13 ----
***************
*** 21,25 ****
  
  import org.apache.log4j.Logger;
- import org.apache.struts.action.Action;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
--- 16,19 ----
***************
*** 34,43 ****
  
  import oscar.OscarDocumentCreator;
- import oscar.oscarBilling.ca.bc.MSP.MSPReconcile;
- import oscar.oscarBilling.ca.bc.MSP.MSPReconcile.BillSearch;
- import oscar.oscarBilling.ca.on.data.BillingCodeData;
  import oscar.oscarBilling.ca.on.data.BillingONDataHelp;
- import oscar.oscarBilling.ca.on.data.JdbcBillingReviewImpl;
- import oscar.oscarDemographic.data.DemographicData;
  import oscar.OscarAction;
  
--- 28,32 ----
***************
*** 164,168 ****
  			   OscarDocumentCreator osc = new OscarDocumentCreator();
  			   String docFmt = "pdf";
! 			   HashMap reportParams = new HashMap();
  			   reportParams.put("patientId", summary.getPatientNo());
  			   reportParams.put("patientName", summary.getPatientName());
--- 153,157 ----
  			   OscarDocumentCreator osc = new OscarDocumentCreator();
  			   String docFmt = "pdf";
! 			   HashMap reportParams = new HashMap<String,Object>();
  			   reportParams.put("patientId", summary.getPatientNo());
  			   reportParams.put("patientName", summary.getPatientName());

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON endYearStatement.jsp, 1.1, 1.2

From: Jay G. <jay...@us...> - 2011-01-04 21:15:41

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22967

Modified Files:
	endYearStatement.jsp 
Log Message:
removed 8859-1 and content-type to fix code check errors

Index: endYearStatement.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/endYearStatement.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** endYearStatement.jsp	2 Jan 2011 20:58:20 -0000	1.1
--- endYearStatement.jsp	4 Jan 2011 21:15:33 -0000	1.2
***************
*** 1,4 ****
! <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
!     pageEncoding="ISO-8859-1"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
--- 1,3 ----
! <%@ page language="java"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/demographic demographicsearch2reportresults.jsp, 1.2, NONE

From: Jay G. <jay...@us...> - 2011-01-04 20:33:58

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11123

Removed Files:
	demographicsearch2reportresults.jsp 
Log Message:
removed jsp

--- demographicsearch2reportresults.jsp DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/demographic demographicsearch2reportresults.jsp, 1.1, 1.2

From: Jay G. <jay...@us...> - 2011-01-04 19:57:18

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32385

Modified Files:
	demographicsearch2reportresults.jsp 
Log Message:
tried removing import that was failing the jsp compile.

Index: demographicsearch2reportresults.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographicsearch2reportresults.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** demographicsearch2reportresults.jsp	3 Jan 2011 17:07:34 -0000	1.1
--- demographicsearch2reportresults.jsp	4 Jan 2011 19:57:10 -0000	1.2
***************
*** 230,234 ****
  	</tr>
  
! 	<%@ include file="../demographic/zzdemographicsearchresult.jsp"%>
  	<%
  String bgColor = bodd?"#EEEEFF":"white";
--- 230,234 ----
  	</tr>
  
! 	
  	<%
  String bgColor = bodd?"#EEEEFF":"white";

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/casemgmt newCaseManagementView.jsp, 1.136, 1.137 newEncounterHeader.jsp, 1.19, 1.20

From: Marc D. <hex...@us...> - 2011-01-04 19:31:00

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25832/web/casemgmt

Modified Files:
	newCaseManagementView.jsp newEncounterHeader.jsp 
Log Message:
eyeform updates


Index: newCaseManagementView.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newCaseManagementView.jsp,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** newCaseManagementView.jsp	15 Nov 2010 03:26:14 -0000	1.136
--- newCaseManagementView.jsp	4 Jan 2011 19:30:52 -0000	1.137
***************
*** 139,146 ****
  			<!--Reminders cell -->
  			<div id="divR2I2" class="topBox"
! 				style="clear: right; float: right; width: 49%; margin-right: 3px;">
! 		
  			</div>
  		</div>
  	</div>
  	
--- 139,147 ----
  			<!--Reminders cell -->
  			<div id="divR2I2" class="topBox"
! 				style="clear: right; float: right; width: 49%; margin-right: 3px;">		
  			</div>
  		</div>
+ 		<!--  any extras go here -->
+ 		<h2 style="visibility:hidden">test</h2>
  	</div>
  	

Index: newEncounterHeader.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newEncounterHeader.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** newEncounterHeader.jsp	15 Sep 2010 11:33:49 -0000	1.19
--- newEncounterHeader.jsp	4 Jan 2011 19:30:52 -0000	1.20
***************
*** 87,91 ****
          %>
          <a href="#" onClick="popupPage(700,1000,'<%=winName%>','<c:out value="${ctx}"/><%=url%>'); return false;" title="<bean:message key="provider.appointmentProviderAdminDay.msgMasterFile"/>"><%=bean.patientLastName %>, <%=bean.patientFirstName%></a> <%=bean.patientSex%> <%=bean.patientAge%>  <%=bean.phone%>
! 
  		<a href="javascript:popupPage(400,850,'ApptHist','<c:out value="${ctx}"/>/demographic/demographiccontrol.jsp?demographic_no=<%=bean.demographicNo%>&amp;last_name=<%=bean.patientLastName%>&amp;first_name=<%=bean.patientFirstName%>&amp;orderby=appointment_date&amp;displaymode=appt_history&amp;dboperation=appt_history&amp;limit1=0&amp;limit2=25')" style="font-size: 11px;text-decoration:none;" title="<bean:message key="oscarEncounter.Header.nextApptMsg"/>"><span style="margin-left:20px;"><bean:message key="oscarEncounter.Header.nextAppt"/>: <oscar:nextAppt demographicNo="<%=bean.demographicNo%>"/></span></a>
  
--- 87,91 ----
          %>
          <a href="#" onClick="popupPage(700,1000,'<%=winName%>','<c:out value="${ctx}"/><%=url%>'); return false;" title="<bean:message key="provider.appointmentProviderAdminDay.msgMasterFile"/>"><%=bean.patientLastName %>, <%=bean.patientFirstName%></a> <%=bean.patientSex%> <%=bean.patientAge%>  <%=bean.phone%>
! 		<span id="encounterHeaderExt"></span>
  		<a href="javascript:popupPage(400,850,'ApptHist','<c:out value="${ctx}"/>/demographic/demographiccontrol.jsp?demographic_no=<%=bean.demographicNo%>&amp;last_name=<%=bean.patientLastName%>&amp;first_name=<%=bean.patientFirstName%>&amp;orderby=appointment_date&amp;displaymode=appt_history&amp;dboperation=appt_history&amp;limit1=0&amp;limit2=25')" style="font-size: 11px;text-decoration:none;" title="<bean:message key="oscarEncounter.Header.nextApptMsg"/>"><span style="margin-left:20px;"><bean:message key="oscarEncounter.Header.nextAppt"/>: <oscar:nextAppt demographicNo="<%=bean.demographicNo%>"/></span></a>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/eyeform exam.jsp, 1.5, 1.6 ocular_proc.jsp, 1.2, 1.3

From: Marc D. <hex...@us...> - 2011-01-04 19:31:00

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25832/web/eyeform

Modified Files:
	exam.jsp ocular_proc.jsp 
Log Message:
eyeform updates


Index: ocular_proc.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/ocular_proc.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ocular_proc.jsp	4 Nov 2010 06:25:16 -0000	1.2
--- ocular_proc.jsp	4 Jan 2011 19:30:52 -0000	1.3
***************
*** 18,22 ****
  </head>
  <body>
! Book Ocular Procedure
  <br />
  
--- 18,22 ----
  </head>
  <body>
! Enter Ocular Procedure
  <br />
  
***************
*** 82,86 ****
  				
  							&nbsp;&nbsp;&nbsp;&nbsp;
! 							<html:submit value="Book Procedure" />
  						
  				&nbsp;&nbsp;&nbsp;&nbsp;
--- 82,86 ----
  				
  							&nbsp;&nbsp;&nbsp;&nbsp;
! 							<html:submit value="Submit" />
  						
  				&nbsp;&nbsp;&nbsp;&nbsp;

Index: exam.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/exam.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** exam.jsp	15 Dec 2010 16:48:05 -0000	1.5
--- exam.jsp	4 Jan 2011 19:30:52 -0000	1.6
***************
*** 1,7 ****
--- 1,13 ----
  <%@ page import="oscar.OscarProperties"%>
  
+ <%@ include file="/casemgmt/taglibs.jsp" %>
+ 
  <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
  
  
+ <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>	
+ <link rel="stylesheet" href="<c:out value="${ctx}"/>/oscarEncounter/encounterStyles.css" type="text/css">
+ 
+ 
  <script>
  //if have value under slidy block set the color to brown
***************
*** 162,166 ****
  	margin:0px;
  	border: 0px;
! 	font-size: 8pt;
  }
  
--- 168,172 ----
  	margin:0px;
  	border: 0px;
! 	font-size: 9px;
  }
  
***************
*** 178,188 ****
  .slidey .title {
          margin-top: 1px;
!         font-size:10pt;
          list-style-type: none;
!         font-family: Trebuchet MS, Lucida Sans Unicode, Arial, sans-serif;
          overflow: hidden;
          background-color: #f6f6ff;
          text-align:left;
!         padding: 0px; }
  
  .slidey .title2 {
--- 184,216 ----
  .slidey .title {
          margin-top: 1px;
!        
          list-style-type: none;
!        /* font-family: Trebuchet MS, Lucida Sans Unicode, Arial, sans-serif; */
!         
          overflow: hidden;
          background-color: #f6f6ff;
          text-align:left;
!         padding: 0px; 
!   
!          /*font-size: 1.0em;*/
!         font-size: 9px;
!         /*font-variant:small-caps;*/
!         
!         font-weight: bold;
!        
!  
!        font-family: Verdana,Tahoma,Arial,sans-serif;
!        font-style:normal;
!        text-transform:none;
!        text-decoration:none;
!        letter-spacing:normal;
!        word-spacing:0;
!        line-height:11px;
!        vertical-align:baseline;
!         
!         
!         
!         
!   }
  
  .slidey .title2 {
***************
*** 215,232 ****
  
  </style>
! <table>
! <tr><td><span class="ge">Photos:</span></td></tr>
! <tr>
! <td>
! <div class="slidey">
!         <div class="title">
!             <a style="font-weight: bold;" href="javascript:void(0)" tabindex="31" id="a_19" onclick="togglediv(this);">Digital Photos:</a>            
!         </div>
!         <div id="s_19" class="slideblock">
! 	        <a href="#" onclick="window.open('<html:rewrite page="/dms/documentReport.jsp"/>?function=demographic&doctype=lab&functionid=14&curUser=<%=session.getAttribute("user")%>&mode=add&parentAjaxId=docs&appointment_no='+appointmentNo);return false;">Add Photos</a>
!         </div>              
! </div>
! </td>
! </tr>
  <tr><td><span class="ge">Examination:</span></td></tr>
  <tr>
--- 243,249 ----
  
  </style>
! 
! <table border="0" width="100%">
! 
  <tr><td><span class="ge">Examination:</span></td></tr>
  <tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/js/custom eyeform-cme.js, 1.10, 1.11

From: Marc D. <hex...@us...> - 2011-01-04 19:31:00

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv25832/web/js/custom

Modified Files:
	eyeform-cme.js 
Log Message:
eyeform updates


Index: eyeform-cme.js
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** eyeform-cme.js	15 Dec 2010 16:48:05 -0000	1.10
--- eyeform-cme.js	4 Jan 2011 19:30:52 -0000	1.11
***************
*** 39,43 ****
  		
  		
!        jQuery("#cppBoxes").append("<div id=\"measurements_div\"></div>");
  
       
--- 39,43 ----
  		
  		
!        jQuery("#cppBoxes").append("<div id=\"measurements_div\" style=\"width:100%\"></div>");
  
       
***************
*** 93,97 ****
         jQuery("form[name='caseManagementEntryForm']").append('<span submit_addon="save_measurements"></span>');
         
!        
       });
  
--- 93,102 ----
         jQuery("form[name='caseManagementEntryForm']").append('<span submit_addon="save_measurements"></span>');
         
!        jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getReferralDoctor&demographicNo="+demographicNo,dataType: "html",success: function(data) {
! 			jQuery("#encounterHeaderExt").append("Referring Dr:"+data);
!       }});
!        jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getAppointmentReason&appointmentNo="+appointmentNo,dataType: "html",success: function(data) {
! 			jQuery("#encounterHeaderExt").append("\tAppointment Reason:"+data);
!      }});
       });

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil EctDisplayDiagramAction.java, 1.2, 1.3 EctDisplayOcularProcedureAction.java, 1.5, 1.6 EctDisplaySpecsHistoryAction.java, 1.4, 1.5

From: Marc D. <hex...@us...> - 2011-01-04 19:31:00

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-serv25832/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil

Modified Files:
	EctDisplayDiagramAction.java 
	EctDisplayOcularProcedureAction.java 
	EctDisplaySpecsHistoryAction.java 
Log Message:
eyeform updates


Index: EctDisplaySpecsHistoryAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplaySpecsHistoryAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EctDisplaySpecsHistoryAction.java	3 Dec 2010 16:04:07 -0000	1.4
--- EctDisplaySpecsHistoryAction.java	4 Jan 2011 19:30:52 -0000	1.5
***************
*** 34,37 ****
--- 34,38 ----
  
  import org.apache.struts.util.MessageResources;
+ import org.oscarehr.PMmodule.dao.ProviderDao;
  import org.oscarehr.eyeform.dao.SpecsHistoryDao;
  import org.oscarehr.eyeform.model.SpecsHistory;
***************
*** 82,85 ****
--- 83,88 ----
  
      SpecsHistoryDao shDao = (SpecsHistoryDao)SpringUtils.getBean("SpecsHistoryDAO");
+     ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao");
+     
      List<SpecsHistory> shs = shDao.getByAppointmentNo(Integer.parseInt(appointmentNo));
  
***************
*** 87,91 ****
      	NavBarDisplayDAO.Item item = Dao.Item();                  
      	item.setDate(sh.getDate());
!     	String itemHeader = StringUtils.maxLenString("Specs", MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES);                      
          item.setLinkTitle(itemHeader);        
          item.setTitle(itemHeader);
--- 90,97 ----
      	NavBarDisplayDAO.Item item = Dao.Item();                  
      	item.setDate(sh.getDate());
!     	
!     	String title = sh.getType() + " - " + providerDao.getProvider(sh.getProvider()).getFormattedName();
!     	
!     	String itemHeader = StringUtils.maxLenString(title, MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES);                      
          item.setLinkTitle(itemHeader);        
          item.setTitle(itemHeader);

Index: EctDisplayDiagramAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayDiagramAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EctDisplayDiagramAction.java	14 Dec 2010 23:40:41 -0000	1.2
--- EctDisplayDiagramAction.java	4 Jan 2011 19:30:52 -0000	1.3
***************
*** 82,86 ****
          	}catch(Exception e) {item.setDate(new Date());}
          	
!         	String itemHeader = StringUtils.maxLenString((String)form.get("formName"), MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES);                      
              item.setLinkTitle(itemHeader);        
              item.setTitle(itemHeader);
--- 82,94 ----
          	}catch(Exception e) {item.setDate(new Date());}
          	
!         	String formName = (String)form.get("formName");
!         	String formSubject = (String)form.get("formSubject");
!         	
!         	String header = formSubject;
!         	if(header == null || header.length()==0) {
!         		header = formName;
!         	}
!         	
!         	String itemHeader = StringUtils.maxLenString(header, MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES);                      
              item.setLinkTitle(itemHeader);        
              item.setTitle(itemHeader);

Index: EctDisplayOcularProcedureAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayOcularProcedureAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EctDisplayOcularProcedureAction.java	3 Dec 2010 16:04:07 -0000	1.5
--- EctDisplayOcularProcedureAction.java	4 Jan 2011 19:30:52 -0000	1.6
***************
*** 34,37 ****
--- 34,39 ----
  
  import org.apache.struts.util.MessageResources;
+ import org.oscarehr.PMmodule.dao.ProviderDao;
+ import org.oscarehr.common.model.Provider;
  import org.oscarehr.eyeform.dao.OcularProcDao;
  import org.oscarehr.eyeform.model.OcularProc;
***************
*** 82,85 ****
--- 84,90 ----
  
      OcularProcDao opDao = (OcularProcDao)SpringUtils.getBean("OcularProcDAO");
+     ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao");
+     
+     
      List<OcularProc> ops = opDao.getByAppointmentNo(Integer.parseInt(appointmentNo));
  
***************
*** 87,91 ****
      	NavBarDisplayDAO.Item item = Dao.Item();                  
      	item.setDate(op.getDate());
!     	String itemHeader = StringUtils.maxLenString(op.getProcedureName(), MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES);                      
          item.setLinkTitle(itemHeader);        
          item.setTitle(itemHeader);
--- 92,101 ----
      	NavBarDisplayDAO.Item item = Dao.Item();                  
      	item.setDate(op.getDate());
!     	
!     	Provider provider = providerDao.getProvider(op.getDoctor());
!     	
!     	String title = provider.getTeam() + " " + op.getEye() + " " + op.getProcedureName();
!     	
!     	String itemHeader = StringUtils.maxLenString(title, MAX_LEN_TITLE, CROP_LEN_TITLE, ELLIPSES);                      
          item.setLinkTitle(itemHeader);        
          item.setTitle(itemHeader);

38 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 1175 > >> (Page 7 of 1175)