Changeset 5953 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

04/16/12 17:23:13 (12 years ago)

Author:

acoutinho

Message:

Ticket #2631 - Inconsistencia na mudanca de fuso-horario na decorrencia de uma repeticao

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (1 diff)

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

@@ -308 +308 @@
     if( $repeat['frequency'] === 'none' )
         return( array() );
-
-    $start =  new DateTime( '@'.(int)( max( $start, $repeat['startTime']  ) / 1000 ), new DateTimeZone('UTC') );    
-
+ 
+    //Nao deve ser usando o horário da repeticao pois nela contem apenas o dias,
+    //deve se recuperar o horário do evento para um correto calculo.
+    if(max( $start, $repeat['startTime']  ) != $repeat['startTime']){
+        $time = new DateTime( '@'.(int)( $repeat['startTime'] / 1000 ), new DateTimeZone('UTC') );
+        
+        $hoursOcurrence = new DateTime( '@'.(int)( $start / 1000 ), new DateTimeZone('UTC') );
+        $hoursOcurrence = $hoursOcurrence->format('H');
+        
+        $diffTime = ((($time->format('H') - $hoursOcurrence) * (3600000)) + ($time->format('i') * (60000)));
+        $start =  new DateTime( '@'.(int)( ( $start + $diffTime )  / 1000 ), new DateTimeZone('UTC') );    
+        
+        
+    }else
+        $start =  new DateTime( '@'.(int)( max( $start, $repeat['startTime']  ) / 1000 ), new DateTimeZone('UTC') );    
+    
     foreach($repeat as $rule => $value)
     {