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

Timestamp:

06/18/12 12:26:38 (12 years ago)

Author:

acoutinho

Message:

Ticket #2864 - Problema com os eventos que contem repeticao

File:

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

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

@@ -149 +149 @@
                         .'(range_start >= \'' . $start[1] . '\' AND range_start <= \'' . $end[1] . '\') OR '
                         .'(range_start <= \'' . $start[2] . '\' AND range_end >= \'' . $end[2] . '\')) '
-                .(!empty($ids) ? ' ' .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\') ' : ' ');
-
+                .(!empty($ids) ? ' ' .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\') ' : ' ')
+                .'AND calendar_object.dtstart NOT IN (SELECT calendar_repeat_occurrence.occurrence from calendar_repeat_occurrence, '
+                .'calendar_repeat where (calendar_repeat_occurrence.repeat_id = calendar_repeat.id) '
+                .'AND (calendar_repeat.object_id = calendar_object.id))';
 
                 $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
@@ -206 +208 @@
         //Recurepa as execeções anteriores caso exista
         if (isset($lastExceptions) && count($lastExceptions) && $lastExceptions)
-            foreach ($lastExceptions as $key => $value)
-                array_push($exceptions, $lastExceptions[$key]['occurrence']);
+            foreach ($lastExceptions as $value)
+                array_push($exceptions, $value['occurrence']);
 
         $params = array_diff(self::decodeRepeat($repeat, $ranges[0]['rangeStart'], $ranges[0]['rangeEnd']), $exceptions);
@@ -215 +217 @@
         if (!empty($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 . "','1','", $exceptions) . "')" ));
-    }
+        else if(!empty($exceptions))
+            Controller::service('PostgreSQL')->execResultSql("INSERT INTO calendar_repeat_occurrence(repeat_id,exception,occurrence)VALUES ('" . $id . "','1','" . implode("'),('" . $id . "','1','", $exceptions) . "')" );
+    }       
 
     public function checkOccurrences($start, $end, $calendarIds) {