Changeset 7660 for trunk/prototype/modules/calendar

Timestamp:

12/17/12 14:22:24 (12 years ago)

Author:

cristiano

Message:

Ticket #3239 - Inconsistência na importação de eventos com repetição

Location:

trunk/prototype/modules/calendar/interceptors

Files:

• DAViCalAdapter.php (modified) (1 diff)
• DBMapping.php (modified) (3 diffs)

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

@@ -233 +233 @@
         }
         if(isset($params['calendar']))
-        { 
-            require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php';
+        {
             require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php';
             
-            $vcalendar = new icalCreator( ); 
+            $vcalendar = new vcalendar( );
             $vcalendar->parse($data); 
             $vcalendar->sort();

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

@@ -835 +835 @@
             foreach ($result as $i => $v) {
 
-                $currentTimezone = isset($original['criteria']['timezones'][$v['calendar']]) ? $original['criteria']['timezones'][$v['calendar']] : $v['timezone'];
+                $currentTimezone = (isset($v['calendar']) && isset($original['criteria']['timezones'][$v['calendar']])) ? $original['criteria']['timezones'][$v['calendar']] : $v['timezone'];
 
                 $date->setTimestamp((int) ($v['startTime'] / 1000));
@@ -863 +863 @@
                     $result[$i]['historic'] = Controller::find(array('concept' => 'calendarHistoric'), false, array('filter' => array('=', 'schedulable', $v['id']) , 'deepness' => 2));
 
+                }
+
+
+                if(isset( $v['occurrences'] ) && count( $v['occurrences'] ) > 0){
+
+                    foreach( $result[$i]['occurrences'] as &$o){
+
+                        $date->setTimestamp((int) ($o / 1000));
+                        $o = ($date->getTimestamp() + $date->getOffset()).'000';
+
+                    }
                 }
 
@@ -1107 +1118 @@
                 "THEN rep.id = occ.repeat_id AND occ.occurrence - al.alarm_offset >= '$target' AND occ.occurrence - al.alarm_offset <= '".( $target + 86400000)."' ".
                 "ELSE (co.range_start - al.alarm_offset) >= '$target' AND (co.range_start - al.alarm_offset) <= '".( $target + 86400000)."' END");
-            
+
             if(is_array($al))
               foreach( $al as $v )
                 $params[] = array('schedulable' =>  $v);
-              
+
             else
               $params = false;
- 
+
             return false;
         }