Changeset 5409

Timestamp:

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

Author:

acoutinho

Message:

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

Location:

trunk

Files:

• expressoMail1_2/inc/class.db_functions.inc.php (modified) (1 diff)
• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• expressoMail1_2/js/main.js (modified) (4 diffs)
• prototype/modules/calendar/css/layout.css (modified) (1 diff)
• prototype/modules/calendar/js/calendar.codecs.js (modified) (30 diffs)
• prototype/modules/calendar/js/calendar.date.js (added)
• prototype/modules/calendar/js/helpers.js (modified) (28 diffs)
• prototype/modules/calendar/js/init.js (modified) (9 diffs)
• prototype/modules/calendar/js/timezone.js (added)
• prototype/modules/calendar/templates/attendee_add.ejs (modified) (2 diffs)
• prototype/modules/calendar/templates/event_add.ejs (modified) (1 diff)
• prototype/modules/calendar/templates/event_list.ejs (modified) (4 diffs)
• prototype/modules/calendar/templates/import_export.ejs (modified) (3 diffs)
• prototype/modules/calendar/templates/index.ejs (modified) (1 diff)
• prototype/timezones.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.db_functions.inc.php

@@ -410 +410 @@
                                         {
                                                 $return = false;
-                                                $output = unserialize($output);
-                                        
-                                                ob_start();
-                                                var_dump($output[0]);                                           
-                                                $l = ob_get_clean();
-                                                file_put_contents( "/tmp/acoutinho.log",  $l , FILE_APPEND);
-
-                                                
-                                                
+                                                $output = unserialize($output);                                                                         
                                                 foreach($output[0] as $key => &$value){
                                                 

trunk/expressoMail1_2/index.php

@@ -45 +45 @@
                                         <script type='text/javascript' src='../prototype/plugins/alphanumeric/jquery.alphanumeric.js'></script>
                                         <script type='text/javascript' src='../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js'></script>
+                                        <script type='text/javascript' src='../prototype/modules/calendar/js/calendar.date.js'></script>
                                         <script type='text/javascript' src='../prototype/modules/calendar/js/helpers.js'></script>
                                         <script type='text/javascript' src='../prototype/modules/calendar/js/calendar.codecs.js'></script>
+                                        <script type='text/javascript' src='../prototype/modules/calendar/js/timezone.js'></script>
                                         <script type='text/javascript' src='../prototype/plugins/encoder/encoder.js'></script>
                                         <script type='text/javascript' src='../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js'></script>

trunk/expressoMail1_2/js/draw_api.js

@@ -2609 +2609 @@
                         DataLayer.dispatchPath = "../prototype/";
                         var path = "../prototype/modules/calendar/";
+                        
+                        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({ 
                                         summary : $("#subject_"+ID).text(),
                                         description : $("#body_" + ID).text(),
-                                        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, path);
                         

trunk/expressoMail1_2/js/main.js

@@ -3388 +3388 @@
 
 
-                                var createDialog = function(isCorrentEvent){
+                                var createDialog = function(isCorrentEvent, propaget){
 
                                         if(!(!!isCorrentEvent)){
@@ -3410 +3410 @@
                                                                      success: function(msg){
 
-                                                                            msg = connector.unserialize(msg) == "ok" ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";
-
-                                                                            alert( msg + $("#select-agenda option:selected").text() );
-                                                                            
-                                                                            $( this ).dialog( "close" );
+                                                                            var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";
+                                                                            alert( alt + $("#select-agenda option:selected").text() );
                                                                     }
                                                                 });
-                                                        }
+                                                        
+                                                                                                                        $( this ).dialog( "close" );
+                                                                                                                }
                                                     }
                                                  });                                    
@@ -3435 +3434 @@
                                                            if ($(".ui-dialog-buttonpane").find(".ui-button:last").children().html() == 'Atualizar'){
                                                                
-                                                               var isOk = DataLayer.put('participant', { id: ( DataLayer.get('participant', ['AND', ['=', 'user', User.me.id], ['=', 'schedulable', isCorrentEvent[0].schedulable]] ) )[0].id, 
+                                                                                                                           
+                                                                                                                           
+                                                               var isOk = propaget || DataLayer.put('participant', { id: ( DataLayer.get('participant', ['AND', ['=', 'user', User.me.id], ['=', 'schedulable', isCorrentEvent[0].schedulable]] ) )[0].id, 
                                                                                                          status: $("#select-status option:selected").val() });
 
@@ -3465 +3466 @@
                                         }, createDialog);
                                 }else{
-                                        createDialog(false);
+                                        createDialog(true, true);
                                 }
                 }});

trunk/prototype/modules/calendar/css/layout.css

@@ -433 +433 @@
 }
 .details-event-list p.input-group { margin: 7px 0 0 0; text-align: justify; }
-.details-event-list p.input-group label { font-weight: bold; width: 13% }
+.details-event-list p.input-group label { font-weight: bold; width: 14% }
 .details-event-list p.input-group .large { width: 85%; }
 .fields-details-event-list {

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

@@ -1 @@
-//TODO: recuperar esses valores no init do Calendar
 User = {
   
     init: function(){
-      
-    this.moduleName = 'expressoCalendar';
-        this.me = DataLayer.dispatch( "me" );
-        
-        var objTime = DataLayer.dispatch( "timezones" );
-        this.timezones = objTime.timezones;
-        this.isDaylightSaving = objTime.isDaylightSaving;
-    this.lastView = 0;
-        this.load();      
+                this.moduleName = 'expressoCalendar';
+                this.me = DataLayer.dispatch( "me" );
+                
+                var objTime = DataLayer.dispatch( "timezones" );
+                this.timezones = objTime.timezones;
+                this.isDaylightSaving = objTime.isDaylightSaving;
+                this.load();      
     },
   
     load: function(){
 
-        var defaultPreferences = { dateFormat: "dd/MM/yyyy",
-                hourFormat: "HH:mm",
-                defaultCalView: "month",
-                defaultDuration: 30,
-                backgroundColor: "36C",
-                borderColor: "36C",
-                fontColor: "fff",
-                timezone: 'America/Sao_Paulo',
-                weekStart: 'SUN'
-          };
-
-        var pref = DataLayer.get( "modulePreference:detail", ['and',[ "=", "user", this.me.id ], [ "=", "module", this.moduleName ]] );
-        
-        this.preferences = $.isEmptyObject( pref.values ) ? defaultPreferences : pref.values;
-        this.preferenceIds = pref.ids;
+                var defaultPreferences = { dateFormat: "dd/MM/yyyy",
+                        hourFormat: "HH:mm",
+                        defaultCalView: "month",
+                        defaultDuration: 30,
+                        backgroundColor: "36C",
+                        borderColor: "36C",
+                        fontColor: "fff",
+                        timezone: 'America/Sao_Paulo',
+                        weekStart: 'SUN'
+                  };
+
+                var pref = DataLayer.get( "modulePreference:detail", ['and',[ "=", "user", this.me.id ], [ "=", "module", this.moduleName ]] );
+
+                this.preferences = DataLayer.merge( defaultPreferences, pref.values || {} );
+                this.preferenceIds = pref.ids;
     }
 }
@@ -43 +40 @@
 DataLayer.codec( "calendarSignature", "calendar", {
   
-      decoder: function(){
-
-          
-
-      },
+        decoder: function(){},
       
-      encoder: function( signatures ){
-
-        return $.map( signatures, function( signature ){
-              
-                  return { events: function( start, end, callback ){
-                        
+        encoder: function( signatures ){
+
+                return $.map( signatures, function( signature ){
+                        return { events: function( start, end, callback ){
                                 var viewKey = start + ':' + end;
-
-                                if( Calendar.currentViewKey !== viewKey )
-                                {
+                                if( Calendar.currentViewKey !== viewKey ){
                                     Calendar.currentViewKey = viewKey;
-
                                     Calendar.currentView = DataLayer.get( 'schedulable:calendar', { start: start, end: end } );
                                 }
-                                
                                 var view = Calendar.currentView[ signature.calendar.id ];
-                                
                                 callback( view && !view.hidden ? view : [] );
-
                            },
 
@@ -83 +68 @@
 Calendar = {
   
-      load: function(){
-
-          this.signatures  = DataLayer.get("calendarSignature", {filter: ['=', 'user', User.me.id], criteria: {deepness: 2}});
-          //this.signatures  = DataLayer.get( "calendarSignature", [ "=", "user", User.me.id ] );
+        load: function(){
+                this.lastView = 0;
+                this.signatures  = DataLayer.get("calendarSignature", {filter: ['=', 'user', User.me.id], criteria: {deepness: 2}});
           
-          var prevSources = this.sources;
-
-          this.sources = DataLayer.encode( "calendarSignature:calendar", this.signatures );
-
-          if( prevSources )
-          {     
-              var newSources = DataLayer.diff( { 'diff': prevSources }, { 'diff': this.sources } ).diff;
- 
-               for( var i = 0; i < newSources.length; i++ )
-                  $('#calendar').fullCalendar( 'addEventSource', newSources[i] );
-            
-              var removeSources = DataLayer.diff( { 'diff': newSources }, { 'diff': prevSources } ).diff;
-
-              for( var i = 0; i < removeSources.length; i++ )
-                  $('#calendar').fullCalendar( 'removeEventSource', removeSources[i] );
-          }
-
-          this.calendarIds = [], this.signatureOf = {}, this.calendars = [];
-
-          for( var i = 0; i < this.signatures.length; i++ )
-          {
-              this.signatureOf[ this.calendarIds[i] = ( this.calendars[ this.calendars.length ] = this.signatures[i].calendar ).id ] = this.signatures[i];
-          }
-          this.rerenderView = function(){
+                var prevSources = this.sources;
+
+                this.sources = DataLayer.encode( "calendarSignature:calendar", this.signatures );
+
+                if( prevSources ){     
+                        var newSources = DataLayer.diff( { 'diff': prevSources }, { 'diff': this.sources } ).diff;
+
+                        for( var i = 0; i < newSources.length; i++ )
+                                $('#calendar').fullCalendar( 'addEventSource', newSources[i] );
+
+                        var removeSources = DataLayer.diff( { 'diff': newSources }, { 'diff': prevSources } ).diff;
+
+                        for( var i = 0; i < removeSources.length; i++ )
+                                $('#calendar').fullCalendar( 'removeEventSource', removeSources[i] );
+                }
+
+                this.calendarIds = [], this.signatureOf = {}, this.calendars = [], this.calendarOf= {};
+
+                for( var i = 0; i < this.signatures.length; i++ ){
+                        this.signatureOf[ ( this.calendarOf[ this.calendarIds[i] = ( this.calendars[ this.calendars.length ] = this.signatures[i].calendar ).id ] = this.signatures[i].calendar ).id ] = this.signatures[i];
+                }
+
                 delete Calendar.currentViewKey;
-                $('#calendar').fullCalendar( 'refetchEvents' );
-                
-                var calendarNotSelected = getNotSelectedCalendars();
+        },
+
+        rerenderView: function(force){
+
+                if(force){
+                        delete Calendar.currentViewKey;
+                        $('#calendar').fullCalendar( 'refetchEvents' );
+                }
+
+                var calendarNotSelected = getSelectedCalendars( true );
                 for(var i = 0; i < calendarNotSelected.length; i++)
                         if(!!Calendar.currentView[ calendarNotSelected[i] ])
                                 Calendar.currentView[ calendarNotSelected[i] ].hidden = true;
-        
-                //Necessita ser chamado novamente para atualizar os eventos na tela para o usuário
-                //de acordo com as a agendas selecionadas
+
                 $('#calendar').fullCalendar( 'refetchEvents' ); 
-          };
-          
-          delete Calendar.currentViewKey;
-      }
+        }
 }
 
@@ -132 +116 @@
         load: function(){
                 var eventsDay = DataLayer.get('alarm:schedulable',['=', 'date', new Date().toString("yyyy-MM-dd")]);
-
                 for(var i = 0; i < eventsDay.length; i++){
                         this.addAlarm( eventsDay[i] );
@@ -155 +138 @@
                 
                 var res = $.map(evtObj, function( form ){
+
                         var returns = [];
-                        var cont = 0;
-                        for (var name in form){
-                                returns[cont] = {
+
+                        for (var name in form)
+                                returns[ returns.length ] = {
                                         name: name,
                                         user: User.me.id,
                                         value: form[name],
-                                        module: User.moduleName
+                                        module: User.moduleName,
+                                        id: User.preferenceIds[ name ] || undefined
                                 };
-                                if(typeof(User.preferenceIds[ name ]) != 'undefined')
-                                        returns[cont].id = User.preferenceIds[ name ];
-                                cont++;
-                        }
-                return [returns];
+
+                        return [returns];
                 });
         
@@ -175 +157 @@
 
     encoder: function( evtObj ){
-                var val = {};
-                var id = {}
+                var val = {}, id = {};
                 for (var i in evtObj){
-                        val[evtObj[i].name] = evtObj[i].value; 
-                        id[evtObj[i].name] = evtObj[i].id; 
+                        
+                        if( evtObj[i].value && evtObj[i].id )
+                        {
+                            val[evtObj[i].name] = evtObj[i].value;
+                            id[evtObj[i].name] = evtObj[i].id;
+                        }
                 }
                 return {values: val,ids: id};
@@ -192 +177 @@
 isValidCalback = false;
 
-
+/*Todo Melhorias serão feitas na API*/
 //DataLayer.poll( "schedulable" );
 
@@ -199 +184 @@
     if( status === 'serverclient' ){
                 DataLayer.commit( false, false, function(){     
-                        Calendar.rerenderView();
+                        if(!!$('#calendar').fullCalendar)
+                                Calendar.rerenderView(true);
                         //Atualiza a listagem de eventos apenas se estiver na aba de listagem
-                        if($tabs.tabs('option' ,'selected') == 1)
-                                pageselectCallback("", 0);
+                        if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
+                                pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0);
+                        
                 });
     }
@@ -218 +205 @@
                                 }
                         });
-                        isValidCalback = false;
                 }else if(updateData == false){
                         $.Zebra_Dialog('Erro ao importar evento(s)!', {
@@ -229 +215 @@
 DataLayer.listen( "calendarSignature", function( status ){
 
-    switch( status )
-    {
-      case 'serverclient':  DataLayer.commit( false, false, function( received ){
-
-          delete Calendar.currentViewKey;
-
-          Calendar.load();
-          refresh_calendars();
-      });
-      break;
-      case 'client':  
-      break;
+    switch( status ){
+                case 'serverclient':  DataLayer.commit( false, false, function( received ){
+                        delete Calendar.currentViewKey;
+                        Calendar.load();
+                        refresh_calendars();
+                });
+                break;
+                case 'client':  
+                break;
     }
 });
@@ -246 +229 @@
 DataLayer.listen( "modulePreference", function( status ){
 
-    switch( status )
-    {
-        case 'serverclient':  DataLayer.commit( false, false, function(){
-
-            User.load();
-
-        });
-        break;
-        case 'client':  
-        break;
-    }
-
-});
-
-// DataLayer.listen( "calendar", function( status ){
-// 
-//     if( status === 'serverclient' )
-//     {
-//      DataLayer.commit( false, false, function(){ 
-// 
-//        $('#calendar').fullCalendar( 'refetchEvents' );
-// 
-//      });
-//     }
-// 
-// });
+    switch( status ){
+                case 'serverclient':  DataLayer.commit( false, false, function(){
+                        User.load();
+                });
+                break;
+                case 'client':  
+                break;
+    }
+
+});
 
 DataLayer.listen( "alarm", function( created, updated, deleted ){
@@ -277 +244 @@
 });
 
-DataLayer.listen( "calendar", function( status, updateData ){
-
-      if (updateData === false)
-        switch( status )
-        {
-          case 'serverclient':  DataLayer.commit( false, false, function(){
+/*DataLayer.listen( "calendar", function( status, updateData ){
+
+    if (updateData === false)
+        switch( status ){
+                case 'serverclient':  DataLayer.commit( false, false, function(){
             
-              Calendar.load();
-              refresh_calendars();
+                        Calendar.load();
+                        refresh_calendars();
             
-          });
-          break;
-          case 'client':  
-          break;
-    }
-});
+                });
+                break;
+                case 'client':  
+                break;
+    }
+});*/
 
 DataLayer.codec( "calendarSignature", "configure", {
@@ -306 +272 @@
                                 user: User.me.id,       
                                 calendar: {
-                                        id: DataLayer.get('calendarSignature', form.signature).calendar,
+                                        id: Calendar.signatureOf[form.signature].calendar.id,
                                         name: Encoder.htmlEncode(form.name),
                                         description: Encoder.htmlEncode(form.description),
@@ -323 +289 @@
                                 msgAlarm: Encoder.htmlEncode(form.msgAlarm),
                                 calendarSignatureAlarms: $.map( form.alarmTime || [], function( alarmTime, i ){
-                                        if(form.alarmId[i] === "")
-                                                return{type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i]};
-                                        else
-                                                return{type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i]};
+                                        return (!!form.alarmId[i] ?
+                                                        {type: form.alarmType[i],       unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i]} :
+                                                        {type: form.alarmType[i],       unit: form.alarmUnit[i], time: form.alarmTime[i]});
                                 })
                         };
@@ -335 +300 @@
         },
 
-    encoder: function( evtObj ){
-        
-        }
+    encoder: function( evtObj ){}
 });
 
 DataLayer.codec( "alarm", "schedulable", {
 
-    decoder: function( evtObj ){
-                return false;
-    },
+    decoder: function( evtObj ){},
         
         encoder: function (evtObjt){
@@ -352 +313 @@
                         
                         var res = $.map(evtObjt, function( objEvent ){  
-                                var timezone = User.timezones[objEvent.schedulable.timezone];
-                                var timeEvent = function(time, idCalendar){
-                                        var data =  new Date();
-                                        data.setTime(time);
-                                        return dateFormat(setDateTimezone(data, timezone, true, idCalendar), User.preferences.hourFormat.replace(/m/g,'M'))                     
-                                }
-                                
-                                var dateEvent = function( time){
-                                        return new Date( parseInt(time) ).setTimezoneOffset(timezone).toString( User.preferences.dateFormat); 
-                                }
-                                
-                                var unitTemp = function(unit, time){
-                                        switch (unit.toLowerCase()){
-                                                case 'h':
-                                                        if(parseInt(time) > 1)
-                                                                return 'horas';
-                                                        return 'hora';
-                                                case 'd':
-                                                        if(parseInt(time) > 1)
-                                                                return 'dias';
-                                                        return 'dia';
-                                                case 'm':
-                                                        if(parseInt(time) > 1)
-                                                                return 'minutos';
-                                                        return 'minuto';
-                                        }
-                                }
-                        
+
+                                var time = parseInt(objEvent.schedulable.startTime);
+                                                                                        
                                 return{
                                         id: objEvent.id,
-                                        event_start: dateEvent(objEvent.schedulable.startTime),
+                                        event_start: new Date( time ).setTimezoneOffset(Timezone.timezones[objEvent.schedulable.timezone]).toString( User.preferences.dateFormat),
                                         sendTime: objEvent.sendTime,
                                         schedulable: {
-                                                startTime: timeEvent(objEvent.schedulable.startTime),
+                                                startTime: dateCalendar.formatDate(Timezone.setDateTimezone(new Date(time), objEvent.schedulable.timezone, true), User.preferences.hourFormat),
                                                 id: objEvent.schedulable.id,
                                                 summary: objEvent.schedulable.summary,
                                                 time: objEvent.time,    
-                                                unit: unitTemp(objEvent.unit ,objEvent.time)
+                                                unit: dateCalendar.timeunit[objEvent.unit.toLowerCase()] + ( parseInt(objEvent.time) > 1 ? 's' : '' )
                                         }
                                 }
@@ -423 +359 @@
                                                                 return( null );
 
-                                                        if(form.alarmId[i] === "")
-                                                                return { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
-                                                        else
-                                                                return { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] };
+                                                        return !!form.alarmId[i] ?
+                                                                { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] } : 
+                                                                { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
                                                 }) : []
                                         }]
@@ -442 +377 @@
             evtObj = [ evtObj ];
 
-        var pref = User.preferences;
-        var statusParticipants = [];
-        for (var i = 1; i <= 5; i++)
-                statusParticipants[i] = 0;
-                
-        var statusObject = function(status){
-                return{
-                        accepted: status[1],
-                        tentative: status[2],
-                        cancelled: status[3],
-                        unanswered: status[4],
-                        delegated: status[5]            
-                }
-        };      
-
-        var isOrganizer = !!evtObj[0].id ? 0 : 1;
+        var statusParticipants = {},
+        
+        statusLabels = [ '', 'accepted', 'tentative', 'cancelled', 'unanswered', 'delegated' ];
+        
+        for( var i = 0; i < statusLabels.length; i++ )
+                statusParticipants[ statusLabels[i] ] = 0;
+
+        var isOrganizer = 1;
         
         var res = $.map(evtObj, function( objEvent ){                   
                     
-                        var existsTimezone = false;
-                        var participantInfo = {}, me = { uid: User.me.id, name: User.me.name, mail: User.me.mail};
-                        var timezone = '';
-                        if(objEvent.timezone){
-                                timezone = User.timezones[objEvent.timezone];
-                                existsTimezone = true;
-                        }else{
-                                var tzId = pref.timezone;
-                                timezone = User.timezones[ tzId ];
-                        }
-                        
-                    var dateEvent = function( time, allDayEnd){
-                        
-                        return new Date( parseInt(time) - ((allDayEnd) ? 86400000 : 0)  ).setTimezoneOffset(timezone).toString( User.preferences.dateFormat); }
-
-                        var timeEvent = function(time, idCalendar){
-                                var data =  new Date();
-                                data.setTime(time);
-                                return dateFormat(setDateTimezone(data, timezone, existsTimezone, idCalendar), User.preferences.hourFormat.replace(/m/g,'M'))                   
-                        }                                               
-                        var alarmParticipant = function(obj){
-                                var alarms = [];
-                                for(var i = 0; i < obj.length; i++){ 
-                                        alarms.push(DataLayer.get('alarm', obj[i]));
-                                }
-                                return alarms;
-                        }
+                        var participantInfo = {}, me = DataLayer.copy(User.me);
+                                                
                     return {
-                              "class": objEvent["class"],
-                              id: objEvent.id,
-                              location: objEvent.location,
-                              category: objEvent.category,
-                              calendars: Calendar.calendars,
-                              calendar: objEvent.calendar,
-                              summary: objEvent.summary,
-                              description: objEvent.description,
-                              timezone: objEvent.timezone,
-                              timezones: User.timezones,
-                              startDate: dateEvent( objEvent.startTime, false ),
-                              startHour: timeEvent(objEvent.startTime, objEvent.calendar ),
-                              endDate: dateEvent( objEvent.endTime, (!!parseInt(objEvent.allDay)) ? true : false ),
-                              endHour: timeEvent(objEvent.endTime, objEvent.calendar),
-                              allDay: !!parseInt( objEvent.allDay ),
+                            "class": objEvent["class"],
+                            id: objEvent.id,
+                            location: objEvent.location,
+                            category: objEvent.category,
+                            calendars: Calendar.calendars,
+                            calendar: objEvent.calendar,
+                            summary: objEvent.summary,
+                            description: objEvent.description,
+                            timezone: objEvent.timezone,
+                            timezones: Timezone.timezones,
+                            startDate: new Date( parseInt(objEvent.startTime) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+                            startHour: dateCalendar.formatDate(Timezone.setDateTimezone(new Date( parseInt(objEvent.startTime)), objEvent.timezone, objEvent.calendar), User.preferences.hourFormat),
+                            endDate: new Date( parseInt(objEvent.endTime) - (!!parseInt(objEvent.allDay) ? 86400000 : 0)  ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
+                            endHour: dateCalendar.formatDate(Timezone.setDateTimezone(new Date(parseInt(objEvent.endTime)), objEvent.timezone, objEvent.calendar), User.preferences.hourFormat),
+                            allDay: !!parseInt( objEvent.allDay ),
           //                            attachments: this.decode( "attachment:detail", form ),
-                              attendee: $.map(objEvent.participants || [], function( participant, i ){                                          
+                            attendee: $.map(objEvent.participants || [], function( participant, i ){                                            
                                         
                                         var attend = DataLayer.get('participant', participant);
-                                        attend.user = DataLayer.get('user', attend.user)
+                                        attend.user = DataLayer.get('user', attend.user);
                                         
-                                        statusParticipants[attend.status]++;    
-                                         
-                                          var person = { uid: attend.id,
-                                                 name: attend.user.name != 'false' ? attend.user.name : '',
-                                                 mail: attend.user.mail,
-                                                 isExternal: attend.isExternal
+                                        statusParticipants[ statusLabels[attend.status] ]++;    
+                                        
+                                        if( attend.user.id ===  me.id ){
+                                            participantInfo = {
+                                                        status : attend.status,
+                                                        alarms : $.map(attend.alarms || [], function( alarm ){
+                                                                return DataLayer.get('alarm', alarm);
+                                                        })
                                                 };
-
-                                          if( attend.user.id ===  me.uid )
-                                          {
-                                              participantInfo.status = attend.status;
-                                              participantInfo.alarms = alarmParticipant(attend.alarms);
-                                                  me.uid = attend.id;
-                                          }
-                                          if( parseInt( attend.isOrganizer ) )
-                                          {
-                                                 isOrganizer = ((attend.user.id == User.me.id) || (!!!attend.user)) ? 1 : 0;
-                                              participantInfo.organizer = person;
-                                                  return(null);
-                                          }
-
-                                          return( person );
-
-                                      }),
-                              organizer: participantInfo.organizer || me,
-                              alarms: participantInfo.alarms || [],
-                              status: participantInfo.status || 1,
-                              me: me
-                            };
-                });
-        res[0].isOrganizer = isOrganizer;
-        res[0].statusParticipants = statusObject(statusParticipants);
-        if( !notArray )
-        {
-            var dates = {};
-
-            for (var i=0; i<res.length; i++) {
-
-                    var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat );
-                    var endDate   = Date.parseExact( res[i]['endDate'], User.preferences.dateFormat );
-
-                    var counter   = startDate.clone();
-
-                    while (counter.compareTo(startDate) == 0) {
-
-                            if (!dates[counter.toString(User.preferences.dateFormat)]) 
-                                dates[counter.toString(User.preferences.dateFormat)] = { startDate:false, events:[] };
-                            if (!dates[counter.toString(User.preferences.dateFormat)].startDate) 
-                                dates[counter.toString(User.preferences.dateFormat)].startDate = counter.toString(User.preferences.dateFormat);
-
-                            dates[counter.toString(User.preferences.dateFormat)].events.push(res[i]);
-                            counter.addDays(-1);
-                    } 
-            }
-
-            res = { events_list: dates };
-        }
+                                                me.id = attend.id;
+                                        };
+                                        
+                                        var person = {
+                                                id: attend.id,
+                                                name: attend.user.name != 'false' ? attend.user.name : '',
+                                                mail: attend.user.mail,
+                                                isExternal: attend.isExternal
+                                        };
+                                        
+                                        if( !!parseInt(attend.isOrganizer )){
+                                                isOrganizer = ((attend.user.id == User.me.id) || (!!!attend.user)) ? 1 : 0;
+                                            participantInfo.organizer = person;
+                                                return(null);
+                                        };                                      
+                                        
+                                        return (person);
+                                }),
+                            organizer: participantInfo.organizer || me,
+                            alarms: participantInfo.alarms || [],
+                            status: participantInfo.status || 1,
+                            me: me,
+                                isOrganizer: isOrganizer,
+                                statusParticipants: statusParticipants
+                        };
+                });
 
         return notArray ? res[0] : res;
@@ -577 +457 @@
 
     decoder: function( evtObj ){
-
+                
         Encoder.EncodeType = "entity";
         
@@ -586 +466 @@
 
         var res = $.map(evtObj, function( form ){
-                        var tzId = '';
-                    if(form.timezone == ''){
-                                calendar = DataLayer.get('calendar', form.calendar);
-                                tzId = calendar.timezone || User.preferences.timezone;
-                        }else
-                                tzId = form.timezone;
-                    timezone = User.timezones[ tzId ];
-
-                    opposites = { '-':'+', '+':'-' },
-
-                    formatString = ( typeof form.allDay !== "undefined" && !!form.allDay )? pref.dateFormat+" HH:mm" : pref.dateFormat + " " + pref.hourFormat;
+    
+                    var tzId =  form.timezone || Calendar.calendarOf[form.calendar].timezone || User.preferences.timezone,
+
+                    formatString = ( typeof form.allDay !== "undefined" && !!form.allDay )? pref.dateFormat+" HH:mm" : pref.dateFormat + " " + pref.hourFormat,
                         
                     participants = []; 
-
-                    //if( form.idEvent )
-                        //      participants = DataLayer.get( "participant:detail", [ "=", "schedulable", form.idEvent ] );
-                        
-                        var spaces = function(hours){
-                                return hours.replace(/\s$/, "");
-                        };
-                        
-                        var startDate = Date.parseExact( !!form.allDay ? form.startDate+ " 00:00": form.startDate + " " + spaces(form.startHour) , formatString );
-                        startDate = getDateUTC(startDate, timezone);
-                        
-                        var endDate = Date.parseExact( !!form.allDay ? form.endDate + " 00:00": form.endDate + " " + spaces(form.endHour), formatString );
-                        endDate = getDateUTC(endDate, timezone);
                     return {
                               "class": form["class"],
-                                  startTime: startDate.getTime(),
-                                  endTime: !!form.allDay ? (new Date(endDate.getTime() + (86400000)).getTime()) : endDate.getTime(),
+                                  startTime: Timezone.getDateUTC(Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ), tzId).getTime(),
+                                  endTime:  parseInt(Timezone.getDateUTC(Date.parseExact(form.endDate + ( !!form.allDay ? " 00:00": " "+$.trim(form.endHour)), formatString ), tzId).getTime()) + (!!form.allDay ? 86400000 : 0) ,
                                   allDay: ( !!form.allDay ? 1 : 0 ),
                               id: form.idEvent,
@@ -633 +493 @@
                                                 
                                                 if( participant.user === User.me.id ){
-                                                        if(!!form.idEvent )
-                                                                participant.id = attendee;
-                                                        participant.isOrganizer = ( !i ? 1 : 0 );
-                                                        var obj = form.alarmTime ? form : pref;
-                                                        participant.alarms = $.map( obj.alarmTime || [], function( alarmTime, i ){
-
-                                                                if( alarmTime === "" )
-                                                                        return( null );
-
-                                                                if(obj.alarmId[i] === "")
-                                                                        return { type: obj.alarmType[i],unit: obj.alarmUnit[i], time: obj.alarmTime[i] };
-                                                                else
-                                                                        return { type: obj.alarmType[i], unit: obj.alarmUnit[i], time: obj.alarmTime[i], id: obj.alarmId[i] };
-                                                        });
-                                                        participant.status = form.status;
+                                                        return DataLayer.merge({
+                                                                isOrganizer: ( !i ? 1 : 0 ),
+                                                                alarms: participant.alarms = $.map( form.alarmTime || [], function( alarmTime, i ){
+                                                                                if( alarmTime === "" )
+                                                                                        return( null );
+                                                                                 return !!form.alarmId[i] ? { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] }:
+                                                                                                                                        { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
+                                                                        }),
+                                                                status: form.status
+                                                        }, !!form.idEvent ? {id: attendee} : {user: participant.user});                                                 
                                                 }else{
-                                                        participant.id = attendee;
-                                                        participant.isOrganizer = ( !i ? 1 : 0 );
-                                                        if(!!parseInt(form.attendeeType[i]))
-                                                                participant.isExternal= 1;
-                                                }
-                                                if( participants[ attendee ] ){
-                                                        participant.id = participants[ attendee ].id;
-                                                }
-                                                return( participant );
+                                                        return {
+                                                                id: attendee,
+                                                                isOrganizer: ( !i ? 1 : 0 ),
+                                                                isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0
+                                                        };
+                                                };
                                           })
                             };
@@ -666 +518 @@
 
     encoder: function( evtObj ){
+        
+        if(!(!!evtObj))
+                return undefined;
 
         var notArray = false;
@@ -674 +529 @@
         var pref = User.preferences;
 
-        var res = $.map(evtObj, function( objEvent ){                   
-                    
-                        var participantInfo = {}, me = { uid: User.me.id, name: User.me.name };
-
-                        var timezone = User.timezones[ (!!objEvent && !!objEvent.timezone) ? objEvent.timezone : User.preferences.timezone ];
-                        
-                    var dateEvent = function( time){
-                        return new Date( parseInt(time) ).setTimezoneOffset( User.timezones[ pref.timezone] ).toString( User.preferences.dateFormat); }
-
-                        var timeEvent = function(time){
-                                if(time){
-                                        var data =  new Date();
-                                        data.setTime(time);
-                                        data = getDateTimezone(data, timezone);
-                                        return dateFormat(data, User.preferences.hourFormat.replace(/m/g,'M'))                  
-                                }
-                        }
-                        if(!!objEvent)
-                    return {
-                              "class": objEvent["class"],
-                              id: objEvent.id,
-                              location: objEvent.location,
-                              category: objEvent.category,
-                              calendars: Calendar.calendars,
-                              calendar: objEvent.calendar,
-                              summary: Encoder.htmlEncode(objEvent.summary),
-                              description: objEvent.description,
-                              timezone: objEvent.timezone,
-                              timezones: User.timezones,
-                              startDate: dateEvent( objEvent.startTime ),
-                              startHour: timeEvent(objEvent.startTime ),
-                              endDate: dateEvent( objEvent.endTime ),
-                              endHour: timeEvent(objEvent.endTime),
-                              allDay: !!parseInt( objEvent.allDay ),
-          //                            attachments: this.decode( "attachment:detail", form ),
-                              attendee: $.map(objEvent.participants || [], function( participant ){
-
-                                          participant = DataLayer.get( "participant", participant );
-
-                                          var user = DataLayer.get( "user", participant.user.id || participant.user );
-
-                                          var person = { uid: user.id,
-                                                         name: user.name };
-
-                                          if( person.uid ===  me.uid )
-                                          {
-                                              participantInfo.status = participant.status;
-                                              participantInfo.alarms = participant.alarms;
-                                          }
-
-                                          if( parseInt( participant.isOrganizer ) )
-                                          {
-                                              participantInfo.organizer = person;
-                                                  return(null);
-                                          }
-
-                                          return( person );
-
-                                      }),
-                              organizer: participantInfo.organizer || me,
-                              alarms: participantInfo.alarms || [],
-                              status: participantInfo.status || 1,
-                              me: me
-                            };
-                });
-
-        if( !notArray )
-        {
+        var res =  DataLayer.encode('schedulable:preview', evtObj);
+
+        if( !notArray ){
             var dates = {};
 
-            for (var i=0; i<res.length; i++) {
+            for (var i=0; i < res.length; i++) {
 
                     var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat );
@@ -754 +544 @@
 
                             if (!dates[counter.toString(User.preferences.dateFormat)]) 
-                                dates[counter.toString(User.preferences.dateFormat)] = { startDate:false, events:[] };
+                                        dates[counter.toString(User.preferences.dateFormat)] = { startDate:false, events:[] };
                             if (!dates[counter.toString(User.preferences.dateFormat)].startDate) 
-                                dates[counter.toString(User.preferences.dateFormat)].startDate = counter.toString(User.preferences.dateFormat);
+                                        dates[counter.toString(User.preferences.dateFormat)].startDate = counter.toString(User.preferences.dateFormat);
 
                             dates[counter.toString(User.preferences.dateFormat)].events.push(res[i]);
@@ -776 +566 @@
     encoder: function( participants ){
 
-          var result = {};
-      
-          for( var i = 0; i< participants.length; i++ )
-          {
-              result[ participants[i].user.id || participants[i].user ] = participants[i];
-          }
-
-          return( result );
+                var result = {};
+                for( var i = 0; i< participants.length; i++ ){
+                        result[ participants[i].user.id || participants[i].user ] = participants[i];
+                }
+                return( result );
     }
 });
@@ -791 +578 @@
     encoder: function( calendars ){
 
-        var result = { my_calendars: [], others_calendars: [] };
-
-        for( var i = 0; i < calendars.length; i++ )
-        {
-            if( Calendar.signatureOf[ calendars[i].id ].isOwner )
-                result.my_calendars.push( calendars[i] );
-            else
-                result.others_calendars.push( calendars[i] );
-        }
-
-        return { agendas_usuario: result };
+                var result = { my_calendars: [], others_calendars: [] };
+
+                for( var i = 0; i < calendars.length; i++ )
+                {
+                        !!Calendar.signatureOf[ calendars[i].id ].isOwner ?
+                                result.my_calendars.push( calendars[i] ) :
+                                result.others_calendars.push( calendars[i] );
+                }
+
+                return { agendas_usuario: result };
 
     }
@@ -927 +713 @@
                         
                 var calendar = DataLayer.get('calendar', evt.calendar);
-                
-                var timesEvent = function(time, timezone){
-                        return getDateTimezone(time, User.timezones[timezone], false )
-                };
-          
+                  
                 grouped[ evt.calendar ].push( { id: evt.URI || evt.id,
                                                 title: Encoder.htmlDecode(evt.summary),
-                                                start: timesEvent(new Date( parseInt( evt.startTime )), calendar.timezone),
-                                                end: !!parseInt(evt.allDay) ? timesEvent(new Date( (parseInt( evt.endTime ) - 86400000) )) : timesEvent(new Date( parseInt( evt.endTime ) ), calendar.timezone),
-                                                allDay: !!parseInt( evt.allDay ) } );
+                                                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 ) } );
         });
 
@@ -944 +726 @@
     criteria: function( filter ){
       
-        if( $.type(filter.start) !== 'date' )
-            filter.start = new Date( filter.start * 1000 );
-        if( $.type(filter.end) !== 'date' )
-            filter.end = new Date( filter.end * 1000 );
-
-        return { filter: ["AND", 
-
-                            [ ">=", "rangeStart", filter.start.toString( "dd-MM-yyyy" ) ],
-                            [ "<=", "rangeEnd", filter.end.toString( "dd-MM-yyyy" ) ],
-                            [ "IN", "calendar", Calendar.calendarIds ]
-
-                          ], 
+                if( $.type(filter.start) !== 'date' )
+                        filter.start = new Date( filter.start * 1000 );
+                if( $.type(filter.end) !== 'date' )
+                        filter.end = new Date( filter.end * 1000 );
+
+                return { filter: ["AND", 
+
+                                        [ ">=", "rangeStart", filter.start.toString( "dd-MM-yyyy" ) ],
+                                        [ "<=", "rangeEnd", filter.end.toString( "dd-MM-yyyy" ) ],
+                                        [ "IN", "calendar", Calendar.calendarIds ]
+
+                                  ], 
                  criteria: { deepness: 2 } }
     }
@@ -963 +745 @@
 DataLayer.codec( "preference", "detail", {
   
-  decoder:function( pref ){
-        
-        var res = [];
-
-      pref.defaultAlarm = $.map( pref.alarmTime || [], function( alarmTime, i ){
-              
-            return { type: pref.alarmType[i], 
-                     time: alarmTime,
-                     unit: pref.alarmUnit[i] };
-        
-      });
-
-      $.each( pref, function( i, el ){
-        
-          res[ res.length ] = { name: i, value: el };
-        
-      });
-    
-      return( res );
+        decoder:function( pref ){
+        
+                var res = [];
+
+                pref.defaultAlarm = $.map( pref.alarmTime || [], function( alarmTime, i ){
+                  
+                        return { type: pref.alarmType[i], 
+                                time: alarmTime,
+                                unit: pref.alarmUnit[i] };
+                        });
+
+                $.each( pref, function( i, el ){
+
+                        res[ res.length ] = { name: i, value: el };
+
+                });
+                
+                return( res );
       
-  },
-
-  encoder:function( pref ){
-
-      return( pref );
-
-  }
+        },
+
+        encoder:function( pref ){
+                return( pref );
+        }
 
 });
@@ -995 +774 @@
 DataLayer.codec( "schedulable", "export", {
   
-      decoder: function(){
-
-          
-
-      },
+        decoder: function(){},
       
-      encoder: function( signatures ){
-
-          
-
-      },
+    encoder: function( signatures ){},
       
-      criteria: function( filter ){
-        
-          if( isCal  = filter && filter.calendar )
-              filter = filter.calendar;
-
-            return {
-
-                      filter: filter ? [  "=", ( isCal ? "calendar" : "id" ), filter ] : false,
-
-                      criteria: { format: 'iCal', deepness: 2 }
-            };
-      }
-
-
+    criteria: function( filter ){
+        
+                if( isCal  = filter && filter.calendar )
+                        filter = filter.calendar;
+                        return {
+                                filter: filter ? [  "=", ( isCal ? "calendar" : "id" ), filter ] : false,
+                                criteria: { format: 'iCal', deepness: 2 }
+                        };
+                }
 });
 

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

@@ -1 @@
-/*
-        Todo Otimizar caulculo de timezone
-        Objeto Date.toString() retorna a data com inserção do offset
-        Objeto Date.getTime() retorna a data sem inserção do offset
-*/
-function checkTimezoneCalendar(idCalendar, timezone){
-        var obj = DataLayer.get('calendar', idCalendar);
-        if(User.timezones[obj.timezone] ==  timezone)
-                return true;
-        else
-                return false;
-}
-
-function setDateTimezone(date, timezone, existsTimezone, idCalendar){
-        
-if(!existsTimezone)
-                return date;
-        if(idCalendar)
-                if(checkTimezoneCalendar(idCalendar, timezone))
-                        return getDateTimezone(date, timezone, false);
-        
-        var timezoneOffset = '';
-        if(User.isDaylightSaving == '1')
-                timezoneOffset = parseInt(timezone.substr(2)) - 100;
-        else
-                timezoneOffset = parseInt(timezone.substr(2));
-                
-        var timeCurrent = parseInt((date.getTimezoneOffset()/60)+'00')
-        var times = 0;
-        if(timezone.charAt(0) != date.getUTCOffset().charAt(0))
-                times = timeCurrent + timezoneOffset ;
-        else
-                times = timezoneOffset - timeCurrent  ;
-        
-        if(times == 0)
-                return date;            
-        else if(times > 0)
-                return date.setTimezoneOffset('-0'+(times));
-        else
-                return date.setTimezoneOffset('+0'+((times * -1)));
-}
-
-
-function getDateTimezone(date, timezone, recursive){            
-        if(!timezone)
-                return date;
-        
-        var times = 0;
-        currentTimezone = parseInt((date.getTimezoneOffset()/60)+'00');
-        var timezoneOffset = 0;
-        if(User.isDaylightSaving == '1')
-                timezoneOffset = parseInt(timezone.substr(2)) - 100;
-        else
-                timezoneOffset = parseInt(timezone.substr(2));
-                
-        var times =  timezoneOffset - currentTimezone;
-        if(times == 0){
-                if((timezone.charAt(0) == date.getUTCOffset().charAt(0)) && recursive)
-                        return date.setTimezoneOffset( timezone.charAt(0)+'0'+(currentTimezone));
-                else
-                        return  date;
-        }else if (times > 0)
-                return date.setTimezoneOffset('+0'+(times));
-        else{
-                return date.setTimezoneOffset('-0'+((times * -1) + (currentTimezone * 2)));
-        }
-}
-
-function getDateUTC(date, timezone){
-        currentTimezone = parseInt(timezone.substr(2));
-        if(User.isDaylightSaving == '1')
-                currentTimezone = currentTimezone - 100;
-                return(date.setTimezoneOffset(timezone.charAt(0)+'0'+currentTimezone));
-}               
-
-function createDateTimezone(date, timezone, idCalendar){                
-        
-        if(checkTimezoneCalendar(idCalendar, timezone))
-                return getDateTimezone(date, timezone, true);
-
-        var times = 0;
-        
-        if(timezone.charAt(0) == '+')
-                times = parseInt(timezone.substr(2)) - parseInt((date.getTimezoneOffset()/60)+'00');
-        else
-                times = (parseInt(timezone.substr(2)) + parseInt((date.getTimezoneOffset()/60)+'00')) * (-1);
-        if(times == 0)
-                return date.setTimezoneOffset('0000');
-        else if (times > 0)
-                return date.setTimezoneOffset('+0'+times);
-        else
-                return date.setTimezoneOffset('-0'+(times * -1));
-}
-   
-function defaultToAmPm( Hour )
-{
-        var HourAmPm = Hour.split(":");
-        if(HourAmPm[0] == 0)
-                HourAmPm[0] = 12;       
-        if(HourAmPm[0] < 12){
-                Hour += (Hour.length == 5) ? " am" : "";
-        }else if(HourAmPm[0] == 12){
-                Hour += (Hour.length == 5) ? " pm" : "";
-        }else
-                Hour = "0"+(HourAmPm[0]-12)+":"+HourAmPm[1]+ ((Hour.length == 5) ? " pm" : "");
-        return Hour;
-}
-
 function validDateEvent(){
         var start_date = $(".new-event-win.active .start-date").val();
@@ -112 +4 @@
         var start_time = $(".new-event-win.active .start-time").val();
         var end_time   = $(".new-event-win.active .end-time").val();
-        var isAllDay = $('.new-event-win.active input[name="allDay"]').is(':checked');
+        var isAllDay   = $('.new-event-win.active input[name="allDay"]').is(':checked');
         
         if(start_date == "")
@@ -124 +16 @@
         
         var formatString = (isAllDay)? User.preferences.dateFormat+" HH:mm" : User.preferences.dateFormat + " " + User.preferences.hourFormat;
-        
-        var spaces = function(hours){
-                return hours.replace(/\s$/, "");
-        };
-        
-        var startDate = Date.parseExact( isAllDay ? start_date+ " 00:00": start_date + " " + spaces(start_time) , formatString );
-        var endDate = Date.parseExact( isAllDay ? end_date+ " 00:00": end_date + " " + spaces(end_time) , formatString );
+                
+        var startDate = Date.parseExact( isAllDay ? start_date+ " 00:00": start_date + " " + $.trim(start_time) , formatString );
+        var endDate = Date.parseExact( isAllDay ? end_date+ " 00:00": end_date + " " + $.trim(end_time) , formatString );
         
         if(startDate == null || startDate.getTime() < 0 )
@@ -138 +26 @@
         
         if((endDate.compareTo(startDate) != 1) && !((endDate.compareTo(startDate) == 0) && (isAllDay))){
-                if(start_date == end_date){
-                        if(end_time == start_time)
-                                return 'Hora inicial igual a final';
-                        else
-                                return 'Hora final menor que a inicial';
-                
-                }else
-                        return 'Data final menor que a inicial';
+                return (start_date == end_date) ? 
+                        ((end_time == start_time) ? 'Hora inicial igual a final' : 'Hora final menor que a inicial') :
+                        'Data final menor que a inicial';
         }
         return false;
@@ -173 +56 @@
         
         if(typeof(objEvent.id) == 'undefined'){
-                        objEvent.alarms = Calendar.signatureOf[!!User.preferences.defaultCalendar ? User.preferences.defaultCalendar : Calendar.calendarIds[0]].defaultAlarms;
+                        objEvent.alarms = Calendar.signatureOf[User.preferences.defaultCalendar || Calendar.calendarIds[0]].defaultAlarms || false;
                         objEvent.useAlarmDefault = 1;
         }
@@ -259 +142 @@
                     $(this).addClass('hidden');
                     $('.calendar-addevent-details-txt-timezone').removeClass('hidden');
-
                     e.preventDefault();
             });
@@ -267 +149 @@
                         if( id = $(this).parent().find('input[name="alarmId[]"]').val())
                                 DataLayer.remove('alarm', id);
-                        if( $(this).parent().remove().find('li').is(':empty') ) {
-                                //alert('nao tem');
-                        }
+                        $(this).parent().remove().find('li').is(':empty');
                 });
                 
@@ -277 +157 @@
                 /*Adicionar alarms padrões, quando alterado a agenda do usuário*/               
                 UI.dialogs.addEvent.find('select[name="calendar"]').change(function(){
-                        if((typeof($('input[name = "idEvent"]').val()) == 'undefined') || ($('input[name = "idEvent"]').val() == '')) {
+                        if((typeof($('input[name = "idEvent"]').val()) == 'undefined') || (!!!$('input[name = "idEvent"]').val())) {
                                 $('input[name = "isDefaultAlarm[]"]').parent().remove();
                                 UI.dialogs.addEvent.find('input[name="defaultAlarm"]').parent().removeClass('hidden');
@@ -285 +165 @@
                                         var li_attach = DataLayer.render(path+'templates/alarms_add_itemlist.ejs', {alarm:calendarSelected});
                                                 jQuery('.event-alarms-list').append(li_attach).find('.button.remove').button({text:false, icons:{primary:'ui-icon-close'}}).click(function(el) {
-                                                        if( $(this).parent().remove().find('li').is(':empty') ) {
-                                                                //alert('nao tem');
-                                                        }
-
+                                                        $(this).parent().remove().find('li').is(':empty');
                                                 });
                                 }else{
@@ -308 +185 @@
                                                         if( id = $(this).parent().find('input[name="alarmId[]"]').val())
                                                                 DataLayer.remove('alarm', id);
-                                                        if( $(this).parent().remove().find('li').is(':empty') ) {
-                                                                //alert('nao tem');
-                                                        }
-
+                                                        $(this).parent().remove().find('li').is(':empty') 
                                                 });
                                 }
@@ -320 +194 @@
             /* Checkbox allday */
             UI.dialogs.addEvent.find('input[name="allDay"]').click(function(){
-                    if($(this).attr("checked"))
-                                UI.dialogs.addEvent.find('.start-time, .end-time').addClass('hidden');   
-                    else
+                    $(this).attr("checked") ? 
+                                UI.dialogs.addEvent.find('.start-time, .end-time').addClass('hidden') :
                             UI.dialogs.addEvent.find('.start-time, .end-time').removeClass('hidden'); 
             });
@@ -342 +215 @@
                         UI.dialogs.addEvent.find(".end-time, .start-time").mask("99:99 {}", {
                                 completed:function(){
-                                        $(this).val(defaultToAmPm($(this).val()));
+                                        $(this).val(date.Calendar.defaultToAmPm($(this).val()));
                                         $(this).timepicker("refresh");
                                         $(this).val($(this).val().replace(/[\.]/gi, ""));
@@ -349 +222 @@
                 }
                 UI.dialogs.addEvent.find(".number").numeric();
-                if(User.preferences.dateFormat.indexOf('-') > 0)
-                        UI.dialogs.addEvent.find(".date").mask("99-99-9999");
-                else
+                User.preferences.dateFormat.indexOf('-') > 0 ? 
+                        UI.dialogs.addEvent.find(".date").mask("99-99-9999") :
                         UI.dialogs.addEvent.find(".date").mask("99/99/9999");
 
@@ -415 +287 @@
 
                         jQuery('.event-alarms-list').append(li_attach).find('.button.remove').button({text:false, icons:{primary:'ui-icon-close'}}).click(function(el) {
-                                if( $(this).parent().remove().find('li').is(':empty') ) {
-                                        //alert('nao tem');
-                                }
-
-                        });
-
+                                $(this).parent().remove().find('li').is(':empty')
+                        });
                         // valicacao de campos numericos
                         $('.number').numeric();
@@ -496 +364 @@
                                                 newAttendeeEmail = currentTip.find('input[name="mail"]').val();
 
-                                                var isValidMail = newAttendeeEmail.match(/^[\w!#$%&'*+\/=?^`{|}~-]+(\.[\w!#$%&'*+\/=?^`{|}~-]+)*@(([\w-]+\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/);
-                                                if (!isValidMail) {
+                                                if (!(!!newAttendeeEmail.match(/^[\w!#$%&'*+\/=?^`{|}~-]+(\.[\w!#$%&'*+\/=?^`{|}~-]+)*@(([\w-]+\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/))) {
                                                         currentTip.find('.messages').removeClass('hidden').find('.message label').html('Email inválido.');
                                                         return false;
@@ -522 +389 @@
                                                 $('.qtip-active .button').button()
                                                 .filter('.save').click(function(event, ui) {
-                                                        if (saveContact()) {                                            
+                                                        if(saveContact())
                                                                 lastEditAttendeeToolTip.qtip("destroy");
-                                                        } else {
+                                                        else
                                                                 return false;
-                                                        }
                                                 }).end()
                                                 .filter('.cancel').click(function(event, ui) {
@@ -538 +404 @@
                                                 $('.qtip-active input').keydown(function(event) {
                                                         if (event.keyCode == '13') {                                            
-                                                                if (saveContact()) {                                            
+                                                                if (saveContact())                                              
                                                                         lastEditAttendeeToolTip.qtip("destroy");
-                                                                }
-
+                        
                                                                 lastEditAttendeeToolTip.qtip("destroy");
                                                                 event.preventDefault();
@@ -549 +414 @@
                                                 .filter('[name="mail"]').Watermark("informe o email do contato");
                                         }
-
                                         
                                         /**
@@ -726 +590 @@
                         });
 
-
+/*
                         UI.dialogs.addEvent.find('.attendees-list li').hover(
                                 function () {
@@ -735 +599 @@
                                 }
                         );
-
+*/
                         //$('.block-add-attendee .search-result-list').selectable();
 
@@ -1010 +874 @@
 }
 
-function getNotSelectedCalendars(){
+function getSelectedCalendars( reverse ){
         var selecteds = {};
         var cont = 0; 
@@ -1016 +880 @@
             jQuery(".my-calendars .calendar-view").each(function(i, obj) { 
                 var check_box = obj;
-                        if(!check_box.checked) {
-                                selecteds[cont] = obj.value;
-                                cont++;
-                        };
-            });               
-        });
-        if (!cont)
-                return false;
-        
-        selecteds.length = cont;
-        return $.makeArray( selecteds );
-}
-
-function getSelectedCalendars(){
-        var selecteds = {};
-        var cont = 0; 
-        jQuery(function() {
-            jQuery(".my-calendars .calendar-view").each(function(i, obj) { 
-                var check_box = obj;
-                        if(check_box.checked) {
+                        if( reverse ? !check_box.checked : check_box.checked ) {
                                 selecteds[cont] = obj.value;
                                 cont++;
@@ -1080 +925 @@
                                 if(idCalendar == User.preferences.defaultCalendar)
                                         DataLayer.remove( 'modulePreference', User.preferenceIds['defaultCalendar']);
+                        }
                                 $('.positionHelper').css('display', 'none');
-                        }else{
-                                $('.positionHelper').css('display', 'none');
-                        }       
+        
                 }
         });     
@@ -1309 +1153 @@
                 case 'basicDay':
                         var date = new Date().add({days: page_index});
-                        return (weekOfDay(date.getDay()))+", "+(date.toString('dd MMM yyyy'));
+                        return (dateCalendar.dayNames[date.getDay()])+", "+(date.toString('dd MMM yyyy'));
                 case 'agendaWeek':
                 case 'week':
-                        var dateStart = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault));
+                        var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]);
                         dateStart.add({days: (7 * page_index)});
-                        var dateEnd = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault));
+                        var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]);
                         dateEnd.add({days: (page_index * 7)+7});
                         if(dateStart.toString('MM') != dateEnd.toString('MM'))
-                                        return dateStart.toString('dd')+' de '+sortMonthOfNumber(dateStart.getMonth())+' a '+dateEnd.toString('dd')+' de '+monthOfNumber(dateEnd.getMonth())+' - '+dateEnd.toString('yyyy');
-                        return +dateStart.toString("dd")+" a "+dateEnd.toString("dd")+" de "+monthOfNumber(dateEnd.getMonth())+" - "+dateEnd.toString('yyyy');
+                                        return dateStart.toString('dd')+' de '+dateCalendar.monthNamesShort[dateStart.getMonth()]+' a '+dateEnd.toString('dd')+' de '+dateCalendar.monthNames[dateEnd.getMonth()]+' - '+dateEnd.toString('yyyy');
+                        return +dateStart.toString("dd")+" a "+dateEnd.toString("dd")+" de "+dateCalendar.monthNames[dateEnd.getMonth()]+" - "+dateEnd.toString('yyyy');
                 case 'month':
                         var date = new Date().add({months: page_index}) 
-                        return monthOfNumber(date.getMonth())+" "+date.toString("yyyy");
+                        return dateCalendar.monthNames[date.getMonth()]+" "+date.toString("yyyy");
                 case 'year':
                         var date = new Date().add({years: page_index});
@@ -1405 +1249 @@
 
 function mountCriteriaList(view, page_index, calerdars_selecteds){
+        var criteria = {deepness: 2, order: 'startTime'}
         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'}}; 
+                        return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['=', 'rangeEnd', new Date().add({days: page_index}).toString("yyyy-MM-dd")]], criteria: criteria}; 
                 case 'agendaWeek':
                 case 'week':
-                        var dateStart = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault)); 
-                        var dateEnd = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault)); 
-                        return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', dateStart.add({days: (7 * page_index)}).toString("yyyy-MM-dd")], ['<=', 'rangeEnd', dateEnd.add({days: (7 * page_index)+7}).toString("yyyy-MM-dd")]]], criteria: {order: 'startTime'}}; 
+                        var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekDefault]); 
+                        var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekDefault]); 
+                        return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', dateStart.add({days: (7 * page_index)}).toString("yyyy-MM-dd")], ['<=', 'rangeEnd', dateEnd.add({days: (7 * page_index)+7}).toString("yyyy-MM-dd")]]], criteria: criteria}; 
                 case 'month':
                         var date = new Date().add({months: page_index}) 
-                        return {filter: ['AND',['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', date.moveToFirstDayOfMonth().toString("yyyy-MM-dd")], ['<=', 'rangeEnd', date.moveToLastDayOfMonth().toString("yyyy-MM-dd")]]], criteria: {order: 'startTime'}}; 
+                        return {filter: ['AND',['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', date.moveToFirstDayOfMonth().toString("yyyy-MM-dd")], ['<=', 'rangeEnd', date.moveToLastDayOfMonth().toString("yyyy-MM-dd")]]], criteria: criteria}; 
                 case 'year':
                         var dateStart = new Date().add({years: page_index});    
@@ -1424 +1269 @@
                         if(dateEnd.getMonth() != 11)
                                 dateEnd.moveToMonth(11) 
-                        return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', dateStart.moveToFirstDayOfMonth().toString("yyyy-MM-dd")], ['<=', 'rangeEnd', dateEnd.moveToLastDayOfMonth().toString("yyyy-MM-dd")]]], criteria: {order: 'startTime'}}; 
+                        return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['AND',['>=', 'rangeEnd', dateStart.moveToFirstDayOfMonth().toString("yyyy-MM-dd")], ['<=', 'rangeEnd', dateEnd.moveToLastDayOfMonth().toString("yyyy-MM-dd")]]], criteria: criteria}; 
         }
 }
@@ -1442 +1287 @@
                         criteria = mountCriteriaList(!!view ? view : User.preferences.defaultCalView, page_index, selecteds)
                 else
-                        criteria =  {filter: ['AND', ['OR', ["i*", "summary", keyword], ["i*", "description", keyword]], ['IN', 'calendar',  selecteds]], criteria: {order: 'startTime', offset: (25 * page_index), limit: (((25 * page_index) + 25) + 1)}};
+                        criteria =  {filter: ['AND', ['OR', ["i*", "summary", keyword], ["i*", "description", keyword]], ['IN', 'calendar',  selecteds]], criteria: {order: 'startTime', offset: (25 * page_index), limit: (((25 * page_index) + 25) + 1), deepness: 2}};
                 var results = DataLayer.get('schedulable:detail', criteria);
                 keyword = ( keyword || '' ).replace( /\s+/g, "_" );     
@@ -1555 +1400 @@
     });
 }
-
-function dayOfWeek(day) {
-        switch (day) {
-                case 'SUN':
-                        return 0;
-                        break;
-                case 'MON':
-                        return 1;
-                        break;
-                case 'TUE':
-                        return 2;
-                        break;
-                case 'WED':
-                        return 3;
-                        break;
-                case 'THU':
-                        return 4;
-                        break;
-                case 'FRI':
-                        return 5;
-                        break;
-                case 'SAT':
-                        return 6;
-                        break;
-                default:
-                        return false;
-                        break;
-        }
-}
-
-function weekOfDay(week) {
-        switch (week) {
-                case 0:
-                        return 'Domingo';
-                case 1:
-                        return 'Segunda';
-                case 2:
-                        return 'Terça';
-                case 3:
-                        return 'Quarta';
-                case 4:
-                        return 'Quinta';
-                case 5:
-                        return 'Sexta';
-                case 6:
-                        return 'Sábado';
-                default:
-                        return false;
-        }
-}
-
-function monthOfNumber(number) {
-        switch (number) {
-                case 0:
-                        return 'Janeiro';
-                case 1:
-                        return 'Fevereiro';
-                case 2:
-                        return 'Março';
-                case 3:
-                        return 'Abril';
-                case 4:
-                        return 'Maio';
-                case 5:
-                        return 'Junho';
-                case 6:
-                        return 'Julho';
-                case 7:
-                        return 'Agosto';
-                case 8:
-                        return 'Setembro';
-                case 9:
-                        return 'Outubro';
-                case 10:
-                        return 'Novembro';
-                case 11:
-                        return 'Dezembro';
-                default:
-                        return false;
-        }
-}
-
-function sortMonthOfNumber(number) {
-        switch (number) {
-                case 0:
-                        return 'Jan';
-                case 1:
-                        return 'Fev';
-                case 2:
-                        return 'Mar';
-                case 3:
-                        return 'Abr';
-                case 4:
-                        return 'Mai';
-                case 5:
-                        return 'Jun';
-                case 6:
-                        return 'Jul';
-                case 7:
-                        return 'Ago';
-                case 8:
-                        return 'Set';
-                case 9:
-                        return 'Out';
-                case 10:
-                        return 'Nov';
-                case 11:
-                        return 'Dez';
-                default:
-                        return false;
-        }
-}

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()){

trunk/prototype/modules/calendar/templates/attendee_add.ejs

@@ -19 +19 @@
                                 <li class="organizer"> 
                                         <div style="overflow:hidden; width:100%; display:table;">
-                                                <input type="checkbox" value="<%= data.event.organizer.uid %>" disabled="disabled">
-                                                <input type="hidden" name="attendee[]" value="<%=data.event.organizer.uid%>">
+                                                <input type="checkbox" value="<%= data.event.organizer.id %>" disabled="disabled">
+                                                <input type="hidden" name="attendee[]" value="<%=data.event.organizer.id%>">
                                                 <input type="hidden" name="attendeeType[]" value="0">
-                                                <input type="hidden" name="attendee_organizer[]" value="<%=data.event.organizer.uid%>">
+                                                <input type="hidden" name="attendee_organizer[]" value="<%=data.event.organizer.id%>">
                                                 <label for="attendee_organizer" title="<%= data.event.organizer.name ? data.event.organizer.name: '' %>" class="name"><%= data.event.organizer.name ? data.event.organizer.name : '' %></label>
                                                 <label for="attendee_organizer" title="<%= data.event.organizer.mail ? data.event.organizer.mail: '' %>" class="mail"><%= data.event.organizer.mail ? data.event.organizer.mail : '' %></label>
-                                                <% if (data.event.me.uid == data.event.organizer.uid && false) { %>
+                                                <% if (data.event.me.id == data.event.organizer.id && false) { %>
                                                 <span class="button small swap">Mudar organizador</span>
                                                 <% } %>
@@ -36 +36 @@
                                 <li class="attendee"> 
                                         <div style="overflow:hidden; width:100%; display:table;">
-                                                <input type="checkbox" value="<%= data.event.attendee[i].uid %>" disabled="disabled">
-                                                <input type="hidden" name="attendee[]" value="<%=data.event.attendee[i].uid%>">
+                                                <input type="checkbox" value="<%= data.event.attendee[i].id %>" disabled="disabled">
+                                                <input type="hidden" name="attendee[]" value="<%=data.event.attendee[i].id%>">
                                                 <input type="hidden" name="attendeeType[]" value="<%=data.event.attendee[i].isExternal%>">
                                                 <label title="<%= data.event.attendee[i].name ? data.event.attendee[i].name: '' %>" class="name"><%= data.event.attendee[i].name ? data.event.attendee[i].name : '' %></label>

trunk/prototype/modules/calendar/templates/event_add.ejs

@@ -107 +107 @@
         <fieldset id="calendar_addevent_details4" class="tab-level2">
                 <legend class="hidden">Lembretes</legend>
-                <%if(!data.event.id && data.event.alarms.length){%>
-                        <p class="default-alarm-event">
-                                <input type="checkbox" name="defaultAlarm" value="true" checked="checked"/>
-                                <label class="input-default-alarm" for="defautAlarm">Usar alarmes padrões</label>
-                        </p>
-                <%}%>
+                
+                <p class="default-alarm-event <%= (!data.event.id && data.event.alarms) ? '' : 'hidden'%>">
+                        <input type="checkbox" name="defaultAlarm" value="true" checked="checked"/>
+                        <label class="input-default-alarm" for="defautAlarm">Usar alarmes padrões</label>
+                </p>
+        
                 <ul class="event-alarms-list">
                         <% if (data.event && data.event.alarms) {

trunk/prototype/modules/calendar/templates/event_list.ejs

@@ -88 +88 @@
                                                 <div class="details-event-list hidden">
                                                         <fieldset class="fields-details-event-list">                                                    
-                                                                <p class="input-group date-info">
-                                                                        <label>Início:</label>
-                                                                        <span class="date start-date"><%= _event.startDate %> às </span>
-                                                                        <span class="time start-time"><%= _event.startHour %></span> 
-                                                                        
-                                                                </p>
-                                                                <p class="input-group">
-                                                                        <label>Término:</label>
-                                                                        <span class="date end-date"><%= _event.endDate %> às </span>
-                                                                        <span class="time end-time"><%= _event.endHour %></span>
-                                                                        <span><%= _event.timeZone %></span>
-                                                                </p>
+                                                                <%if(_event.allDay){%>
+                                                                        <p class="input-group date-info">
+                                                                                <label>Duração</label>
+                                                                                <span class="date start-date">Dia inteiro</span>
+                                                                        </p>
+                                                                <%}else{%>
+                                                                
+                                                                        <p class="input-group date-info">
+                                                                                <label>Início:</label>
+                                                                                <span class="date start-date"><%= _event.startDate %> às </span>
+                                                                                <span class="time start-time"><%= _event.startHour %></span> 
+                                                                                
+                                                                        </p>
+                                                                        <p class="input-group">
+                                                                                <label>Término:</label>
+                                                                                <span class="date end-date"><%= _event.endDate %> às </span>
+                                                                                <span class="time end-time"><%= _event.endHour %></span>
+                                                                                <span><%= _event.timeZone %></span>
+                                                                        </p>
+                                                                <%}%>
                                                                 <p class="input-group">
                                                                         <label>Repete em</label>
@@ -108 +116 @@
                                                                         <% if(_event.alarms) { %>
                                                                                 <span class="large" >
-                                                                                <% for (var l=0; l < _event.alarms.length; l++) { %>
-                                                                                        Você será notificado por <%= _event.alarms[l].typee %> <%= _event.alarms[l].time %> <%= _event.alarms[l].unit %> antes do evento<br /> <!-- Tirar esse br -->
-                                                                                
-                                                                                <% } %>
+                                                                                        <% for (var l=0; l < _event.alarms.length; l++) { %>
+                                                                                                <span class="large" >Você será notificado por um <%=dateCalendar.alarmtype[_event.alarms[l].type]%> <%= _event.alarms[l].time %> <%= dateCalendar.timeunit[_event.alarms[l].unit]%><%=_event.alarms[l].time > 1 ? 's' : '' %> antes do evento</span>
+                                                                                        <% } %>
                                                                                 </span>
-                                                                                <% } %>
+                                                                        <% } %>
                                                                 </p>
                                                                 <p class="input-group">
@@ -128 +135 @@
                                                                 </p>
                                                                 <p class="input-group">
+                                                                        <label>Organizador</label>
+                                                                        <span class="large"><%=_event.organizer.name%>  (<%= _event.organizer.mail %>)</span>
+                                                                </p>
+                                                                <p class="input-group">
                                                                         <label>Participantes</label>
-                                                                        <span>
-                                                                        <% if(_event.participants) { %>
+                                                                        <% if(_event.attendee) { %>
                                                                                 <span class="large" >
-                                                                                <% for (var m=0; m < _event.participants.length; m++) { %>
-                                                                                        <%= _event.participants[m].name %> (<%= _event.participants[m].email %>) <br />
-                                                                                
-                                                                                <% } %>
+                                                                                        <% for (var m=0; m < _event.attendee.length; m++) { %>
+                                                                                                <span class="large"><%=_event.attendee[m].name%>  (<%= _event.attendee[m].mail %>)</span>
+                                                                                        <%}%>
                                                                                 </span>
-                                                                                <% } %>
+                                                                        <% } %>
                                                                 </p>
                                                                 <p class="input-group">
@@ -156 +165 @@
                                                         <div class="menu-container footer-container">
                                                                 <input name="eventid" type="hidden" value="<%=_event.id%>"></input>
+                                                                <a class="button delete" href="#">Excluir</a>
                                                                 <a class="button edit" href="#">Editar</a>
-                                                                <a class="button delete" href="#">Excluir</a>
                                                         </div>
                                                 </div>

trunk/prototype/modules/calendar/templates/import_export.ejs

@@ -11 +11 @@
     
     <div id="tab-import">
-        <form method="POST" action="../../converter.php" class="import-event-form">
+        <form method="POST" action="../prototype/converter.php" class="import-event-form">
         <fieldset class="import-calendar"> 
                 <input type="hidden" name="type" value="iCal">
@@ -31 +31 @@
         </form>
                 <div class="menu-container footer-container menu-import-event">
-                        <a class="button import calendar-import-btn-import" href="#">Importar</a>
                         <a class="button cancel calendar-import-btn-cancel" href="#">Cancelar</a>
+                                                <a class="button import calendar-import-btn-import" href="#">Importar</a>
                 </div>
      </div>
     
     <div id="tab-export">
-        <form method="GET" action="export.php" class="export-event-form">
+        <form method="GET" action="../prototype/modules/calendar/export.php" class="export-event-form">
         <fieldset class="export_calendar">
                 <legend class="hidden">Exportar agenda</legend>
@@ -53 +53 @@
         </form>
                 <div class="menu-container footer-container menu-export-event">
-                        <a class="button export calendar-export-btn-export" href="#">Exportar</a>
                         <a class="button cancel calendar-export-btn-cancel" href="#">Cancelar</a>
+                                                <a class="button export calendar-export-btn-export" href="#">Exportar</a>
                 </div>
     </div>

trunk/prototype/modules/calendar/templates/index.ejs

@@ -81 +81 @@
 
 <script type='text/javascript' src='<?= MODULESURL ?>/js/base64.js'></script>
+<script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.date.js'></script>
+
 <script type='text/javascript' src='<?= MODULESURL ?>/js/helpers.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.codecs.js'></script>
+<script type='text/javascript' src='<?= MODULESURL ?>/js/timezone.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/I18n.js'></script>
 <script type="text/javascript" src="<?= MODULESURL ?>/js/init.js"></script>

trunk/prototype/timezones.php

@@ -457 +457 @@
 "UTC":"+0000"
 },
-"isDaylightSaving":"<?php
-                $time = time();
-                $hora = localtime($time, true);
-                if($hora['tm_isdst']){
-                        echo true;
-                }else{
-                        echo false;
-                } 
-?>"
+"isDaylightSaving":"<?php $localtime = localtime(time(), true); echo !!$localtime['tm_isdst']; ?>"
 }