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

Timestamp:

01/10/12 14:27:44 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - (acoutinho) Correcoes de bugs e melhorias

File:

• trunk/prototype/modules/calendar/js/helpers.js (modified) (3 diffs)

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

@@ -1229 +1229 @@
         switch (view){
                 case 'day':
+                case 'basicDay':
                         var date = new Date().add({days: page_index});
                         return (weekOfDay(date.getDay()))+", "+(date.toString('dd MMM yyyy'));
+                case 'agendaWeek':
                 case 'week':
                         var dateStart = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault));
@@ -1251 +1253 @@
                 $(currentView+' .events-list.events-list-win.active .list-events-paginator .fc-header-title').html('<h2>'+mountTitleList( parseInt($('[name = page_index]').val()),view)+'</h2>');
                 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button').removeClass('fc-state-active')
-                $(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');
+                if(view == 'basicDay')
+                        $(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').addClass('list-right');
                 $(currentView+' .header-paginator .fc-header-right .fc-button-agendaday').hover(
@@ -1362 +1367 @@
 function mountCriteriaList(view, page_index, calerdars_selecteds){
         switch (view){
+                case 'basicDay':
                 case 'day':
                         return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['=', 'rangeEnd', new Date().add({days: page_index}).toString("yyyy-MM-dd")]], criteria: {order: 'startTime'}}; 
+                case 'agendaWeek':
                 case 'week':
                         var dateStart = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault));