Changeset 6177

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

Location:

trunk/prototype/modules/calendar/interceptors

Files:

• DBMapping.php (modified) (5 diffs)
• Helpers.php (modified) (3 diffs)
• Notifications.php (modified) (6 diffs)

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

@@ -554 +554 @@
 //TODO: Remover apos suporte a deepness na api
     public function deepnessReadParticipant( &$uri , &$result , &$criteria , $original ){
-
+        
+        
        if(isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0)
        {
@@ -565 +566 @@
             }
        }
-
+       
+      
+       
    } 
 
     //TODO: Remover apos suporte a deepness na api 
     public function deepnessReadEvent( &$uri , &$result , &$criteria , $original ){             
-       
+    
        if(isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0)
        {
             if(isset($result['id']))
             {
-                $result['participants'] = Controller::find( array( 'concept' => 'participant' ) , false ,array( 'filter' => array('=' ,  'schedulable' ,  $result['id']), 'criteria' => array('deepness' => $original['criteria']['deepness'] - 1) )); 
+                $result['participants'] = Controller::find( array( 'concept' => 'participant' ) , false ,array( 'filter' => array('=' ,  'schedulable' ,  $result['id']), 'deepness' => $original['criteria']['deepness'] - 1) ); 
 
                 $repeat =  Controller::find( array( 'concept' => 'repeat' ), false, array( 'filter' => array( '=', 'schedulable', $result['id'] ) ) );
@@ -581 +584 @@
                 if(is_array($repeat))
                     $result['repeat'] = $repeat[0];
-            }
+            } 
+            
        }
    } 
@@ -587 +591 @@
     //TODO: Remover apos suporte a deepness na api 
     public function deepnessFindParticipant( &$uri , &$result , &$criteria , $original ){
-
        if(isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0)
        {
@@ -593 +596 @@
            {
                 self::deepnessReadParticipant( $uri, $v, $criteria, $original );
-           }
-       }
+           }
+       }  
        
    } 

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;
+    }
+    
+    
+    
     
     /**

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

@@ -43 +43 @@
                     $updated[] = $concept['id'];
             }
-            else if ($concept['concept'] === 'schedulable') { //Caso exista schedulable no commit antecipa o carregamento do owner
+            else if ($concept['concept'] === 'schedulable') { //Caso exista schedulable no commit antecipa o carregamento do owner              
                 $schedulables[$concept['id']] = Controller::read(array('concept' => 'schedulable', 'id' => $concept['id']), false, array('deepness' => '2'));
                 foreach ($schedulables[$concept['id']]['participants'] as $i => $v) //salva em $organizers as informações do organizador      
@@ -69 +69 @@
                     continue; //escapa organizador
                 $schedulable = isset($schedulables[$pCreated['schedulable']]) ? $schedulables[$pCreated['schedulable']] : Controller::read(array('concept' => 'schedulable', 'id' => $pCreated['schedulable']), false, array('deepness' => '2'));
-                if (!self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))
+                if (!self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))
                     continue; //Escapa eventos do passado
 
@@ -96 +96 @@
                     continue; //escapa organizador
                 $schedulable = isset($schedulables[$pUpdated['schedulable']]) ? $schedulables[$pUpdated['schedulable']] : Controller::read(array('concept' => 'schedulable', 'id' => $pUpdated['schedulable']), false, array('deepness' => '2'));
-                if (!self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))
+                if (!self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))
                     continue; //Escapa eventos do passado
 
@@ -452 +452 @@
     public function deleteEvent(&$uri, &$result, &$params, $original) {
         $schedulable = Controller::read(array('concept' => 'schedulable', 'id' => $uri['id']), null, array('deepness' => '2'));
-        if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))) {
+        if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
             $method = 'CANCEL';
             $notificationType = 'Cancelamento de Calendario';
@@ -478 +478 @@
         $schedulable = Controller::read(array('concept' => 'schedulable', 'id' => $participant['schedulable']));
 
-        if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))) {
+        if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
             $method = 'CANCEL';
             $notificationType = 'Cancelamento de Calendario';
@@ -509 +509 @@
             }
 
-        if (($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))) {
+        if (($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
             $method = 'REQUEST';
             $notificationType = 'Modificação de Calendario';