oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2011-01-18.sql, 1.1, 1.2

[Marc D. <hex...@us...>]

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

Added Files:
	update-2011-01-18.sql 
Log Message:
consulation request  adding cc


--- NEW FILE: update-2011-01-18.sql ---
create table consultationRequestExt(
 id int(10) NOT NULL auto_increment, 
 requestId int(10) NOT NULL, 
 name varchar(100) NOT NULL,
 value varchar(100) NOT NULL,
 dateCreated date not null,
 primary key(id),
 key(requestId)
);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model ConsultationRequestExt.java, NONE, 1.1

[Marc D. <hex...@us...>]

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

Added Files:
	ConsultationRequestExt.java 
Log Message:
consulation request  adding cc


--- NEW FILE: ConsultationRequestExt.java ---
package org.oscarehr.common.model;

import java.io.Serializable;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;

@Entity
@Table(name = "consultationRequestExt")
public class ConsultationRequestExt extends AbstractModel<Integer> implements Serializable {


	private static final long serialVersionUID = 1L;

	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)		
	private Integer id;
	
	@Column(name = "requestId")
	private int requestId;
	
	@Column(name= "name")
	private String key;
	
    private String value;
    
    @Temporal(TemporalType.DATE)
    private java.util.Date dateCreated;
    
    
	@Override
    public Integer getId() {
	    return(id);
    }
	
	public int getRequestId() {
		return requestId;
	}
	
	public void setRequestId(int requestId) {
		this.requestId = requestId;
	}

	public String getKey() {
		return key;
	}

	public void setKey(String key) {
		this.key = key;
	}

	public String getValue() {
		return value;
	}

	public void setValue(String value) {
		this.value = value;
	}

	public java.util.Date getDateCreated() {
		return dateCreated;
	}

	public void setDateCreated(java.util.Date dateCreated) {
		this.dateCreated = dateCreated;
	}
		
		
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql, 1.278, 1.279

[Marc D. <hex...@us...>]

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

Modified Files:
	oscarinit.sql 
Log Message:
consulation request  adding cc


Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.278
retrieving revision 1.279
diff -C2 -d -r1.278 -r1.279
*** oscarinit.sql	17 Jan 2011 15:07:15 -0000	1.278
--- oscarinit.sql	18 Jan 2011 19:48:25 -0000	1.279
***************
*** 8282,8283 ****
--- 8282,8293 ----
  );
  
+ create table consultationRequestExt(
+  id int(10) NOT NULL auto_increment,
+  requestId int(10) NOT NULL,
+  name varchar(100) NOT NULL,
+  value varchar(100) NOT NULL,
+  dateCreated date not null,
+  primary key(id),
+  key(requestId)
+ );
+ 

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2011-01-18.sql, NONE, 1.1.2.1

[Randy J. <rj...@us...>]

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

Added Files:
      Tag: RELEASE_10_12
	update-2011-01-18.sql 
Log Message:
Set legacy data to sane values so consults will display properly


--- NEW FILE: update-2011-01-18.sql ---
update consultationRequests c left outer join professionalSpecialists p on p.specId = c.specId set c.specId = NULL where p.specId is null;
update consultationRequests set patientWillBook = false where patientWillBook != true and patientWillBook != false;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/config EditSpecialists.jsp, 1.7, 1.7.2.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/config
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6800

Modified Files:
      Tag: RELEASE_10_12
	EditSpecialists.jsp 
Log Message:
- ID: 3160248 Remove ability to delete specialists as this actually removed
record from db. Fix involves change to database table professionalSpecialists

Index: EditSpecialists.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/config/EditSpecialists.jsp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** EditSpecialists.jsp	15 Nov 2010 03:26:14 -0000	1.7
--- EditSpecialists.jsp	18 Jan 2011 14:50:24 -0000	1.7.2.1
***************
*** 78,83 ****
  			<!----Start new rows here-->
  			<tr>
! 				<td><bean:message
! 					key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.msgCheckOff" /><br>
  				<bean:message
  					key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.msgClickOn" /><br>
--- 78,83 ----
  			<!----Start new rows here-->
  			<tr>
!                             <td><%--bean:message
! 					key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.msgCheckOff" /--%><br>
  				<bean:message
  					key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.msgClickOn" /><br>
***************
*** 88,93 ****
  			<tr>
  				<td><html:form action="/oscarEncounter/EditSpecialists">
! 					<input type="submit" name="delete"
! 						value="<bean:message key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.btnDeleteSpecialist"/>">
  					<div class="ChooseRecipientsBox1">
  					<table>
--- 88,93 ----
  			<tr>
  				<td><html:form action="/oscarEncounter/EditSpecialists">
! 					<%-- input type="submit" name="delete"
! 						value="<bean:message key="oscarEncounter.oscarConsultationRequest.config.EditSpecialists.btnDeleteSpecialist"/>"--%>
  					<div class="ChooseRecipientsBox1">
  					<table>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctViewRequestAction.java, 1.23, 1.23.2.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5994

Modified Files:
      Tag: RELEASE_10_12
	EctViewRequestAction.java 
Log Message:
- ID: 3160248 fix time calculation between 12 am and 12 pm and format patient
address and provider name

Index: EctViewRequestAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewRequestAction.java,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** EctViewRequestAction.java	15 Nov 2010 01:27:31 -0000	1.23
--- EctViewRequestAction.java	18 Jan 2011 14:48:05 -0000	1.23.2.1
***************
*** 51,57 ****
  import java.io.IOException;
  import java.io.UnsupportedEncodingException;
- import java.util.Calendar;
  import java.util.Date;
  import java.util.GregorianCalendar;
  
  import javax.servlet.ServletException;
--- 51,57 ----
  import java.io.IOException;
  import java.io.UnsupportedEncodingException;
  import java.util.Date;
  import java.util.GregorianCalendar;
+ import java.util.Calendar;
  
  import javax.servlet.ServletException;
***************
*** 65,80 ****
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
- import org.oscarehr.PMmodule.dao.ProviderDao;
- import org.oscarehr.common.dao.ConsultationRequestDao;
- import org.oscarehr.common.dao.DemographicDao;
  import org.oscarehr.common.dao.Hl7TextMessageDao;
  import org.oscarehr.common.hl7.v2.oscar_to_oscar.DataTypeUtils;
  import org.oscarehr.common.hl7.v2.oscar_to_oscar.OscarToOscarUtils;
  import org.oscarehr.common.hl7.v2.oscar_to_oscar.RefI12;
- import org.oscarehr.common.model.ConsultationRequest;
  import org.oscarehr.common.model.Demographic;
  import org.oscarehr.common.model.Hl7TextMessage;
  import org.oscarehr.common.model.ProfessionalSpecialist;
  import org.oscarehr.common.model.Provider;
  import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
--- 65,80 ----
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  import org.oscarehr.common.dao.Hl7TextMessageDao;
  import org.oscarehr.common.hl7.v2.oscar_to_oscar.DataTypeUtils;
  import org.oscarehr.common.hl7.v2.oscar_to_oscar.OscarToOscarUtils;
  import org.oscarehr.common.hl7.v2.oscar_to_oscar.RefI12;
  import org.oscarehr.common.model.Demographic;
+ import org.oscarehr.common.dao.DemographicDao;
  import org.oscarehr.common.model.Hl7TextMessage;
  import org.oscarehr.common.model.ProfessionalSpecialist;
  import org.oscarehr.common.model.Provider;
+ import org.oscarehr.PMmodule.dao.ProviderDao;
+ import org.oscarehr.common.model.ConsultationRequest;
+ import org.oscarehr.common.dao.ConsultationRequestDao;
  import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
***************
*** 124,127 ****
--- 124,128 ----
              Integer hr = cal.get(Calendar.HOUR_OF_DAY);
              hr = hr == 0 ? 12 : hr;
+             hr = hr > 12 ? hr - 12: hr;
              thisForm.setAppointmentHour(String.valueOf(hr));
              thisForm.setAppointmentMinute(String.valueOf(cal.get(Calendar.MINUTE)));
***************
*** 151,155 ****
              Demographic demo = demoDao.getDemographicById(consult.getDemographicId());
  
!             thisForm.setPatientAddress(demo.getAddress());
              thisForm.setPatientDOB(demo.getFormattedDob());
              thisForm.setPatientHealthNum(demo.getHin());
--- 152,156 ----
              Demographic demo = demoDao.getDemographicById(consult.getDemographicId());
  
!             thisForm.setPatientAddress(demo.getAddress() + "<br>" + demo.getCity() + ", " + demo.getProvince() + "<br>" + demo.getPostal());
              thisForm.setPatientDOB(demo.getFormattedDob());
              thisForm.setPatientHealthNum(demo.getHin());
***************
*** 164,168 ****
  
              ProviderDao provDao = (ProviderDao)SpringUtils.getBean("providerDao");
!             Provider prov = provDao.getProvider(demo.getProviderNo());
              thisForm.setProviderName(prov.getFormattedName());
  
--- 165,169 ----
  
              ProviderDao provDao = (ProviderDao)SpringUtils.getBean("providerDao");
!             Provider prov = provDao.getProvider(consult.getProviderNo());
              thisForm.setProviderName(prov.getFormattedName());
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctViewConsultationRequestsUtil.java, 1.18, 1.18.2.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5074

Modified Files:
      Tag: RELEASE_10_12
	EctViewConsultationRequestsUtil.java 
Log Message:
- ID: 3160248 Allow for null providers and specialists

Index: EctViewConsultationRequestsUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** EctViewConsultationRequestsUtil.java	15 Nov 2010 01:27:31 -0000	1.18
--- EctViewConsultationRequestsUtil.java	18 Jan 2011 14:44:35 -0000	1.18.2.1
***************
*** 26,46 ****
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
- import java.util.Calendar;
  import java.util.Date;
- import java.util.List;
  import java.util.Vector;
  
  import org.apache.commons.lang.time.DateFormatUtils;
! import org.oscarehr.PMmodule.dao.ProviderDao;
  import org.oscarehr.common.dao.ConsultationRequestDao;
! import org.oscarehr.common.dao.ConsultationServiceDao;
  import org.oscarehr.common.dao.DemographicDao;
  import org.oscarehr.common.dao.ProfessionalSpecialistDao;
- import org.oscarehr.common.model.ConsultationRequest;
- import org.oscarehr.common.model.ConsultationServices;
- import org.oscarehr.common.model.Demographic;
  import org.oscarehr.common.model.ProfessionalSpecialist;
! import org.oscarehr.common.model.Provider;
! import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
  
--- 26,48 ----
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
  import java.util.Date;
  import java.util.Vector;
+ import java.util.List;
+ import java.util.Calendar;
  
  import org.apache.commons.lang.time.DateFormatUtils;
! 
! import org.oscarehr.util.MiscUtils;
! import org.oscarehr.common.model.ConsultationRequest;
  import org.oscarehr.common.dao.ConsultationRequestDao;
! import org.oscarehr.common.model.Demographic;
  import org.oscarehr.common.dao.DemographicDao;
+ import org.oscarehr.PMmodule.dao.ProviderDao;
+ import org.oscarehr.common.model.Provider;
  import org.oscarehr.common.dao.ProfessionalSpecialistDao;
  import org.oscarehr.common.model.ProfessionalSpecialist;
! import org.oscarehr.common.dao.ConsultationServiceDao;
! import org.oscarehr.common.model.ConsultationServices;
! 
  import org.oscarehr.util.SpringUtils;
  
***************
*** 92,104 ****
            Calendar cal = Calendar.getInstance();
            Date date1, date2;
! 
            List consultList = consultReqDao.getConsults(team, showCompleted, startDate, endDate, orderby, desc, searchDate);
            for( int idx = 0; idx < consultList.size(); ++idx ) {
                consult = (ConsultationRequest)consultList.get(idx);
                demo = demoDao.getDemographicById(consult.getDemographicId());
-               prov = providerDao.getProvider(demo.getProviderNo());
-               specialist = specialistDao.find(consult.getSpecialistId());
                services = serviceDao.find(consult.getServiceId());
  
                demographicNo.add(consult.getDemographicId().toString());
                date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getReferralDate()));
--- 94,122 ----
            Calendar cal = Calendar.getInstance();
            Date date1, date2;
!           String providerId, providerName, specialistName;
            List consultList = consultReqDao.getConsults(team, showCompleted, startDate, endDate, orderby, desc, searchDate);
+ 
            for( int idx = 0; idx < consultList.size(); ++idx ) {
                consult = (ConsultationRequest)consultList.get(idx);
                demo = demoDao.getDemographicById(consult.getDemographicId());
                services = serviceDao.find(consult.getServiceId());
  
+               providerId = demo.getProviderNo();
+               if( providerId != null && !providerId.equals("")) {
+                   prov = providerDao.getProvider(demo.getProviderNo());
+                   providerName = prov.getFormattedName();
+               }
+               else {
+                   providerName = "N/A";
+               }
+ 
+               if( consult.getProfessionalSpecialist() == null ) {
+                   specialistName = "N/A";
+               }
+               else {
+                   specialist = consult.getProfessionalSpecialist();
+                   specialistName = specialist.getLastName() + ", " + specialist.getFirstName();
+               }
+ 
                demographicNo.add(consult.getDemographicId().toString());
                date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getReferralDate()));
***************
*** 106,112 ****
                status.add(consult.getStatus());
                patient.add(demo.getFormattedName());
!               provider.add(prov.getFormattedName());
                service.add(services.getServiceDesc());
!               vSpecialist.add(specialist.getLastName() + ", " + specialist.getFirstName());
                urgency.add(consult.getUrgency());
                teams.add(consult.getSendTo());
--- 124,130 ----
                status.add(consult.getStatus());
                patient.add(demo.getFormattedName());
!               provider.add(providerName);
                service.add(services.getServiceDesc());
!               vSpecialist.add(specialistName);
                urgency.add(consult.getUrgency());
                teams.add(consult.getSendTo());
***************
*** 155,160 ****
            Provider prov;
            Demographic demo;
-           ProfessionalSpecialist specialist;
            ConsultationServices services;
  
            List consultList = consultReqDao.getConsults(demoNo);
--- 173,178 ----
            Provider prov;
            Demographic demo;
            ConsultationServices services;
+           String providerId, providerName;
  
            List consultList = consultReqDao.getConsults(demoNo);
***************
*** 162,167 ****
                consult = (ConsultationRequest)consultList.get(idx);
                demo = demoDao.getDemographicById(consult.getDemographicId());
                prov = providerDao.getProvider(demo.getProviderNo());
!               specialist = specialistDao.find(consult.getSpecialistId());
                services = serviceDao.find(consult.getServiceId());
  
--- 180,192 ----
                consult = (ConsultationRequest)consultList.get(idx);
                demo = demoDao.getDemographicById(consult.getDemographicId());
+               providerId = demo.getProviderNo();
+               if( providerId != null && !providerId.equals("")) {
                prov = providerDao.getProvider(demo.getProviderNo());
!                 providerName = prov.getFormattedName();
!               }
!               else {
!                   providerName = "N/A";
!               }
! 
                services = serviceDao.find(consult.getServiceId());
  
***************
*** 169,177 ****
                status.add(consult.getStatus());
                patient.add(demo.getFormattedName());
!               provider.add(prov.getFormattedName());
                service.add(services.getServiceDesc());
                urgency.add(consult.getUrgency());
                patientWillBook.add(""+consult.isPatientWillBook());
!               date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getAppointmentDate()));
            }
        } catch(Exception e) {         
--- 194,202 ----
                status.add(consult.getStatus());
                patient.add(demo.getFormattedName());
!               provider.add(providerName);
                service.add(services.getServiceDesc());
                urgency.add(consult.getUrgency());
                patientWillBook.add(""+consult.isPatientWillBook());
!               date.add(DateFormatUtils.ISO_DATE_FORMAT.format(consult.getReferralDate()));
            }
        } catch(Exception e) {         

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctConsultationFormRequestAction.java, 1.39, 1.39.2.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4527

Modified Files:
      Tag: RELEASE_10_12
	EctConsultationFormRequestAction.java 
Log Message:
- ID: 3160248 Changed logic to persist and merge consults depending on whether a
professional specialist is present

Index: EctConsultationFormRequestAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -C2 -d -r1.39 -r1.39.2.1
*** EctConsultationFormRequestAction.java	29 Nov 2010 20:06:53 -0000	1.39
--- EctConsultationFormRequestAction.java	18 Jan 2011 14:41:46 -0000	1.39.2.1
***************
*** 107,110 ****
--- 107,111 ----
  
                  ConsultationRequestDao consultationRequestDao=(ConsultationRequestDao)SpringUtils.getBean("consultationRequestDao");
+                 ProfessionalSpecialistDao professionalSpecialistDao=(ProfessionalSpecialistDao)SpringUtils.getBean("professionalSpecialistDao");
                  String[] format = new String[] {"yyyy-MM-dd","yyyy/MM/dd"};
  
***************
*** 116,120 ****
                                  consult.setReferralDate(date);
                                  consult.setServiceId(new Integer(frm.getService()));
!                                 consult.setSpecialistId(new Integer(frm.getSpecialist()));
                                  date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format);
                                  consult.setAppointmentDate(date);
--- 117,122 ----
                                  consult.setReferralDate(date);
                                  consult.setServiceId(new Integer(frm.getService()));
! 
!                                 if( frm.getAppointmentYear() != null && !frm.getAppointmentYear().equals("") ) {
                                  date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format);
                                  consult.setAppointmentDate(date);
***************
*** 122,125 ****
--- 124,128 ----
                                  date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute()));
                                  consult.setAppointmentTime(date);
+                                 }
                                  consult.setReasonForReferral(frm.getReasonForConsultation());
                                  consult.setClinicalInfo(frm.getClinicalInformation());
***************
*** 133,137 ****
                                  consult.setConcurrentProblems(frm.getConcurrentProblems());
                                  consult.setUrgency(frm.getUrgency());
!                                 consult.setPatientWillBook(new Boolean(frm.getPatientWillBook()));
                                  if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) {
                                      date = DateUtils.parseDate(frm.getFollowUpDate(), format);
--- 136,146 ----
                                  consult.setConcurrentProblems(frm.getConcurrentProblems());
                                  consult.setUrgency(frm.getUrgency());
! 
!                                 Boolean pWillBook = false;
!                                 if( frm.getPatientWillBook() != null ) {
!                                     pWillBook = frm.getPatientWillBook().equals("1");
!                                 }
!                                 consult.setPatientWillBook(pWillBook);
! 
                                  if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) {
                                      date = DateUtils.parseDate(frm.getFollowUpDate(), format);
***************
*** 139,144 ****
--- 148,161 ----
                                  }
  
+ 
                                  consultationRequestDao.persist(consult);
  
+                                     Integer specId = new Integer(frm.getSpecialist());
+                                     ProfessionalSpecialist professionalSpecialist=professionalSpecialistDao.find(specId);
+                                     if( professionalSpecialist != null ) {
+                                         consult.setProfessionalSpecialist(professionalSpecialist);
+                                         consultationRequestDao.merge(consult);
+                                     }
+                                         MiscUtils.getLogger().info("saved new consult id "+ consult.getId());
                                          requestId = String.valueOf(consult.getId());
  					// now that we have consultation id we can save any attached docs as well
***************
*** 171,175 ****
                                  consult.setReferralDate(date);
                                  consult.setServiceId(new Integer(frm.getService()));
!                                 consult.setSpecialistId(new Integer(frm.getSpecialist()));
                                  date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format);                                
                                  consult.setAppointmentDate(date);
--- 188,196 ----
                                  consult.setReferralDate(date);
                                  consult.setServiceId(new Integer(frm.getService()));
! 
!                                 Integer specId = new Integer(frm.getSpecialist());
!                                 ProfessionalSpecialist professionalSpecialist=professionalSpecialistDao.find(specId);
!                                 consult.setProfessionalSpecialist(professionalSpecialist);
!                                 if( frm.getAppointmentYear() != null && !frm.getAppointmentYear().equals("") ) {
                                  date = DateUtils.parseDate(frm.getAppointmentYear() + "-" + frm.getAppointmentMonth() + "-" + frm.getAppointmentDay(), format);                                
                                  consult.setAppointmentDate(date);
***************
*** 177,185 ****
                                  date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute()));                                
                                  consult.setAppointmentTime(date);
                                  consult.setReasonForReferral(frm.getReasonForConsultation());
                                  consult.setClinicalInfo(frm.getClinicalInformation());
                                  consult.setCurrentMeds(frm.getCurrentMedications());
                                  consult.setAllergies(frm.getAllergies());
-                                 consult.setProviderNo(frm.getProviderNo());
                                  consult.setDemographicId(new Integer(frm.getDemographicNo()));
                                  consult.setStatus(frm.getStatus());
--- 198,206 ----
                                  date = DateUtils.setMinutes(date, new Integer(frm.getAppointmentMinute()));                                
                                  consult.setAppointmentTime(date);
+                                 }
                                  consult.setReasonForReferral(frm.getReasonForConsultation());
                                  consult.setClinicalInfo(frm.getClinicalInformation());
                                  consult.setCurrentMeds(frm.getCurrentMedications());
                                  consult.setAllergies(frm.getAllergies());
                                  consult.setDemographicId(new Integer(frm.getDemographicNo()));
                                  consult.setStatus(frm.getStatus());
***************
*** 188,192 ****
                                  consult.setConcurrentProblems(frm.getConcurrentProblems());
                                  consult.setUrgency(frm.getUrgency());
!                                 consult.setPatientWillBook(new Boolean(frm.getPatientWillBook()));
                                  if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) {
                                      date = DateUtils.parseDate(frm.getFollowUpDate(), format);
--- 209,219 ----
                                  consult.setConcurrentProblems(frm.getConcurrentProblems());
                                  consult.setUrgency(frm.getUrgency());
! 
!                                 Boolean pWillBook = false;
!                                 if( frm.getPatientWillBook() != null ) {
!                                     pWillBook = frm.getPatientWillBook().equals("1");
!                                 }
!                                 consult.setPatientWillBook(pWillBook);
! 
                                  if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) {
                                      date = DateUtils.parseDate(frm.getFollowUpDate(), format);
***************
*** 194,197 ****
--- 221,225 ----
                                  }
                                  consultationRequestDao.merge(consult);
+                                 MiscUtils.getLogger().info("updated consult id "+ consult.getId());
  			}
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model Demographic.java, 1.20, 1.20.2.1

[Randy J. <rj...@us...>]

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

Modified Files:
      Tag: RELEASE_10_12
	Demographic.java 
Log Message:
- ID: 3160248 Add provider member so we can left outer join in HQL

Index: Demographic.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Demographic.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -d -r1.20 -r1.20.2.1
*** Demographic.java	12 Nov 2010 19:06:37 -0000	1.20
--- Demographic.java	18 Jan 2011 14:39:12 -0000	1.20.2.1
***************
*** 96,99 ****
--- 96,101 ----
  	private int hsAlertCount = 0;
  
+         private Provider provider;    
+ 
      /**
       * @return the rosterDate
***************
*** 963,965 ****
--- 965,981 ----
  	}
  
+      /**
+      * @return the provider
+      */
+     public Provider getProvider() {
+         return provider;
+ }
+ 
+     /**
+      * @param provider the provider to set
+      */
+     public void setProvider(Provider provider) {
+         this.provider = provider;
+     }
+ 
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model Demographic.hbm.xml, 1.8, 1.8.2.1

[Randy J. <rj...@us...>]

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

Modified Files:
      Tag: RELEASE_10_12
	Demographic.hbm.xml 
Log Message:
- ID: 3160248 Add provider mapping to demographic

Index: Demographic.hbm.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Demographic.hbm.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** Demographic.hbm.xml	12 Nov 2010 19:06:37 -0000	1.8
--- Demographic.hbm.xml	18 Jan 2011 14:38:32 -0000	1.8.2.1
***************
*** 66,69 ****
--- 66,73 ----
  		</set>
  
+                 <many-to-one name="provider" class="org.oscarehr.common.model.Provider"
+ 			column="provider_no" update="false" not-found='ignore' insert="false"
+ 			lazy="false" />
+ 
  	</class>
  </hibernate-mapping>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao ConsultationRequestDao.java, 1.4, 1.4.2.1

[Randy J. <rj...@us...>]

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

Modified Files:
      Tag: RELEASE_10_12
	ConsultationRequestDao.java 
Log Message:
- ID: 3160248 Left outer join professional specialists and providers as we are
not guaranteed they are present

Index: ConsultationRequestDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/ConsultationRequestDao.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** ConsultationRequestDao.java	29 Nov 2010 17:20:23 -0000	1.4
--- ConsultationRequestDao.java	18 Jan 2011 14:37:35 -0000	1.4.2.1
***************
*** 66,70 ****
  
          public List getConsults(String team, boolean showCompleted, Date startDate, Date endDate, String orderby, String desc, String searchDate) {
!             StringBuilder sql = new StringBuilder("select cr from ConsultationRequest cr, Demographic d, Provider p, ProfessionalSpecialist specialist, ConsultationServices service where d.DemographicNo = cr.demographicId and p.ProviderNo = d.ProviderNo and specialist.id = cr.specialistId and service.id = cr.serviceId ");
  
              if( !showCompleted ) {
--- 66,70 ----
  
          public List getConsults(String team, boolean showCompleted, Date startDate, Date endDate, String orderby, String desc, String searchDate) {
!             StringBuilder sql = new StringBuilder("select cr from ConsultationRequest cr left outer join cr.professionalSpecialist specialist, ConsultationServices service, Demographic d left outer join d.provider p where d.DemographicNo = cr.demographicId and service.id = cr.serviceId ");
  
              if( !showCompleted ) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model ConsultationRequest.java, 1.3, 1.3.2.1

[Randy J. <rj...@us...>]

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

Modified Files:
      Tag: RELEASE_10_12
	ConsultationRequest.java 
Log Message:
- ID: 3160248 Added professionalSpecialist member so we can left outer join in
HQL, allows null values for professionalSpecialists

Index: ConsultationRequest.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/ConsultationRequest.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** ConsultationRequest.java	12 Nov 2010 21:01:02 -0000	1.3
--- ConsultationRequest.java	18 Jan 2011 14:36:37 -0000	1.3.2.1
***************
*** 36,39 ****
--- 36,43 ----
  import javax.persistence.Temporal;
  import javax.persistence.TemporalType;
+ import javax.persistence.JoinColumn;
+ import javax.persistence.ManyToOne;
+ import javax.persistence.FetchType;
+ import javax.persistence.CascadeType;
  
  import org.apache.commons.lang.StringUtils;
***************
*** 54,59 ****
  	private Integer serviceId;
  
! 	@Column(name = "specId")
! 	private Integer specialistId;
  
  	@Temporal(TemporalType.DATE)
--- 58,64 ----
  	private Integer serviceId;
  
!         @ManyToOne(fetch=FetchType.EAGER, cascade=CascadeType.ALL)
!         @JoinColumn(name="specId")
!         private ProfessionalSpecialist professionalSpecialist;
  
  	@Temporal(TemporalType.DATE)
***************
*** 104,115 ****
      }
  
- 	public Integer getSpecialistId() {
-     	return specialistId;
-     }
- 
- 	public void setSpecialistId(Integer specialistId) {
-     	this.specialistId = specialistId;
-     }
- 
  	public Date getAppointmentDate() {
      	return appointmentDate;
--- 109,112 ----
***************
*** 237,239 ****
--- 234,254 ----
          this.followUpDate = followUpDate;
      }
+ 
+     /**
+      * @return the professionalSpecialist
+      */
+     public ProfessionalSpecialist getProfessionalSpecialist() {
+         return professionalSpecialist;
+ }
+ 
+     /**
+      * @param professionalSpecialist the professionalSpecialist to set
+      */
+     public void setProfessionalSpecialist(ProfessionalSpecialist professionalSpecialist) {
+         this.professionalSpecialist = professionalSpecialist;
+     }
+ 
+     public Integer getSpecialistId() {
+         return this.professionalSpecialist.getId();
+     }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest ConsultationFormRequest.jsp, 1.71, 1.71.2.1

[Randy J. <rj...@us...>]

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

Modified Files:
      Tag: RELEASE_10_12
	ConsultationFormRequest.jsp 
Log Message:
- ID: 3160248 Restored buttons to top of consult and changed how javascript
cycles through specialist objects when populating list box

Index: ConsultationFormRequest.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormRequest.jsp,v
retrieving revision 1.71
retrieving revision 1.71.2.1
diff -C2 -d -r1.71 -r1.71.2.1
*** ConsultationFormRequest.jsp	29 Nov 2010 19:42:16 -0000	1.71
--- ConsultationFormRequest.jsp	18 Jan 2011 14:35:01 -0000	1.71.2.1
***************
*** 208,212 ****
  <script language="JavaScript" type="text/javascript">
  
! var servicesName = new Array();   		// used as a cross reference table for name and number
  var services = new Array();				// the following are used as a 2D table for makes and models
  var specialists = new Array();
--- 208,212 ----
  <script language="JavaScript" type="text/javascript">
  
! var servicesName = new Object();   		// used as a cross reference table for name and number
  var services = new Array();				// the following are used as a 2D table for makes and models
  var specialists = new Array();
***************
*** 227,231 ****
  function K( serviceNumber, service ){
  
! 	servicesName[service] = new ServicesName(serviceNumber);
  	services[serviceNumber] = new Service( );
  }
--- 227,232 ----
  function K( serviceNumber, service ){
  
! 	//servicesName[service] = new ServicesName(serviceNumber);
!         servicesName[service] = serviceNumber;
  	services[serviceNumber] = new Service( );
  }
***************
*** 446,450 ****
  	var strSer = new String(ser);
  
! 	for (aIdx in servicesName){
  	   var serNBR = servicesName[aIdx].serviceNumber;
     	   document.EctConsultationFormRequestForm.service.options[ i ] = new Option( aIdx, serNBR );
--- 447,463 ----
  	var strSer = new String(ser);
  
!         $H(servicesName).each(function(pair){
!               var opt = document.createElement("option");
!               opt.textContent = pair.key;
!               opt.value = pair.value;
!               if( pair.value == strSer ) {
!                 opt.selected = true;
!                 fillSpecialistSelect1( pair.value );
!               }
!               $("service").options.add(opt);
! 
!         });
! 
! /*	for (aIdx in servicesName){
  	   var serNBR = servicesName[aIdx].serviceNumber;
     	   document.EctConsultationFormRequestForm.service.options[ i ] = new Option( aIdx, serNBR );
***************
*** 460,465 ****
  	   }
  	   i++;
  	}
- }
  //-------------------------------------------------------------------
  
--- 473,478 ----
  	   }
  	   i++;
+ 	}*/
  	}
  //-------------------------------------------------------------------
  
***************
*** 529,532 ****
--- 542,550 ----
  	button=form.submitAndSendElectronically;
  	if (button!=null) button.disabled=disabled;
+ 
+         var button=form.updateAndSendElectronicallyTop;
+ 	if (button!=null) button.disabled=disabled;
+ 	button=form.submitAndSendElectronicallyTop;
+ 	if (button!=null) button.disabled=disabled;
  }
  
***************
*** 584,587 ****
--- 602,606 ----
       return false;
    }
+   $("saved").value = "true";
    document.forms[formName].submission.value=submissionVal;
    document.forms[formName].submit();
***************
*** 746,749 ****
--- 765,775 ----
  }
  
+ function checksave() {
+     var saved = $F("saved");
+     if( saved == "false" ) {
+         return "You are about to close the consult WITHOUT saving. Are you sure you want to exit?";
+     }
+ }
+ window.onbeforeunload = checksave;
  </script>
  <%=WebUtils.popErrorMessagesAsAlert(session)%>
***************
*** 808,811 ****
--- 834,838 ----
  	<input type="hidden" name="requestId" value="<%=requestId%>">
  	<input type="hidden" name="documents" value="">
+         <input type="hidden" id="saved" value="false">
  	<!--  -->
  	<table class="MainTable" id="scrollNumber1" name="encounterTable">
***************
*** 942,945 ****
--- 969,1017 ----
  				<!----Start new rows here-->
  				<tr>
+ 					<td class="tite4" colspan=2>
+ 					<%
+ 						if (request.getAttribute("id") != null)
+ 								{
+ 					%>
+ 						<input name="update" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnUpdate"/>" onclick="return checkForm('Update Consultation Request','EctConsultationFormRequestForm');" />
+ 						<input name="updateAndPrint" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnUpdateAndPrint"/>" onclick="return checkForm('Update Consultation Request And Print Preview','EctConsultationFormRequestForm');" />
+ 						<input name="updateAndSendElectronicallyTop" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnUpdateAndSendElectronicReferral"/>" onclick="return checkForm('Update_esend','EctConsultationFormRequestForm');" />
+ 						<%
+ 							if (props.getProperty("faxEnable", "").equalsIgnoreCase("yes"))
+ 										{
+ 						%>
+ 						<input name="updateAndFax" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnUpdateAndFax"/>" onclick="return checkForm('Update And Fax','EctConsultationFormRequestForm');" />
+ 						<%
+ 							}
+ 						%>
+ 					<%
+ 						}
+ 								else
+ 								{
+ 					%>
+ 						<input name="submitSaveOnly" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmit"/>" onclick="return checkForm('Submit Consultation Request','EctConsultationFormRequestForm'); " />
+ 						<input name="submitAndPrint" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmitAndPrint"/>" onclick="return checkForm('Submit Consultation Request And Print Preview','EctConsultationFormRequestForm'); " />
+ 						<input name="submitAndSendElectronicallyTop" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmitAndSendElectronicReferral"/>" onclick="return checkForm('Submit_esend','EctConsultationFormRequestForm');" />
+ 						<%
+ 							if (props.getProperty("faxEnable", "").equalsIgnoreCase("yes"))
+ 										{
+ 						%>
+ 						<input name="submitAndFax" type="button" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnSubmitAndFax"/>" onclick="return checkForm('Submit And Fax','EctConsultationFormRequestForm');" />
+ 						<%
+ 							}
+ 						%>
+ 					<%
+ 						}
+ 
+ 						if (thisForm.iseReferral())
+ 						{
+ 							%>
+ 								<input type="button" value="Send eResponse" onclick="$('saved').value='true';document.location='<%=thisForm.getOruR01UrlString(request)%>'" />
+ 							<%
+ 						}
+ 						%>
+ 					</td>
+                                 </tr>
+                                 <tr>
  					<td>
  
***************
*** 965,969 ****
  							</td>
  							<td align="right" class="tite1">
! 								<html:select property="service" onchange="fillSpecialistSelect(this);">
  								<!-- <option value="-1">------ <bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formServSelect"/> ------</option>
  					<option/>
--- 1037,1041 ----
  							</td>
  							<td align="right" class="tite1">
! 								<html:select styleId="service" property="service" onchange="fillSpecialistSelect(this);">
  								<!-- <option value="-1">------ <bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.formServSelect"/> ------</option>
  					<option/>
***************
*** 1412,1416 ****
  						{
  							%>
! 								<input type="button" value="Send eResponse" onclick="document.location='<%=thisForm.getOruR01UrlString(request)%>'" />
  							<%
  						}
--- 1484,1488 ----
  						{
  							%>
! 								<input type="button" value="Send eResponse" onclick="$('saved').value='true';document.location='<%=thisForm.getOruR01UrlString(request)%>'" />
  							<%
  						}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF struts-config.xml, 1.366, 1.367

[jai <yg...@us...>]

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

Modified Files:
	struts-config.xml 
Log Message:
- ID: 3160237
-remove mymeds view

Index: struts-config.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v
retrieving revision 1.366
retrieving revision 1.367
diff -C2 -d -r1.366 -r1.367
*** struts-config.xml	14 Jan 2011 19:37:31 -0000	1.366
--- struts-config.xml	17 Jan 2011 20:38:22 -0000	1.367
***************
*** 1262,1271 ****
  			<forward name="eject" path="/index.jsp" />
  		</action>
- 		<action  path="/mymeds/providerLogin" scope="request" parameter="method" type="org.mymeds.web.MyMedsLoginAction">
- 			<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" />
--- 1262,1265 ----
***************
*** 2092,2095 ****
--- 2086,2090 ----
  		</action>
  		<action path="/phrExchange" name="FrmForm" type="org.springframework.web.struts.DelegatingActionProxy" parameter="method" scope="request">
+                     <forward name="success" path="/oscarRx/displayMedsFromPhr.jsp" />
  		</action>
  		<action path="/phr/UserManagement" name="FrmForm" type="org.springframework.web.struts.DelegatingActionProxy" parameter="method" scope="request">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider infirmaryviewprogramlist.jspf, 1.2, 1.3

[jai <yg...@us...>]

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

Modified Files:
	infirmaryviewprogramlist.jspf 
Log Message:
- ID: 3160237
-remove mymeds view

Index: infirmaryviewprogramlist.jspf
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/infirmaryviewprogramlist.jspf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** infirmaryviewprogramlist.jspf	3 Jan 2011 23:50:45 -0000	1.2
--- infirmaryviewprogramlist.jspf	17 Jan 2011 20:38:08 -0000	1.3
***************
*** 26,30 ****
  questr=oscar.caisi.CaisiUtil.removeAttr(questr,"GoToCaisiViewFromOscarView=");
  
- questr=oscar.caisi.CaisiUtil.removeAttr(questr,"GoToMyMedsView=");
  session.setAttribute("infirmaryView_OscarQue",questr);
  
--- 26,29 ----
***************
*** 136,141 ****
  	</caisi:ProgramExclusiveView>
  </logic:equal>
-  <div align="right"><a href='providercontrol.jsp?infirmaryView_isOscar=false&GoToCaisiViewFromOscarView=false&GoToMyMedsView=true&<%=session.getAttribute("infirmaryView_OscarQue") %>'>|
- 		MyMeds View</a></div>
  </td>
  </tr>
--- 135,138 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider infirmarydemographiclist.jspf, 1.4, 1.5

[jai <yg...@us...>]

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

Modified Files:
	infirmarydemographiclist.jspf 
Log Message:
- ID: 3160237
-remove mymeds view

Index: infirmarydemographiclist.jspf
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/infirmarydemographiclist.jspf,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** infirmarydemographiclist.jspf	3 Jan 2011 23:50:34 -0000	1.4
--- infirmarydemographiclist.jspf	17 Jan 2011 20:37:52 -0000	1.5
***************
*** 2,9 ****
  
  <logic:equal name="infirmaryView_isOscar" value="false">
!     <logic:equal parameter="GoToMyMedsView" value="true">
!         <c:import url="../mymeds/providerLogin.do?" />
!     </logic:equal>
!     <logic:notEqual parameter="GoToMyMedsView" value="true">
  <%
  	session.setAttribute("case_program_id", session.getAttribute(SessionConstants.CURRENT_PROGRAM_ID));
--- 2,6 ----
  
  <logic:equal name="infirmaryView_isOscar" value="false">
! 
  <%
  	session.setAttribute("case_program_id", session.getAttribute(SessionConstants.CURRENT_PROGRAM_ID));
***************
*** 183,186 ****
  	}
  }%>
- </logic:notEqual>
  </logic:equal>
--- 180,182 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/Admin/ProgramEdit general.jsp, 1.27, 1.28

[jai <yg...@us...>]

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

Modified Files:
	general.jsp 
Log Message:
- ID: 3160237
-removed mymeds view

Index: general.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/Admin/ProgramEdit/general.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** general.jsp	3 Jan 2011 23:50:17 -0000	1.27
--- general.jsp	17 Jan 2011 20:37:36 -0000	1.28
***************
*** 238,242 ****
  			<html:option value="appointment">Appointment View</html:option>
  			<html:option value="case-management">Case-management View</html:option>
-                         <html:option value="mymeds">MyMeds View</html:option>
  		</html:select> (Selecting "No" allows users to switch views)</td>
  	</tr>
--- 238,241 ----

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

[jai <yg...@us...>]

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-serv5619/WEB-INF/classes/src/org/mymeds/web

Removed Files:
	MyMedsLoginAction.java 
Log Message:
- ID: 3160237
-removed because not correct.

--- MyMedsLoginAction.java DELETED ---

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

[jai <yg...@us...>]

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

Removed Files:
	index.jsp 
Log Message:
- ID: 3160237
-removed because not correct.

--- index.jsp DELETED ---

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

[jai <yg...@us...>]

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

Removed Files:
	providerLogin.jsp 
Log Message:
- ID: 3160237
-removed because not correct.

--- providerLogin.jsp DELETED ---

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

[jai <yg...@us...>]

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-serv5619/WEB-INF/classes/src/org/mymeds/casemanagement

Removed Files:
	CaseMgmtAction.java 
Log Message:
- ID: 3160237
-removed because not correct.

--- CaseMgmtAction.java DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web OcanForm.java, 1.17, 1.18

[annie <ann...@us...>]

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

Modified Files:
	OcanForm.java 
Log Message:
change StringBuffer to StringBuilder.

Index: OcanForm.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanForm.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** OcanForm.java	14 Jan 2011 21:35:17 -0000	1.17
--- OcanForm.java	17 Jan 2011 15:36:35 -0000	1.18
***************
*** 791,795 ****
  	public static String getOcanWarningMessage(Integer facilityId) {
  				
! 		StringBuffer messages = new StringBuffer();
  		messages.append("You need to do OCAN reassessment for the clients whose IDs are: ");
  		
--- 791,795 ----
  	public static String getOcanWarningMessage(Integer facilityId) {
  				
! 		StringBuilder messages = new StringBuilder();
  		messages.append("You need to do OCAN reassessment for the clients whose IDs are: ");
  		

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2011-01-17.sql, NONE, 1.1

[Marc D. <hex...@us...>]

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

Added Files:
	update-2011-01-17.sql 
Log Message:
measurements table - needed bigger fields


--- NEW FILE: update-2011-01-17.sql ---
alter table measurements modify type varchar(50);
alter table measurements modify dataField varchar(50);

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql, 1.277, 1.278

[Marc D. <hex...@us...>]

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

Modified Files:
	oscarinit.sql 
Log Message:
measurements table - needed bigger fields


Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.277
retrieving revision 1.278
diff -C2 -d -r1.277 -r1.278
*** oscarinit.sql	14 Jan 2011 15:40:17 -0000	1.277
--- oscarinit.sql	17 Jan 2011 15:07:15 -0000	1.278
***************
*** 6146,6153 ****
  CREATE TABLE measurements(
    id int UNSIGNED AUTO_INCREMENT,
!   type varchar(4) NOT NULL,
    demographicNo int(10) NOT NULL default '0', 
    providerNo varchar(6) NOT NULL default '',
!   dataField  varchar(20) NOT NULL,
    measuringInstruction varchar(255) NOT NULL,  
    comments varchar(255) NOT NULL, 
--- 6146,6153 ----
  CREATE TABLE measurements(
    id int UNSIGNED AUTO_INCREMENT,
!   type varchar(50) NOT NULL,
    demographicNo int(10) NOT NULL default '0', 
    providerNo varchar(6) NOT NULL default '',
!   dataField  varchar(50) NOT NULL,
    measuringInstruction varchar(255) NOT NULL,  
    comments varchar(255) NOT NULL, 

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs/git_gerrit automated_deploy.sh, 1.8, 1.9

[Ted L. <ted...@us...>]

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

Modified Files:
	automated_deploy.sh 
Log Message:
made script cleaner

Index: automated_deploy.sh
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/automated_deploy.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** automated_deploy.sh	7 Jan 2011 00:42:26 -0000	1.8
--- automated_deploy.sh	14 Jan 2011 22:28:20 -0000	1.9
***************
*** 28,33 ****
  
  	# get latest code
! 	git fetch origin
! 	git merge origin
  	
  	# clear out local maven repo
--- 28,32 ----
  
  	# get latest code
! 	git pull
  	
  	# clear out local maven repo