Changeset 5442 for trunk/prototype/modules/calendar/js

Timestamp:

01/27/12 19:25:06 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correção de bugs e melhorias

Location:

trunk/prototype/modules/calendar/js

Files:

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

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

@@ -714 +714 @@
                         
                 var calendar = DataLayer.get('calendar', evt.calendar);
+                
+                var eventEditable = function(){
+                        var attendee = {};
+                        for(var i = 0; i < evt.participants.length; i++){
+                                attendee = DataLayer.get('participant', evt.participants[i]);
+                                if(!!parseInt(attendee.isOrganizer))
+                                        if(attendee.user == User.me.id)
+                                                return true;
+                                        else
+                                                return false;
+                        }
+                }
                   
-                grouped[ evt.calendar ].push( { id: evt.URI || evt.id,
+                grouped[ evt.calendar ].push( DataLayer.merge({ id: evt.URI || evt.id,
                                                 title: Encoder.htmlDecode(evt.summary),
                                                 start: Timezone.getDateTimezone(new Date(parseInt( evt.startTime )), calendar.timezone, false),
                                                 end:   Timezone.getDateTimezone(new Date(parseInt( evt.endTime ) - (!!parseInt(evt.allDay) ? 86400000 : 0)), calendar.timezone, false ),
-                                                allDay: parseInt( evt.allDay ) } );
+                                                allDay: parseInt( evt.allDay ) }, eventEditable() ? {} : {editable: false, className: 'blocked-event-permision'}) );
         });
 

trunk/prototype/modules/calendar/js/helpers.js

@@ -552 +552 @@
                         blkAddAtendee.find('.add-attendee-search input').keydown(function(event) {
 
-                                if(event.keyCode == '13') {
-                                        Encoder.EncodeType = "entity";
-                                        $(this).val(Encoder.htmlEncode($(this).val()));
-                        
+                                if(event.keyCode == '13') {                     
                                         var result = DataLayer.get('user', ["*", "name", $(this).val()], true);
 

trunk/prototype/modules/calendar/js/init.js

@@ -56 +56 @@
                         {       
                                 $tabs.tabs("select", "#calendar");
-                                $('#calendar').fullCalendar('gotoDate',$(this).siblings('span').html(), Date.getMonthNumberFromName($(this).html() == 'Março' ? 'Mar' : $(this).html()),'01');
+                                var toDate = $('.block-vertical-toolbox .mini-calendar').datepicker("getDate").toString('yyyy-MM-dd').split('-');
+                                $('#calendar').fullCalendar('gotoDate', toDate[0], parseInt(toDate[1]-1), toDate[2] );
                                 $('#calendar').fullCalendar( 'changeView', 'agendaDay' );
                         }                       
@@ -66 +67 @@
                 $('.ui-datepicker-title .ui-datepicker-month').live('click',function(){
                         $tabs.tabs("select", "#calendar");
-                        $('#calendar').fullCalendar('gotoDate',$(this).html(), '0', '01');
+                        $('#calendar').fullCalendar('gotoDate',$(this).siblings('span').html(), Date.getMonthNumberFromName($(this).html() == 'Março' ? 'Mar' : $(this).html()),'01');
                         $('#calendar').fullCalendar( 'changeView', 'month');
                 });
@@ -72 +73 @@
                 $('.ui-datepicker-title .ui-datepicker-year').live('click',function(){
                         $tabs.tabs("select", "#calendar");
-                        var currentDate = $.fullCalendar.formatDate($('#calendar').fullCalendar('getDate'), "yyyy-MM-dd").split('-');
-                        $('#calendar').fullCalendar('gotoDate',$('.ui-datepicker-title .ui-datepicker-year').html(), Date.getMonthNumberFromName($('.ui-datepicker-title .ui-datepicker-month').html()), currentDate[2]);
+                        $('#calendar').fullCalendar('gotoDate',$(this).html(), '0', '01');
                         $('.fc-button-year').click();
                 });