Changeset 6974 for sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

08/09/12 12:25:44 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Correcoes de bugs e melhorias / suporte a historico em atividades

File:

• sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php (modified) (5 diffs)

sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php

@@ -12 +12 @@
     static function encodeCreateSchedulable(&$uri, &$params, &$criteria, $original) 
     {
-
-        if(isset($params['summary']) && $params['summary'] == '')
-            $params['summary'] = 'Evento sem título';
 
         if (!is_numeric($params['startTime']))
@@ -566 +563 @@
     static function createParticipantHistoric(&$uri, &$params, &$criteria, $original){
 
-        if(!isset($criteria['event'])){
-            $event = Controller::read(array('concept' => 'schedulable', 'id' => $original['properties']['schedulable']));
-            $criteria['event'] = $event;
-        }else
-            $event = $criteria['event'];
-
-        if($event['type'] == '2'){
-             Controller::create(array('concept' => 'calendarHistoric'), 
-                array('schedulable' => $original['properties']['schedulable'], 
-                    'user' => Config::me('uidNumber'),
-                    'time' => time() . '000',
-                    'attribute' => 'participant',
-                    'beforeValue' => '',
-                    'afterValue' => $original['properties']['user']
-                    )
-                );
-        }
+        if(isset($original['properties']) && $original['properties']['isOrganizer'] != '1'){
+            if(!isset($criteria['event'])){
+                $event = Controller::read(array('concept' => 'schedulable', 'id' => $original['properties']['schedulable']));
+                $criteria['event'] = $event;
+            }else
+                $event = $criteria['event'];
+
+            if($event['type'] == '2'){
+                Controller::create(array('concept' => 'calendarHistoric'), 
+                    array('schedulable' => $original['properties']['schedulable'], 
+                        'user' => Config::me('uidNumber'),
+                        'time' => time() . '000',
+                        'attribute' => 'participant',
+                        'beforeValue' => '',
+                        'afterValue' => $original['properties']['user']
+                        )
+                    );
+            }
+        }
     }
 
@@ -840 +839 @@
             } 
             
+       }
+       
+       if(isset($result['id']) && $result['type'] == '2'){
+           $result['historic'] =  Controller::find( array( 'concept' => 'calendarHistoric' ), false, array( 'filter' => array( '=', 'schedulable', $result['id'] ) ) );
        }
    } 
@@ -1039 +1042 @@
         if(isset($criteria['filter']) && $criteria['filter'] && isset($criteria['filter'][1][2])){
             $idSchedulable = $criteria['filter'][1][2];
-                        $idCalendar = $criteria['filter'][2][2];
+            $idCalendar = $criteria['filter'][2][2];
             $owner = $criteria['filter'][3][2];
 
@@ -1076 +1079 @@
 
             $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)));
+            }
         }