Changeset 5415 for trunk/prototype/modules/calendar

Timestamp:

01/24/12 17:22:37 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Correções no importar ical

Location:

trunk/prototype/modules/calendar

Files:

• constants.php (modified) (1 diff)
• interceptors/DBMapping.php (modified) (6 diffs)
• js/calendar.codecs.js (modified) (4 diffs)

trunk/prototype/modules/calendar/constants.php

@@ -23 +23 @@
 define('CLASS_CONFIDENTIAL', 3);
 
+
+define('ICAL_ACTION_IMPORT', 1);
+define('ICAL_ACTION_UPDATE', 2);
+define('ICAL_ACTION_DELETE', 3);
+define('ICAL_ACTION_NONE', 4);
+define('ICAL_ACTION_REPLY', 5);
+
 ?>

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

@@ -24 +24 @@
                                          'lastUpdate' => 'last_update',
                                          'dtstamp' => 'dtstamp',
+                                         'sequence' => 'sequence',
                                          'timezone' => 'tzid');
       
@@ -287 +288 @@
 
     public function encodeUpdateSchedulable( &$uri , &$params , &$criteria , $original ){       
-        if(isset($params['rangeStart']))
+        if(isset($params['startTime']))
                 $params['rangeStart'] = gmdate( 'd-m-Y' , (int)($params['startTime'] / 1000) );
-        if(isset($params['rangeEnd']))
+        if(isset($params['endTime']))
                 $params['rangeEnd'] = gmdate( 'd-m-Y' , (int)($params['endTime'] / 1000) );       
         
@@ -679 +680 @@
         $newCriteria = $original['criteria'];
         $valid = true;
-        self::validExternalUserCriteria($newCriteria, self::$calendar_ex_participantMap, $valid);
+        self::validExternalUserCriteria($newCriteria['filter'], self::$calendar_ex_participantMap, $valid);
         if($valid == true)
         {
@@ -979 +980 @@
         if (!is_array($filter) || count($filter) <= 0)
             return null;
-
+        
         $op = array_shift($filter);
 
@@ -985 +986 @@
             foreach ($filter as $i => $f)
                 $filter[$i] = self::validExternalUserCriteria($f, $map ,$findCalendar );
-        }
-        else
-        {
+        }
+        else
+        {           
            if( isset($filter[0]) && !in_array($filter[0] , self::$calendar_ex_participantMap))
              $ref = false;
@@ -994 +995 @@
                 $filter[0] = isset($map[$filter[0]]) ? $map[$filter[0]] : $filter[0];
         }
-
-        array_unshift($filter, $op);
-
+        
         return( $filter );
     }

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

@@ -415 +415 @@
                                         
                                         if( attend.user.id ===  me.id ){
-                                            participantInfo = {
+                                            participantInfo.user = {
                                                         status : attend.status,
                                                         alarms : $.map(attend.alarms || [], function( alarm ){
@@ -422 +422 @@
                                                 };
                                                 me.id = attend.id;
+                                                return(null);
                                         };
                                         
@@ -433 +434 @@
                                         if( !!parseInt(attend.isOrganizer )){
                                                 isOrganizer = ((attend.user.id == User.me.id) || (!!!attend.user)) ? 1 : 0;
-                                            participantInfo.organizer = person;
+                                            participantInfo.organizer = DataLayer.copy(person);
                                                 return(null);
                                         };                                      
@@ -440 +441 @@
                                 }),
                             organizer: participantInfo.organizer || me,
-                            alarms: participantInfo.alarms || [],
-                            status: participantInfo.status || 1,
+                            alarms: !!participantInfo.user ?  participantInfo.user.alarms : [],
+                            status: !!participantInfo.user ? participantInfo.user.status :  1,
                             me: me,
                                 isOrganizer: isOrganizer,