oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web OcanReportUIBean.java, 1.5.4.10, 1.5.4.11

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

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

Modified Files:
      Tag: RELEASE_10_06
	OcanReportUIBean.java 
Log Message:
add missing features to ocan.

Index: OcanReportUIBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web/OcanReportUIBean.java,v
retrieving revision 1.5.4.10
retrieving revision 1.5.4.11
diff -C2 -d -r1.5.4.10 -r1.5.4.11
*** OcanReportUIBean.java	29 Dec 2010 19:02:46 -0000	1.5.4.10
--- OcanReportUIBean.java	13 Jan 2011 03:52:56 -0000	1.5.4.11
***************
*** 19,22 ****
--- 19,23 ----
  import org.oscarehr.PMmodule.dao.AdmissionDao;
  import org.oscarehr.PMmodule.model.Admission;
+ import org.oscarehr.PMmodule.web.OcanForm;
  import org.oscarehr.common.dao.FacilityDao;
  import org.oscarehr.common.dao.OcanClientFormDao;
***************
*** 173,177 ****
  		LoggedInInfo loggedInInfo = LoggedInInfo.loggedInInfo.get();
  		
! 		List<OcanStaffForm> ocanStaffForms = ocanStaffFormDao.findLatestSignedOcanForms(loggedInInfo.currentFacility.getId(), "1.2", getStartDate(year,month), getEndDate(year,month));
  		logger.info("# of staff forms found for time period = " + ocanStaffForms.size());
  		
--- 174,178 ----
  		LoggedInInfo loggedInInfo = LoggedInInfo.loggedInInfo.get();
  		
! 		List<OcanStaffForm> ocanStaffForms = ocanStaffFormDao.findLatestSignedOcanForms(loggedInInfo.currentFacility.getId(), "1.2", getStartDate(year,month), getEndDate(year,month),"FULL");
  		logger.info("# of staff forms found for time period = " + ocanStaffForms.size());
  		
***************
*** 194,210 ****
  			
  			//Only download one latest completed OCAN for one client 
! 			int clientId_1 = staffForm.getClientId().intValue();
! 			if(clientId_0!=clientId_1) {
! 				clientId_0 = clientId_1;
! 			} else {
! 				continue;
! 			}
  			
  			//check for a clientform
! 			OcanClientForm clientForm = ocanClientFormDao.findLatestSignedOcanForm(loggedInInfo.currentFacility.getId(),staffForm.getClientId(), "1.2", getStartDate(year,month), getEndDate(year,month));
  			List<OcanClientFormData> clientFormData = null;
- 			if(clientForm != null) {
- 				clientFormData = ocanClientFormDataDao.findByForm(clientForm.getId());
- 			}			
  			OCANv2SubmissionRecord submissionRecord = convertOcanForm(staffForm,ocanStaffFormDataDao.findByForm(staffForm.getId()),clientForm,clientFormData);
  			submissionRecordList.add(submissionRecord);			
--- 195,215 ----
  			
  			//Only download one latest completed OCAN for one client 
! 			//One client could have more than one completed OCAN,so remove this part.
! 			//int clientId_1 = staffForm.getClientId().intValue();
! 			//if(clientId_0!=clientId_1) {
! 			//	clientId_0 = clientId_1;
! 			//} else {
! 			//	continue;
! 			//}
  			
  			//check for a clientform
! 			//merge clientform with staffform, so remove the following code.
! 			//OcanClientForm clientForm = ocanClientFormDao.findLatestSignedOcanForm(loggedInInfo.currentFacility.getId(),staffForm.getClientId(), "1.2", getStartDate(year,month), getEndDate(year,month));
! 			//List<OcanClientFormData> clientFormData = null;
! 			//if(clientForm != null) {
! 			//	clientFormData = ocanClientFormDataDao.findByForm(clientForm.getId());
! 			//}	
! 			OcanClientForm clientForm = null;
  			List<OcanClientFormData> clientFormData = null;
  			OCANv2SubmissionRecord submissionRecord = convertOcanForm(staffForm,ocanStaffFormDataDao.findByForm(staffForm.getId()),clientForm,clientFormData);
  			submissionRecordList.add(submissionRecord);			
***************
*** 268,280 ****
  		OCANv2SubmissionRecord ocanSubmissionRecord = OCANv2SubmissionRecord.Factory.newInstance();
  		
! 		ocanSubmissionRecord.setOCANType(OCANv2SubmissionRecord.OCANType.Enum.forString("FULL"));
  		ocanSubmissionRecord.setAssessmentID(String.valueOf(ocanStaffForm.getId()));
  		ocanSubmissionRecord.setAssessmentRevision("1");
! 		ocanSubmissionRecord.setStartDate(convertToOcanXmlDate(ocanStaffForm.getStartDate()));
! 		ocanSubmissionRecord.setCompletionDate(convertToOcanXmlDate(ocanStaffForm.getCompletionDate()));
  		ocanSubmissionRecord.setAssessmentStatus(OCANv2SubmissionRecord.AssessmentStatus.COMPLETE);
  		ocanSubmissionRecord.setIARViewingConsent(OCANv2SubmissionRecord.IARViewingConsent.Enum.forString("TRUE"));
! 		
! 		
  		ocanSubmissionRecord.setSubmitOrganizationRecord(convertSubmitOrganizationRecord(ocanStaffForm,ocanStaffFormData));
  		ocanSubmissionRecord.setClientRecord(convertClientRecord(ocanStaffForm,ocanStaffFormData));
--- 273,286 ----
  		OCANv2SubmissionRecord ocanSubmissionRecord = OCANv2SubmissionRecord.Factory.newInstance();
  		
! 		ocanSubmissionRecord.setOCANType(OCANv2SubmissionRecord.OCANType.Enum.forString(ocanStaffForm.getOcanType()));
  		ocanSubmissionRecord.setAssessmentID(String.valueOf(ocanStaffForm.getId()));
  		ocanSubmissionRecord.setAssessmentRevision("1");
! 
! 		ocanSubmissionRecord.setStartDate(convertToOcanXmlDate(OcanForm.getAssessmentStartDate(ocanStaffForm.getStartDate(),ocanStaffForm.getClientStartDate())));
! 		ocanSubmissionRecord.setCompletionDate(convertToOcanXmlDate(OcanForm.getAssessmentCompletionDate(ocanStaffForm.getCompletionDate(),ocanStaffForm.getClientCompletionDate())));
! 						
  		ocanSubmissionRecord.setAssessmentStatus(OCANv2SubmissionRecord.AssessmentStatus.COMPLETE);
  		ocanSubmissionRecord.setIARViewingConsent(OCANv2SubmissionRecord.IARViewingConsent.Enum.forString("TRUE"));
! 				
  		ocanSubmissionRecord.setSubmitOrganizationRecord(convertSubmitOrganizationRecord(ocanStaffForm,ocanStaffFormData));
  		ocanSubmissionRecord.setClientRecord(convertClientRecord(ocanStaffForm,ocanStaffFormData));
***************
*** 516,528 ****
  		needRating.setStaff(Byte.valueOf(staffAnswer));
  		if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) {
! 			if(ocanClientForm != null) {
! 				String clientAnswer = getClientAnswer(domainNumber+"_1",ocanClientFormData);
! 				if(clientAnswer.length()>0)
! 					needRating.setClient(Byte.valueOf(clientAnswer));
! 				else
! 					needRating.setClient((byte)-1);
  			} else {
  				needRating.setClient((byte)-1);
! 			}
  		} else {
  			needRating.setClient((byte)-1);
--- 522,541 ----
  		needRating.setStaff(Byte.valueOf(staffAnswer));
  		if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) {
! 			// merge clientform with staffform, so don't need the following code.
! 			//if(ocanClientForm != null) {
! 			//	String clientAnswer = getClientAnswer(domainNumber+"_1",ocanClientFormData);
! 			//	if(clientAnswer.length()>0)
! 			//		needRating.setClient(Byte.valueOf(clientAnswer));
! 			//	else
! 			//		needRating.setClient((byte)-1);
! 			//} else {
! 			//	needRating.setClient((byte)-1);
! 			//}
! 			String clientAnswer = getStaffAnswer("client_"+domainNumber+"_1",ocanStaffFormData);
! 			if(clientAnswer.length()>0) {
! 				needRating.setClient(Byte.valueOf(clientAnswer));
  			} else {
  				needRating.setClient((byte)-1);
! 			}			
  		} else {
  			needRating.setClient((byte)-1);
***************
*** 567,579 ****
  		domainComments.setStaff(getStaffAnswer(domainNumber+"_comments",ocanStaffFormData));
  		if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) {
! 			if(ocanClientForm != null) {
! 				String clientAnswer = getClientAnswer(domainNumber+"_comments",ocanClientFormData);
! 				if(clientAnswer.length()>0)
! 					domainComments.setClient(clientAnswer);
! 				else
! 					domainComments.setClient("");
! 			} else {
! 				domainComments.setClient("");
! 			}
  		} else {
  			domainComments.setClient("");
--- 580,593 ----
  		domainComments.setStaff(getStaffAnswer(domainNumber+"_comments",ocanStaffFormData));
  		if(getStaffAnswer("consumerSelfAxCompleted",ocanStaffFormData).equals("TRUE")) {
! 			//if(ocanClientForm != null) {
! 			//	String clientAnswer = getClientAnswer(domainNumber+"_comments",ocanClientFormData);
! 			//	if(clientAnswer.length()>0)
! 			//		domainComments.setClient(clientAnswer);
! 			//	else
! 			//		domainComments.setClient("");
! 			//} else {
! 			//	domainComments.setClient("");
! 			//}
! 			domainComments.setClient(getStaffAnswer("client_"+domainNumber+"_comments",ocanStaffFormData));
  		} else {
  			domainComments.setClient("");

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

[annie <ann...@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-serv13252/web/WEB-INF/classes/src/org/oscarehr/common/model

Modified Files:
      Tag: RELEASE_10_06
	OcanStaffForm.java OcanStaffFormData.java 
Log Message:
add missing features to ocan.

Index: OcanStaffFormData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/OcanStaffFormData.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** OcanStaffFormData.java	25 Jun 2010 15:43:49 -0000	1.3
--- OcanStaffFormData.java	13 Jan 2011 03:52:55 -0000	1.3.2.1
***************
*** 73,82 ****
  		throw (new UnsupportedOperationException("Remove is not allowed for this type of item."));
  	}
! 
  	@PreUpdate
  	protected void jpaPreventUpdate() {
  		throw (new UnsupportedOperationException("Update is not allowed for this type of item."));
  	}
! 
  	/**
  	 * @return true if the list of cdsClientFormData contains the answer specified. 
--- 73,82 ----
  		throw (new UnsupportedOperationException("Remove is not allowed for this type of item."));
  	}
! /*
  	@PreUpdate
  	protected void jpaPreventUpdate() {
  		throw (new UnsupportedOperationException("Update is not allowed for this type of item."));
  	}
! */
  	/**
  	 * @return true if the list of cdsClientFormData contains the answer specified. 

Index: OcanStaffForm.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/OcanStaffForm.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** OcanStaffForm.java	25 Jun 2010 15:43:49 -0000	1.6
--- OcanStaffForm.java	13 Jan 2011 03:52:55 -0000	1.6.2.1
***************
*** 31,34 ****
--- 31,36 ----
  
  	private String ocanFormVersion=null;
+ 	private String ocanType=null;
+ 	
  	private String providerNo = null;
  	private boolean signed=false;
***************
*** 44,57 ****
  	private String lastName;
  	private String firstName;
! 	private String addressLine1;
! 	private String addressLine2;
! 	private String city;
  	private String province;
! 	private String postalCode;
! 	private String phoneNumber;
! 	private String email;
! 	private String hcNumber;
! 	private String hcVersion;
  	private String dateOfBirth;
  	private String gender;
  	
--- 46,60 ----
  	private String lastName;
  	private String firstName;
! 	private String addressLine1="";
! 	private String addressLine2="";
! 	private String city="";
  	private String province;
! 	private String postalCode="";
! 	private String phoneNumber="";
! 	private String email="";
! 	private String hcNumber="";
! 	private String hcVersion="";
  	private String dateOfBirth;
+ 	private String clientDateOfBirth;
  	private String gender;
  	
***************
*** 59,62 ****
--- 62,69 ----
  	private Date startDate;
  	private Date completionDate;
+ 	private Date clientStartDate;
+ 	private Date clientCompletionDate;
+ 	
+ 
  	private String reasonForAssessment;
  	
***************
*** 64,68 ****
  	
  	public OcanStaffForm() {
! 		province = "ON";		
  	}
  	
--- 71,76 ----
  	
  	public OcanStaffForm() {
! 		province = "ON";
! 		setAssessmentStatus("In Progress");
  	}
  	
***************
*** 71,74 ****
--- 79,86 ----
  	}
  
+ 	public void setId(Integer id) {
+ 		this.id = id;
+ 	}
+ 	
  	public Date getCreated() {
  		return created;
***************
*** 83,86 ****
--- 95,106 ----
      }
  
+ 	public String getOcanType() {
+ 		return ocanType;
+ 	}
+ 
+ 	public void setOcanType(String ocanType) {
+ 		this.ocanType = ocanType;
+ 	}
+ 
  	public String getProviderNo() {
      	return providerNo;
***************
*** 148,152 ****
  		throw(new UnsupportedOperationException("Remove is not allowed for this type of item."));
  	}
! 
  	@PreUpdate
  	protected void jpaPreventUpdate()
--- 168,172 ----
  		throw(new UnsupportedOperationException("Remove is not allowed for this type of item."));
  	}
! /*
  	@PreUpdate
  	protected void jpaPreventUpdate()
***************
*** 154,158 ****
  		throw(new UnsupportedOperationException("Update is not allowed for this type of item."));
  	}
! 
  	public String getLastName() {
  		return lastName;
--- 174,178 ----
  		throw(new UnsupportedOperationException("Update is not allowed for this type of item."));
  	}
! */
  	public String getLastName() {
  		return lastName;
***************
*** 250,254 ****
--- 270,282 ----
  		this.dateOfBirth = dateOfBirth;
  	}
+ 	
+ 	public String getClientDateOfBirth() {
+ 		return clientDateOfBirth;
+ 	}
  
+ 	public void setClientDateOfBirth(String clientDateOfBirth) {
+ 		this.clientDateOfBirth = clientDateOfBirth;
+ 	}
+ 	
  	public void setCreated(Date created) {
  		this.created = created;
***************
*** 278,281 ****
--- 306,325 ----
  		this.completionDate = completionDate;
  	}
+ 	
+ 	public Date getClientStartDate() {
+ 		return clientStartDate;
+ 	}
+ 
+ 	public void setClientStartDate(Date clientStartDate) {
+ 		this.clientStartDate = clientStartDate;
+ 	}
+ 
+ 	public Date getClientCompletionDate() {
+ 		return clientCompletionDate;
+ 	}
+ 
+ 	public void setClientCompletionDate(Date clientCompletionDate) {
+ 		this.clientCompletionDate = clientCompletionDate;
+ 	}
  
  	public String getFormattedStartDate() {
***************
*** 292,296 ****
  		return formatter.format(d);
  	}
! 
  	public String getReasonForAssessment() {
  		return reasonForAssessment;
--- 336,353 ----
  		return formatter.format(d);
  	}
! 	public String getFormattedClientStartDate() {
! 		Date d = getClientStartDate();
! 		if(d==null) {return "";}
! 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
! 		return formatter.format(d);
! 	}
! 	
! 	public String getFormattedClientCompletionDate() {
! 		Date d = getClientCompletionDate();
! 		if(d==null) {return "";}
! 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
! 		return formatter.format(d);
! 	}
! 	
  	public String getReasonForAssessment() {
  		return reasonForAssessment;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao OcanStaffFormDataDao.java, 1.3, 1.3.4.1 OcanStaffFormDao.java, 1.3.4.4, 1.3.4.5

[annie <ann...@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-serv13252/web/WEB-INF/classes/src/org/oscarehr/common/dao

Modified Files:
      Tag: RELEASE_10_06
	OcanStaffFormDataDao.java OcanStaffFormDao.java 
Log Message:
add missing features to ocan.

Index: OcanStaffFormDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/OcanStaffFormDao.java,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -C2 -d -r1.3.4.4 -r1.3.4.5
*** OcanStaffFormDao.java	6 Oct 2010 21:05:23 -0000	1.3.4.4
--- OcanStaffFormDao.java	13 Jan 2011 03:52:56 -0000	1.3.4.5
***************
*** 35,57 ****
  		super(OcanStaffForm.class);
  	}
  
! 	public OcanStaffForm findLatestByFacilityClient(Integer facilityId, Integer clientId) {
  
! 		String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 order by created desc limit 1";
  
  		Query query = entityManager.createNativeQuery(sqlCommand, modelClass);
  		query.setParameter(1, facilityId);
  		query.setParameter(2, clientId);
  		
  		return getSingleResultOrNull(query);
  	}
  
!     public List<OcanStaffForm> findByFacilityClient(Integer facilityId, Integer clientId) {
  
! 		String sqlCommand = "select x from OcanStaffForm x where x.facilityId=?1 and x.clientId=?2 order by x.created desc";
  
  		Query query = entityManager.createQuery(sqlCommand);
  		query.setParameter(1, facilityId);
  		query.setParameter(2, clientId);
  		
  		@SuppressWarnings("unchecked")
--- 35,102 ----
  		super(OcanStaffForm.class);
  	}
+ 	
+ 	public List<OcanStaffForm> findCompletedInitialOcan(Integer facilityId, Integer clientId) {
  
! 		String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1";
  
! 		Query query = entityManager.createNativeQuery(sqlCommand, modelClass);
! 		query.setParameter(1, facilityId);
! 		query.setParameter(2, clientId);
! 		query.setParameter(3, "Completed");
! 		query.setParameter(4, "IA");
! 				
! 		@SuppressWarnings("unchecked")
! 		List<OcanStaffForm> results=query.getResultList();
! 		
! 		return (results);
! 	}
! 
! 	public OcanStaffForm findLatestCompletedReassessment(Integer facilityId, Integer clientId) {
! 
! 		String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1";
! 
! 		Query query = entityManager.createNativeQuery(sqlCommand, modelClass);
! 		query.setParameter(1, facilityId);
! 		query.setParameter(2, clientId);
! 		query.setParameter(3, "Completed");
! 		query.setParameter(4, "RA");
! 				
! 		return getSingleResultOrNull(query);
! 	}
! 	
! 	public OcanStaffForm findLatestCompletedDischargedAssessment(Integer facilityId, Integer clientId) {
! 
! 		String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and reasonForAssessment=?4 order by startDate desc limit 1";
! 
! 		Query query = entityManager.createNativeQuery(sqlCommand, modelClass);
! 		query.setParameter(1, facilityId);
! 		query.setParameter(2, clientId);
! 		query.setParameter(3, "Completed");
! 		query.setParameter(4, "DIS");
! 				
! 		return getSingleResultOrNull(query);
! 	}
! 	
! 	public OcanStaffForm findLatestByFacilityClient(Integer facilityId, Integer clientId, String ocanType) {
! 
! 		String sqlCommand = "select * from OcanStaffForm where facilityId=?1 and clientId=?2 and assessmentStatus=?3 and ocanType=?4 order by created desc limit 1";
  
  		Query query = entityManager.createNativeQuery(sqlCommand, modelClass);
  		query.setParameter(1, facilityId);
  		query.setParameter(2, clientId);
+ 		query.setParameter(3, "In Progress");
+ 		query.setParameter(4, ocanType);
  		
  		return getSingleResultOrNull(query);
  	}
  
!     public List<OcanStaffForm> findByFacilityClient(Integer facilityId, Integer clientId, String ocanType) {
  
! 		String sqlCommand = "select x from OcanStaffForm x where x.facilityId=?1 and x.clientId=?2 and x.ocanType=?3 order by x.created desc";
  
  		Query query = entityManager.createQuery(sqlCommand);
  		query.setParameter(1, facilityId);
  		query.setParameter(2, clientId);
+ 		query.setParameter(3, ocanType);
  		
  		@SuppressWarnings("unchecked")
***************
*** 70,83 ****
      }
      
!     public List<OcanStaffForm> findLatestSignedOcanForms(Integer facilityId, String formVersion, Date startDate, Date endDate) {
  		
! 		String sqlCommand="select x from OcanStaffForm x where x.facilityId=?1 and x.assessmentStatus=?2 and x.ocanFormVersion=?3 and x.completionDate>=?4 and x.completionDate<?5 order by x.clientId ASC, x.created DESC";
  
  		Query query = entityManager.createQuery(sqlCommand);
  		query.setParameter(1, facilityId);
! 		query.setParameter(2, "Complete");
  		query.setParameter(3, formVersion);
  		query.setParameter(4, startDate);
  		query.setParameter(5, endDate);
  		
  		@SuppressWarnings("unchecked")
--- 115,129 ----
      }
      
!     public List<OcanStaffForm> findLatestSignedOcanForms(Integer facilityId, String formVersion, Date startDate, Date endDate,String ocanType) {
  		
! 		String sqlCommand="select x from OcanStaffForm x where x.facilityId=?1 and x.assessmentStatus=?2 and x.ocanFormVersion=?3 and x.completionDate>=?4 and x.completionDate<?5 and x.ocanType=?6 order by x.clientId ASC, x.created DESC";
  
  		Query query = entityManager.createQuery(sqlCommand);
  		query.setParameter(1, facilityId);
! 		query.setParameter(2, "Completed");
  		query.setParameter(3, formVersion);
  		query.setParameter(4, startDate);
  		query.setParameter(5, endDate);
+ 		query.setParameter(6, ocanType);
  		
  		@SuppressWarnings("unchecked")

Index: OcanStaffFormDataDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/OcanStaffFormDataDao.java,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** OcanStaffFormDataDao.java	23 Feb 2010 16:32:47 -0000	1.3
--- OcanStaffFormDataDao.java	13 Jan 2011 03:52:56 -0000	1.3.4.1
***************
*** 29,32 ****
--- 29,52 ----
  	}
  	
+ 	public OcanStaffFormData findLatestByQuestion(Integer ocanStaffFormId, String question) {
+ 
+ 		String sqlCommand = "select x from OcanStaffFormData x where x.ocanStaffFormId=?1 and x.question=?2 order by ocanStaffFormId Desc";
+ 
+ 		Query query = entityManager.createQuery(sqlCommand);
+ 		query.setParameter(1, ocanStaffFormId);
+ 		query.setParameter(2, question);
+ 
+ 		@SuppressWarnings("unchecked")
+ 		List<OcanStaffFormData> results=query.getResultList();
+ 		
+ 		if(results.isEmpty()) {
+ 			return null;
+ 		} else {
+ 			return results.get(0);
+ 		}
+ 			
+ 		
+ 	}
+ 	
  	public List<OcanStaffFormData> findByForm(Integer ocanStaffFormId) {
  
***************
*** 59,62 ****
  	}
  
! 	
  }
--- 79,82 ----
  	}
  
!     
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/ClientManager ocan_check_assessment_type.jsp, NONE, 1.1.2.1 summary.jsp, 1.98.4.2, 1.98.4.3 ocan_client_form.jsp, 1.9, 1.9.4.1 ocan_client_form_action.jsp, 1.3, 1.3.4.1 ocan_form_summary_of_actions.jsp, 1.3.4.1, 1.3.4.2 ocan_form_getProgramName.jsp, 1.1.2.2, 1.1.2.3 ocan_form_getProgramNumber.jsp, 1.1.2.1, 1.1.2.2 forms.jsp, 1.27.4.1, 1.27.4.2 ocan_form_action.jsp, 1.6.4.1, 1.6.4.2 ocan_form_mentalHealthCenter.jsp, 1.1.4.8, 1.1.4.9 ocan_form_referral.jsp, 1.2.4.2, 1.2.4.3 ocan_staff_form_validation.js, 1.2.4.8, 1.2.4.9 ocan_form.jsp, 1.15.4.17, 1.15.4.18 ocan_form_medication.jsp, 1.4.4.1, 1.4.4.2 ocan_form_getOrgName.jsp, 1.1.2.1, 1.1.2.2

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

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

Modified Files:
      Tag: RELEASE_10_06
	summary.jsp ocan_client_form.jsp ocan_client_form_action.jsp 
	ocan_form_summary_of_actions.jsp ocan_form_getProgramName.jsp 
	ocan_form_getProgramNumber.jsp forms.jsp ocan_form_action.jsp 
	ocan_form_mentalHealthCenter.jsp ocan_form_referral.jsp 
	ocan_staff_form_validation.js ocan_form.jsp 
	ocan_form_medication.jsp ocan_form_getOrgName.jsp 
Added Files:
      Tag: RELEASE_10_06
	ocan_check_assessment_type.jsp 
Log Message:
add missing features to ocan.

Index: ocan_form_getProgramNumber.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_getProgramNumber.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ocan_form_getProgramNumber.jsp	18 Dec 2010 02:57:11 -0000	1.1.2.1
--- ocan_form_getProgramNumber.jsp	13 Jan 2011 03:43:12 -0000	1.1.2.2
***************
*** 8,12 ****
  	int currentDemographicId=Integer.parseInt(request.getParameter("demographicId"));	
  	int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL;
! 	
  	int centerNumber = Integer.parseInt(request.getParameter("center_num"));
  	String LHIN_code = request.getParameter("LHIN_code");
--- 8,12 ----
  	int currentDemographicId=Integer.parseInt(request.getParameter("demographicId"));	
  	int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL;
! 	String ocanType = request.getParameter("ocanType");
  	int centerNumber = Integer.parseInt(request.getParameter("center_num"));
  	String LHIN_code = request.getParameter("LHIN_code");
***************
*** 14,18 ****
  	String programName = request.getParameter("programName");
  	
! 	OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel);		
  	
  %>
--- 14,18 ----
  	String programName = request.getParameter("programName");
  	
! 	OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel,ocanType);		
  	
  %>

Index: ocan_form_action.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_action.jsp,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -C2 -d -r1.6.4.1 -r1.6.4.2
*** ocan_form_action.jsp	9 Aug 2010 20:54:17 -0000	1.6.4.1
--- ocan_form_action.jsp	13 Jan 2011 03:43:12 -0000	1.6.4.2
***************
*** 10,13 ****
--- 10,14 ----
  	HashMap<String,String[]> parameters=new HashMap(request.getParameterMap());
  
+ 	
  	// for these values get them and pop them from map so subsequent iterating through map doesn't process these parameters again.
  	//Integer admissionId=Integer.valueOf(parameters.get("admissionId")[0]);	
***************
*** 25,35 ****
  	parameters.remove("signed");
  
! 	String assessmentStatus = parameters.get("assessment_status")[0];
  	String startDate = parameters.get("startDate")[0];
  	String completionDate = parameters.get("completionDate")[0];
  	String reasonForAssessment = parameters.get("reasonForAssessment")[0];
  	String gender = parameters.get("gender")[0];	
  	
- 	OcanStaffForm ocanStaffForm=OcanFormAction.createOcanStaffForm(admissionId, clientId, signed);
  	ocanStaffForm.setLastName(request.getParameter("lastName"));
  	ocanStaffForm.setFirstName(request.getParameter("firstName"));
--- 26,39 ----
  	parameters.remove("signed");
  
! 	String assessmentStatus = request.getParameter("assessment_status");
  	String startDate = parameters.get("startDate")[0];
  	String completionDate = parameters.get("completionDate")[0];
  	String reasonForAssessment = parameters.get("reasonForAssessment")[0];
  	String gender = parameters.get("gender")[0];	
+ 	String ocanStaffFormId = parameters.get("ocanStaffFormId")[0];
+ 	
+ 	OcanStaffForm ocanStaffForm=OcanFormAction.createOcanStaffForm(ocanStaffFormId, clientId, signed);
+ 	
  	
  	ocanStaffForm.setLastName(request.getParameter("lastName"));
  	ocanStaffForm.setFirstName(request.getParameter("firstName"));
***************
*** 44,50 ****
  	ocanStaffForm.setHcVersion(request.getParameter("hcVersion"));
  	ocanStaffForm.setDateOfBirth(request.getParameter("date_of_birth"));
  	ocanStaffForm.setGender(gender);
  	//ocanStaffForm.setAdmissionId(admissionId);
! 	ocanStaffForm.setAssessmentStatus(assessmentStatus);
  	ocanStaffForm.setReasonForAssessment(reasonForAssessment);
  	java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat("yyyy-MM-dd");
--- 48,61 ----
  	ocanStaffForm.setHcVersion(request.getParameter("hcVersion"));
  	ocanStaffForm.setDateOfBirth(request.getParameter("date_of_birth"));
+ 	ocanStaffForm.setClientDateOfBirth(request.getParameter("client_date_of_birth"));
  	ocanStaffForm.setGender(gender);
  	//ocanStaffForm.setAdmissionId(admissionId);
! 	ocanStaffForm.setOcanType(request.getParameter("ocanType"));
! 	
! 	//Once ocan assessment was completed, it can not be changed to other status.
! 	if(!"Completed".equals(ocanStaffForm.getAssessmentStatus())) {	
! 		ocanStaffForm.setAssessmentStatus(assessmentStatus);
! 	}
! 	
  	ocanStaffForm.setReasonForAssessment(reasonForAssessment);
  	java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat("yyyy-MM-dd");
***************
*** 52,58 ****
--- 63,71 ----
  	try {
  		ocanStaffForm.setStartDate(formatter.parse(startDate));
+ 		ocanStaffForm.setClientStartDate(formatter.parse(request.getParameter("clientStartDate")));
  	}catch(java.text.ParseException e){}
  	try {
  		ocanStaffForm.setCompletionDate(formatter.parse(completionDate));
+ 		ocanStaffForm.setClientCompletionDate(formatter.parse(request.getParameter("clientCompletionDate")));
  	}catch(java.text.ParseException e){}
  	
***************
*** 70,74 ****
  	parameters.remove("hcNumber");
  	parameters.remove("hcVersion");
! 	parameters.remove("dateOfBirth");
  	parameters.remove("startDate");
  	parameters.remove("completionDate");
--- 83,87 ----
  	parameters.remove("hcNumber");
  	parameters.remove("hcVersion");
! 	parameters.remove("date_of_birth");
  	parameters.remove("startDate");
  	parameters.remove("completionDate");
***************
*** 76,79 ****
--- 89,93 ----
  	parameters.remove("gender");
  	
+ 	
  	for (Map.Entry<String, String[]> entry : parameters.entrySet())
  	{

--- NEW FILE: ocan_check_assessment_type.jsp ---

<%@page import="org.oscarehr.common.model.OcanStaffForm"%>
<%@page import="org.oscarehr.PMmodule.web.OcanFormAction"%>
<%@page import="org.oscarehr.util.WebUtils"%>
<%@page import="java.util.Arrays"%>

<%@page import="java.util.Map"%>
<%
	
	String reasonForAssessment = request.getParameter("reasonForAssessment1");	
	Integer clientId = Integer.valueOf(request.getParameter("demographicId1"));
	
	//When can we make Initial OCAN
	if("IA".equals(reasonForAssessment)) {
		if(OcanFormAction.canCreateInitialAssessment(clientId)) { 
			out.print("true");
		} else {
			out.print("false");
		}
	}

%>
Index: ocan_staff_form_validation.js
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_staff_form_validation.js,v
retrieving revision 1.2.4.8
retrieving revision 1.2.4.9
diff -C2 -d -r1.2.4.8 -r1.2.4.9
*** ocan_staff_form_validation.js	6 Jan 2011 21:10:22 -0000	1.2.4.8
--- ocan_staff_form_validation.js	13 Jan 2011 03:43:12 -0000	1.2.4.9
***************
*** 38,41 ****
--- 38,48 ----
  	});
  	
+ 	$("#assessment_status").each(function() {
+ 		if($("#assessment_status").val() == 'Completed') {
+ 			$("#assessment_status").attr('disabled','disabled');			
+ 		}
+ 	});
+ 	
+ 			
  	$("#reasonForAssessment").change(function() {
  		if($("#reasonForAssessment").val() == 'OTHR') {
***************
*** 46,49 ****
--- 53,72 ----
  			$("#reason_for_assessment_other").val("");
  		}
+ 		
+ 		var demographicId1=$("#clientId").val();;
+ 		var reasonForAssessment1 = $("#reasonForAssessment").val();
+ 		var params={demographicId1:demographicId1,reasonForAssessment1:reasonForAssessment1};
+ 
+ 		$("#reasonForAssessmentBlock")
+ 		.load("ocan_check_assessment_type.jsp?", params, function(data){
+ 			
+ 			 $('#reasonForAssessmentBlock').hide();
+ 
+ 			if(data.match("false")){				
+ 				alert("You can not create a new initial assessment for this client for now. It already exists in the system.");
+ 				$("#reasonForAssessment").val('').attr("selected", "selected");
+ 			}
+ 		});
+ 
  	});
  	
***************
*** 55,58 ****
--- 78,82 ----
  			$("#reason_for_assessment_other").val("");
  		}
+ 		
  	});
  	
***************
*** 503,507 ****
  function submitOcanForm() {
  	var status = document.getElementById('assessment_status').value;
! 	if(status == 'Active') {
  		$('#ocan_staff_form').unbind('submit').submit();		
  		return true;
--- 527,531 ----
  function submitOcanForm() {
  	var status = document.getElementById('assessment_status').value;
! 	if(status != 'Completed') {
  		$('#ocan_staff_form').unbind('submit').submit();		
  		return true;
***************
*** 511,515 ****
  		return false;
  	}
! 
  	if(!validateStartAndCompletionDates()) {
  		return false;
--- 535,539 ----
  		return false;
  	}
! 	
  	if(!validateStartAndCompletionDates()) {
  		return false;
***************
*** 538,548 ****
  		}		
  	}
! 	/*
! 	if($("#clientDOBType").val().length == 0) {	
! 		alert('Date of Birth - Please choose the type of date of birth');
! 		$("#clientDOBType").focus();
! 		return false;				
! 	}
! 	*/
  	
  	var newCount = $("#center_count").val(); 
--- 562,566 ----
  		}		
  	}
! 	
  	
  	var newCount = $("#center_count").val(); 
***************
*** 607,612 ****
  				return false;
  			}
- 		
  	}	
  	
  	
--- 625,630 ----
  				return false;
  			}
  	}	
+ 		
  	
  	
***************
*** 730,734 ****
  	
  	
! 	//alert('submitting');
  	return true;
  }
--- 748,761 ----
  	
  	
! 	if($("#assessment_status").val() == 'Completed') {
! 		var r = comfirm("Are you sure you have completed this assessment?");
! 		if(r == true) {
! 			return true;
! 		}
! 		else {
! 			return false;
! 		}
! 	}
! 		
  	return true;
  }

Index: ocan_form.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v
retrieving revision 1.15.4.17
retrieving revision 1.15.4.18
diff -C2 -d -r1.15.4.17 -r1.15.4.18
*** ocan_form.jsp	6 Jan 2011 21:10:22 -0000	1.15.4.17
--- ocan_form.jsp	13 Jan 2011 03:43:12 -0000	1.15.4.18
***************
*** 9,13 ****
  
  <%
! 	int currentDemographicId=Integer.parseInt(request.getParameter("demographicId"));	
  	int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL;
  	
--- 9,14 ----
  
  <%
! 	int currentDemographicId=Integer.parseInt(request.getParameter("demographicId"));
! 	String ocanType = request.getParameter("ocanType");
  	int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL;
  	
***************
*** 16,22 ****
  		ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId")));
  	}else {
! 		ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel);		
  	}
  	
  	boolean printOnly=request.getParameter("print")!=null;
  	if (printOnly) request.setAttribute("noMenus", true);
--- 17,24 ----
  		ocanStaffForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId")));
  	}else {
! 		ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType);		
  	}
  	
+ 
  	boolean printOnly=request.getParameter("print")!=null;
  	if (printOnly) request.setAttribute("noMenus", true);
***************
*** 212,216 ****
  		var demographicId='<%=currentDemographicId%>';
  		$.get('ocan_form_summary_of_actions.jsp?demographicId='+demographicId+'&size='+count+'&domains='+domains, function(data) {
! 			  $("#summary_of_actions_block").innerHTML=data;					 
  			});		
  	});
--- 214,218 ----
  		var demographicId='<%=currentDemographicId%>';
  		$.get('ocan_form_summary_of_actions.jsp?demographicId='+demographicId+'&size='+count+'&domains='+domains, function(data) {
! 			  $("#summary_of_actions_block").append(data);					 
  			});		
  	});
***************
*** 277,282 ****
  
  
- 
- 
  </script>
  
--- 279,282 ----
***************
*** 364,373 ****
  
  <form id="ocan_staff_form" name="ocan_staff_form" action="ocan_form_action.jsp" method="post" onsubmit="return submitOcanForm()">
! 	<input type="hidden" id="assessment_status" name="assessment_status" value=""/>
! 	<h3>OCAN Staff Assessment (v2.0)</h3>
! 
  	<br />
! 	
  	<table style="margin-left:auto;margin-right:auto;background-color:#f0f0f0;border-collapse:collapse">
  		<tr>
  			<td class="genericTableHeader">Start Date</td>
--- 364,384 ----
  
  <form id="ocan_staff_form" name="ocan_staff_form" action="ocan_form_action.jsp" method="post" onsubmit="return submitOcanForm()">
! 	<h3>FULL OCAN 2.0 Staff Assessment</h3>	
  	<br />
! 	<input type="hidden" name="client_date_of_birth" id="client_date_of_birth" value="<%=ocanStaffForm.getClientDateOfBirth()%>" class="{validate: {required:true}}"/>
! 	<input type="hidden" id="clientStartDate" name="clientStartDate" value="<%=ocanStaffForm.getFormattedClientStartDate()%>"/>
! 	<input type="hidden" id="clientCompletionDate" name="clientCompletionDate" value="<%=ocanStaffForm.getFormattedClientCompletionDate()%>"/>
! 	<input type="hidden" name="ocanStaffFormId" id="ocanStaffFormId" value="<%=ocanStaffForm.getId()%>" class="{validate: {required:true}}"/>
! 		
  	<table style="margin-left:auto;margin-right:auto;background-color:#f0f0f0;border-collapse:collapse">
+ 		
+ 		<tr>
+ 			<td class="genericTableHeader">OCAN Assessment Status</td>
+ 			<td class="genericTableData">
+ 				<select name="assessment_status" id="assessment_status">
+ 					<%=OcanForm.renderAsAssessmentStatusSelectOptions(ocanStaffForm)%>
+ 				</select>							
+ 			</td>			
+ 		</tr>
  		<tr>
  			<td class="genericTableHeader">Start Date</td>
***************
*** 383,386 ****
--- 394,403 ----
  			</td>
  		</tr>
+ 		
+ 		
+ 		<tr><td colspan="2">
+ 		<h3>Consumer Information Summary</h3>
+ 		</td></tr>
+ 		
  		<tr>
  			<td colspan="2">OCAN Lead Assessment</td>
***************
*** 399,402 ****
--- 416,429 ----
  		</tr>
  		<tr>
+ 			<td colspan="2">			
+ 				<div id="reasonForAssessmentBlock">
+ 							
+ 							
+ 				
+ 				</div>
+ 			</td>
+ 		</tr>
+ 		
+ 		<tr>
  			<td class="genericTableHeader">Reason for OCAN</td>
  			<td class="genericTableData">
***************
*** 538,542 ****
  				<input type="text" name="email" id="email" value="<%=ocanStaffForm.getEmail()%>" size="64" maxlength="64"/>
  			</td>
! 		</tr>	
  		<tr>
  			<td class="genericTableHeader">Date of Birth (YYYY-MM-DD)</td>
--- 565,570 ----
  				<input type="text" name="email" id="email" value="<%=ocanStaffForm.getEmail()%>" size="64" maxlength="64"/>
  			</td>
! 		</tr>
! 		
  		<tr>
  			<td class="genericTableHeader">Date of Birth (YYYY-MM-DD)</td>
***************
*** 1615,1619 ****
  						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"commments",5,50,prepopulationLevel)%>
  			</td>
! 		</tr>						
  	 	
  		<tr>
--- 1643,1651 ----
  						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"commments",5,50,prepopulationLevel)%>
  			</td>
! 		</tr>
! 		
! 		<tr><td colspan="2">	
! 		<h3>Staff Assessment</h3>
! 		</td></tr>					
  	 	
  		<tr>
***************
*** 3707,3711 ****
  		</tr>	
  		<tr>
! 			<td colspan="2"><input type="button" value="Generate Summary" name="generate_summary_of_actions" id="generate_summary_of_actions"/></td>
  			<%=OcanForm.renderAsHiddenField(ocanStaffForm.getId(), "summary_of_actions_count",prepopulationLevel)%>
  			<%=OcanForm.renderAsHiddenField(ocanStaffForm.getId(), "summary_of_actions_domains",prepopulationLevel)%>		
--- 3739,3743 ----
  		</tr>	
  		<tr>
! 			<td colspan="2"><input type="button" value="Generate Summary" name="generate_summary_of_actions" id="generate_summary_of_actions" /></td>
  			<%=OcanForm.renderAsHiddenField(ocanStaffForm.getId(), "summary_of_actions_count",prepopulationLevel)%>
  			<%=OcanForm.renderAsHiddenField(ocanStaffForm.getId(), "summary_of_actions_domains",prepopulationLevel)%>		
***************
*** 3745,3749 ****
  			<td colspan="2">
  				<br />
! 				<input type="hidden" name="clientId" value="<%=currentDemographicId%>" />
  				Sign <input type="checkbox" name="signed" />
  				&nbsp;&nbsp;&nbsp;&nbsp;
--- 3777,3782 ----
  			<td colspan="2">
  				<br />
! 				<input type="hidden" name="clientId" id="clientId" value="<%=currentDemographicId%>" />
! 				<input type="hidden" name="ocanType" id="ocanType" value="<%=ocanType%>" />
  				Sign <input type="checkbox" name="signed" />
  				&nbsp;&nbsp;&nbsp;&nbsp;
***************
*** 3752,3759 ****
  					{
  						%>
! 				<input type="submit" name="submit" value="Submit"  onclick="document.getElementById('assessment_status').value='Complete';"/>
! 				&nbsp;&nbsp;&nbsp;&nbsp;
! 				<input type="submit" name="submit" value="Save Draft"  onclick="document.getElementById('assessment_status').value='Active'; document.getElementById('completionDate').value=''"/>
  				&nbsp;&nbsp;&nbsp;&nbsp;
  				<%
  					}
--- 3785,3791 ----
  					{
  						%>
! 				<input type="submit" name="submit" value="Save"/>
  				&nbsp;&nbsp;&nbsp;&nbsp;
+ 				
  				<%
  					}

Index: forms.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/forms.jsp,v
retrieving revision 1.27.4.1
retrieving revision 1.27.4.2
diff -C2 -d -r1.27.4.1 -r1.27.4.2
*** forms.jsp	1 Sep 2010 00:43:08 -0000	1.27.4.1
--- forms.jsp	13 Jan 2011 03:43:12 -0000	1.27.4.2
***************
*** 360,364 ****
  <table cellpadding="3" cellspacing="0" border="0">
  	<tr>
! 		<th title="Programs">Ocan Staff Assessment Form History</th>
  	</tr>
  </table>
--- 360,364 ----
  <table cellpadding="3" cellspacing="0" border="0">
  	<tr>
! 		<th title="Programs">FULL Ocan Staff Assessment Form History</th>
  	</tr>
  </table>
***************
*** 385,394 ****
  			<%
  				OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form");
! 				String ocanStaffFormUrl="ClientManager/ocan_form.jsp?demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId();
  			%>
  			<!--  
  			<td><input type="button" value="Print Preview" onclick="printOcanStaffForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td>	
  		-->
! 			<td><input type="button" value="Print Preview" onclick="document.location='<%=ocanStaffFormUrl+"&print=true"%>'" /></td>
  		</tr>
  	</c:forEach>
--- 385,395 ----
  			<%
  				OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form");
! 				String fullOcanStaffFormUrl="ClientManager/ocan_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId();
! 				
  			%>
  			<!--  
  			<td><input type="button" value="Print Preview" onclick="printOcanStaffForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td>	
  		-->
! 			<td><a href="<%=fullOcanStaffFormUrl%>">Update FULL OCAN Data</a><input type="button" value="Print Preview" onclick="document.location='<%=fullOcanStaffFormUrl+"&print=true"%>'" /></td>
  		</tr>
  	</c:forEach>
***************
*** 401,405 ****
  <table cellpadding="3" cellspacing="0" border="0">
  	<tr>
! 		<th title="Programs">Ocan Consumer Self-Assessment Form History</th>
  	</tr>
  </table>
--- 402,406 ----
  <table cellpadding="3" cellspacing="0" border="0">
  	<tr>
! 		<th title="Programs">FULL Ocan Consumer Self-Assessment Form History</th>
  	</tr>
  </table>
***************
*** 411,427 ****
  			<th>Start Date</th>
  			<th>Completion Date</th>
! 			<th>Staff</th>
! 			<th>Status</th>
  			<th>Actions</th>
  		</tr>
  	</thead>
! 	<c:forEach var="form" items="${ocanClientForms}">
  		<tr>		
  			<td width="20%"><c:out value="${form.created}" /></td>
! 			<td width="10%"><c:out value="${form.formattedStartDate}" /></td>
! 			<td width="10%"><c:out value="${form.formattedCompletionDate}" /></td>			
  			<td><c:out value="${form.providerName}" /></td>
! 			<td><c:out value="${form.assessmentStatus}" /></td>
! 			<td><input type="button" value="Print Preview" onclick="printOcanClientForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td>	
  		</tr>
  	</c:forEach>
--- 412,431 ----
  			<th>Start Date</th>
  			<th>Completion Date</th>
! 			<th>Staff</th>			
  			<th>Actions</th>
  		</tr>
  	</thead>
! 	<c:forEach var="form" items="${ocanStaffForms}">
  		<tr>		
  			<td width="20%"><c:out value="${form.created}" /></td>
! 			<td width="10%"><c:out value="${form.formattedClientStartDate}" /></td>
! 			<td width="10%"><c:out value="${form.formattedClientCompletionDate}" /></td>			
  			<td><c:out value="${form.providerName}" /></td>
! 			<c:set var="form" value="${form}" scope="request" />
! 			<%
! 				OcanStaffForm ocanStaffForm=(OcanStaffForm)request.getAttribute("form");
! 				String fullOcanClientFormUrl="ClientManager/ocan_client_form.jsp?ocanType=FULL&demographicId="+currentDemographic.getDemographicNo()+ "&ocanStaffFormId="+ocanStaffForm.getId();			
! 			%>
! 			<td><a href="<%=fullOcanClientFormUrl%>">Update FULL OCAN Data</a><input type="button" value="Print Preview" onclick="printOcanClientForm('<c:out value="${client.demographicNo}" />','<c:out value="${form.id}" />')" /></td>	
  		</tr>
  	</c:forEach>

Index: ocan_client_form_action.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_client_form_action.jsp,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** ocan_client_form_action.jsp	23 Mar 2010 17:32:45 -0000	1.3
--- ocan_client_form_action.jsp	13 Jan 2011 03:43:12 -0000	1.3.4.1
***************
*** 1,4 ****
  
! <%@page import="org.oscarehr.common.model.OcanClientForm"%>
  <%@page import="org.oscarehr.PMmodule.web.OcanFormAction"%>
  <%@page import="org.oscarehr.util.WebUtils"%>
--- 1,4 ----
  
! <%@page import="org.oscarehr.common.model.OcanStaffForm"%>
  <%@page import="org.oscarehr.PMmodule.web.OcanFormAction"%>
  <%@page import="org.oscarehr.util.WebUtils"%>
***************
*** 13,45 ****
  	parameters.remove("clientId");
  	
! 	String startDate = parameters.get("startDate")[0];
! 	String completionDate = parameters.get("completionDate")[0];
  	
! 	String assessmentStatus = parameters.get("assessment_status")[0];
  	
  
! 	OcanClientForm ocanClientForm=OcanFormAction.createOcanClientForm(clientId);
  	ocanClientForm.setLastName(request.getParameter("lastName"));
  	ocanClientForm.setFirstName(request.getParameter("firstName"));	
! 	ocanClientForm.setDateOfBirth(request.getParameter("dateOfBirth"));	
! 	ocanClientForm.setAssessmentStatus(assessmentStatus);
  
  	java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat("yyyy-MM-dd");
  	
  	try {
! 		ocanClientForm.setStartDate(formatter.parse(startDate));
  	}catch(java.text.ParseException e){}
  	try {
! 		ocanClientForm.setCompletionDate(formatter.parse(completionDate));
  	}catch(java.text.ParseException e){}
  	
  	
! 	OcanFormAction.saveOcanClientForm(ocanClientForm);
  	
  	parameters.remove("lastName");
  	parameters.remove("firstName");	
! 	parameters.remove("dateOfBirth");
! 	parameters.remove("startDate");
! 	parameters.remove("completionDate");
  	
  	
--- 13,51 ----
  	parameters.remove("clientId");
  	
! 	boolean signed=WebUtils.isChecked(request, "signed");	
! 	parameters.remove("signed");
  	
! 	String startDate = parameters.get("clientStartDate")[0];
! 	String completionDate = parameters.get("clientCompletionDate")[0];
  	
+ 	//String assessmentStatus = parameters.get("assessment_status")[0];
+ 	String ocanStaffFormId = parameters.get("ocanStaffFormId")[0];
  
! 	OcanStaffForm ocanClientForm=OcanFormAction.createOcanStaffForm(ocanStaffFormId,clientId,signed);
  	ocanClientForm.setLastName(request.getParameter("lastName"));
  	ocanClientForm.setFirstName(request.getParameter("firstName"));	
! 	//ocanClientForm.setDateOfBirth(request.getParameter("dateOfBirth"));
! 	ocanClientForm.setClientDateOfBirth(request.getParameter("client_date_of_birth"));
! 	ocanClientForm.setOcanType(request.getParameter("ocanType"));
  
  	java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat("yyyy-MM-dd");
  	
  	try {
! 		ocanClientForm.setClientStartDate(formatter.parse(startDate));
! 		ocanClientForm.setStartDate(formatter.parse(request.getParameter("startDate")));
  	}catch(java.text.ParseException e){}
  	try {
! 		ocanClientForm.setClientCompletionDate(formatter.parse(completionDate));
! 		ocanClientForm.setCompletionDate(formatter.parse(request.getParameter("completionDate")));
  	}catch(java.text.ParseException e){}
  	
  	
! 	OcanFormAction.saveOcanStaffForm(ocanClientForm);
  	
  	parameters.remove("lastName");
  	parameters.remove("firstName");	
! 	parameters.remove("client_date_of_birth");
! 	parameters.remove("clientStartDate");
! 	parameters.remove("clientCompletionDate");
  	
  	
***************
*** 50,54 ****
  			for (String value : entry.getValue())
  			{
! 				OcanFormAction.addOcanClientFormData(ocanClientForm.getId(), entry.getKey(), value);				
  			}
  		}
--- 56,60 ----
  			for (String value : entry.getValue())
  			{
! 				OcanFormAction.addOcanStaffFormData(ocanClientForm.getId(), entry.getKey(), value);				
  			}
  		}

Index: ocan_form_mentalHealthCenter.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_mentalHealthCenter.jsp,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.9
diff -C2 -d -r1.1.4.8 -r1.1.4.9
*** ocan_form_mentalHealthCenter.jsp	6 Jan 2011 21:10:22 -0000	1.1.4.8
--- ocan_form_mentalHealthCenter.jsp	13 Jan 2011 03:43:12 -0000	1.1.4.9
***************
*** 9,14 ****
  	int currentDemographicId=Integer.parseInt(request.getParameter("demographicId"));	
  	int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL;
! 	
! 	OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel);		
  
  	int centerNumber = Integer.parseInt(request.getParameter("center_num"));
--- 9,14 ----
  	int currentDemographicId=Integer.parseInt(request.getParameter("demographicId"));	
  	int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL;
! 	String ocanType = request.getParameter("ocanType");
! 	OcanStaffForm ocanStaffForm=OcanForm.getOcanStaffForm(currentDemographicId, prepopulationLevel, ocanType);		
  
  	int centerNumber = Integer.parseInt(request.getParameter("center_num"));

Index: ocan_client_form.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_client_form.jsp,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -d -r1.9 -r1.9.4.1
*** ocan_client_form.jsp	2 Jun 2010 01:06:34 -0000	1.9
--- ocan_client_form.jsp	13 Jan 2011 03:43:12 -0000	1.9.4.1
***************
*** 1,7 ****
! <%@page import="org.oscarehr.common.model.OcanClientForm"%>
  <%@page import="org.oscarehr.common.model.Demographic"%>
  <%@page import="org.oscarehr.PMmodule.web.OcanForm"%>
  <%@page import="org.oscarehr.util.LoggedInInfo"%>
- 
  <%@include file="/layouts/caisi_html_top-jquery.jspf"%>
  
--- 1,8 ----
! 
! <%@page import="org.oscarehr.common.model.OcanStaffForm"%>
! <%@page import="org.oscarehr.PMmodule.model.Admission"%>
  <%@page import="org.oscarehr.common.model.Demographic"%>
  <%@page import="org.oscarehr.PMmodule.web.OcanForm"%>
  <%@page import="org.oscarehr.util.LoggedInInfo"%>
  <%@include file="/layouts/caisi_html_top-jquery.jspf"%>
  
***************
*** 9,15 ****
  <%
  	int currentDemographicId=Integer.parseInt(request.getParameter("demographicId"));	
  	int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL;
  	
! 	OcanClientForm ocanClientForm=OcanForm.getOcanClientForm(currentDemographicId,prepopulationLevel);		
  	boolean printOnly=request.getParameter("print")!=null;
  	if (printOnly) request.setAttribute("noMenus", true);
--- 10,23 ----
  <%
  	int currentDemographicId=Integer.parseInt(request.getParameter("demographicId"));	
+ 	String ocanType = request.getParameter("ocanType");
  	int prepopulationLevel = OcanForm.PRE_POPULATION_LEVEL_ALL;
  	
! 	//OcanClientForm ocanClientForm=OcanForm.getOcanClientForm(currentDemographicId,prepopulationLevel);		
! 	OcanStaffForm ocanClientForm = null;
! 	if(request.getParameter("ocanStaffFormId")!=null && request.getParameter("ocanStaffFormId")!="") {
! 		ocanClientForm=OcanForm.getOcanStaffForm(Integer.valueOf(request.getParameter("ocanStaffFormId")));
! 	}else {
! 		ocanClientForm=OcanForm.getOcanStaffForm(currentDemographicId,prepopulationLevel,ocanType);		
! 	}
  	boolean printOnly=request.getParameter("print")!=null;
  	if (printOnly) request.setAttribute("noMenus", true);
***************
*** 47,53 ****
  </style>
  
  
- <form id="ocan_client_form" name="ocan_client_form" action="ocan_client_form_action.jsp" onsubmit="return submitOcanClientForm()">
  	<input type="hidden" id="assessment_status" name="assessment_status" value=""/>
  	
  	<h3>OCAN Consumer Self-Assessment (v2.0)</h3>
--- 55,64 ----
  </style>
  
+ <form id="ocan_client_form" name="ocan_client_form" action="ocan_client_form_action.jsp" method="post" onsubmit="return submitOcanClientForm()">
  
  	<input type="hidden" id="assessment_status" name="assessment_status" value=""/>
+ 	<input type="hidden" id="startDate" name="startDate" value="<%=ocanClientForm.getFormattedStartDate()%>"/>
+ 	<input type="hidden" id="completionDate" name="completionDate" value="<%=ocanClientForm.getFormattedCompletionDate()%>"/>
+ 	<input type="hidden" name="ocanStaffFormId" id="ocanStaffFormId" value="<%=ocanClientForm.getId()%>" class="{validate: {required:true}}"/>
  	
  	<h3>OCAN Consumer Self-Assessment (v2.0)</h3>
***************
*** 60,64 ****
  			<td class="genericTableHeader">Start Date</td>
  			<td class="genericTableData">
! 				<input id="startDate" name="startDate" onfocus="this.blur()" readonly="readonly" class="{validate: {required:true}}" type="text" value="<%=ocanClientForm.getFormattedStartDate()%>"> <img title="Calendar" id="cal_startDate" src="../../images/cal.gif" alt="Calendar" border="0"><script type="text/javascript">Calendar.setup({inputField:'startDate',ifFormat :'%Y-%m-%d',button :'cal_startDate',align :'cr',singleClick :true,firstDay :1});</script>		
  			</td>
  		</tr>
--- 71,75 ----
  			<td class="genericTableHeader">Start Date</td>
  			<td class="genericTableData">
! 				<input id="clientStartDate" name="clientStartDate" onfocus="this.blur()" readonly="readonly" class="{validate: {required:true}}" type="text" value="<%=ocanClientForm.getFormattedClientStartDate()%>"> <img title="Calendar" id="cal_startDate" src="../../images/cal.gif" alt="Calendar" border="0"><script type="text/javascript">Calendar.setup({inputField:'clientStartDate',ifFormat :'%Y-%m-%d',button :'cal_startDate',align :'cr',singleClick :true,firstDay :1});</script>		
  			</td>
  		</tr>
***************
*** 79,83 ****
  			<td class="genericTableHeader">Date of Birth</td>
  			<td class="genericTableData" class="{validate: {required:true}}">
! 				<%=OcanForm.renderAsDate(ocanClientForm.getId(), "date_of_birth",true,ocanClientForm.getDateOfBirth(),prepopulationLevel)%>										
  			</td>
  		</tr>
--- 90,94 ----
  			<td class="genericTableHeader">Date of Birth</td>
  			<td class="genericTableData" class="{validate: {required:true}}">
! 				<input type="text" name="client_date_of_birth" id="client_date_of_birth" value="<%=ocanClientForm.getClientDateOfBirth()%>" class="{validate: {required:true}}"/>
  			</td>
  		</tr>
***************
*** 90,95 ****
  			<td class="genericTableHeader">1. Does the person lack a current place to stay?</td>
  			<td class="genericTableData">
! 				<select name="1_1" id="1_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "1_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 101,106 ----
  			<td class="genericTableHeader">1. Does the person lack a current place to stay?</td>
  			<td class="genericTableData">
! 				<select name="client_1_1" id="client_1_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_1_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 99,103 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"1_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 110,114 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_1_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 111,116 ****
  			<td class="genericTableHeader">1. Does the person have difficulty in getting enough to eat?</td>
  			<td class="genericTableData">
! 				<select name="2_1" id="2_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "2_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 122,127 ----
  			<td class="genericTableHeader">1. Does the person have difficulty in getting enough to eat?</td>
  			<td class="genericTableData">
! 				<select name="client_2_1" id="client_2_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_2_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 120,124 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"2_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 131,135 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_2_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 132,137 ****
  			<td class="genericTableHeader">1. Does the person have difficulty looking after the home?</td>
  			<td class="genericTableData">
! 				<select name="3_1" id="3_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "3_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 143,148 ----
  			<td class="genericTableHeader">1. Does the person have difficulty looking after the home?</td>
  			<td class="genericTableData">
! 				<select name="client_3_1" id="client_3_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_3_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 142,146 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"3_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 153,157 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_3_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 154,159 ****
  			<td class="genericTableHeader">1. Does the person have difficulty with self-care?</td>
  			<td class="genericTableData">
! 				<select name="4_1" id="4_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "4_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 165,170 ----
  			<td class="genericTableHeader">1. Does the person have difficulty with self-care?</td>
  			<td class="genericTableData">
! 				<select name="client_4_1" id="client_4_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_4_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 164,168 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"4_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 175,179 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_4_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 176,181 ****
  			<td class="genericTableHeader">1. Does the person have difficulty with regular, appropriate daytime activities?</td>
  			<td class="genericTableData">
! 				<select name="5_1" id="5_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "5_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 187,192 ----
  			<td class="genericTableHeader">1. Does the person have difficulty with regular, appropriate daytime activities?</td>
  			<td class="genericTableData">
! 				<select name="client_5_1" id="client_5_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_5_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 185,189 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"5_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 196,200 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_5_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 198,203 ****
  			<td class="genericTableHeader">1. Does the person have any physical disability or any physical illness?</td>
  			<td class="genericTableData">
! 				<select name="6_1" id="6_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "6_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 209,214 ----
  			<td class="genericTableHeader">1. Does the person have any physical disability or any physical illness?</td>
  			<td class="genericTableData">
! 				<select name="client_6_1" id="client_6_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_6_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 207,211 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"6_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 218,222 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_6_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 218,223 ****
  			<td class="genericTableHeader">1. Does the person have any psychotic symptoms?</td>
  			<td class="genericTableData">
! 				<select name="7_1"  id="7_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "7_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 229,234 ----
  			<td class="genericTableHeader">1. Does the person have any psychotic symptoms?</td>
  			<td class="genericTableData">
! 				<select name="client_7_1"  id="client_7_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_7_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 228,232 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"7_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 239,243 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_7_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 241,246 ****
  			<td class="genericTableHeader">1. Has the person had clear verbal or written information about condition and treatment?</td>
  			<td class="genericTableData">
! 				<select name="8_1" id="8_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "8_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 252,257 ----
  			<td class="genericTableHeader">1. Has the person had clear verbal or written information about condition and treatment?</td>
  			<td class="genericTableData">
! 				<select name="client_8_1" id="client_8_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_8_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 251,255 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"8_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 262,266 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_8_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 262,267 ****
  			<td class="genericTableHeader">1. Does the person suffer from current psychological distress?</td>
  			<td class="genericTableData">
! 				<select name="9_1"  id="9_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "9_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 273,278 ----
  			<td class="genericTableHeader">1. Does the person suffer from current psychological distress?</td>
  			<td class="genericTableData">
! 				<select name="client_9_1"  id="client_9_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_9_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 271,275 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"9_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 282,286 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_9_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 282,287 ****
  			<td class="genericTableHeader">1. Is the person a danger to him- or herself?</td>
  			<td class="genericTableData">
! 				<select name="10_1" id="10_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "10_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 293,298 ----
  			<td class="genericTableHeader">1. Is the person a danger to him- or herself?</td>
  			<td class="genericTableData">
! 				<select name="client_10_1" id="client_10_1">
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_10_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 291,295 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"10_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 302,306 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_10_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 303,308 ****
  			<td class="genericTableHeader">1. Is the person a current or potential risk to other's people safety?</td>
  			<td class="genericTableData">
! 				<select name="11_1" id="11_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "11_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 314,319 ----
  			<td class="genericTableHeader">1. Is the person a current or potential risk to other's people safety?</td>
  			<td class="genericTableData">
! 				<select name="client_11_1" id="client_11_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_11_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 312,316 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"11_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 323,327 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_11_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 324,329 ****
  			<td class="genericTableHeader">1.  Does the person drink excessively, or have a problem controlling his or her drinking?</td>
  			<td class="genericTableData">
! 				<select name="12_1" id="12_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "12_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 335,340 ----
  			<td class="genericTableHeader">1.  Does the person drink excessively, or have a problem controlling his or her drinking?</td>
  			<td class="genericTableData">
! 				<select name="client_12_1" id="client_12_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_12_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 333,337 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"12_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 344,348 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_12_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 344,349 ****
  			<td class="genericTableHeader">1. Does the person have problems with drug misuse?</td>
  			<td class="genericTableData">
! 				<select name="13_1" id="13_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "13_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 355,360 ----
  			<td class="genericTableHeader">1. Does the person have problems with drug misuse?</td>
  			<td class="genericTableData">
! 				<select name="client_13_1" id="client_13_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_13_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 353,357 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"13_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 364,368 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_13_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 364,369 ****
  			<td class="genericTableHeader">1. Does the person have problems with addictions?</td>
  			<td class="genericTableData">
! 				<select name="14_1" id="14_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "14_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 375,380 ----
  			<td class="genericTableHeader">1. Does the person have problems with addictions?</td>
  			<td class="genericTableData">
! 				<select name="client_14_1" id="client_14_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_14_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 373,377 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"14_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 384,388 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_14_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 385,390 ****
  			<td class="genericTableHeader">1.  Does the person need help with social contact?</td>
  			<td class="genericTableData">
! 				<select name="15_1" id="15_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "15_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 396,401 ----
  			<td class="genericTableHeader">1.  Does the person need help with social contact?</td>
  			<td class="genericTableData">
! 				<select name="client_15_1" id="client_15_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_15_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 394,398 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"15_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 405,409 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_15_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 406,411 ****
  			<td class="genericTableHeader">1.  Does the person have any difficulty in finding a partner or in maintaining a close relationship?</td>
  			<td class="genericTableData">
! 				<select name="16_1" id="16_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "16_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 417,422 ----
  			<td class="genericTableHeader">1.  Does the person have any difficulty in finding a partner or in maintaining a close relationship?</td>
  			<td class="genericTableData">
! 				<select name="client_16_1" id="client_16_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_16_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 415,419 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"16_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 426,430 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_16_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 426,431 ****
  			<td class="genericTableHeader">1. Does the person have problems with his or her sex life?</td>
  			<td class="genericTableData">
! 				<select name="17_1" id="17_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "17_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 437,442 ----
  			<td class="genericTableHeader">1. Does the person have problems with his or her sex life?</td>
  			<td class="genericTableData">
! 				<select name="client_17_1" id="client_17_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_17_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 435,439 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"17_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 446,450 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_17_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 446,451 ****
  			<td class="genericTableHeader">1. Does the person have difficulty looking after his or her children?</td>
  			<td class="genericTableData">
! 				<select name="18_1" id="18_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "18_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 457,462 ----
  			<td class="genericTableHeader">1. Does the person have difficulty looking after his or her children?</td>
  			<td class="genericTableData">
! 				<select name="client_18_1" id="client_18_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_18_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 455,459 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"18_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 466,470 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_18_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 468,473 ****
  			<td class="genericTableHeader">1. Does the person have difficulty looking after other dependents?</td>
  			<td class="genericTableData">
! 				<select name="19_1" id="19_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "19_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 479,484 ----
  			<td class="genericTableHeader">1. Does the person have difficulty looking after other dependents?</td>
  			<td class="genericTableData">
! 				<select name="client_19_1" id="client_19_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_19_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 477,481 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"19_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 488,492 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_19_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 488,493 ****
  			<td class="genericTableHeader">1. Does the person lack basic skills in numeracy and literacy?</td>
  			<td class="genericTableData">
! 				<select name="20_1" id="20_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "20_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 499,504 ----
  			<td class="genericTableHeader">1. Does the person lack basic skills in numeracy and literacy?</td>
  			<td class="genericTableData">
! 				<select name="client_20_1" id="client_20_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_20_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 497,501 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"20_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 508,512 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_20_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 509,514 ****
  			<td class="genericTableHeader">1. Does the person lack basic skills in getting access to or using a telephone?</td>
  			<td class="genericTableData">
! 				<select name="21_1" id="21_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "21_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 520,525 ----
  			<td class="genericTableHeader">1. Does the person lack basic skills in getting access to or using a telephone?</td>
  			<td class="genericTableData">
! 				<select name="client_21_1" id="client_21_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_21_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 518,522 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"21_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 529,533 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_21_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 530,535 ****
  			<td class="genericTableHeader">1. Does the person have any problems using public transport?</td>
  			<td class="genericTableData">
! 				<select name="22_1" id="22_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "22_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 541,546 ----
  			<td class="genericTableHeader">1. Does the person have any problems using public transport?</td>
  			<td class="genericTableData">
! 				<select name="client_22_1" id="client_22_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "client_22_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
***************
*** 539,543 ****
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"22_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
--- 550,554 ----
  			<td class="genericTableHeader">Comments</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanClientForm.getId(),"client_22_comments",5,30,prepopulationLevel,true)%>
  			</td>
  		</tr>			
***************
*** 551,556 ****
  			<td class="genericTableHeader">1. Does the person have problems budgeting his or her money?</td>
  			<td class="genericTableData">
! 				<select name="23_1" id="23_1" >
! 					<%=OcanForm.renderAsSelectOptions(ocanClientForm.getId(), "23_1", OcanForm.getOcanFormOptions("Camberwell Need"),prepopulationLevel,true)%>
  				</select>					
  			</td>
--- 562,567 ----
  			<td class="genericTableHeader">1. Does the person have problems budgeting his or her money?</td>
  			<td class="genericTableData">
! 				<select name="client_23_1" id="client_23_1" >
! 					<%=OcanForm.renderAsSelectO...
 
[truncated message content]

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs/git_gerrit git_eclipse_working_model.txt, 1.5, 1.6

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

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

Modified Files:
	git_eclipse_working_model.txt 
Log Message:
added more information to the document

Index: git_eclipse_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/git_eclipse_working_model.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** git_eclipse_working_model.txt	12 Jan 2011 23:21:15 -0000	1.5
--- git_eclipse_working_model.txt	13 Jan 2011 00:20:22 -0000	1.6
***************
*** 6,10 ****
  
  -------------------
! Register For Gerrit
  -------------------
  Go to the gerrit web site and register your user. The gerrit url should be provided. For this example I will use https://source.oscartools.org:8080 and my email r6s...@gm... (you'll need to use your own where ever you see my account name).
--- 6,10 ----
  
  -------------------
! Register For Gerrit (required)
  -------------------
  Go to the gerrit web site and register your user. The gerrit url should be provided. For this example I will use https://source.oscartools.org:8080 and my email r6s...@gm... (you'll need to use your own where ever you see my account name).
***************
*** 26,30 ****
  
  ------
! Plugin
  ------
  Follow the instructions at http://www.eclipse.org/egit/ to install the git eclipse plugin. At the time of this writing I was using 0.9.3.
--- 26,30 ----
  
  ------
! Plugin (required if using eclipse)
  ------
  Follow the instructions at http://www.eclipse.org/egit/ to install the git eclipse plugin. At the time of this writing I was using 0.9.3.
***************
*** 32,36 ****
  
  ------------
! ~/.gitconfig
  ------------
  You need a file in your home directory calls .gitconfig, in that file you need at least the [user] section, below is my .gitconfig for reference
--- 32,36 ----
  
  ------------
! ~/.gitconfig (required, even if using git from command line)
  ------------
  You need a file in your home directory calls .gitconfig, in that file you need at least the [user] section, below is my .gitconfig for reference
***************
*** 45,50 ****
  
  --------------
! Add Repository
  --------------
  On the package explorer tab (or what ever your favourite explorer is), right click and select import -> "projects from git" -> clone.
  
--- 45,52 ----
  
  --------------
! Add Repository 
  --------------
+ Also known as "cvs checkout" or "git clone ssh://r6s...@so...:29418/test".
+ 
  On the package explorer tab (or what ever your favourite explorer is), right click and select import -> "projects from git" -> clone.
  
***************
*** 59,71 ****
  Getting updates
  ---------------
! To get updates from the remote repository. First right click on the project and do a team -> fetch from. 
! 
! If this is the first time you've done this you'll need to configure the remote repository. On the first screen my option is "origin: ssh//r6squeegee@localhost:29418/foo". On the next screen just accept the defaults. If you follow the next dialogs it will tell you if anything was retrieved.
! 
! At this point notice your work place hasn't changed. The remote changes were put into your local repository but your local work space hasn't been affected.
  
! Right click on the project and go to team -> merge. Click on origin/master on the remote branches. Now you'll see your local work space with the changes.
  
! As a short cut, "team -> pull" will do all the above (fetch from and a merge) in one step 
  
  
--- 61,70 ----
  Getting updates
  ---------------
! Also known as "cvs update" or "git pull".
  
! The closest thing to a CVS update is a git pull. It will retrieve the latest from the server and merge them into your working directory.
  
! In more detail, a pull actually does a fetch and then a merge for you. To do this manally/separately :
! Right click on the project and do a team -> fetch from. If this is the first time you've done this you'll need to configure the remote repository. On the first screen my option is "origin: ssh//r6squeegee@localhost:29418/foo". On the next screen just accept the defaults. If you follow the next dialogs it will tell you if anything was retrieved. At this point notice your work place hasn't changed. The remote changes were put into your local repository but your local work space hasn't been affected. Right click on the project and go to team -> merge. Click on origin/master on the remote branches. Now you'll see your local work space with the changes.
  
  
***************
*** 73,76 ****
--- 72,77 ----
  Making changes
  --------------
+ Also known as "cvs commit" or "git commit -a; git push".
+ 
  Now say you've created new files in the project and altered some existing ones.
  
***************
*** 94,98 ****
  Generally speaking you should commit locally for independent small units of work. So as an example if you are working on a feature, you may have incremental phases in completion of that feature. You should commit at each phase, the code should at least compile and run.
  
! Generally speaking pushing remotely can be done for any commit. There is generally no need to bundle up multiple commits into one big push. The difference between a push and commit maybe more important if you're working offline as you can only push while online.
  
  The reason for the above is because of the review model of gerrit. You don't want to do one big commit because it will be a nightmare to review and approve. Think about the example of converting 300 DBHandler calls into maybe 100 JPA objects. If that was 1 commit, it would take for ever to review and verify that commit. If you made 300 separate commits, the review process could at least proceed incrementally and in manageable size chunks. The push is for a similar reason, if you had 300 separate commits and you pushed all at once at the end of 6 months, there will be a sudden flood of 300 commits to review and it would be a huge backlog. If you pushed those 300 commits over a 6 month period, review of the commits could have started as soon as the first push was done. 
--- 95,99 ----
  Generally speaking you should commit locally for independent small units of work. So as an example if you are working on a feature, you may have incremental phases in completion of that feature. You should commit at each phase, the code should at least compile and run.
  
! Generally speaking pushing remotely can be done for any commit. There is generally no need to bundle up multiple commits into one big push. The difference between a push and commit maybe more important if you're working off line as you can only push while online.
  
  The reason for the above is because of the review model of gerrit. You don't want to do one big commit because it will be a nightmare to review and approve. Think about the example of converting 300 DBHandler calls into maybe 100 JPA objects. If that was 1 commit, it would take for ever to review and verify that commit. If you made 300 separate commits, the review process could at least proceed incrementally and in manageable size chunks. The push is for a similar reason, if you had 300 separate commits and you pushed all at once at the end of 6 months, there will be a sudden flood of 300 commits to review and it would be a huge backlog. If you pushed those 300 commits over a 6 month period, review of the commits could have started as soon as the first push was done. 
***************
*** 100,104 ****
  
  --------------
! 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. 
--- 101,105 ----
  
  --------------
! ChangeId Hooks (more advanced optional topic)
  --------------
  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. 
***************
*** 111,115 ****
  
  -----------------------
! Fixing previous commits
  -----------------------
  The easiest way to fix a previous commit is to continue working the way we did in CVS... i.e. make another commit with the changes/fixes. For those who are more adventurous the following is a native git/gerrit routine to do this but the commands are also not supported in eclipse.
--- 112,116 ----
  
  -----------------------
! Fixing previous commits (more advanced optional topic)
  -----------------------
  The easiest way to fix a previous commit is to continue working the way we did in CVS... i.e. make another commit with the changes/fixes. For those who are more adventurous the following is a native git/gerrit routine to do this but the commands are also not supported in eclipse.

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

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

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

Modified Files:
	git_eclipse_working_model.txt 
Log Message:
amended documentation a bit

Index: git_eclipse_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/git_eclipse_working_model.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** git_eclipse_working_model.txt	6 Jan 2011 05:59:14 -0000	1.4
--- git_eclipse_working_model.txt	12 Jan 2011 23:21:15 -0000	1.5
***************
*** 20,23 ****
--- 20,25 ----
  		- click add and it should list it as an added key on the screen.
  	- now on the bottom of the screen there's a link that says "continue" click that, now you should be at the your "code review dashboard" screen.
+ 	
+ At this point you will have an account but to prevent spam/bots we have to manually enable write access to each account. You will need to email devel so we know you've signed up for an account so we can give you write access. You may wish to say hi to everyone and give a brief into into who you are too so we all have a better idea as to who everyone else is. :)
  
  At this point, if your eclipse was already running, you need to stop it and start it again. Eclipse caches ssh key information. (really, it does)
***************
*** 73,77 ****
  Now say you've created new files in the project and altered some existing ones.
  
! If you right click on the project, go to team -> commit. You'll see the commit screen. Notice on eclipse it will list the tracked and untracked file and by default they will be "git added" and "git commited" at the same time. Now when you commit, it's commited locally. This means no one else except you has these changes still.
  
  Now to share these changes with everyone else, i.e. committed to the main repository... (You must have committed locally first) 
--- 75,79 ----
  Now say you've created new files in the project and altered some existing ones.
  
! If you right click on the project, go to team -> commit. You'll see the commit screen. Notice on eclipse it will list the tracked and untracked file and by default they will be "git added" and "git committed" at the same time. Now when you commit, it's commited locally. This means no one else except you has these changes still.
  
  Now to share these changes with everyone else, i.e. committed to the main repository... (You must have committed locally first) 
***************
*** 81,85 ****
  If this is the first time you've pushed, you'll need to fill in a push specification. source ref="HEAD", destincation ref="refs/for/master", select add spec, check the box on the bottom saying save spec... so you don't have to do this again. Just click "finish" (next doesn't show anything interesting).
  
! If you go to the gerrit web page you should see the change is pending review now.
  
  Note that at this point, you and the central repository are not in sync, the files at the central repository must be approved first. Even after the changes on the central repository are approved, you must follow the "getting updates" again before you and the central repository are in sync (yes even if the files happen to be the same on the 2 servers, the pointers are not in sync until you merge).  
--- 83,87 ----
  If this is the first time you've pushed, you'll need to fill in a push specification. source ref="HEAD", destincation ref="refs/for/master", select add spec, check the box on the bottom saying save spec... so you don't have to do this again. Just click "finish" (next doesn't show anything interesting).
  
! If you go to the gerrit web page you should see the change is pending review now. If you receive a permissions error here, it maybe because your account hasn't been authorised yet, to prevent spam/bots we try to make sure only real humans get write access to the repository. You can email the devel list if you think we've missed your account / access.
  
  Note that at this point, you and the central repository are not in sync, the files at the central repository must be approved first. Even after the changes on the central repository are approved, you must follow the "getting updates" again before you and the central repository are in sync (yes even if the files happen to be the same on the 2 servers, the pointers are not in sync until you merge).  
***************
*** 111,115 ****
  Fixing previous commits
  -----------------------
! The easiest way to fix a previous commit is to continue working the way we did in CVS... i.e. make another commit with the changes/fixes. For those who are more adventurous there is a native git/gerrit routine to do this but the commands are also not supported in eclipse.
  
  From the command line :
--- 113,117 ----
  Fixing previous commits
  -----------------------
! The easiest way to fix a previous commit is to continue working the way we did in CVS... i.e. make another commit with the changes/fixes. For those who are more adventurous the following is a native git/gerrit routine to do this but the commands are also not supported in eclipse.
  
  From the command line :

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/admin providertemplatearray.jsp, NONE, 1.1 providertemplatecontent.jsp, NONE, 1.1

[Toby B. <tob...@us...>]

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

Added Files:
	providertemplatearray.jsp providertemplatecontent.jsp 
Log Message:
jsp hook for ajax call from template table for eforms

--- NEW FILE: providertemplatearray.jsp ---
<%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
<%
    if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
    String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
%>
<security:oscarSec roleName="<%=roleName$%>"
        objectName="_admin,_admin.schedule" rights="r" reverse="<%=true%>">
        <%response.sendRedirect("../logout.jsp");%>
</security:oscarSec>
<%@ page import="java.util.*, java.sql.*, oscar.*,oscar.util.*"
        errorPage="errorpage.jsp"%>
<jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean"
        scope="page" />
<%@ include file="../admin/dbconnection.jsp"%>
<%
  String [][] dbQueries=new String[][] {
{"search_templatename", "select encountertemplate_name from encountertemplate where encountertemplate_name like ? order by encountertemplate_name" },
  };
  apptMainBean.doConfigure(dbParams,dbQueries);
%>
[<%
  ResultSet rsdemo = null;
  rsdemo = apptMainBean.queryResults("%", "search_templatename");
  while (rsdemo.next()) {%>"<%=rsdemo.getString("encountertemplate_name")%>",<%}%>""]

--- NEW FILE: providertemplatecontent.jsp ---
<%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
<%
    if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
    String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
%>
<security:oscarSec roleName="<%=roleName$%>"
        objectName="_admin,_admin.schedule" rights="r" reverse="<%=true%>">        
        <%response.sendRedirect("../logout.jsp");%>        
</security:oscarSec>
<%@ page import="java.util.*, java.sql.*, oscar.*,oscar.util.*"
        errorPage="errorpage.jsp"%>
<jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean"
        scope="page" />
<%@ include file="../admin/dbconnection.jsp"%>
<%
  String [][] dbQueries=new String[][] {
{"search_template", "select * from encountertemplate where encountertemplate_name = ?" },
  };
  apptMainBean.doConfigure(dbParams,dbQueries);
%>

<%
  String tName = null;
  String tValue = null;
  ResultSet rsdemo = null;
    rsdemo = apptMainBean.queryResults(request.getParameter("name"), "search_template");
    while (rsdemo.next()) {
      tName = UtilMisc.charEscape(rsdemo.getString("encountertemplate_name"), '"');
      tValue = rsdemo.getString("encountertemplate_value");
        }
  apptMainBean.closePstmtConn();
%>
<%=tValue%>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform apconfig.xml, 1.30, 1.31

[Toby B. <tob...@us...>]

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

Modified Files:
	apconfig.xml 
Log Message:
update apconfig.xml, add today's drug

Index: apconfig.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/apconfig.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** apconfig.xml	16 Sep 2010 18:51:48 -0000	1.30
--- apconfig.xml	11 Jan 2011 17:46:45 -0000	1.31
***************
*** 220,223 ****
--- 220,228 ----
      </databaseap>
      <databaseap>
+     </databaseap>
+         <databaseap>
+         <ap-name>today_rx</ap-name>        <ap-sql>SELECT GROUP_CONCAT(CONCAT(p.date_prescribed,' ',SUBSTRING_INDEX(p.textView, '\n\n', -1)),'\n' ORDER BY p.date_prescribed DESC SEPARATOR '') AS rx FROM prescription p WHERE p.demographic_no=${demographic} and p.date_prescribed=LEFT(now(),10) </ap-sql>
+         <ap-output>${rx}</ap-output>
+     </databaseap>
          <ap-name>druglist_generic</ap-name>
          <ap-sql>SELECT GROUP_CONCAT(DISTINCT if(LENGTH(d.GN) &gt; 4, GN, d.customName) , if(d.takemax &gt; d.takemin, CONCAT(' ',d.takemin,'-',d.takemax,' '), CONCAT(' ',d.takemin,' ')) , d.freqcode , if(d.prn=1,' prn','') ORDER BY d.rx_date DESC SEPARATOR '\n' ) AS rxgen

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

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2407/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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** eyeform-cme.js	4 Jan 2011 19:30:52 -0000	1.11
--- eyeform-cme.js	11 Jan 2011 16:39:08 -0000	1.12
***************
*** 93,104 ****
         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);
!      }});
       });
  
   
     
\ No newline at end of file
--- 93,116 ----
         jQuery("form[name='caseManagementEntryForm']").append('<span submit_addon="save_measurements"></span>');
         
+        jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getAppointmentReason&appointmentNo="+appointmentNo,dataType: "html",success: function(data) {
+ 			jQuery("#encounterHeaderExt").append("&nbsp;&nbsp;Reason:<b>"+data+"</b>");
+        }});
+        
         jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getReferralDoctor&demographicNo="+demographicNo,dataType: "html",success: function(data) {
! 			jQuery("#encounterHeaderExt").append("&nbsp;&nbsp;Ref:<b>"+data+"</b>");
        }});
!        
       });
  
   
+    
+    function runMacro(macroId,appointmentNo) {
+ 	   jQuery.ajax({ url: ctx+"/CaseManagementView.do?method=run_macro&id="+macroId+"&appointmentNo="+appointmentNo +"&noteId="+savedNoteId + "&demographicNo="+demographicNo, dataType:'script', async:false});
+ 	   jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getCurrentNoteData&demographicNo="+demographicNo+"&noteId="+savedNoteId+"&appointmentNo="+appointmentNo,dataType: "html",async:false, success: function(data) {
+ 			jQuery("#current_note_addon").html(data);
+       }});
+ 	   jQuery.ajax({ url: ctx+"/CaseManagementView.do?method=run_macro_script&id="+macroId+"&appointmentNo="+appointmentNo +"&noteId="+savedNoteId + "&demographicNo="+demographicNo, dataType:'script', async:false});
+ 	   
+    }
+   
     
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil EctDisplayMacroAction.java, 1.6, 1.7

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

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

Modified Files:
	EctDisplayMacroAction.java 
Log Message:
eyeform updates


Index: EctDisplayMacroAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayMacroAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EctDisplayMacroAction.java	3 Dec 2010 17:42:59 -0000	1.6
--- EctDisplayMacroAction.java	11 Jan 2011 16:39:08 -0000	1.7
***************
*** 93,97 ****
          item.setTitle(itemHeader);
          int hash = Math.abs(winName.hashCode());        
!         url = "popupPage(500,900,'" + hash + "','" + request.getContextPath() + "/eyeform/Macro.do?macro.id="+ sh.getId() +"'); return false;";        
          item.setURL(url);               
          Dao.addItem(item);
--- 93,98 ----
          item.setTitle(itemHeader);
          int hash = Math.abs(winName.hashCode());        
!        // url = "popupPage(500,900,'" + hash + "','" + request.getContextPath() + "/eyeform/Macro.do?macro.id="+ sh.getId() +"'); return false;";
!         url = "runMacro("+sh.getId()+","+appointmentNo+");return false;";
          item.setURL(url);               
          Dao.addItem(item);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/js newCaseManagementView.js.jsp, 1.6, 1.7

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

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

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


Index: newCaseManagementView.js.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/newCaseManagementView.js.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** newCaseManagementView.js.jsp	15 Dec 2010 16:48:05 -0000	1.6
--- newCaseManagementView.js.jsp	11 Jan 2011 16:39:08 -0000	1.7
***************
*** 2621,2625 ****
          var pos;
  
!         for( idx = 0; idx <= numNotes; ++idx ) {
              notesDiv = $("nc" + idx).down('div');
              noteId = notesDiv.id.substr(1);  //get note id
--- 2621,2626 ----
          var pos;
  
!         for( idx = 0; idx <= numNotes; ++idx ) {    
!         	if($("nc"+idx) == null) continue;    
              notesDiv = $("nc" + idx).down('div');
              noteId = notesDiv.id.substr(1);  //get note id

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model Macro.java, 1.1, 1.2 macro.hbm.xml, 1.1, 1.2

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

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

Modified Files:
	Macro.java macro.hbm.xml 
Log Message:
eyeform updates


Index: Macro.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/Macro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Macro.java	1 Oct 2010 14:10:51 -0000	1.1
--- Macro.java	11 Jan 2011 16:39:08 -0000	1.2
***************
*** 15,19 ****
  	private String followupUnit;
  	private Provider followupDoctor;
! 	private Integer followupDoctorId;
  	private String followupReason;
  	private String billingVisitType;
--- 15,19 ----
  	private String followupUnit;
  	private Provider followupDoctor;
! 	private String followupDoctorId;
  	private String followupReason;
  	private String billingVisitType;
***************
*** 65,72 ****
  		this.dischargeFlag = dischargeFlag;
  	}
! 	public Integer getFollowupDoctorId() {
  		return followupDoctorId;
  	}
! 	public void setFollowupDoctorId(Integer followupDoctorId) {
  		this.followupDoctorId = followupDoctorId;
  	}
--- 65,72 ----
  		this.dischargeFlag = dischargeFlag;
  	}
! 	public String getFollowupDoctorId() {
  		return followupDoctorId;
  	}
! 	public void setFollowupDoctorId(String followupDoctorId) {
  		this.followupDoctorId = followupDoctorId;
  	}

Index: macro.hbm.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/macro.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** macro.hbm.xml	1 Oct 2010 14:10:51 -0000	1.1
--- macro.hbm.xml	11 Jan 2011 16:39:08 -0000	1.2
***************
*** 24,38 ****
              <column name="followup_unit" length="50" />
          </property>
!         <!--      <many-to-one
! 			name="followupDoctor"
! 			column="followup_doctor"
! 			class="org.oscarehr.common.model.Provider"
! 			not-null="false"
! 			lazy="false"
! 		>
! 		</many-to-one>
! -->
!         <property name="followupReason" type="string">
!             <column name="followup_reason" />
          </property>
          <!-- 
--- 24,32 ----
              <column name="followup_unit" length="50" />
          </property>
!         <property name="followupDoctorId" type="string">
!             <column name="followup_doctor" />
!         </property>        
!         <property name="ticklerRecipient" type="string">
!             <column name="tickler_staff" />
          </property>
          <!-- 
***************
*** 91,94 ****
--- 85,98 ----
              <column name="test_records" length="65535" />
          </property>
+         
+         <property name="dischargeFlag" type="string">
+             <column name="discharge" length="20" />
+         </property>
+         <property name="statFlag" type="string">
+             <column name="stat" length="20" />
+         </property>
+         <property name="optFlag" type="string">
+             <column name="opt" length="20" />
+         </property>
      </class>
  </hibernate-mapping>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/service MeasurementPrint.java, 1.1, 1.2

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

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

Modified Files:
	MeasurementPrint.java 
Log Message:
eyeform updates


Index: MeasurementPrint.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/service/MeasurementPrint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MeasurementPrint.java	13 Dec 2010 19:33:22 -0000	1.1
--- MeasurementPrint.java	11 Jan 2011 16:39:08 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  
  import java.io.IOException;
+ import java.util.Date;
  
  import org.apache.log4j.Logger;
***************
*** 8,11 ****
--- 9,13 ----
  import org.oscarehr.util.MiscUtils;
  
+ import com.lowagie.text.Chunk;
  import com.lowagie.text.DocumentException;
  import com.lowagie.text.Font;
***************
*** 36,39 ****
--- 38,51 ----
          p.add(phrase);
          engine.getDocument().add(p);
+         
+         //go through each appt in reverge chronological order, and print the measurements
+         p = new Paragraph();
+         phrase = new Phrase(engine.LEADING, "", engine.getFont());              
+         Chunk chunk = new Chunk("Documentation Date: " + engine.getFormatter().format(new Date()) + "\n", obsfont);
+         phrase.add(chunk);                    
+         p.add(phrase);
+       
+         engine.getDocument().add(p);
+         
  	}
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web CaseManagementViewAction.java, 1.140, 1.141

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

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

Modified Files:
	CaseManagementViewAction.java 
Log Message:
eyeform updates


Index: CaseManagementViewAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web/CaseManagementViewAction.java,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** CaseManagementViewAction.java	14 Dec 2010 23:40:41 -0000	1.140
--- CaseManagementViewAction.java	11 Jan 2011 16:39:08 -0000	1.141
***************
*** 35,39 ****
  import java.util.HashMap;
  import java.util.HashSet;
- import java.util.Hashtable;
  import java.util.Iterator;
  import java.util.List;
--- 35,38 ----
***************
*** 88,91 ****
--- 87,96 ----
  import org.oscarehr.common.model.UserProperty;
  import org.oscarehr.dx.model.DxResearch;
+ import org.oscarehr.eyeform.dao.FollowUpDao;
+ import org.oscarehr.eyeform.dao.MacroDao;
+ import org.oscarehr.eyeform.dao.TestBookRecordDao;
+ import org.oscarehr.eyeform.model.FollowUp;
+ import org.oscarehr.eyeform.model.Macro;
+ import org.oscarehr.eyeform.model.TestBookRecord;
  import org.oscarehr.util.LoggedInInfo;
  import org.oscarehr.util.MiscUtils;
***************
*** 1334,1337 ****
--- 1339,1430 ----
  	}
  
+ 	public ActionForward run_macro_script(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+ 		MacroDao macroDao = (MacroDao)SpringUtils.getBean("MacroDAO");
+ 		Macro macro = macroDao.find(Integer.parseInt(request.getParameter("id")));
+ 		logger.info("loaded macro " + macro.getLabel());	
+ 		StringBuilder sb = new StringBuilder();
+ 		
+ 		//impression text
+ 		sb.append("var noteTa = document.getElementById('caseNote_note"+request.getParameter("noteId")+"');");
+ 		sb.append("var noteTaVal = noteTa.value;");
+ 		sb.append("noteTaVal = noteTaVal + '"+macro.getImpression()+"';");
+ 		sb.append("noteTa.value = noteTaVal;");
+ 		
+ 		//checkboxes
+ 		if(macro.getDischargeFlag().equals("dischargeFlag")) {
+ 			sb.append("jQuery(\"#ack1\").attr(\"checked\",true);");			
+ 		}
+ 		if(macro.getStatFlag().equals("statFlag")) {
+ 			sb.append("jQuery(\"#ack2\").attr(\"checked\",true);");
+ 		}
+ 		if(macro.getOptFlag().equals("optFlag")) {
+ 			sb.append("jQuery(\"#ack3\").attr(\"checked\",true);");
+ 		}
+ 		
+ 		//send tickler
+ 		if(macro.getTicklerRecipient().length()>0) {
+ 			sb.append("saveNoteAndSendTickler();");
+ 		} else {
+ 			sb.append("saveEyeformNote();");	
+ 		}
+ 		
+ 		//billing
+ 		
+ 		response.getWriter().println(sb.toString());
+ 		
+ 		return null;
+ 	}
+ 	
+ 	public ActionForward run_macro(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+ 		MacroDao macroDao = (MacroDao)SpringUtils.getBean("MacroDAO");
+ 		Macro macro = macroDao.find(Integer.parseInt(request.getParameter("id")));
+ 		logger.info("loaded macro " + macro.getLabel());
+ 		
+ 		StringBuilder sb = new StringBuilder();
+ 		
+ 		
+ 		//follow up - need to add it, then force a reload
+ 		int followUpNo = macro.getFollowupNo();
+ 		String followUpUnit = macro.getFollowupUnit();
+ 		String followUpDr = macro.getFollowupDoctorId();
+ 		if(followUpDr.length()>0) {
+ 			FollowUp f = new FollowUp();
+ 			f.setAppointmentNo(Integer.parseInt(request.getParameter("appointmentNo")));
+ 			f.setDate(new Date());
+ 			f.setDemographicNo(Integer.parseInt(request.getParameter("demographicNo")));
+ 			f.setProvider(LoggedInInfo.loggedInInfo.get().loggedInProvider);
+ 			f.setTimeframe(followUpUnit);
+ 			f.setTimespan(followUpNo);
+ 			f.setType("followup");
+ 			f.setUrgency("routine");
+ 			f.setFollowupProvider(followUpDr);
+ 			FollowUpDao dao = (FollowUpDao)SpringUtils.getBean("FollowUpDAO");
+ 	    	dao.save(f);
+ 		}				
+ 		
+ 		//tests
+ 		TestBookRecordDao testDao = (TestBookRecordDao)SpringUtils.getBean("TestBookDAO");
+ 		String[] tests = macro.getTestRecords().split("\n");
+ 		for(String test:tests) {
+ 			String[] parts = test.trim().split("\\|");
+ 			if(parts.length==4) {
+ 				TestBookRecord rec = new TestBookRecord();
+ 				rec.setAppointmentNo(Integer.parseInt(request.getParameter("appointmentNo")));
+ 				rec.setComment(parts[3]);
+ 				rec.setDate(new Date());
+ 				rec.setDemographicNo(Integer.parseInt(request.getParameter("demographicNo")));
+ 				rec.setEye(parts[1]);
+ 				rec.setProvider(LoggedInInfo.loggedInInfo.get().loggedInProvider.getProviderNo());
+ 				rec.setStatus(null);
+ 				rec.setTestname(parts[0]);
+ 				rec.setUrgency(parts[2]);
+ 				testDao.save(rec);
+ 			}
+ 		}
+ 		
+ 		
+ 		return null;
+ 	}
+ 	
  	protected Map getUnlockedNotesMap(HttpServletRequest request) {
  		Map map = (Map) request.getSession().getAttribute("unlockedNoteMap");

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2011-01-07.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-serv2407/database/mysql/updates

Modified Files:
	update-2011-01-07.sql 
Log Message:
eyeform updates


Index: update-2011-01-07.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates/update-2011-01-07.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** update-2011-01-07.sql	7 Jan 2011 16:47:48 -0000	1.1
--- update-2011-01-07.sql	11 Jan 2011 16:39:07 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
  insert into issue (`code`,`description`,`role`,`update_date`) Values('CurrentHistory','Current History', 'nurse', now());
  
+ alter table eyeform_macro add discharge varchar(20);
+ alter table eyeform_macro add stat varchar(20);
+ alter table eyeform_macro add opt varchar(20);

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

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

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

Modified Files:
	oscarinit.sql 
Log Message:
eyeform updates


Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.274
retrieving revision 1.275
diff -C2 -d -r1.274 -r1.275
*** oscarinit.sql	5 Jan 2011 19:24:48 -0000	1.274
--- oscarinit.sql	11 Jan 2011 16:39:07 -0000	1.275
***************
*** 8189,8192 ****
--- 8189,8195 ----
    `billing_gst` varchar(50) COLLATE utf8_bin ,
    `test_records` text COLLATE utf8_bin,
+   `discharge` varchar(20) COLLATE uft8_bin,
+   `stat` varchar(20) COLLATE uft8_bin,
+   `opt` varchar(20) COLLATE uft8_bin,
    PRIMARY KEY (`id`)
  );

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers MDSHandler.java, 1.16.2.1, 1.16.2.2

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23916

Modified Files:
      Tag: RELEASE_10_12
	MDSHandler.java 
Log Message:
- ID: 3154443 According to Life Labs, use the date of service rather than
timestamp of obx when timestamp is
missing

Index: MDSHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/MDSHandler.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** MDSHandler.java	9 Dec 2010 16:16:35 -0000	1.16.2.1
--- MDSHandler.java	10 Jan 2011 19:15:02 -0000	1.16.2.2
***************
*** 189,193 ****
              return(timeStamp);
          }catch(Exception e){
!             return("");
          }
      }
--- 189,193 ----
              return(timeStamp);
          }catch(Exception e){
!             return getMsgDate();
          }
      }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers MDSHandler.java, 1.17, 1.18

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23728

Modified Files:
	MDSHandler.java 
Log Message:
- ID: 3154443 According to Life Labs, use the date of service rather than
timestamp of obx when timestamp is
missing

Index: MDSHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/MDSHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MDSHandler.java	8 Dec 2010 04:42:33 -0000	1.17
--- MDSHandler.java	10 Jan 2011 19:14:28 -0000	1.18
***************
*** 189,193 ****
              return(timeStamp);
          }catch(Exception e){
!             return("");
          }
      }
--- 189,193 ----
              return(timeStamp);
          }catch(Exception e){
!             return getMsgDate();
          }
      }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers MDSHandler.java, 1.13.4.2, 1.13.4.3

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23173

Modified Files:
      Tag: RELEASE_10_06
	MDSHandler.java 
Log Message:
- ID: 3154443 According to Life Labs, use the date of service rather than
timestamp of obx when timestamp is
missing

Index: MDSHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/all/parsers/MDSHandler.java,v
retrieving revision 1.13.4.2
retrieving revision 1.13.4.3
diff -C2 -d -r1.13.4.2 -r1.13.4.3
*** MDSHandler.java	9 Dec 2010 11:21:08 -0000	1.13.4.2
--- MDSHandler.java	10 Jan 2011 19:12:19 -0000	1.13.4.3
***************
*** 189,193 ****
              return(timeStamp);
          }catch(Exception e){
!             return("");
          }
      }
--- 189,193 ----
              return(timeStamp);
          }catch(Exception e){
!             return getMsgDate();
          }
      }

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscardata.sql, 1.110, 1.111

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

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

Modified Files:
	oscardata.sql 
Log Message:
added current history for eyeform


Index: oscardata.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** oscardata.sql	4 Jan 2011 19:30:52 -0000	1.110
--- oscardata.sql	7 Jan 2011 16:47:47 -0000	1.111
***************
*** 1760,1762 ****
  insert into issue (code,description,role,update_date,priority,type) values ('OcularMedication','Ocular Medication','nurse',now(),NULL,'system');
  insert into issue (code,description,role,update_date,priority,type) values ('PatientLog','Patient Log','nurse',now(),NULL,'system');
! 
--- 1760,1762 ----
  insert into issue (code,description,role,update_date,priority,type) values ('OcularMedication','Ocular Medication','nurse',now(),NULL,'system');
  insert into issue (code,description,role,update_date,priority,type) values ('PatientLog','Patient Log','nurse',now(),NULL,'system');
! insert into issue (`code`,`description`,`role`,`update_date`) Values('CurrentHistory','Current History', 'nurse', now());

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2011-01-07.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-serv1784/updates

Added Files:
	update-2011-01-07.sql 
Log Message:
added current history for eyeform


--- NEW FILE: update-2011-01-07.sql ---
insert into issue (`code`,`description`,`role`,`update_date`) Values('CurrentHistory','Current History', 'nurse', now());

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

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

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

Modified Files:
	automated_deploy.sh 
Log Message:
attempt at recommit, previous commit didn't work?

updated script command order to attempt prevention of non-deploys

Index: automated_deploy.sh
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/automated_deploy.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** automated_deploy.sh	7 Jan 2011 00:29:09 -0000	1.7
--- automated_deploy.sh	7 Jan 2011 00:42:26 -0000	1.8
***************
*** 43,47 ****
  		# stop tomcat, sleep to allow tomcat to shutdown before restarting
  		catalina.sh stop
! 		sleep 30
  		mv ${CATALINA_BASE}/logs/catalina.out ${CATALINA_BASE}/logs/catalina.out.`date -I` 
  		
--- 43,47 ----
  		# stop tomcat, sleep to allow tomcat to shutdown before restarting
  		catalina.sh stop
! 		sleep 60
  		mv ${CATALINA_BASE}/logs/catalina.out ${CATALINA_BASE}/logs/catalina.out.`date -I` 
  		

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs/git_gerrit automated_deploy.sh, 1.6, 1.7

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

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

Modified Files:
	automated_deploy.sh 
Log Message:
changed order of operations to try and prevent hangs

Index: automated_deploy.sh
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_gerrit/automated_deploy.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** automated_deploy.sh	5 Jan 2011 01:45:48 -0000	1.6
--- automated_deploy.sh	7 Jan 2011 00:29:09 -0000	1.7
***************
*** 41,44 ****
--- 41,49 ----
  	then
  	
+ 		# stop tomcat, sleep to allow tomcat to shutdown before restarting
+ 		catalina.sh stop
+ 		sleep 30
+ 		mv ${CATALINA_BASE}/logs/catalina.out ${CATALINA_BASE}/logs/catalina.out.`date -I` 
+ 		
  		# copy the built result to catalina base
  		cd ${CATALINA_BASE}/webapps
***************
*** 48,56 ****
  		unzip ${SRC_DIR}/target/${SERVER_NAME}-3.1-SNAPSHOT.war
  		
- 		# 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
  		mysql -e "drop database ${SERVER_NAME}"
--- 53,56 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/ClientManager ocan_form_referral.jsp, 1.3, 1.4 ocan_staff_form_validation.js, 1.7, 1.8 ocan_form_summary_of_actions.jsp, 1.3, 1.4 ocan_form.jsp, 1.29, 1.30 ocan_form_medication.jsp, 1.4, 1.5 ocan_form_mentalHealthCenter.jsp, 1.8, 1.9

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

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

Modified Files:
	ocan_form_referral.jsp ocan_staff_form_validation.js 
	ocan_form_summary_of_actions.jsp ocan_form.jsp 
	ocan_form_medication.jsp ocan_form_mentalHealthCenter.jsp 
Log Message:
add validation

Index: ocan_form.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ocan_form.jsp	4 Jan 2011 23:25:02 -0000	1.29
--- ocan_form.jsp	6 Jan 2011 23:22:16 -0000	1.30
***************
*** 42,46 ****
  	    return /^((\d{5}-\d{4})|(\d{5})|()|([A-Z]\d[A-Z]\s\d[A-Z]\d))$/.test(value); 
  	}, 'Please enter a valid US or Canadian postal code.');
! 	
  });
  
--- 42,49 ----
  	    return /^((\d{5}-\d{4})|(\d{5})|()|([A-Z]\d[A-Z]\s\d[A-Z]\d))$/.test(value); 
  	}, 'Please enter a valid US or Canadian postal code.');
! 
! 	$.validator.addMethod('digitalNumber', function(value) {
[...2436 lines suppressed...]
  		</tr>
--- 3682,3686 ----
  			<td class="genericTableHeader">Is culture (heritage) an important part of your life?</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"culture_heritage",5,50,prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 3668,3672 ****
  			<td class="genericTableHeader">Presenting Issues - Other</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"presenting_issues_other",5,30,prepopulationLevel)%>
  			</td>
  		</tr>
--- 3696,3700 ----
  			<td class="genericTableHeader">Presenting Issues - Other</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"presenting_issues_other",128,prepopulationLevel)%>
  			</td>
  		</tr>

Index: ocan_staff_form_validation.js
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_staff_form_validation.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ocan_staff_form_validation.js	8 Oct 2010 21:25:13 -0000	1.7
--- ocan_staff_form_validation.js	6 Jan 2011 23:22:16 -0000	1.8
***************
*** 1,3 ****
--- 1,4 ----
  $("document").ready(function() {
+ 	
  	$("input[name='immigration_issues'][value='4']").change(function(){
  		if($("input[name='immigration_issues'][value='4']").attr('checked') == true) {
***************
*** 16,19 ****
--- 17,22 ----
  	}
  	
+ 	
+ 	
  	$("input[name='presenting_issues'][value='OTH']").change(function() {
  		if($("input[name='presenting_issues'][value='OTH']").attr('checked') == true) {
***************
*** 149,152 ****
--- 152,182 ----
  	});
  	
+ 	$("#hospitalized_mental_illness").change(function() { 
+ 		if($("#hospitalized_mental_illness").val()=='TRUE'){ 
+ 			$("#hospitalized_mental_illness_admissions").attr('disabled','');
+ 			$("#hospitalized_mental_illness_admissions").val("");
+ 			$("#hospitalized_mental_illness_days").attr('disabled','');
+ 			$("#hospitalized_mental_illness_days").val("");
+ 		} else {
+ 			$("#hospitalized_mental_illness_admissions").attr('disabled','disabled');
+ 			$("#hospitalized_mental_illness_admissions").val("");	
+ 			$("#hospitalized_mental_illness_days").attr('disabled','disabled');
+ 			$("#hospitalized_mental_illness_days").val("");
+ 		}
+ 	});	
+ 	
+ 	$("#hospitalized_mental_illness").each(function() { 
+ 		if($("#hospitalized_mental_illness").val()=='TRUE'){ 
+ 			$("#hospitalized_mental_illness_admissions").attr('disabled','');
+ 			$("#hospitalized_mental_illness_days").attr('disabled','');
+ 		} else {
+ 			$("#hospitalized_mental_illness_admissions").attr('disabled','disabled');
+ 			$("#hospitalized_mental_illness_admissions").val("");
+ 			$("#hospitalized_mental_illness_days").attr('disabled','disabled');
+ 			$("#hospitalized_mental_illness_days").val("");
+ 		}
+ 	});
+ 			
+ 			
  	$("#6_physical_health_concerns").change(function() { 
  		if($("#6_physical_health_concerns").val()=='TRUE'){ 
***************
*** 546,557 ****
  	}	
  	
! 	if($("#reasonForAssessment").val() == 'OTHR') {
! 			if($("#reason_for_assessment_other").val().length == 0) {
! 				alert('Reason for Reason for OCAN -- please specify other');
! 				$("#reason_for_assessment_other").focus();
! 				return false;
! 			}			
  	}
! 		
  		
  	if($("#consumerSelfAxCompleted").val() == 'FALSE') {
--- 576,588 ----
  	}	
  	
! 	
! 	if($("#reasonForAssessment").val() == 'OTHR') {		
! 		if($("#reason_for_assessment_other").val().length==0) {			
! 			alert('Reason for assessment - Please specify other');
! 			$("#reason_for_assessment_other").focus();
! 			return false;
! 		}		
  	}
! 	
  		
  	if($("#consumerSelfAxCompleted").val() == 'FALSE') {
***************
*** 579,615 ****
  	}	
  	
- 	if($("#reasonForAssessment").val() == 'OTHR') {		
- 		if($("#reason_for_assessment_other").val().length==0) {			
- 			alert('Reason for assessment - Please specify other');
- 			$("#reason_for_assessment_other").focus();
- 			return false;
- 		}		
- 	}
- 	
- 	if($("#power_attorney_property").val() == 'TRUE') {
- 		if($("#power_attorney_property_additional_information").val().length == 0) {
- 			alert('Client Capacity - please provider additional information');
- 			$("#power_attorney_property_additional_information").focus();
- 			return false;
- 		}
- 	}
- 	
  	
- 	if($("#power_attorney_personal_care").val() == 'TRUE') {
- 		if($("#power_attorney_personal_care_additional_information").val().length == 0) {
- 			alert('Client Capacity - please provider additional information');
- 			$("#power_attorney_personal_care_additional_information").focus();
- 			return false;
- 		}
- 	}
  	
- 	if($("#court_appointed_guardian").val() == 'TRUE') {
- 		if($("#court_appointed_guardian_additional_information").val().length == 0) {
- 			alert('Client Capacity - please provider additional information');
- 			$("#court_appointed_guardian_additional_information").focus();
- 			return false;
- 		}
- 	}
- 
  	if($("input[name='immigration_issues'][value='8']").attr('checked') == true) {
  		if($("#immigration_issues_other").val().length == 0) {
--- 610,615 ----
***************
*** 700,703 ****
--- 700,718 ----
  	
  
+ 		
+ 	if($("#hospitalized_mental_illness").val()=='TRUE') {
+ 		if($("#hospitalized_mental_illness_admissions").val().length == 0) {
+ 			alert('Please input - Total Number of Admissions for Mental Health Reasons');
+ 			$("#hospitalized_mental_illness_admissions").focus();
+ 			return false;
+ 		}
+ 		if($("#hospitalized_mental_illness_days").val().length == 0) {
+ 			alert('Please input - Total Number of Hospitalization Days for Mental Health Reasons');
+ 			$("#hospitalized_mental_illness_days").focus();
+ 			return false;
+ 		}
+ 	}	
+ 	
+ 	
  	
  	var ppCount=0;
***************
*** 710,713 ****
--- 725,729 ----
  	if(ppCount==0) {
  		alert('You must choose atleast 1 presenting issue');
+ 		$("input[name='presenting_issues']").focus();
  		return false;
  	}
***************
*** 759,761 ****
  	}
  	return false;
! }
\ No newline at end of file
--- 775,777 ----
  	}
  	return false;
! }

Index: ocan_form_mentalHealthCenter.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_mentalHealthCenter.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ocan_form_mentalHealthCenter.jsp	29 Dec 2010 23:11:09 -0000	1.8
--- ocan_form_mentalHealthCenter.jsp	6 Jan 2011 23:22:16 -0000	1.9
***************
*** 70,74 ****
  			<td class="genericTableHeader">Ext </td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_ext"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 70,74 ----
  			<td class="genericTableHeader">Ext </td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_ext"+centerNumber,16, prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 96,100 ****
  			<td class="genericTableHeader">Organization Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_orgNameOther"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 96,100 ----
  			<td class="genericTableHeader">Organization Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_orgNameOther"+centerNumber,128, prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 111,115 ****
  			<td class="genericTableHeader">Program Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_programNameOther"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 111,115 ----
  			<td class="genericTableHeader">Program Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_programNameOther"+centerNumber,128, prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 133,137 ****
  			<td class="genericTableHeader">Functional Center Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_functionNameOther"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 133,137 ----
  			<td class="genericTableHeader">Functional Center Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_functionNameOther"+centerNumber,128, prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 140,144 ****
  			<td class="genericTableHeader">Functional Center Number - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_functionNumberOther"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 140,144 ----
  			<td class="genericTableHeader">Functional Center Number - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_functionNumberOther"+centerNumber,16, prepopulationLevel)%>
  			</td>
  		</tr>

Index: ocan_form_referral.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_referral.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ocan_form_referral.jsp	22 Sep 2010 19:31:13 -0000	1.3
--- ocan_form_referral.jsp	6 Jan 2011 23:22:16 -0000	1.4
***************
*** 27,31 ****
  			<td class="genericTableHeader">Specify</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),referralNumber+"_summary_of_referral_optimal_spec",5,30,prepopulationLevel)%>
  			</td>
  		</tr>		
--- 27,31 ----
  			<td class="genericTableHeader">Specify</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),referralNumber+"_summary_of_referral_optimal_spec",128,prepopulationLevel)%>
  			</td>
  		</tr>		
***************
*** 43,47 ****
  			<td class="genericTableHeader">Actual Specify</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),referralNumber+"_summary_of_referral_actual_spec",5,30,prepopulationLevel)%>
  			</td>
  		</tr>		
--- 43,47 ----
  			<td class="genericTableHeader">Actual Specify</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),referralNumber+"_summary_of_referral_actual_spec",128,prepopulationLevel)%>
  			</td>
  		</tr>		

Index: ocan_form_medication.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_medication.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ocan_form_medication.jsp	31 May 2010 13:29:31 -0000	1.4
--- ocan_form_medication.jsp	6 Jan 2011 23:22:16 -0000	1.5
***************
*** 18,22 ****
  			<td class="genericTableHeader">Medication</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(), "medication_"+medicationNumber+"_medication", 25,prepopulationLevel)%>	
  			</td>								
  		</tr>
--- 18,22 ----
  			<td class="genericTableHeader">Medication</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(), "medication_"+medicationNumber+"_medication", 128,prepopulationLevel)%>	
  			</td>								
  		</tr>
***************
*** 32,36 ****
  			<td class="genericTableHeader">Dosage</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(), "medication_"+medicationNumber+"_dosage", 25,prepopulationLevel)%>	
  			</td>								
  		</tr>
--- 32,36 ----
  			<td class="genericTableHeader">Dosage</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(), "medication_"+medicationNumber+"_dosage", 128,prepopulationLevel)%>	
  			</td>								
  		</tr>

Index: ocan_form_summary_of_actions.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_summary_of_actions.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ocan_form_summary_of_actions.jsp	11 Feb 2010 19:08:14 -0000	1.3
--- ocan_form_summary_of_actions.jsp	6 Jan 2011 23:22:16 -0000	1.4
***************
*** 41,45 ****
  	</td>
  	<td>
! 		<%=OcanForm.renderAsSoATextArea(ocanStaffForm.getId(),x+"_summary_of_actions_action",5,30,prepopulationLevel)%>							
  	</td>
  </tr>		
--- 41,45 ----
  	</td>
  	<td>
! 		<%=OcanForm.renderAsSoATextArea(ocanStaffForm.getId(),x+"_summary_of_actions_action",5,50,prepopulationLevel)%>							
  	</td>
  </tr>		

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/ClientManager ocan_form_referral.jsp, 1.2.4.1, 1.2.4.2 ocan_staff_form_validation.js, 1.2.4.7, 1.2.4.8 ocan_form_summary_of_actions.jsp, 1.3, 1.3.4.1 ocan_form.jsp, 1.15.4.16, 1.15.4.17 ocan_form_medication.jsp, 1.4, 1.4.4.1 ocan_form_mentalHealthCenter.jsp, 1.1.4.7, 1.1.4.8

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

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

Modified Files:
      Tag: RELEASE_10_06
	ocan_form_referral.jsp ocan_staff_form_validation.js 
	ocan_form_summary_of_actions.jsp ocan_form.jsp 
	ocan_form_medication.jsp ocan_form_mentalHealthCenter.jsp 
Log Message:
add validation 

Index: ocan_form.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form.jsp,v
retrieving revision 1.15.4.16
retrieving revision 1.15.4.17
diff -C2 -d -r1.15.4.16 -r1.15.4.17
*** ocan_form.jsp	4 Jan 2011 22:38:41 -0000	1.15.4.16
--- ocan_form.jsp	6 Jan 2011 21:10:22 -0000	1.15.4.17
***************
*** 42,46 ****
  	    return /^((\d{5}-\d{4})|(\d{5})|()|([A-Z]\d[A-Z]\s\d[A-Z]\d))$/.test(value); 
  	}, 'Please enter a valid US or Canadian postal code.');
! 	
  });
  
--- 42,49 ----
  	    return /^((\d{5}-\d{4})|(\d{5})|()|([A-Z]\d[A-Z]\s\d[A-Z]\d))$/.test(value); 
  	}, 'Please enter a valid US or Canadian postal code.');
! 
! 	$.validator.addMethod('digitalNumber', function(value) {
[...2436 lines suppressed...]
  		</tr>
--- 3682,3686 ----
  			<td class="genericTableHeader">Is culture (heritage) an important part of your life?</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"culture_heritage",5,50,prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 3668,3672 ****
  			<td class="genericTableHeader">Presenting Issues - Other</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"presenting_issues_other",5,30,prepopulationLevel)%>
  			</td>
  		</tr>
--- 3696,3700 ----
  			<td class="genericTableHeader">Presenting Issues - Other</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"presenting_issues_other",128,prepopulationLevel)%>
  			</td>
  		</tr>

Index: ocan_staff_form_validation.js
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_staff_form_validation.js,v
retrieving revision 1.2.4.7
retrieving revision 1.2.4.8
diff -C2 -d -r1.2.4.7 -r1.2.4.8
*** ocan_staff_form_validation.js	6 Oct 2010 21:02:47 -0000	1.2.4.7
--- ocan_staff_form_validation.js	6 Jan 2011 21:10:22 -0000	1.2.4.8
***************
*** 1,3 ****
--- 1,4 ----
  $("document").ready(function() {
+ 	
  	$("input[name='immigration_issues'][value='4']").change(function(){
  		if($("input[name='immigration_issues'][value='4']").attr('checked') == true) {
***************
*** 16,19 ****
--- 17,22 ----
  	}
  	
+ 	
+ 	
  	$("input[name='presenting_issues'][value='OTH']").change(function() {
  		if($("input[name='presenting_issues'][value='OTH']").attr('checked') == true) {
***************
*** 149,152 ****
--- 152,182 ----
  	});
  	
+ 	$("#hospitalized_mental_illness").change(function() { 
+ 		if($("#hospitalized_mental_illness").val()=='TRUE'){ 
+ 			$("#hospitalized_mental_illness_admissions").attr('disabled','');
+ 			$("#hospitalized_mental_illness_admissions").val("");
+ 			$("#hospitalized_mental_illness_days").attr('disabled','');
+ 			$("#hospitalized_mental_illness_days").val("");
+ 		} else {
+ 			$("#hospitalized_mental_illness_admissions").attr('disabled','disabled');
+ 			$("#hospitalized_mental_illness_admissions").val("");	
+ 			$("#hospitalized_mental_illness_days").attr('disabled','disabled');
+ 			$("#hospitalized_mental_illness_days").val("");
+ 		}
+ 	});	
+ 	
+ 	$("#hospitalized_mental_illness").each(function() { 
+ 		if($("#hospitalized_mental_illness").val()=='TRUE'){ 
+ 			$("#hospitalized_mental_illness_admissions").attr('disabled','');
+ 			$("#hospitalized_mental_illness_days").attr('disabled','');
+ 		} else {
+ 			$("#hospitalized_mental_illness_admissions").attr('disabled','disabled');
+ 			$("#hospitalized_mental_illness_admissions").val("");
+ 			$("#hospitalized_mental_illness_days").attr('disabled','disabled');
+ 			$("#hospitalized_mental_illness_days").val("");
+ 		}
+ 	});
+ 			
+ 			
  	$("#6_physical_health_concerns").change(function() { 
  		if($("#6_physical_health_concerns").val()=='TRUE'){ 
***************
*** 546,557 ****
  	}	
  	
! 	if($("#reasonForAssessment").val() == 'OTHR') {
! 			if($("#reason_for_assessment_other").val().length == 0) {
! 				alert('Reason for Reason for OCAN -- please specify other');
! 				$("#reason_for_assessment_other").focus();
! 				return false;
! 			}			
  	}
! 		
  		
  	if($("#consumerSelfAxCompleted").val() == 'FALSE') {
--- 576,588 ----
  	}	
  	
! 	
! 	if($("#reasonForAssessment").val() == 'OTHR') {		
! 		if($("#reason_for_assessment_other").val().length==0) {			
! 			alert('Reason for assessment - Please specify other');
! 			$("#reason_for_assessment_other").focus();
! 			return false;
! 		}		
  	}
! 	
  		
  	if($("#consumerSelfAxCompleted").val() == 'FALSE') {
***************
*** 579,615 ****
  	}	
  	
- 	if($("#reasonForAssessment").val() == 'OTHR') {		
- 		if($("#reason_for_assessment_other").val().length==0) {			
- 			alert('Reason for assessment - Please specify other');
- 			$("#reason_for_assessment_other").focus();
- 			return false;
- 		}		
- 	}
- 	
- 	if($("#power_attorney_property").val() == 'TRUE') {
- 		if($("#power_attorney_property_additional_information").val().length == 0) {
- 			alert('Client Capacity - please provider additional information');
- 			$("#power_attorney_property_additional_information").focus();
- 			return false;
- 		}
- 	}
  	
  	
- 	if($("#power_attorney_personal_care").val() == 'TRUE') {
- 		if($("#power_attorney_personal_care_additional_information").val().length == 0) {
- 			alert('Client Capacity - please provider additional information');
- 			$("#power_attorney_personal_care_additional_information").focus();
- 			return false;
- 		}
- 	}
- 	
- 	if($("#court_appointed_guardian").val() == 'TRUE') {
- 		if($("#court_appointed_guardian_additional_information").val().length == 0) {
- 			alert('Client Capacity - please provider additional information');
- 			$("#court_appointed_guardian_additional_information").focus();
- 			return false;
- 		}
- 	}
- 
  	if($("input[name='immigration_issues'][value='8']").attr('checked') == true) {
  		if($("#immigration_issues_other").val().length == 0) {
--- 610,615 ----
***************
*** 700,703 ****
--- 700,718 ----
  	
  
+ 		
+ 	if($("#hospitalized_mental_illness").val()=='TRUE') {
+ 		if($("#hospitalized_mental_illness_admissions").val().length == 0) {
+ 			alert('Please input - Total Number of Admissions for Mental Health Reasons');
+ 			$("#hospitalized_mental_illness_admissions").focus();
+ 			return false;
+ 		}
+ 		if($("#hospitalized_mental_illness_days").val().length == 0) {
+ 			alert('Please input - Total Number of Hospitalization Days for Mental Health Reasons');
+ 			$("#hospitalized_mental_illness_days").focus();
+ 			return false;
+ 		}
+ 	}	
+ 	
+ 	
  	
  	var ppCount=0;
***************
*** 710,713 ****
--- 725,729 ----
  	if(ppCount==0) {
  		alert('You must choose atleast 1 presenting issue');
+ 		$("input[name='presenting_issues']").focus();
  		return false;
  	}

Index: ocan_form_mentalHealthCenter.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_mentalHealthCenter.jsp,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -C2 -d -r1.1.4.7 -r1.1.4.8
*** ocan_form_mentalHealthCenter.jsp	29 Dec 2010 19:04:00 -0000	1.1.4.7
--- ocan_form_mentalHealthCenter.jsp	6 Jan 2011 21:10:22 -0000	1.1.4.8
***************
*** 70,74 ****
  			<td class="genericTableHeader">Ext </td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_ext"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 70,74 ----
  			<td class="genericTableHeader">Ext </td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_ext"+centerNumber,16, prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 96,100 ****
  			<td class="genericTableHeader">Organization Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_orgNameOther"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 96,100 ----
  			<td class="genericTableHeader">Organization Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_orgNameOther"+centerNumber,128, prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 111,115 ****
  			<td class="genericTableHeader">Program Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_programNameOther"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 111,115 ----
  			<td class="genericTableHeader">Program Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_programNameOther"+centerNumber,128, prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 133,137 ****
  			<td class="genericTableHeader">Functional Center Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_functionNameOther"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 133,137 ----
  			<td class="genericTableHeader">Functional Center Name - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_functionNameOther"+centerNumber,128, prepopulationLevel)%>
  			</td>
  		</tr>
***************
*** 140,144 ****
  			<td class="genericTableHeader">Functional Center Number - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),"serviceUseRecord_functionNumberOther"+centerNumber,1,30, prepopulationLevel)%>
  			</td>
  		</tr>
--- 140,144 ----
  			<td class="genericTableHeader">Functional Center Number - Other</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),"serviceUseRecord_functionNumberOther"+centerNumber,16, prepopulationLevel)%>
  			</td>
  		</tr>

Index: ocan_form_referral.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_referral.jsp,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** ocan_form_referral.jsp	22 Sep 2010 00:24:25 -0000	1.2.4.1
--- ocan_form_referral.jsp	6 Jan 2011 21:10:22 -0000	1.2.4.2
***************
*** 27,31 ****
  			<td class="genericTableHeader">Specify</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),referralNumber+"_summary_of_referral_optimal_spec",5,30,prepopulationLevel)%>
  			</td>
  		</tr>		
--- 27,31 ----
  			<td class="genericTableHeader">Specify</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),referralNumber+"_summary_of_referral_optimal_spec",128,prepopulationLevel)%>
  			</td>
  		</tr>		
***************
*** 43,47 ****
  			<td class="genericTableHeader">Actual Specify</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextArea(ocanStaffForm.getId(),referralNumber+"_summary_of_referral_actual_spec",5,30,prepopulationLevel)%>
  			</td>
  		</tr>		
--- 43,47 ----
  			<td class="genericTableHeader">Actual Specify</td>
  			<td class="genericTableData">
! 						<%=OcanForm.renderAsTextField(ocanStaffForm.getId(),referralNumber+"_summary_of_referral_actual_spec",128,prepopulationLevel)%>
  			</td>
  		</tr>		

Index: ocan_form_medication.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_medication.jsp,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** ocan_form_medication.jsp	31 May 2010 13:29:31 -0000	1.4
--- ocan_form_medication.jsp	6 Jan 2011 21:10:22 -0000	1.4.4.1
***************
*** 18,22 ****
  			<td class="genericTableHeader">Medication</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(), "medication_"+medicationNumber+"_medication", 25,prepopulationLevel)%>	
  			</td>								
  		</tr>
--- 18,22 ----
  			<td class="genericTableHeader">Medication</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(), "medication_"+medicationNumber+"_medication", 128,prepopulationLevel)%>	
  			</td>								
  		</tr>
***************
*** 32,36 ****
  			<td class="genericTableHeader">Dosage</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(), "medication_"+medicationNumber+"_dosage", 25,prepopulationLevel)%>	
  			</td>								
  		</tr>
--- 32,36 ----
  			<td class="genericTableHeader">Dosage</td>
  			<td class="genericTableData">
! 				<%=OcanForm.renderAsTextField(ocanStaffForm.getId(), "medication_"+medicationNumber+"_dosage", 128,prepopulationLevel)%>	
  			</td>								
  		</tr>

Index: ocan_form_summary_of_actions.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/ocan_form_summary_of_actions.jsp,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** ocan_form_summary_of_actions.jsp	11 Feb 2010 19:08:14 -0000	1.3
--- ocan_form_summary_of_actions.jsp	6 Jan 2011 21:10:22 -0000	1.3.4.1
***************
*** 41,45 ****
  	</td>
  	<td>
! 		<%=OcanForm.renderAsSoATextArea(ocanStaffForm.getId(),x+"_summary_of_actions_action",5,30,prepopulationLevel)%>							
  	</td>
  </tr>		
--- 41,45 ----
  	</td>
  	<td>
! 		<%=OcanForm.renderAsSoATextArea(ocanStaffForm.getId(),x+"_summary_of_actions_action",5,50,prepopulationLevel)%>							
  	</td>
  </tr>