Changeset 6160

Timestamp:

05/10/12 17:40:45 (12 years ago)

Author:

acoutinho

Message:

Ticket #2714 - Inconsistencia na query de busca de repeticoes

File:

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

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

@@ -118 +118 @@
             $occ = array();
 
-            if ($occurrences = self::checkOccurrences($start[0], $end[0]))
+            if ($occurrences = self::checkOccurrences($start[0], $end[0], $criteria['filter'][2][2]))
                 foreach ($occurrences as $id => $occurrence) {
                     $ids[] = $id;
@@ -143 +143 @@
                 .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\')' : '');
 
+
             $params = Controller::service('PostgreSQL')->execResultSql($sql);
 
@@ -209 +210 @@
     }
 
-    public function checkOccurrences($start, $end) {
+    public function checkOccurrences($start, $end, $calendarIds) {
 
         $ranges = Controller::find(array('concept' => 'repeatRange'), array('rangeStart', 'rangeEnd'), array('filter' => array('=', 'user', Config::me("uidNumber"))));
@@ -224 +225 @@
         }
 
-        $repeats = self::findRepeats();
-
+        $repeats = self::findRepeats($calendarIds);
         if (!is_array($repeats) || empty($repeats))
             return( false );
@@ -302 +302 @@
     }
 
-    public static function findRepeats() {
-        return Controller::service('PostgreSQL')->execResultSql('SELECT calendar_repeat.wkst as "wkst", calendar_repeat.byweekno as "byweekno", calendar_repeat.byminute as "byminute", calendar_repeat.bysecond as "bysecond", calendar_repeat.byyearday as "byyearday", calendar_repeat.bymonthday as "bymonthday", calendar_repeat.bysetpos as "bysetpos", calendar_repeat.byday as "byday", calendar_repeat.byhour as "byhour", calendar_repeat.interval as "interval", calendar_repeat.frequency as "frequency", calendar_repeat.until as "endTime", calendar_repeat.id as "id", calendar_repeat.count as "count", calendar_repeat.dtstart as "startTime" FROM calendar_repeat, calendar_participant WHERE calendar_repeat.object_id = calendar_participant.object_id AND calendar_participant.user_info_id = \'' . Config::me('uidNumber') . '\'');
+    public static function findRepeats($ids) {
+        return Controller::service('PostgreSQL')->execResultSql('SELECT calendar_repeat.wkst as "wkst", calendar_repeat.byweekno as "byweekno", calendar_repeat.byminute as "byminute", calendar_repeat.bysecond as "bysecond", calendar_repeat.byyearday as "byyearday", calendar_repeat.bymonthday as "bymonthday", calendar_repeat.bysetpos as "bysetpos", calendar_repeat.byday as "byday", calendar_repeat.byhour as "byhour", calendar_repeat.interval as "interval", calendar_repeat.frequency as "frequency", calendar_repeat.until as "endTime", calendar_repeat.id as "id", calendar_repeat.count as "count", calendar_repeat.dtstart as "startTime" FROM calendar_repeat, calendar_to_calendar_object WHERE calendar_repeat.object_id = calendar_to_calendar_object.calendar_object_id AND calendar_to_calendar_object.calendar_id IN (\'' . implode('\',\'', $ids) . '\')');
     }