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

Timestamp:

07/25/12 17:05:36 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Criacao e edicao de tarefas / suporte a anexos, alarmes, participantes e mapa de disponibilidade

File:

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

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

@@ -16 +16 @@
             $params['summary'] = 'Evento sem título';
 
-        if (!is_numeric($params['startTime']))
-            $params['startTime'] = self::parseTimeDate($params['startTime'], $params['timezone']);
-
-        if (!is_numeric($params['endTime'])) {
-            $params['endTime'] = self::parseTimeDate($params['endTime'], $params['timezone']);
-
-            if ($params['allDay'])
-                $params['endTime'] = $params['endTime'] + 86400000;
-        }
-
-        $params['rangeEnd'] = $params['endTime'];
-        $params['rangeStart'] = $params['startTime'];
-
-        ///////////////////////////////////////////////////////////////////
-
-        $params['dtstamp'] = (isset($params['dtstamp'])) ? $params['dtstamp'] : time() . '000';
-        $params['lastUpdate'] = (isset($params['lastUpdate'])) ? $params['lastUpdate'] : time() . '000';
-        $params['uid'] = isset($params['uid']) ? $params['uid'] : self::_makeUid();
-    }
+        if (!is_numeric($params['startTime']))
+            $params['startTime'] = self::parseTimeDate($params['startTime'], $params['timezone']);
+
+        if (!is_numeric($params['endTime'])) {
+            $params['endTime'] = self::parseTimeDate($params['endTime'], $params['timezone']);
+
+            if ($params['allDay'])
+                $params['endTime'] = $params['endTime'] + 86400000;
+        }
+
+        if (isset($params['due']) && $params['due'] != '' && !is_numeric($params['due']))
+            $params['due'] = self::parseTimeDate($params['due'], $params['timezone']);
+
+
+        $params['rangeEnd'] = $params['endTime'];
+        $params['rangeStart'] = $params['startTime'];
+
+        ///////////////////////////////////////////////////////////////////
+
+        $params['dtstamp'] = (isset($params['dtstamp'])) ? $params['dtstamp'] : time() . '000';
+        $params['lastUpdate'] = (isset($params['lastUpdate'])) ? $params['lastUpdate'] : time() . '000';
+        $params['uid'] = isset($params['uid']) ? $params['uid'] : self::_makeUid();
+        }
 
     static function parseTimeDate($time, $timezone) {
@@ -136 +140 @@
                 .'calendar_object.dtstart as "startTime", calendar_object.summary as "summary", '
                 .'calendar_object.description as "description", calendar_object.dtend as "endTime" , '
+        .'calendar_object.priority as "priority", calendar_object.due as "due", '
+        .'calendar_object.percentage as "percentage", calendar_object.status as "status", '
                 .'calendar_object.location as "location", calendar_object.allday as "allDay", '
                 .'calendar_object.transp as "transparent", calendar_object.class_id as "class", '
@@ -422 +428 @@
     public function encodeUpdateSchedulable(&$uri, &$params, &$criteria, $original) {
 
-        $event = Controller::read(array('concept' => 'schedulable', 'id' => $params['id']));
-        
-        if (isset($params['startTime'])) {
-
-            if (!is_numeric($params['startTime']))
-                $params['startTime'] = self::parseTimeDate($params['startTime'], $event['timezone']);
-
-            $params['rangeStart'] = $params['startTime'];
-        }if (isset($params['endTime'])) {
-
-            if (!is_numeric($params['endTime'])) {
-                $params['endTime'] = self::parseTimeDate($params['endTime'], $event['timezone']);
-
-            if ((isset($params['allDay']) && $params['allDay']) || ( !isset($params['allDay']) && $event['allDay']))
-                $params['endTime'] = $params['endTime'] + 86400000;
-            }
-            $params['rangeEnd'] = $params['endTime'];
-        }
+        $event = Controller::read(array('concept' => 'schedulable', 'id' => $params['id']));
+        
+        if (isset($params['startTime'])) {
+
+            if (!is_numeric($params['startTime']))
+                $params['startTime'] = self::parseTimeDate($params['startTime'], $event['timezone']);
+
+            $params['rangeStart'] = $params['startTime'];
+        }
+
+        if (isset($params['endTime'])) {
+
+            if (!is_numeric($params['endTime'])) {
+                $params['endTime'] = self::parseTimeDate($params['endTime'], $event['timezone']);
+
+            if ((isset($params['allDay']) && $params['allDay']) || ( !isset($params['allDay']) && $event['allDay']))
+                $params['endTime'] = $params['endTime'] + 86400000;
+            }
+            $params['rangeEnd'] = $params['endTime'];
+        }
+
+
+        if (isset($params['due']) && $params['due'] != '' && !is_numeric($params['due']))
+            $params['due'] = self::parseTimeDate($params['due'], $event['timezone']);
     }