Changeset 7390 for trunk/prototype/mapDisponibility.php

Timestamp:

10/09/12 17:43:17 (12 years ago)

Author:

douglasz

Message:

Ticket #3153 - Inconsistência na matriz de disponibilidade da agenda.

File:

• trunk/prototype/mapDisponibility.php (modified) (1 diff)

trunk/prototype/mapDisponibility.php

@@ -44 +44 @@
                         .' OR (range_start <=  '.$data['startTime'].' AND range_end >= '.$data['endTime'].') )'
                         .' AND transp = 0  AND id IN ( SELECT calendar_object_id from calendar_to_calendar_object where '
-                        .'calendar_id IN (SELECT calendar_id FROM calendar_signature WHERE (user_uidnumber = '. $value['id'] .'  AND is_owner = 1 ))  ))';
+                        .'calendar_id IN (SELECT calendar_id FROM calendar_signature WHERE (user_uidnumber = '. $value['id'] .'  AND is_owner = 1 ))  )'
+                        .'AND (calendar_object.id NOT IN (SELECT calendar_object_activity_id FROM calendar_task_to_activity_object)'
+                        .'OR calendar_object.type_id = 1))';
 
                         $result = Controller::service('PostgreSQL')->execResultSql($sql);