Changeset 5615 for trunk/prototype/modules/calendar

Timestamp:

03/02/12 19:52:21 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Remocao do importe de arquivos da agenda na inicializacao do modulo expressoMail e correcoes de bugs

Location:

trunk/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (1 diff)
• interceptors/Helpers.php (modified) (1 diff)
• js/calendar.codecs.js (modified) (3 diffs)
• js/calendar.shared.js (modified) (1 diff)
• js/helpers.js (modified) (6 diffs)

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

@@ -10 +10 @@
         $params['type_id'] = EVENT_ID;
         
-                $params['startTime'] =  strtotime( $params['startTime'] . ' ' .$params['timezone']).'000';
-        
-                $params['endTime'] =   strtotime( $params['endTime'] . ' ' .$params['timezone']).'000';
+        
+                if(!is_numeric($params['startTime']) )
+                        $params['startTime'] =  strtotime( $params['startTime'] . ' ' .$params['timezone']).'000';
                 
-                if($params['allDay'])
-                        $params['endTime'] =  $params['endTime']  + 86400000;
-
+                if (!is_numeric($params['endTime'])){
+                        $params['endTime'] =   strtotime( $params['endTime'] . ' ' .$params['timezone']).'000';
+                        
+                        if($params['allDay'])
+                                $params['endTime'] =  $params['endTime']  + 86400000;
+                }
     //        if( !isset( $new['repeat'] ))
     //            $new['range_end'] = '7287926400'; // 12/12/2200

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

@@ -5 +5 @@
     public static function futureEvent( $startTime , $rangeEnd )
     {
-        //Verifica data   
-        list( $y1  , $m1 , $d1) = explode( '-' , $rangeEnd ); 
+        //Verifica data  
+                $range = new DateTime( '@'.(int)($rangeEnd / 1000) , new DateTimeZone('UTC') );
+        list( $y1  , $m1 , $d1) = explode( '-' , $range->format('y-m-d')); 
                 
         $rangeEndMicrotime = gmmktime(0, 0, 0, $m1 , $d1, $y1); 

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

@@ -294 +294 @@
 });
 
+//TODO - Voltar quando tratado put de varios items de um mesmo conceito,
+/*
 DataLayer.listen( "calendarSignature", function( status ){
 
@@ -307 +309 @@
     }
 });
+*/
 
 DataLayer.listen( "modulePreference", function( status ){
@@ -360 +363 @@
                                         location: form.location
                                 },
-                                isOwner: 1,
+                        //      isOwner: 1,
                                 fontColor: Encoder.htmlEncode(form.fontColor.substring(1)),
                                 backgroundColor: Encoder.htmlEncode(form.backgroundColor.substring(1)),

trunk/prototype/modules/calendar/js/calendar.shared.js

@@ -317 +317 @@
                                         DataLayer.put('calendarSignature', DataLayer.merge({calendar: calendarId, isOwner: 0, user: User.me.id, fontColor: '120d0d', backgroundColor: (!!type ? 'fbec88' : '8c8c8c'), borderColor: (!!type ? 'fad24e' : '120d0d')}, !!idPermission ? {id: idPermission} : {} ));
                                 });
-                                
+
+                        DataLayer.commit( false, false, function( received ){
+                                        delete Calendar.currentViewKey;
+                                        Calendar.load();
+                                        refresh_calendars();
+                        });
+        
                         UI.dialogs.sharedCalendar.dialog("close");
                 

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

@@ -1327 +1327 @@
                                 template_content.find('form').submit();
                                 $tabs.tabs( "remove", "#configure_tab");
+                                DataLayer.commit( false, false, function( received ){
+                                        delete Calendar.currentViewKey;
+                                        Calendar.load();
+                                        refresh_calendars();
+                                });
+                                
                         }).end().filter('.cancel').click(function(evt){
                                 $tabs.tabs( "remove", "#configure_tab");
@@ -1422 +1428 @@
                                 if(idCalendar == User.preferences.defaultCalendar)
                                         DataLayer.remove( 'modulePreference', User.preferenceIds['defaultCalendar']);
+                                        
+                                        
+                                DataLayer.commit( false, false, function( received ){
+                                        delete Calendar.currentViewKey;
+                                        Calendar.load();
+                                        refresh_calendars();
+                                });
                         }
                                 $('.positionHelper').css('display', 'none');
@@ -1527 +1540 @@
                                         borderColor: colorsSuggestions[selected]['border'].substring(1)
                                 });
+                                
+                                DataLayer.commit( false, false, function( received ){
+                                        delete Calendar.currentViewKey;
+                                        Calendar.load();
+                                        refresh_calendars();
+                                });
+                                
                                 meu_container.find(".button.new").qtip('destroy');
                         });
@@ -1953 +1973 @@
                 delete newSchedulable.dtstamp;
                 delete schedulable.calendar;
-                
-                schedulable.calendar = calendar;        
+                delete schedulable.DayLigth;
+                delete schedulable.rangeStart
+                delete schedulable.rangeEnd;
+                delete schedulable.lastUpdate;
+                delete schedulable.repeat;
+        
+                schedulable.calendar = DataLayer.copy(calendar);        
         
                 newSchedulable.endTime = new Date(parseInt(newSchedulable.endTime) - (newSchedulable.allDay ? 86400000 : 0)).toString('yyyy-MM-dd hh:mm:00');
@@ -1960 +1985 @@
                 
                 var participants = DataLayer.copy(schedulable.participants);
+                
                 delete schedulable.participants;
                 
@@ -1970 +1996 @@
         
                         delete participant.id;
+                        delete participant.schedulable;
+                        delete participant.delegatedFrom;
                         
                         return participant ;
         });
         
-        
-        
-                DataLayer.put('schedulable', newSchedulable);
-
+                DataLayer.put('schedulable', newSchedulable);           
         }