Changeset 7989 for trunk

Timestamp:

03/11/13 17:04:06 (10 years ago)

Author:

cristiano

Message:

Ticket #3378 - Erro de visualização evento com repetição

Location:

trunk/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (3 diffs)
• schedules.php (modified) (2 diffs)

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

@@ -471 +471 @@
         $result = array();
         $params = array();
-
+    $realResult = array();
         foreach ($return as $ret) {
             $currentId = $ret['schedulable'];
@@ -478 +478 @@
                 $result[$currentId] = Controller::read(array('concept' => 'schedulable', 'id' => $currentId));
                 $result[$currentId]['occurrences'] = array();
-
-                $calendarToCalendarObj = self::schedulable2calendarToObject($currentId);
-                $result[$currentId]['calendar'] = $calendarToCalendarObj[0]['calendar_id'];
             }
 
@@ -486 +483 @@
         }
 
-        return( $result );
+    foreach($result as $i => $v)
+    {
+        $calendarToCalendarObj = self::schedulable2calendarToObject($v['id']);
+            foreach($calendarToCalendarObj as $vv)
+            {
+                $v['calendar'] = $vv['calendar_id'];
+                $realResult[] = $v;
+            }
+    }
+
+        return( $realResult );
     }
 

trunk/prototype/modules/calendar/schedules.php

@@ -116 +116 @@
     function normalizeEvents( &$result, $timezones ){
 
+        $myCalendarsT =  Controller::service('PostgreSQL')->execResultSql('SELECT calendar_id FROM calendar_signature WHERE user_uidnumber = \''.Config::me('uidNumber').'\' AND is_owner = \'1\' AND type = \'0\'');
+        $myCalendars = array();
+        foreach($myCalendarsT as $v)
+            $myCalendars[] = $v['calendar_id'];
+
+
         $date = new DateTime('now', new DateTimeZone('UTC'));
         $DayLigth = array();
@@ -169 +175 @@
                 $result[$i]['editable'] = (strstr($attend['acl'],"w") || strstr($attend['acl'],"o") || $attend['isOrganizer'] == '1') ? 1 : 0;
 
-                if($attend['status'] == STATUS_UNANSWERED)
+                if($attend['status'] == STATUS_UNANSWERED && in_array($result[$i]['calendar'] , $myCalendars) )
                     $result[$i]['unanswered'] = 1;