- Timestamp:
- 12/19/12 13:30:46 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r7660 r7680 82 82 83 83 84 if (isset($params['due']) && $params['due'] != '' && !is_numeric($params['due'])) 84 if (isset($params['due']) && $params['due'] != '' && !is_numeric($params['due'])){ 85 85 $params['due'] = self::parseTimeDate($params['due'], $params['timezone']); 86 87 if ($params['allDay']) 88 $params['due'] = $params['due'] + 86400000; 89 } 90 86 91 87 92 /////////////////////////////////////////////////////////////////// … … 535 540 } 536 541 $params['rangeEnd'] = $params['endTime']; 542 543 if($event['type'] == '2'){ 544 545 if(!isset($params['due']) && $params['endTime'] != $event['endTime']) 546 $params['due'] = $params['endTime']; 547 548 } 537 549 } 538 550 539 540 if (isset($params['due']) && $params['due'] != '' && !is_numeric($params['due'])) 551 if (isset($params['due']) && $params['due'] != '' && !is_numeric($params['due'])){ 541 552 $params['due'] = self::parseTimeDate($params['due'], $event['timezone']); 553 554 if ((isset($params['allDay']) && $params['allDay']) || ( !isset($params['allDay']) && $event['allDay'])) 555 $params['due'] = $params['due'] + 86400000; 556 } 542 557 543 558 if($event['type'] == '2'){ … … 550 565 unset($criteria['historic']['due']); 551 566 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 $isAllDay = (($isAllDay == 1) && ($t['task']['allDay'] == '1')) ? 1 : 0; 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 unset($criteria['historic']['id']); 567 //necessário para atulizar a atividade de composta pela tarefa aqui sendo atualizada 568 if(isset($criteria['historic']['startTime']) || isset($criteria['historic']['endTime'])){ 569 $taskToActivity = Controller::find(array('concept' => 'taskToActivity'), false, array('filter' => array('AND', array('=', 'task', $uri['id']), array('=', 'owner', Config::me('uidNumber'))), 'deepness' => 2)); 570 if(!empty($taskToActivity)){ 571 $activity = Controller::read(array('concept' => 'schedulable', 'id' => $taskToActivity[0]['activity']), array('startTime', 'endTime', 'rangeStart', 'rangeEnd', 'allDay')); 572 $isAllDay = 1; 573 574 if(!empty($activity)){ 575 $start = $params['startTime']; 576 $end = $params['endTime']; 577 foreach($taskToActivity as $t){ 578 if($t['task']['id'] != $params['id']){ 579 $start = $t['task']['startTime'] < $start ? $t['task']['startTime'] : $start; 580 $end = $t['task']['endTime'] > $end ? $t['task']['endTime'] : $end; 581 $isAllDay = (($isAllDay == 1) && ($t['task']['allDay'] == '1')) ? 1 : 0; 582 } 583 } 584 585 if($event['allDay'] == '0' || (isset($params['allDay']) && $params['allDay'] == '0')) 586 $isAllDay = 0; 587 588 $toUpdate = array(); 589 590 if($start != $activity['startTime']) 591 $toUpdate['startTime'] = $start; 592 593 if($end != $activity['endTime']){ 594 $toUpdate['endTime'] = $end; 595 $toUpdate['due'] = $end; 596 } 597 598 if($isAllDay != $activity['allDay']) 599 $toUpdate['allDay'] = $isAllDay; 600 601 if(!empty($toUpdate)) 602 Controller::update(array('concept' => 'schedulable', 'id' => $taskToActivity[0]['activity']), $toUpdate); 603 } 604 } 605 } 606 607 unset($criteria['historic']['endTime']); 608 unset($criteria['historic']['rangeEnd']); 609 unset($criteria['historic']['rangeStart']); 610 unset($criteria['historic']['class']); 611 unset($criteria['historic']['type']); 612 unset($criteria['historic']['allDay']); 613 unset($criteria['historic']['id']); 599 614 } 600 615 } … … 847 862 $date->setTimezone( new DateTimeZone($currentTimezone)); 848 863 $DayLigth['event']['endTime'] = ($date->getTimestamp() + $date->getOffset()).'000'; 864 865 if(isset($v['due']) && $v['due'] != '0'){ 866 $date->setTimestamp((int) ($v['due'] / 1000)); 867 $DayLigth['event']['due'] = ($date->getTimestamp() + $date->getOffset()).'000'; 868 }else{ 869 $DayLigth['event']['due'] = $v['due']; 870 } 871 849 872 850 873 $date->setTimezone( new DateTimeZone($currentTimezone));
Note: See TracChangeset
for help on using the changeset viewer.