Changeset 5381 for trunk/prototype/modules/calendar/index.php

Timestamp:

01/15/12 15:23:09 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Melhorias e correcoes de bugs e limpeza de codigo

File:

• trunk/prototype/modules/calendar/index.php (modified) (5 diffs)

trunk/prototype/modules/calendar/index.php

@@ -214 +214 @@
                 $('.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).siblings('span').html(), Date.getMonthNumberFromName($(this).html() == 'Março' ? 'Mar' : $(this).html()),'01');
                         $('#calendar').fullCalendar( 'changeView', 'month');
                 });
@@ -221 +220 @@
                 $('.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();
                 });
@@ -278 +276 @@
       -----------------------------------------------------------------*/
                 $(".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 Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration != "" ? 
+                                                (parseInt(date.getTime()) + 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 );
                 });
@@ -309 +319 @@
                         month: 'MMMM yyyy',                             
                         week: "dd[ yyyy] { 'a'[ MMM] dd 'de' MMMM '-' yyyy}", 
-                        day: 'dddd,  dd MMM , yyyy'
+                        day: 'dddd,  dd MMM, yyyy'
                 },
                 columnFormat:{
@@ -317 +327 @@
                 },
                 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'],
+                monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','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'],