Changeset 7097 for trunk/prototype/modules
- Timestamp:
- 08/22/12 10:21:10 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r7077 r7097 496 496 } 497 497 498 //Encode Update 499 498 //Encode Update 500 499 public function encodeUpdateSchedulable(&$uri, &$params, &$criteria, $original) { 501 502 $event = Controller::read(array('concept' => 'schedulable', 'id' => $params['id'])); 503 500 $event = Controller::read(array('concept' => 'schedulable', 'id' => $uri['id'])); 504 501 if (isset($params['startTime'])) { 505 502 … … 525 522 $params['due'] = self::parseTimeDate($params['due'], $event['timezone']); 526 523 527 528 524 if($event['type'] == '2'){ 529 530 525 $criteria['historic'] = $params; 531 526 $criteria['beforeValue'] = $event; … … 533 528 if(isset($params['startTime']) && $params['startTime'] == $event['startTime']) 534 529 unset($criteria['historic']['startTime']); 535 536 if(isset($params['endTime']) && $params['endTime'] == $event['endTime'])537 unset($criteria['historic']['endTime']);538 539 530 if(isset($params['due']) && $params['due'] == $event['due']) 540 531 unset($criteria['historic']['due']); 541 532 542 //necessário para atulizar a atividade de composta pela tarefa aqui sendo atualizada 543 if(isset($criteria['historic']['startTime']) || isset($criteria['historic']['endTime'])){ 544 $taskToActivity = Controller::find(array('concept' => 'taskToActivity'), false, array('filter' => array('AND', array('=', 'schedulable', $event['id']), array('=', 'owner', Config::me('uidNumber'))), 'deepness' => 2)); 545 546 if(!empty($taskToActivity)){ 547 $activity = Controller::read(array('concept' => 'schedulable', 'id' => $taskToActivity[0]['activity']), array('startTime', 'endTime', 'rangeStart', 'rangeEnd')); 548 $start = $params['startTime']; 549 $end = $params['endTime']; 550 foreach($taskToActivity as $t){ 551 if($t['task']['id'] != $params['id']){ 552 $start = $t['task']['startTime'] < $start ? $t['task']['startTime'] : $start; 553 $end = $t['task']['endTime'] < $end ? $t['task']['endTime'] : $end; 554 } 555 } 556 557 $toUpdate = array(); 558 559 if($start != $activity['startTime']) 560 $toUpdate['starTime'] = $start; 561 562 if($end != $activity['endTime']) 563 $toUpdate['endTime'] = $end; 564 565 if(!empty($toUpdate)) 566 Controller::update(array('concept' => 'schedulable', 'id' => $activity['id']), $toUpdate); 533 //necessário para atulizar a atividade de composta pela tarefa aqui sendo atualizada 534 if(isset($criteria['historic']['startTime']) || isset($criteria['historic']['endTime'])){ 535 $taskToActivity = Controller::find(array('concept' => 'taskToActivity'), false, array('filter' => array('AND', array('=', 'task', $uri['id']), array('=', 'owner', Config::me('uidNumber'))), 'deepness' => 2)); 536 if(!empty($taskToActivity)){ 537 $activity = Controller::read(array('concept' => 'schedulable', 'id' => $taskToActivity[0]['activity']), array('startTime', 'endTime', 'rangeStart', 'rangeEnd', 'allDay')); 538 $isAllDay = 1; 539 540 if(!empty($activity)){ 541 $start = $params['startTime']; 542 $end = $params['endTime']; 543 foreach($taskToActivity as $t){ 544 if($t['task']['id'] != $params['id']){ 545 $start = $t['task']['startTime'] < $start ? $t['task']['startTime'] : $start; 546 $end = $t['task']['endTime'] > $end ? $t['task']['endTime'] : $end; 547 $isAllDay = (($isAllDay == 1) && ($t['task']['allDay'] == '1')) ? 1 : 0; 548 } 549 } 550 551 if($event['allDay'] == '0' || (isset($params['allDay']) && $params['allDay'] == '0')) 552 $isAllDay = 0; 553 554 $toUpdate = array(); 555 556 if($start != $activity['startTime']) 557 $toUpdate['startTime'] = $start; 558 559 if($end != $activity['endTime']){ 560 $toUpdate['endTime'] = $end; 561 $toUpdate['due'] = $end; 562 } 563 564 if($isAllDay != $activity['allDay']) 565 $toUpdate['allDay'] = $isAllDay; 566 567 if(!empty($toUpdate)) 568 Controller::update(array('concept' => 'schedulable', 'id' => $taskToActivity[0]['activity']), $toUpdate); 569 } 570 } 567 571 } 568 } 569 570 571 572 573 574 575 572 573 unset($criteria['historic']['endTime']); 574 unset($criteria['historic']['rangeEnd']); 575 unset($criteria['historic']['rangeStart']); 576 unset($criteria['historic']['class']); 577 unset($criteria['historic']['type']); 578 unset($criteria['historic']['allDay']); 579 unset($criteria['historic']['id']); 576 580 } 577 581 } -
trunk/prototype/modules/calendar/js/calendar.shared.js
r6996 r7097 552 552 'buttons': ['Sim', 'Não'], 553 553 'onClose': function(clicked) { 554 555 DataLayer.remove('calendarSignature', ''+signatureId);556 DataLayer.commit( false, false, function( received ){557 558 559 560 });554 if(clicked == 'Sim'){ 555 DataLayer.remove('calendarSignature', ''+signatureId); 556 DataLayer.commit( false, false, function( received ){ 557 delete Calendar.currentViewKey; 558 Calendar.load(); 559 refresh_calendars(); 560 }); 561 561 } 562 562 } -
trunk/prototype/modules/calendar/templates/calendar_list.ejs
r6996 r7097 102 102 <li><a href="#" onclick="show_modal_import_export(1, <%= signatures['sharedCalendar'][i].calendar.id%>, 0);">Exportar</a></li> 103 103 <%if(!signatures['sharedCalendar'][i].permission.acl['required']){%> 104 <li><a href="#" onclick="cancel_signature s['sharedCalendar'](<%= signatures['sharedCalendar'][i].id %>);">Cancelar assinatura</a></li>104 <li><a href="#" onclick="cancel_signature(<%= signatures['sharedCalendar'][i].id %>);">Cancelar assinatura</a></li> 105 105 <%}%> 106 106 </ul>
Note: See TracChangeset
for help on using the changeset viewer.