Changeset 7556

Timestamp:

11/23/12 11:29:18 (11 years ago)

Author:

eduardow

Message:

Ticket #3193 - Excluir atividade não possibilita excluir tarefas.

Location:

branches/2.4/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (1 diff)
• js/activity.helpers.js (modified) (1 diff)

branches/2.4/prototype/modules/calendar/interceptors/DBMapping.php

@@ -1174 +1174 @@
             $uri['id'] = $idSchedulable;
             
-            if(isset($criteria['filter']) && isset($criteria['filter'][4]) && isset($criteria['filter'][4][2])){
-                Controller::deleteALL(array('concept' => 'taskToActivity'), null, array('filter' => array('=', 'activity', $idSchedulable)));
-            }
+         
+
+                        if(isset($criteria['type']) && $criteria['type'] == '2'){ 
+                 
+                $tasks = Controller::find(array('concept' => 'taskToActivity'), array('task'), array('filter' => array('=', 'activity', $idSchedulable))); 
+ 
+                if(is_array( $tasks ) and count( $tasks ) > 0){ 
+                    Controller::delete(array('concept' => 'taskToActivity'), null, array('filter' => array('=', 'activity', $idSchedulable))); 
+                } 
+ 
+                if(isset($criteria['removeTaskToActivity']) && $criteria['removeTaskToActivity']){ 
+                    if(is_array( $tasks ) and count( $tasks ) > 0){ 
+ 
+                        $ids = array(); 
+                        foreach($tasks as $v){ 
+                            $ids[] = $v['task']; 
+                        } 
+ 
+                        Controller::delete(array('concept' => 'schedulable'), false, array('filter' => array('IN','id', $ids ))); 
+                    } 
+                } 
+            } 
         }
         

branches/2.4/prototype/modules/calendar/js/activity.helpers.js

@@ -187 +187 @@
 UI.dialogs.addActivity.find(".menu-addactivity")
 .children(".delete").click(function(){
-    $.Zebra_Dialog('Tem certeza que deseja excluir a atividade?', {
+    $.Zebra_Dialog('A exclusão desta atividade também traz a opção de excluir suas tarefas adicionadas. O que deseja excluir?', {
         'type':     'question',
+    'width': '400',
         'overlay_opacity': '0.5',
-        'buttons':  ['Sim', 'Não'],
+        'buttons':  ['Atividade e Tarefas', 'Apenas Atividade', 'Cancelar'],
         'onClose':  function(clicked) {
-            if(clicked == 'Sim'){
-                canDiscardActivityDialog = true;
-                /* Remove por filtro */
-                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', 'calendar', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)], ['=', 'type', '2']]});
-                Calendar.rerenderView(true);
-                /********************/
-                UI.dialogs.addActivity.dialog("close");
-            }
+            if(clicked == 'Apenas Atividade'){ 
+             canDiscardActivityDialog = true; 
+             /* Remove por filtro */ 
+             DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', 'calendar', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)], ['=', 'type', '2']],criteria:{type:2}}); 
+             Calendar.rerenderView(true); 
+             /********************/ 
+             UI.dialogs.addActivity.dialog("close"); 
+             }else if(clicked == 'Atividade e Tarefas'){ 
+             canDiscardActivityDialog = true; 
+             DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', 'calendar', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)], ['=', 'type', '2']],criteria:{removeTaskToActivity: true, type:2}}); 
+             Calendar.rerenderView(true); 
+             UI.dialogs.addActivity.dialog("close"); 
+         }
         }
     });