Changeset 6588 for branches/2.4/prototype/modules/calendar/js

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/js

Files:

• calendar.codecs.js (modified) (3 diffs)
• calendar.contentMenu.js (modified) (1 diff)

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
                 });