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

Timestamp:

04/02/12 18:07:04 (12 years ago)

Author:

acoutinho

Message:

Ticket #2587 - Bugs encontrados na nova agenga(expressoCalendar)

Location:

trunk/prototype/modules/calendar/js

Files:

• calendar.contentMenu.js (modified) (1 diff)
• calendar.shared.js (modified) (1 diff)
• helpers.js (modified) (6 diffs)
• init.js (modified) (1 diff)

trunk/prototype/modules/calendar/js/calendar.contentMenu.js

@@ -24 +24 @@
                 var schedulable = DataLayer.get('schedulable', idEvent);
                 
+                var isRecurrence = DataLayer.get('repeat', schedulable.repeat).frequency;
+                
                 var template = DataLayer.render( 'templates/menu_context_event.ejs', {event: schedulable.id ,
                     top: (event.clientY - 135), left: (event.clientX - 445), 
                     signature: Calendar.signatureOf[schedulable.calendar],
-                    calendars: Calendar.calendars, isRecurrence: (!!parseInt(schedulable.repeat)),
+                    calendars: Calendar.calendars, isRecurrence: isRecurrence == 'none' ? false : true,
                     idRecurrence: idRecurrence
                 });

trunk/prototype/modules/calendar/js/calendar.shared.js

@@ -73 +73 @@
                                 }else{
                                         //TODO - remover quando for implementado remove com criteria
-                                        var permission = DataLayer.get('calendarPermission', {filter: [AND, ['=', 'calendar', calendarId], ['=', 'user', '0']]}, true);
+                                        var permission = DataLayer.get('calendarToPermission', {filter: ['AND', ['=', 'calendar', calendarId], ['=', 'user', '0']]}, true);
+                                        if($.isArray(permission))
+                                                permission = permission[0];
+
                                         DataLayer.remove('calendarToPermission', permission.id);
                                 }

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

@@ -1927 +1927 @@
 function mountTitleList(page_index ,view){
         switch (view){
-                case 'day':
+                case 'agendaDay':
                 case 'basicDay':
                         var date = new Date().add({days: page_index});
                         return (dateCalendar.dayNames[date.getDay()])+", "+(date.toString('dd MMM yyyy'));
                 case 'agendaWeek':
-                case 'week':
                         var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]);
                         dateStart.add({days: (7 * page_index)});
@@ -1953 +1952 @@
                 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button').removeClass('fc-state-active')
                 if(view == 'basicDay')
-                        $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button-agendaday').addClass('fc-state-active');
+                        $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button-agendaDay').addClass('fc-state-active');
                 else
-                        $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button-'+((view == 'day' || view == 'week') ? 'agenda'+view : view )).addClass('fc-state-active');
+                        $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button-'+view).addClass('fc-state-active');
                 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right').addClass('list-right');
                 
@@ -1970 +1969 @@
                                 var goView = $(this).attr('class');
                                 if(goView.indexOf('agendaDay') > 0)
-                                        pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'day');
+                                        pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'agendaDay');
                                 else if(goView.indexOf('month') > 0)
                                         pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'month');
@@ -1976 +1975 @@
                                         pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'year');
                                 else if(goView.indexOf('agendaWeek') > 0)
-                                        pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'week');
+                                        pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'agendaWeek');
 
                         });
@@ -2029 +2028 @@
         switch (view){
                 case 'basicDay':
-                case 'day':
+                case 'agendaDay':
                         rangeStart = new Date().add({days: page_index}).getTime();
                         rangeEnd = rangeStart;
                          break;
                 case 'agendaWeek':
-                case 'week':
                         var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
                         var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
@@ -2166 +2164 @@
         UI.dialogs.importCalendar.find(".menu-import-event")        
             .children(".import").click(function(data){
+                        $('.import-event-form fieldset.import-calendar', UI.dialogs.importCalendar).append(
+                            '<input type="hidden" name="params[calendar_timezone]" value="'+  
+                            Calendar.signatureOf[$('.import-event-form option:selected').val()].calendar.timezone
+                            +'"/>')
+
                         $('.import-event-form', UI.dialogs.importCalendar).submit();                    
                         UI.dialogs.importCalendar.dialog("close");

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

@@ -1 +1 @@
 $(document).ready(function() {
+        //Remove o icone de configuraçõe padrão antigo do expresso
+        $('#sideboxdragarea').addClass('hidden');
+
         refresh_calendars();
         $tabs = $('#tabs').tabs({