Changeset 5746 for trunk/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

03/18/12 15:07:09 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Suporte copia/edicao/remocao de ocorrencias de repeticao

File:

• trunk/prototype/modules/calendar/js/calendar.codecs.js (modified) (10 diffs)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -75 +75 @@
                            borderColor: '#' + signature.borderColor || User.preferences.borderColor,
                            textColor: '#' + signature.fontColor || User.preferences.fontColor,
-                           className: 'calendar-' + signature.calendar.id,
                            editable:  signature.isOwner }
                });
@@ -179 +178 @@
 
                 if(force){
-                        delete Calendar.currentViewKey;
+                        delete Calendar.currentViewKey;
+                        
                         $('#calendar').fullCalendar( 'refetchEvents' );
                 }
@@ -189 +189 @@
 
                 $('#calendar').fullCalendar( 'refetchEvents' ); 
+                
+                contentMenu();
         }
 }
@@ -271 +273 @@
                 DataLayer.commit( false, false, function(){     
                         if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') == 0){
-                                Calendar.rerenderView(true);
-                                contentMenu();
+                                Calendar.rerenderView(true);
                         }else if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
                                 pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0);
@@ -603 +604 @@
                                                 return(null);
                                         
-                                        var attend = DataLayer.get('participant', participant);
+                                        var attend = DataLayer.get('participant', (participant.id || participant));
                                         attend.user = DataLayer.get('user', attend.user);
                                         
@@ -612 +613 @@
                                                         id: attend.id,
                                                         status : attend.status,
-                                                        delegatedFrom: attend.delegatedFrom,
+                                                        delegatedFrom: attend.delegatedFrom || '0',
                                                         acl: attend.acl,
                                                         receiveNotification : attend.receiveNotification,
@@ -947 +948 @@
                 var calendar = DataLayer.get('calendar', evt.calendar);
                 
-                var eventEditable = function(idEvent, isRecurrence){
+                var eventEditable = function(idEvent, isRecurrence, Recurrence){
                         if(Calendar.signatureOf[calendar.id].isOwner == "1"){
                                 var attendee = {};
@@ -953 +954 @@
                                         attendee = DataLayer.get('participant', evt.participants[i]);
                                                 if(attendee.user == User.me.id)
-                                                        return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? {selectable: true, className: 'fullcalendar-context-menu  event-id-'+idEvent, editable: !isRecurrence} : { editable: false, selectable: true ,className: 'blocked-event-permision  fullcalendar-not-context-menu event-id-'+idEvent};
+                                                        return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? {selectable: true, className: 'fullcalendar-context-menu  event-id-'+idEvent+ (isRecurrence ? ' isRecurrence Recurrence-id-'+Recurrence : '')} : { editable: false, selectable: true ,className: 'blocked-event-permision  fullcalendar-not-context-menu event-id-'+idEvent};
                                 }
                                 return {editable: false, className: 'blocked-event-permision  fullcalendar-not-context-menu event-id-'+idEvent,  selectable: true, disableDragging: isRecurrence };
@@ -963 +964 @@
                                         var returns = ""
                                         returns += acl['write'] ? "" :  'blocked-event-permision ';
-                                        returns += acl['busy'] ? 'fullcalendar-not-context-menu ' : (acl['read']  ?  'fullcalendar-context-menu ' : '');
+                                        returns += acl['busy'] ? 'fullcalendar-not-context-menu ' : (acl['read']  ?  'fullcalendar-context-menu '+ idEvent + (isRecurrence ? ' isRecurrence Recurrence-id-'+Recurrence : '') : '');
                                         returns += 'event-id-'+idEvent;
                                         return returns;
@@ -992 +993 @@
                   
                 for( var i = 0; i < occurrences.length; i++ )
-                    grouped[ evt.calendar ].push( DataLayer.merge({ id: evt.URI || evt.id,
-                                                    title: Encoder.htmlDecode(evt.summary),
-                                                    start: Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) ), calendar.timezone,  !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
-                                                    end:   Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) + duration - (!!parseInt(evt.allDay) ? 86400000 : 0)), calendar.timezone, !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
-                                                    allDay: parseInt( evt.allDay ) }, eventEditable(evt.id, isRepeat ) ) );
+                    grouped[ evt.calendar ].push( DataLayer.merge({ id: evt.URI || evt.id+ '-' + i,
+                    title: Encoder.htmlDecode(evt.summary),
+                    start: Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) ), calendar.timezone,  !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
+                    end:   Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) + duration - (!!parseInt(evt.allDay) ? 86400000 : 0)), calendar.timezone, !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
+                    allDay: parseInt( evt.allDay ),
+                    isRepeat: isRepeat,
+                    occurrence: i }, eventEditable(evt.id, isRepeat, i ) ) );
         });