[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/admin ProgramManagerViewAction.java, 1.64.4.66, 1.64.4.67

[dawsonli <daw...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/admin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2822/src/org/oscarehr/PMmodule/web/admin

Modified Files:
      Tag: QUATRO_TORONTO_RFQ_20080408B
	ProgramManagerViewAction.java 
Log Message:


Index: ProgramManagerViewAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/admin/ProgramManagerViewAction.java,v
retrieving revision 1.64.4.66
retrieving revision 1.64.4.67
diff -C2 -d -r1.64.4.66 -r1.64.4.67
*** ProgramManagerViewAction.java	30 Jul 2008 18:59:22 -0000	1.64.4.66
--- ProgramManagerViewAction.java	30 Jul 2008 21:10:41 -0000	1.64.4.67
***************
*** 565,579 ****
                  Program programToAdmit = null;
                  Demographic client = clientManager.getClientByDemographicNo(admission.getClientId().toString());
!                 /*
!                 if(communityProgramCode.length() > 0){
!                 	programToAdmit = programManager.getProgram(communityProgramCode);
!                 
!                 	if (programToAdmit != null && programToAdmit.getNumOfMembers().intValue() >= programToAdmit.getMaxAllowed().intValue()) {
! 	                	//client= clientManager.getClientByDemographicNo(admission.getClientId().toString());
! 	                    message += "Program Full. Cannot admit " + client.getFormattedName() + "\n";
! 	                    continue;
!                 	}
!                 }
!                 */
                  admission.setDischargeDate(Calendar.getInstance());
                  admission.setDischargeNotes("Batch discharge");
--- 565,569 ----
                  Program programToAdmit = null;
                  Demographic client = clientManager.getClientByDemographicNo(admission.getClientId().toString());
! 
                  admission.setDischargeDate(Calendar.getInstance());
                  admission.setDischargeNotes("Batch discharge");
***************
*** 589,593 ****
                  List lstFamily = intakeManager.getClientFamilyByIntakeId(admission.getIntakeId().toString());
                  
!                 admissionManager.dischargeAdmission(admission, communityProgramCode.equals(""), lstFamily);
                  
                  message += client.getFormattedName() + " has been discharged.<br>";
--- 579,584 ----
                  List lstFamily = intakeManager.getClientFamilyByIntakeId(admission.getIntakeId().toString());
                  
! //                admissionManager.dischargeAdmission(admission, communityProgramCode.equals(""), lstFamily);
!                 admissionManager.dischargeAdmission(admission, false, lstFamily);
                  
                  message += client.getFormattedName() + " has been discharged.<br>";