Changeset 5409 for trunk/prototype/modules/calendar/js/init.js

Timestamp:

01/21/12 00:18:54 (13 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Limpeza, melhorias e correcoes na camada javascript do novo modulo

File:

• trunk/prototype/modules/calendar/js/init.js (modified) (9 diffs)

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

@@ -4 +4 @@
         $tabs = $('#tabs').tabs({
             add: function( event, ui ) {
-                        User.lastView = $tabs.tabs('option' ,'selected');
+                        Calendar.lastView = $tabs.tabs('option' ,'selected');
+                        $('#tabs .events-list-win.active').removeClass('active');
                         $tabs.tabs('select', '#' + ui.panel.id);
                 },
                 remove: function( event, ui ) {
-                        $tabs.tabs('select', User.lastView);
+                        $tabs.tabs('select', Calendar.lastView);
                 },
                 show: function( event, ui ){
@@ -23 +24 @@
                 var index = $( "li", $tabs ).index( $( this ).parent() );
                 if($tabs.tabs('option' ,'selected') == index){
-                        if($tabs.tabs("length") == 2 && User.lastView != 1)
+                        if($tabs.tabs("length") == 2 && Calendar.lastView != 1)
                                 $tabs.tabs( "select", 0);
-                        $tabs.tabs( "select", User.lastView);
+                        $tabs.tabs( "select", Calendar.lastView);
                 }
                 if($tabs.tabs('option' ,'selected') == 0 || $tabs.tabs('option' ,'selected') == 1)
-                        User.lastView = $tabs.tabs('option' ,'selected');
+                        Calendar.lastView = $tabs.tabs('option' ,'selected');
                 if(index != -1)
                   $tabs.tabs( "remove", index );        
@@ -51 +52 @@
                         //dateFormat: 'DD, d MM, yy',
                         //inline: true,
-                        firstDay: dayOfWeek(User.preferences.weekStart),
+                        firstDay: dateCalendar.dayOfWeek[User.preferences.weekStart],
                         onSelect: function(dateText, inst)
                         {       
                                 $tabs.tabs("select", "#calendar");
-                                var date = dateText.split('-');
-                                var dateFullCalendar = $.fullCalendar.formatDate($('#calendar').fullCalendar('getDate'), "yyyy-MM-dd").split('-');
-                                $('#calendar').fullCalendar('gotoDate',date[0],date[1]-1,date[2]);
+                                $('#calendar').fullCalendar('gotoDate',$(this).siblings('span').html(), Date.getMonthNumberFromName($(this).html() == 'Março' ? 'Mar' : $(this).html()),'01');
                                 $('#calendar').fullCalendar( 'changeView', 'agendaDay' );
                         }                       
@@ -67 +66 @@
                 $('.ui-datepicker-title .ui-datepicker-month').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');
                         $('#calendar').fullCalendar( 'changeView', 'month');
                 });
@@ -131 +129 @@
       -----------------------------------------------------------------*/
                 $(".button.add.add-event").click(function(event){
+                        var startEvent = new Date();  
+                        if(startEvent.toString('mm') < 30) 
+                                        startEvent.add({minutes: (30 - parseInt(startEvent.toString('mm')))}); 
+                        else 
+                                        startEvent.add({hours: 1, minutes: '-'+startEvent.toString('mm')}); 
+                        var endEvent = function(date){ 
+                                        if(!!User.preferences.defaultCalendar){ 
+                                                        return  parseInt(date.getTime()) + 
+                                                                (       !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ?  
+                                                                        (Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration * 60000) :
+                                                                        (User.preferences.defaultDuration * 60000)
+                                                                );
+                                        }else 
+                                                        return parseInt(date.getTime()) + (User.preferences.defaultDuration * 60000); 
+                        };       
+                        
                         eventDetails({ 
-                                startTime: $.now(),
-                                endTime:!!User.preferences.defaultCalendar ? Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration != "" ? ($.now() + Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration * 60000) : (User.preferences.defaultDuration * 60000)
-                                : $.now() + (User.preferences.defaultDuration * 60000)
+                                startTime: startEvent.getTime(),
+                                endTime: endEvent(startEvent)
                         }, true );
                 });
 
-        var calendar = $('#calendar').fullCalendar({
+        var calendar = $('#calendar').fullCalendar(DataLayer.merge({ 
 
                 defaultView: User.preferences.defaultCalView,
@@ -150 +163 @@
                         right: 'agendaDay,agendaWeek,month,year'
                 },
-                firstDay: dayOfWeek(!!User.preferences.weekStart),
+                firstDay: dateCalendar.dayOfWeek[User.preferences.weekStart],
                 editable: true,
                 selectable: true,
@@ -169 +182 @@
                         day: 'dddd dd/MM'  
                 },
-                monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho','Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro' ], 
-                monthNamesShort: ['Jan','Fev','Mar','Abr','Maio','Jun','Jul','Ago','Set','Out','Nov','Dez'],
-                dayNames: [ 'Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'],
-                dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-                dayNamesShortest: ['D','S','T','Q','Q','S','S'],
+                
                 allDayText: 'Dia todo',
                 buttonText: {
@@ -182 +191 @@
                         year: 'ano'
                 },
-                
+                /*
                 eventRender: function( event, element, view ){
                         $(element).attr( 'event-id', event.id );
                 },
-
+                */
                 select: function( start, end, allDay, event, view ){
                         eventDetails( { 'start': start,
@@ -204 +213 @@
                         eventDetails( DataLayer.get( "schedulable", evt.id), true);
                 }
-        });
+        }, dateCalendar));
           
         if($(window).height() < $('body').height()){