Changeset 5741 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

03/16/12 15:02:14 (12 years ago)

Author:

natan

Message:

Ticket #2434 - Desenvolvimento do backend de suporte a excessoes nas repeticoes

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (5 diffs)

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

@@ -120 +120 @@
 
          $params = Controller::service('PostgreSQL')->execResultSql($sql);
+
+         $params = array_merge( $params, $occ );
          $params = self::deepnessFindEvent( &$uri , &$params , &$criteria , $original);
- 
-         $params = array_merge( $params, $occ );
 
          return false;
@@ -166 +166 @@
         unset( $repeat['id'] );
 
-        $params = self::decodeRepeat( $repeat, $ranges[0]['rangeStart'], $ranges[0]['rangeEnd'] );
+        $exceptions = array();
+
+        if( isset( $repeat['exceptions'] ) )
+        {
+            $exceptions = explode( ',', $repeat['exceptions'] );
+            unset( $repeat['exceptions'] );
+        }
+
+        $params = array_diff( self::decodeRepeat( $repeat, $ranges[0]['rangeStart'], $ranges[0]['rangeEnd'] ), $exceptions );
 
         Controller::delete( array( 'concept' => 'repeatOccurrence' ), false, array( 'filter' => array( '=', 'repeat', $id ) ) );
 
         if( !empty($params) )
-            Controller::service('PostgreSQL')->execResultSql( "INSERT INTO calendar_repeat_occurrence(repeat_id,occurrence)VALUES('".$id."', '".implode( "'),('".$id."','", $params )."')" );
+            Controller::service('PostgreSQL')->execResultSql( "INSERT INTO calendar_repeat_occurrence(repeat_id,exception,occurrence)VALUES('".$id."','0','".implode( "'),('".$id."','0','", $params )."')".( empty($exceptions) ? "" : ",('".$id."','1','".implode( "'),('".$id."','0','", $exceptions )."')" ) );
 
     }
@@ -244 +252 @@
         }
 
-        $return = Controller::find( array( 'concept' => 'repeatOccurrence' ), false, array( 'filter' => array( 'AND', array( '>=', 'occurrence', $origStart ), array( '<=', 'occurrence', $origEnd ), array( 'IN', 'repeat', $ids ) ), 'deepness' => $deep ) );
+//      $return = Controller::find( array( 'concept' => 'repeatOccurrence' ), false, array( 'filter' => array( 'AND', array( '>=', 'occurrence', $origStart ), array( '<=', 'occurrence', $origEnd ), array( 'IN', 'repeat', $ids ) ), 'deepness' => $deep ) );
+
+        $return = Controller::service('PostgreSQL')->execResultSql( 'SELECT calendar_repeat_occurrence.occurrence as "occurrence", calendar_repeat.object_id as "schedulable" FROM calendar_repeat, calendar_repeat_occurrence WHERE calendar_repeat_occurrence.occurrence >= \''.$origStart.'\' AND calendar_repeat_occurrence.occurrence <= \''.$origEnd.'\' AND calendar_repeat_occurrence.repeat_id IN (\''.implode( '\',\'', $ids ).'\') AND calendar_repeat.id = calendar_repeat_occurrence.repeat_id AND calendar_repeat_occurrence.exception != 1' );
 
         if( !is_array( $return ) )
@@ -254 +264 @@
         foreach( $return as $ret )
         {
-              $currentId = $ret['repeat']['schedulable']['id'];
+              $currentId = $ret['schedulable'];
 
               if( !isset( $result[ $currentId ] ) )
               {
-                    $result[ $currentId ] = $ret['repeat']['schedulable'];
-                    $result[ $currentId ]['repeat']['schedulable'] = $currentId;
-
+                    $result[ $currentId ] = Controller::read( array( 'concept' => 'schedulable', 'id' => $currentId ) );
                     $result[ $currentId ][ 'occurrences' ] = array();
 
                     $calendarToCalendarObj = self::schedulable2calendarToObject( $currentId );
-
-                    $result[ $currentId ]['calendar'] = $calendarToCalendarObj[0]['calendar_id'];  
+                    $result[ $currentId ]['calendar'] = $calendarToCalendarObj[0]['calendar_id'];
               }
       
@@ -527 +534 @@
                     $repeat = Controller::find( array( 'concept' => 'repeat' ), false, array( 'filter' => array( '=', 'schedulable', $v['id'] ) ) );
 
+                    unset( $result[$i]['repeat'] );
+
                     if( is_array($repeat) )
                         $result[$i]['repeat'] = $repeat[0];