Changeset 7953 for trunk

Timestamp:

03/05/13 11:39:07 (11 years ago)

Author:

acoutinho

Message:

Ticket #3370 - Corrigido duplicacao de repeticao em compartilhamento de eventos

Location:

trunk/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (5 diffs)
• js/calendar.codecs.js (modified) (1 diff)
• js/helpers.js (modified) (2 diffs)

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

@@ -340 +340 @@
         $repeat = Controller::read(array('concept' => 'repeat', 'id' => $id));
 
-        unset($repeat['schedulable']);
         unset($repeat['id']);
 
@@ -347 +346 @@
         if (isset($original['properties']['exceptions'])) {
             $exceptions = explode(',', $original['properties']['exceptions']);
-            unset($repeat['exceptions']);
+            $event = Controller::read(array('concept' => 'schedulable', 'id' => $repeat['schedulable']));
+
+        if(array_key_exists(0, $event)) $event = $event[0];
+
+        $date = new DateTime('now', new DateTimeZone('UTC'));
+
+        foreach($exceptions as &$e){
+            $date->setTimestamp((int) ($e / 1000));
+            $date->setTimezone( new DateTimeZone( $event['timezone'] ));
+            $e = ($date->getTimestamp() - $date->getOffset()).'000';
+        }
+
+        unset($repeat['exceptions']);
         }
 
-        $lastExceptions = Controller::find(array('concept' => 'repeatOccurrence'), array("occurrence"), array('filter' => array('AND', array('=', 'repeat', $id), array('=', 'exception', 1))));
+    unset($repeat['schedulable']);
+
+    $lastExceptions = Controller::find(array('concept' => 'repeatOccurrence'), array("occurrence"), array('filter' => array('AND', array('=', 'repeat', $id), array('=', 'exception', 1))));
 
         //Recurepa as execeções anteriores caso exista
@@ -365 +378 @@
         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) {
@@ -414 +427 @@
 
             foreach ($result as $id => $res){
-                
-                $ocurrences = array_unique($res);
+
+            $ocurrences = array_unique($res);
+
+            /*
+             * Check current range decoded
+             * */
+            $current = Controller::find(array('concept' => 'repeatOccurrence'), array("occurrence"), array('filter' => array('=', 'repeat', $id)));
+            $toDiff = array();
+
+            if(!empty($current))
+                foreach($current as $c) $toDiff[] = $c['occurrence'];
+
+            $ocurrences = array_diff($ocurrences, $toDiff);
+
+            if(!empty($ocurrences))
                 Controller::service('PostgreSQL')->execResultSql("INSERT INTO calendar_repeat_occurrence(repeat_id,occurrence)VALUES('" . $id . "','" . implode("'),('" . $id . "', '", $ocurrences) . "')");
-            }
+
+        }
             $data = array();
 
@@ -436 +463 @@
 //      $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');
+        $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 order by calendar_repeat_occurrence.occurrence');
 
         if (!is_array($return))

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -1856 +1856 @@
                                 allDay: parseInt( evt.allDay ),
                                 isRepeat: isRepeat,
-                                occurrence: i,
+                                occurrence: occurrences[i],
                                 type: typeEvent,
                                 calendar: evt.calendar, 

trunk/prototype/modules/calendar/js/helpers.js

@@ -1981 +1981 @@
 }
 
-function mount_exception(eventID, idException){
+function mount_exception(eventID, exception){
 
     getSchedulable( eventID.toString() , '');
@@ -1990 +1990 @@
     edit.repeat.endTime = parseInt(edit.repeat.count) > 0 ? '0' : new Date(parseInt(edit.repeat.endTime)).toString('yyyy-MM-dd HH:mm:00');
     
-    edit.repeat.exceptions = (schedulable.occurrences[idException]);         
+    edit.repeat.exceptions = ( exception );
     
     return edit.repeat;
-
 }