Changeset 6177 for trunk/prototype/modules/calendar/interceptors/Helpers.php

Timestamp:

05/14/12 16:15:42 (12 years ago)

Author:

acoutinho

Message:

Ticket #2727 - Quando criado evento com repeticoes com a hora data ou hora menor que a hora atual

File:

• trunk/prototype/modules/calendar/interceptors/Helpers.php (modified) (3 diffs)

trunk/prototype/modules/calendar/interceptors/Helpers.php

@@ -3 +3 @@
 class Helpers {    
 
-    public static function futureEvent( $startTime , $rangeEnd )
+    public static function futureEvent( $startTime , $rangeEnd, $idSchedulable )
     {   
         //Verifica data  
-                $range = new DateTime( '@'.(int)($rangeEnd / 1000) , new DateTimeZone('UTC') );
+        $range = new DateTime( '@'.(int)($rangeEnd / 1000) , new DateTimeZone('UTC') );
         list( $y1  , $m1 , $d1) = explode( '-' , $range->format('y-m-d')); 
                 
@@ -13 +13 @@
         
         if($rangeEndMicrotime < $nowMicrotime ) 
-            return false;
+            return self::futureEventDecodedRepeat($startTime , $idSchedulable, $nowMicrotime);
         
-        if($rangeEndMicrotime  === $nowMicrotime ) //caso seja o mesmo dia verifica a hora do evento.
+        if($rangeEndMicrotime === $nowMicrotime ) //caso seja o mesmo dia verifica a hora do evento.
         {
             $sTime = new DateTime( '@'.(int)($startTime / 1000) , new DateTimeZone('UTC') );            
@@ -22 +22 @@
             
             if( $eventHour  <  $nowHour )
-                    return false;
+                    return self::futureEventDecodedRepeat($startTime , $idSchedulable, $nowMicrotime);
         }
        return true; 
     }
+    
+    public static function futureEventDecodedRepeat( $startTime , $idSchedulable, $nowMicrotime )
+    {   
+
+        $sql = 'SELECT calendar_repeat_occurrence.occurrence as "occurrence" '
+        .'FROM calendar_repeat, calendar_repeat_occurrence WHERE calendar_repeat_occurrence.occurrence >= \'' . $startTime . '\' '
+        .'AND calendar_repeat.object_id = \'' . $idSchedulable . '\' '
+        .'AND calendar_repeat.id = calendar_repeat_occurrence.repeat_id AND '
+        .'calendar_repeat_occurrence.exception != 1';
+        
+        $ocurrences = Controller::service('PostgreSQL')->execResultSql($sql);
+        
+        if($ocurrences){
+            $valid = FALSE;
+            foreach($ocurrences as $value)
+                if(($value['occurrence'] / 1000) > $nowMicrotime){
+                    $valid = true;
+                    break;
+                }       
+                return $valid;
+        }  else
+            return false;
+    }
+    
+    
+    
     
     /**