Changeset 6136

Timestamp:

05/08/12 15:12:01 (12 years ago)

Author:

natan

Message:

Ticket #2141 - Eventos com repeticao nao dispara notificacao nos alarmes - ajustes e correcoes

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -38 +38 @@
     }
 
-    public function encodeCreateAlarm(&$uri, &$params, &$criteria, $original) {
-
-        if (!isset($params['schedulable']) || !isset($params['rangeStart']) || !isset($params['rangeEnd'])) {
-            $participant = Controller::read(array('concept' => 'participant', 'id' => $params['participant']), array('schedulable'));
-            $schedulable = Controller::read(array('concept' => 'schedulable', 'id' => $participant['schedulable']), array('startTime', 'endTime'));
-
-            $params['schedulable'] = $participant['schedulable'];
-            $params['rangeStart'] = strtotime('- ' . $params['time'] . ' ' . self::codeAlarmUnit($params['unit']), (int) ($schedulable['startTime'] / 1000)) . '000';
-            $params['rangeEnd'] = $schedulable['endTime'];
-        }
-
-        $params['type'] = self::codeAlarmType($params['type']);
+     public function encodeCreateAlarm( &$uri , &$params , &$criteria , $original ){
+        
+        if(!isset($params['schedulable']) || !isset($params['rangeStart']) || !isset($params['rangeEnd']) )
+        {
+            $participant = Controller::read( array( 'concept' => 'participant' , 'id' => $params['participant'] ) , array('schedulable')  );
+
+            $params['schedulable'] = $participant['schedulable'];
+
+            $params['type'] = self::codeAlarmType($params['type']);
+
+            $params['offset'] = $params['time'] * 1000;
+
+            switch( strtolower($params['unit']) )
+            {
+                case 'd': $params['offset'] *= 24;
+                case 'h': $params['offset'] *= 60;
+                case 'm': $params['offset'] *= 60;
+            }
+        }
     }
 
@@ -658 +665 @@
 
             $params = array();
-            
-            $al = Controller::service('PostgreSQL')->execSql("SELECT co.id as id, co.cal_uid as uid, co.type_id as type, co.dtstart as startTime, co.summary as summary, co.description as description, co.dtend as endTime, co.location as location, co.allday as allDay, co.transp as transparent, co.class_id as class, ".
-                                                              "co.range_start as rangeStart, co.range_end as rangeEnd, co.last_update as lastUpdate, co.dtstamp as dtstamp, co.sequence as sequence, co.tzid as timezone, CASE WHEN rep.object_id = co.id THEN occ.occurrence - al.alarm_offset ELSE co.dtstart - al.alarm_offset END as sendTime ".
-                                                              "FROM calendar_alarm as al, calendar_object as co, calendar_repeat as rep, calendar_repeat_occurrence as occ, calendar_participant as part WHERE ".
-                                                              "al.action_id = '".ALARM_ALERT."' AND al.sent = '0' AND al.participant_id = part.id AND part.object_id = co.id AND ".
-                                                              "CASE WHEN rep.object_id = co.id ".
-                                                              "THEN rep.id = occ.repeat_id AND occ.occurrence - al.alarm_offset >= '$target' AND occ.occurrence - al.alarm_offset <= '".( $target + 86400000)."' ".
-                                                              "ELSE co.range_start - al.alarm_offset >= '$target' AND co.range_start - al.alarm_offset <= '".( $target + 86400000)."' END");
+
+            $al = Controller::service('PostgreSQL')->execSql( "SELECT distinct co.id as \"id\", co.cal_uid as \"uid\", co.type_id as \"type\", co.dtstart as \"startTime\", co.summary as \"summary\", co.description as \"description\", co.dtend as \"endTime\", co.location as \"location\", co.allday as \"allDay\", co.transp as transparent, co.class_id as class, ".
+                                                                "co.range_start as \"rangeStart\", co.range_end as \"rangeEnd\", co.last_update as \"lastUpdate\", co.dtstamp as \"dtstamp\", co.sequence as \"sequence\", co.tzid as \"timezone\", CASE WHEN rep.object_id = co.id THEN occ.occurrence - al.alarm_offset ELSE co.dtstart - al.alarm_offset END as \"sendTime\" ".
+                                                                "FROM calendar_alarm as al, calendar_object as co, calendar_repeat as rep, calendar_repeat_occurrence as occ, calendar_participant as part WHERE ".
+                                                                "al.action_id = '".ALARM_ALERT."' AND al.sent = '0' AND al.participant_id = part.id AND part.object_id = co.id AND ".
+                                                                "CASE WHEN rep.object_id = co.id ".
+                                                                "THEN rep.id = occ.repeat_id AND occ.occurrence - al.alarm_offset >= '$target' AND occ.occurrence - al.alarm_offset <= '".( $target + 86400000)."' ".
+                                                                "ELSE co.range_start - al.alarm_offset >= '$target' AND co.range_start - al.alarm_offset <= '".( $target + 86400000)."' END";);
 
             if(is_array($al))
               foreach( $al as $v )
               {
-                    $params['sendTime'] = $al['sendTime'];
-
-                    unset( $al['sendTime'] );
-
-                    $params['schedulable'] = $al;
+                    $params['sendTime'] = $v['sendTime'];
+
+                    unset( $v['sendTime'] );
+
+                    $params['schedulable'] = $v;
               }
             else