Changeset 5953 for trunk/prototype
- Timestamp:
- 04/16/12 17:23:13 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r5947 r5953 308 308 if( $repeat['frequency'] === 'none' ) 309 309 return( array() ); 310 311 $start = new DateTime( '@'.(int)( max( $start, $repeat['startTime'] ) / 1000 ), new DateTimeZone('UTC') ); 312 310 311 //Nao deve ser usando o horário da repeticao pois nela contem apenas o dias, 312 //deve se recuperar o horário do evento para um correto calculo. 313 if(max( $start, $repeat['startTime'] ) != $repeat['startTime']){ 314 $time = new DateTime( '@'.(int)( $repeat['startTime'] / 1000 ), new DateTimeZone('UTC') ); 315 316 $hoursOcurrence = new DateTime( '@'.(int)( $start / 1000 ), new DateTimeZone('UTC') ); 317 $hoursOcurrence = $hoursOcurrence->format('H'); 318 319 $diffTime = ((($time->format('H') - $hoursOcurrence) * (3600000)) + ($time->format('i') * (60000))); 320 $start = new DateTime( '@'.(int)( ( $start + $diffTime ) / 1000 ), new DateTimeZone('UTC') ); 321 322 323 }else 324 $start = new DateTime( '@'.(int)( max( $start, $repeat['startTime'] ) / 1000 ), new DateTimeZone('UTC') ); 325 313 326 foreach($repeat as $rule => $value) 314 327 { -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r5947 r5953 763 763 var tzId = form.timezone || Calendar.signatureOf[form.calendar].calendar.timezone || User.preferences.timezone, 764 764 765 formatString = ( typeof form.allDay !== "undefined" && !!form.allDay )? pref.dateFormat+" HH:mm" : pref.dateFormat + " " + pref.hourForma ;765 formatString = ( typeof form.allDay !== "undefined" && !!form.allDay )? pref.dateFormat+" HH:mm" : pref.dateFormat + " " + pref.hourFormat; 766 766 767 767 var Owner = decodeOwnerCalendar(form.calendar);
Note: See TracChangeset
for help on using the changeset viewer.