[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web ServiceRestrictionAction.java, 1.1.2.40, 1.1.2.41

[Tony W. <ton...@us...>]

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

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


Index: ServiceRestrictionAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/Attic/ServiceRestrictionAction.java,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -C2 -d -r1.1.2.40 -r1.1.2.41
*** ServiceRestrictionAction.java	19 Aug 2008 13:17:22 -0000	1.1.2.40
--- ServiceRestrictionAction.java	15 Sep 2008 17:34:26 -0000	1.1.2.41
***************
*** 351,355 ****
--- 351,368 ----
      	   else
      		   clientForm.set("maxLength", maxDays);
+  
+     	   if(Utility.IsEmpty(rId)) {
+ 	    	   Integer defDays = program.getDefaultServiceRestrictionDays();
+ 	    	   if(defDays != null)
+ 	    		   clientForm.set("serviceRestrictionLength", defDays);
+ 	    	   else
+ 	    		   clientForm.set("serviceRestrictionLength", null);
+     	   }
+        }
+        else
+        {
+     	   if(Utility.IsEmpty(rId)) clientForm.set("serviceRestrictionLength", null);
         }
+     	   
  //       if (!Utility.IsEmpty(rId) && !("0".equals(rId))){
  //    	   int length = MyDateFormat.getDaysDiff(pcrObj.getStartDate(), pcrObj.getEndDate());