Changeset 6588

Timestamp:

06/22/12 17:32:11 (12 years ago)

Author:

eduardow

Message:

Ticket #2864 - Problema com os eventos que contém repetição.

Location:

branches/2.4/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (3 diffs)
• js/calendar.codecs.js (modified) (3 diffs)
• js/calendar.contentMenu.js (modified) (1 diff)

branches/2.4/prototype/modules/calendar/interceptors/DBMapping.php

@@ -147 +147 @@
                         .'(range_start >= \'' . $start[1] . '\' AND range_start <= \'' . $end[1] . '\') OR '
                         .'(range_start <= \'' . $start[2] . '\' AND range_end >= \'' . $end[2] . '\')) '
-                .(!empty($ids) ? ' ' .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\') ' : ' ');
-
+                .(!empty($ids) ? ' ' .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\') ' : ' ') 
+                .'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))';
 
                 $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
@@ -204 +206 @@
         //Recurepa as execeções anteriores caso exista
         if (isset($lastExceptions) && count($lastExceptions) && $lastExceptions)
-            foreach ($lastExceptions as $key => $value)
-                array_push($exceptions, $lastExceptions[$key]['occurrence']);
+            foreach ($lastExceptions as $value) 
+                array_push($exceptions, $value['occurrence']);
 
         $params = array_diff(self::decodeRepeat($repeat, $ranges[0]['rangeStart'], $ranges[0]['rangeEnd']), $exceptions);
@@ -213 +215 @@
         if (!empty($params))
             Controller::service('PostgreSQL')->execResultSql("INSERT INTO calendar_repeat_occurrence(repeat_id,exception,occurrence)VALUES('" . $id . "','0','" . implode("'),('" . $id . "','0','", $params) . "')" . ( empty($exceptions) ? "" : ",('" . $id . "','1','" . implode("'),('" . $id . "','1','", $exceptions) . "')" ));
-    }
+        else if(!empty($exceptions)) 
+            Controller::service('PostgreSQL')->execResultSql("INSERT INTO calendar_repeat_occurrence(repeat_id,exception,occurrence)VALUES ('" . $id . "','1','" . implode("'),('" . $id . "','1','", $exceptions) . "')" ); 
+   }
 
     public function checkOccurrences($start, $end, $calendarIds) {

branches/2.4/prototype/modules/calendar/js/calendar.codecs.js

@@ -499 +499 @@
 
             var isShared = !objEvent.id ? false : (!!objEvent.calendar) && parseInt(Calendar.signatureOf[objEvent.calendar].isOwner) ? false : true;
-
+            var limitAttendee = false; 
 
             return {
@@ -587 +587 @@
                 me: me,
                 delegatedFrom: delegatedFrom,
-                statusParticipants: statusParticipants
+                statusParticipants: (objEvent.sizeAttendees != "") ? objEvent.statusAttendees : statusParticipants, 
+                sizeAttendeeLimit: (objEvent.sizeAttendees != "") ? objEvent.sizeAttendees : false 
             };
         });
@@ -642 +643 @@
     var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat; 
   
-    patati['startTime'] = Date.parseExact( form.startDate + " "+$.trim(form.startHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'); 
-        
+    var date = Date.parseExact( form.startDate + " "+$.trim(form.startHour) , formatString ) 
+             
+    patati['startTime'] = date.toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00');
+
     if( !patati['byday'] )
         switch(form.frequency) {

branches/2.4/prototype/modules/calendar/js/calendar.contentMenu.js

@@ -26 +26 @@
                 var schedulable = DataLayer.get('schedulable', idEvent);
 
-                var isRecurrence = DataLayer.get('repeat', schedulable.repeat).frequency;
- 
-                var top; 
-                var elementId = document.getElementById("divAppbox"); 
-                  
-                top = elementId.scrollTop; 
+                var isRecurrence = DataLayer.get('repeat', schedulable.repeat).frequency || false; 
+                 
+                var top = $('#divAppbox').scrollTop();  
                   
                 var template = DataLayer.render( 'templates/menu_context_event.ejs', {event: schedulable.id ,
                     top: (event.clientY - 135 + top), left: (event.clientX - 445),  
-                                         signature: Calendar.signatureOf[idCalendar], 
-                    calendars: Calendar.calendars, isRecurrence: isRecurrence == 'none' ? false : true,
+                    signature: Calendar.signatureOf[idCalendar], 
+                    calendars: Calendar.calendars, isRecurrence: (!isRecurrence || isRecurrence == 'none') ? false : true,
                     idRecurrence: idRecurrence
                 });