Changeset 7797

Timestamp:

01/29/13 13:05:33 (11 years ago)

Author:

douglas

Message:

Ticket #3322 - Inconsistência com ícones e telas de edição no Expresso Calendar

File:

• branches/2.5/prototype/modules/calendar/schedules.php (modified) (6 diffs)

branches/2.5/prototype/modules/calendar/schedules.php

@@ -31 +31 @@
                 .'calendar_object.range_end as "rangeEnd", calendar_object.last_update as "lastUpdate", '
                 .'calendar_object.dtstamp as "dtstamp", calendar_object.sequence as "sequence", '
+                .'count(calendar_task_to_activity_object.id) as "tasks", '
                 .'calendar_object.tzid as "timezone" ,calendar_to_calendar_object.calendar_id as '
-                .'calendar FROM calendar_to_calendar_object , calendar_object '
+                .'calendar FROM calendar_object left join calendar_task_to_activity_object on ( calendar_object.id = calendar_task_to_activity_object.calendar_object_activity_id  ), calendar_to_calendar_object '
                 .'WHERE ( calendar_to_calendar_object.calendar_id IN (\'' . implode('\',\'', $calendars) . '\')) '
                 .'AND calendar_to_calendar_object.calendar_object_id = calendar_object.id '
@@ -53 +54 @@
                 .'AND calendar_object.dtstart NOT IN (SELECT calendar_repeat_occurrence.occurrence from calendar_repeat_occurrence, '
                 .'calendar_repeat where (calendar_repeat_occurrence.repeat_id = calendar_repeat.id) '
-                .'AND (calendar_repeat.object_id = calendar_object.id))';
+                .'AND (calendar_repeat.object_id = calendar_object.id)) group by calendar_object.id, calendar_to_calendar_object.calendar_id';
 
         $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
@@ -73 +74 @@
             .'calendar_object.range_end as "rangeEnd", calendar_object.last_update as "lastUpdate", '
             .'calendar_object.dtstamp as "dtstamp", calendar_object.sequence as "sequence", '
+            .'count(calendar_task_to_activity_object.id) as "tasks", '
             .'calendar_object.tzid as "timezone" ,calendar_to_calendar_object.calendar_id as '
-            .'calendar FROM calendar_to_calendar_object , calendar_object '
+            .'calendar FROM calendar_object left join calendar_task_to_activity_object on ( calendar_object.id = calendar_task_to_activity_object.calendar_object_activity_id  ), calendar_to_calendar_object '
             .'WHERE ( calendar_to_calendar_object.calendar_id IN (\'' . implode('\',\'', $calendars) . '\')) '
             .'AND calendar_to_calendar_object.calendar_object_id = calendar_object.id '
@@ -80 +82 @@
 
 
-            $where = 'AND (((upper("summary") like upper(\'%'.$summary.'%\') OR upper("description") like upper(\'%'.$description.'%\')))) ORDER BY dtstart LIMIT '.$limit.'  OFFSET '.$offset.' ';
+            $where = 'AND (((upper("summary") like upper(\'%'.$summary.'%\') OR upper("description") like upper(\'%'.$description.'%\')))) group by calendar_object.id, calendar_to_calendar_object.calendar_id ORDER BY dtstart LIMIT '.$limit.'  OFFSET '.$offset.' ';
             $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
 
@@ -137 +139 @@
                     $attend = $attend[0];
 
-                $result[$i]['editable'] = (strstr($attend['acl'],"w") || strstr($attend['acl'],"o")) ? 1 : 0;
+                $result[$i]['editable'] = (strstr($attend['acl'],"w") || strstr($attend['acl'],"o") || $attend['isOrganizer'] == '1') ? 1 : 0;
 
             }else{
@@ -144 +146 @@
 
             }
+            if( $v['type'] == 2 && $v['tasks'] > 0)
+                $result[$i]['type'] = 3;
         }