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

Timestamp:

03/01/12 03:35:01 (13 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Implementacao de compartilhamento de agendas (agendas usuario e agendas publicas)

Location:

trunk/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (16 diffs)
• calendar.contentMenu.js (added)
• calendar.shared.js (added)
• helpers.js (modified) (16 diffs)
• init.js (modified) (3 diffs)
• timezone.js (modified) (3 diffs)

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

@@ -39 +39 @@
 }
 
+constantsCalendarShared = {
+        'r' : 'read',
+        'w' : 'write',
+        'd' : 'remove',
+        'b' : 'busy',
+        's' : 'shared'
+}
+
 UI = {
         dialogs: {
                 addEvent: null,
                 importCalendar: null,
-                sharedCalendar: null
+                sharedCalendar: null,
+                copyCalendar: null
         }
 }
@@ -74 +83 @@
 });
 
+DataLayer.codec( "calendarToPermission", "detail", {
+        decoder: function( evtObj ){
+/*              Encoder.EncodeType = "entity";
+                
+                if( notArray = $.type(evtObj) !== "array" )
+                        evtObj = [ evtObj ];
+                
+                var res = $.map(evtObj, function( form){
+                        return [$.map(form.user , function( user, i){
+                                return { 
+                                        calendar: form.calendar,
+                                        user: user,
+                                        acl: form.attendeeAcl[i],
+                                        type: 0
+                                };
+                        })];
+                });
+        
+        return notArray ? res[0] : res;
+        */
+        },
+
+    encoder: function( evtObj ){
+        
+                if(evtObj == "")
+                        return "";
+                        
+                var notArray = false;
+                  
+                if( notArray = $.type(evtObj) !== "array" )
+                        evtObj = [ evtObj ];
+                
+                var constantAcl = function(acl){
+                        var returns = {};
+                        for (var i in constantsCalendarShared){
+                                returns[constantsCalendarShared[i]] = acl.indexOf(i) >= 0 ? true : false
+                        }
+                        return returns;
+                };
+
+                var res = $.map(evtObj, function( objEvent ){                   
+                        return {
+                            id: objEvent.id,
+                            type: objEvent.type,
+                            calendar: objEvent.calendar,
+                            user: objEvent.user,
+                                acl: constantAcl(objEvent.acl)  ,
+                                aclValues: objEvent.acl
+                        };
+                });     
+        return notArray ? res[0] : res;
+        }
+});
+
+
 Calendar = {
   
@@ -82 +146 @@
                 *  quando forçado um get do banco, deverá ser criado uma condição para o mesmo
                 */
-                var descart = DataLayer.get("calendarSignature", {filter: ['=', 'user', User.me.id], criteria: {deepness: 2}})
+                var descart = DataLayer.get("calendarSignature", {filter: ['=', 'user', User.me.id], criteria: {deepness: 2}});
                 this.signatures  = DataLayer.get("calendarSignature", {filter: ['=', 'user', User.me.id], criteria: {deepness: 2}}, true);
           
@@ -104 +168 @@
 
                 for( var i = 0; i < this.signatures.length; i++ ){
+                        if(this.signatures[i].isOwner == "0")
+                                this.signatures[i].permission =  DataLayer.encode('calendarToPermission:detail', this.signatures[i].permission);
                         this.signatureOf[ this.calendarIds[i] = ( this.calendars[ this.calendars.length ] = this.calendarOf[ this.signatures[i].id ] = this.signatures[i].calendar ).id ] = this.signatures[i];
                 }
@@ -128 +194 @@
 Alarms = {
         load: function(){
-                var eventsDay = DataLayer.get('alarm:schedulable',['=', 'date', new Date().toString("yyyy-MM-dd")]);
+                var eventsDay = DataLayer.get('alarm:schedulable',['=', 'date', Date.today().getTime()]);
                 for(var i = 0; i < eventsDay.length; i++){
                         this.addAlarm( eventsDay[i] );
@@ -197 +263 @@
     if( status === 'serverclient' ){
                 DataLayer.commit( false, false, function(){     
-                        if(!!$('#calendar').fullCalendar)
+                        if(!!$('#calendar').fullCalendar){
                                 Calendar.rerenderView(true);
+                                contentMenu();
+                        }
                         //Atualiza a listagem de eventos apenas se estiver na aba de listagem
                         if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
@@ -334 +402 @@
                                         sendTime: objEvent.sendTime,
                                         schedulable: {
-                                                startTime: dateCalendar.formatDate(Timezone.setDateTimezone(new Date(time), objEvent.schedulable.timezone, true), User.preferences.hourFormat),
+                                                startTime: dateCalendar.formatDate(Timezone.getDateEvent(new Date(time), objEvent.schedulable.timezone, objEvent.schedulable.DayLigth, 'startTime'), User.preferences.hourFormat),
                                                 id: objEvent.schedulable.id,
                                                 summary: objEvent.schedulable.summary,
@@ -363 +431 @@
                         return {
                                 participant : meAttendee(form.attendee), 
-                                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) ,
+                                startTime: Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ).toString('yyyy-MM-dd hh:mm:00'),
+                                endTime:  Date.parseExact(form.endDate + ( !!form.allDay ? " 00:00": " "+$.trim(form.endHour)), formatString ).toString('yyyy-MM-dd hh:mm:00'),
                                 allDay: ( !!form.allDay ? 1 : 0 ),
                                 schedulable: form.idEvent
@@ -450 +518 @@
                                                                         participant: me.id,
                                                                         type: 'suggestion',
-                                                                        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) ,
+                                                                        startTime: Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ).toString('yyyy-MM-dd hh:mm:00'),
+                                                                        endTime:  Date.parseExact(form.endDate + ( !!form.allDay ? " 00:00": " "+$.trim(form.endHour)), formatString ).toString('yyyy-MM-dd hh:mm:00'),
                                                                         allDay: ( !!form.allDay ? 1 : 0 ),
                                                                         schedulable: form.idEvent
@@ -484 +552 @@
         var res = $.map(evtObj, function( objEvent ){                   
                     
+                        if(!(typeof(objEvent) == 'object'))
+                                return (null);
+                        
                         var participantInfo = {}, delegatedFrom = {}, me = DataLayer.copy(User.me);
                         
@@ -506 +577 @@
                             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),
+                            startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.startTime)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), 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),
+                            endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(objEvent.endTime)),  objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'endTime'), User.preferences.hourFormat),
                             allDay: !!parseInt( objEvent.allDay ),
                                 attachments: $.map(objEvent.attachments || [], function( attachment, i ){
@@ -566 +637 @@
                             alarms: !!participantInfo.user ? participantInfo.user.alarms : [],
                             status: !!participantInfo.user ? participantInfo.user.status : 1,
-                                acl: !!participantInfo.user ? constantAcl(participantInfo.user.acl) : constantAcl('rowi'),
-                            me: !!participantInfo.user ? DataLayer.merge(participantInfo.user, me) : DataLayer.merge(me, {acl: 'rowi', delegatedFrom: 0, receiveNotification: 1}),
+                                acl: !!participantInfo.user ? constantAcl(participantInfo.user.acl) : constantAcl( 'rowi' ),
+                                isShared: objEvent.calendar && Calendar.signatureOf[objEvent.calendar].isOwner ? true : false,
+                            me: !!participantInfo.user ? DataLayer.merge(participantInfo.user, me) : DataLayer.merge(this.isShared ? this.organizer :  me, {acl:  this.isShared ? 'rowi' : Calendar.signatureOf[objEvent.calendar].permission.aclValues, delegatedFrom: 0, receiveNotification: 1}),
                                 delegatedFrom: delegatedFrom,
                                 statusParticipants: statusParticipants
@@ -598 +670 @@
                     return {
                               "class": form["class"],
-                                  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) ,
+                                  startTime: Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ).toString('yyyy-MM-dd hh:mm:00'),
+                                  endTime:  Date.parseExact(form.endDate + ( !!form.allDay ? " 00:00": " "+$.trim(form.endHour)), formatString ).toString('yyyy-MM-dd hh:mm:00'),  //+ (!!form.allDay ? 86400000 : 0) ,
                                   allDay: ( !!form.allDay ? 1 : 0 ),
                               id: form.idEvent,
@@ -837 +909 @@
 
         $.map(filtered, function( evt ){
+                
+                if(!(typeof(evt) == 'object') || (evt.id.indexOf('java') >= 0))
+                        return (null);
 
                 evt.calendar = evt.calendar || "1";
@@ -845 +920 @@
                 var calendar = DataLayer.get('calendar', evt.calendar);
                 
-                var eventEditable = function(){
-                        var attendee = {};
-                        for(var i = 0; i < evt.participants.length; i++){
-                                attendee = DataLayer.get('participant', evt.participants[i]);
-                                        if(attendee.user == User.me.id)
-                                                return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? true : false;
+                var eventEditable = function(idEvent){
+                        if(Calendar.signatureOf[calendar.id].isOwner == "1"){
+                                var attendee = {};
+                                for(var i = 0; i < evt.participants.length; i++){
+                                        attendee = DataLayer.get('participant', evt.participants[i]);
+                                                if(attendee.user == User.me.id)
+                                                        return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? {selectable: true, className: 'fullcalendar-context-menu  event-id-'+idEvent} : {editable: false, className: 'blocked-event-permision  fullcalendar-not-context-menu event-id-'+idEvent};
+                                }
+                                return {editable: false, className: 'blocked-event-permision  fullcalendar-not-context-menu event-id-'+idEvent,  selectable: true};
                         }
+                        else{
+                                var aclSignature = Calendar.signatureOf[calendar.id].permission;
+                                
+                                var mountClass =  function(acl){
+                                        var returns = ""
+                                        returns += acl['write'] ? "" :  'blocked-event-permision ';
+                                        returns += acl['busy'] ? 'fullcalendar-not-context-menu ' : (acl['read']  ?  'fullcalendar-context-menu ' : '');
+                                        returns += 'event-id-'+idEvent;
+                                        return returns;
+                                }                               
+                                return DataLayer.merge({
+                                        editable: aclSignature.acl['write'],
+                                        disableResizing : (((aclSignature.acl['busy'] && !aclSignature.acl['write']) || (!aclSignature.acl['write'] && aclSignature.acl['read'])) ? true : false),
+                                        disableDragging  : (((aclSignature.acl['busy'] && !aclSignature.acl['write']) || (!aclSignature.acl['write'] && aclSignature.acl['read'])) ? true: false),
+                                        className: mountClass(aclSignature.acl)
+                                }, aclSignature.acl['busy'] ? {title: 'Ocupado', selectable: false } : {selectable: true});
+                        }
+                        
                 }
                   
                 grouped[ evt.calendar ].push( DataLayer.merge({ id: evt.URI || evt.id,
                                                 title: Encoder.htmlDecode(evt.summary),
-                                                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 ) }, eventEditable() ? {} : {editable: false, className: 'blocked-event-permision'}) );
+                                                start: Timezone.getDateCalendar(new Date(parseInt( evt.startTime )), calendar.timezone,  !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
+                                                end:   Timezone.getDateCalendar(new Date(parseInt( evt.endTime ) - (!!parseInt(evt.allDay) ? 86400000 : 0)), calendar.timezone, !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
+                                                allDay: parseInt( evt.allDay ) }, eventEditable(evt.id) ) );
         });
 
@@ -871 +967 @@
                         filter.end = new Date( filter.end * 1000 );
 
+                var timezone = {};
+                for(var i in Calendar.signatureOf)
+                        timezone[i] = Calendar.signatureOf[i].calendar.timezone;
+                
                 return { filter: ["AND", 
 
-                                        [ ">=", "rangeStart", filter.start.toString( "dd-MM-yyyy" ) ],
-                                        [ "<=", "rangeEnd", filter.end.toString( "dd-MM-yyyy" ) ],
+                                        [ ">=", "rangeStart", filter.start.getTime() ],
+                                        [ "<=", "rangeEnd", filter.end.getTime() ],
                                         [ "IN", "calendar", Calendar.calendarIds ]
 
                                   ], 
-                 criteria: { deepness: 2 } }
+                 criteria: { deepness: 2, timezones: timezone } }
     }
 });

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

@@ -59 +59 @@
 */
 
-function eventDetails( objEvent, decoded, path)
+function eventDetails( objEvent, decoded, path, isMail)
 {
         if(path == undefined)
@@ -67 +67 @@
             objEvent = DataLayer.decode( "schedulable:calendar", objEvent );
 
+        if(!isMail)
         objEvent = DataLayer.encode( "schedulable:preview", objEvent );
         
@@ -730 +731 @@
                                         if (user){
                                                 if (!skipAddNewLine) {
-                                                        user[0].id =  DataLayer.put('participant', {user: user[0].id, isExternal: isExternal});
+                                                        user[0].id =  DataLayer.put('participant', {user: user[0].id, isExternal: isExternal, acl: 'r'});
+                                                        user[0].acl = objEvent.acl
+
                                                         blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
-                                                                DataLayer.render(path+'templates/participants_add_itemlist.ejs', {user:user, acl: objEvent.acl})
+                                                                DataLayer.render(path+'templates/participants_add_itemlist.ejs', user)
                                                         )
                                                         .scrollTo('max');
@@ -794 +797 @@
                         * Trata a busca de usuários para adição de participantes
                         */
+                        blkAddAtendee.find('.add-attendee-search .ui-icon-search').click(function(event) {
+                                blkAddAtendee.find('.add-attendee-search input').keydown();
+                        });
+                        
+                        
                         blkAddAtendee.find('.add-attendee-search input').keydown(function(event) {
 
-                                if(event.keyCode == '13') {                     
+                                if(event.keyCode == '13' || typeof(event.keyCode) == 'undefined') {                     
                                         var result = DataLayer.get('user', ["*", "name", $(this).val()], true);
 
@@ -899 +907 @@
                 sequentialUploads: true,
                 add: function (e, data) {
-                        if(data.files[0].size < 30000000)
+                        if(data.files[0].size < 2000000)
                                 data.submit();
                 },
@@ -909 +917 @@
                                         attach.fileName = file.name.substr(0, 6) + file.name.substr(file.name.length-4, file.name.length);
                                 attach.fileSize = formatBytes(file.size);
-                                if(file.size > 30000000)
+                                if(file.size > 2000000)
                                         attach.error = 'Tamanho de arquivo nao permitido!!'
                                 
                                 $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {file : attach}));
                                 
-                                if(file.size < 30000000){
+                                if(file.size < 2000000){
                                         $('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
                                         $('.attachments-list').find('[type=file]').addClass('hidden');
@@ -1034 +1042 @@
                         canDiscardEventDialog = false;
         });     
-                
-                
-                UI.dialogs.addEvent.dialog('open');
+        
+        if(objEvent.isShared){
+                
+                var acls = Calendar.signatureOf[objEvent.calendar].permission.acl;
+                
+                if(!acls.write){
+                        UI.dialogs.addEvent.find(':input').attr('disabled', 'disabled');
+                        UI.dialogs.addEvent.find('.button').hide();
+                }
+                
+                if(acls.remove)
+                        UI.dialogs.addEvent.find('.button.remove').show();
+                
+                UI.dialogs.addEvent.find('.button.cancel').show();
+                
+        
+        }
+        
+                
+        UI.dialogs.addEvent.dialog('open');
 }
 
@@ -1368 +1393 @@
 }
 
+function remove_event(eventId){
+        $.Zebra_Dialog('Tem certeza que deseja excluir o evento?', {
+                'type':     'question',
+                'overlay_opacity': '0.5',
+                'buttons':  ['Sim', 'Não'],
+                'onClose':  function(clicked) {
+                        if(clicked == 'Sim'){
+                                DataLayer.remove('schedulable', ''+eventId);
+                                window.setTimeout(function() {DataLayer.commit();}, 500);
+                        }
+                }
+        });     
+}
+
+
 function remove_calendar(){
         /* Pode ser assim $('.cal-list-options-btn.ui-state-active').attr('class').replace(/[a-zA-Z-]+/g, ''); */
@@ -1377 +1417 @@
                         if(clicked == 'Sim'){
                                 var idCalendar =  $('.cal-list-options-btn.ui-state-active').attr('class').match(/[0-9]+/g);
-                                var signature = '';
-                                for(var i =0; i < Calendar.signatures.length; i++){
-                                        if(idCalendar[0] == Calendar.signatures[i].calendar.id){
-                                                signature = Calendar.signatures[i].id;
-                                                break;
-                                        }
-                                }
-                                DataLayer.remove('calendarSignature', signature);
+                                
+                                DataLayer.remove('calendarSignature', Calendar.signatureOf[idCalendar[0]].id );
+                                
                                 if(idCalendar == User.preferences.defaultCalendar)
                                         DataLayer.remove( 'modulePreference', User.preferenceIds['defaultCalendar']);
@@ -1428 +1463 @@
         });         
         
-        
-        meu_container.find(".button.new").button({
+        meu_container.find(".button.new-calendar").button({
                 icons: {
             primary: "ui-icon-plus"
@@ -1462 +1496 @@
                         })
                         .click(function(){
-                                meu_container.find(".button.new").qtip('destroy');
+                                meu_container.find(".button.new-calendar").qtip('destroy');
                         });
                         //TODO emplementar tratamento de duplicação de valores no location
@@ -1543 +1577 @@
             });   
         
+                meu_container.find(".button.new-calendar-shared").button({
+                icons: {
+            primary: "ui-icon-plus"
+        },
+        text: false
+                }).click(function (event) {
+                        show_modal_search_shared();
+                });
+                
+                
+                //TODO Implementar ocultar agendas.
+                meu_container.find('.title-signed-calendars').click(function(evt){
+                        var status = $(this).parent().find('.status-list-shared');
+                        
+                        if(status.hasClass('ui-icon-triangle-1-s'))
+                                status.removeClass('ui-icon-triangle-1-s').addClass('ui-icon-triangle-1-e');
+                        else
+                                status.removeClass('ui-icon-triangle-1-e').addClass('ui-icon-triangle-1-s');
+                });
+                
             $('.calendar-view').click(function(evt){
                         if($tabs.tabs('option' ,'selected') == 1){
@@ -1715 +1769 @@
                 case 'basicDay':
                 case 'day':
-                        rangeStart = new Date().add({days: page_index}).toString("yyyy-MM-dd");
+                        rangeStart = new Date().add({days: page_index}).getTime();
                         rangeEnd = rangeStart;
                          break;
@@ -1722 +1776 @@
                         var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
                         var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
-                        rangeStart = dateStart.add({days: (7 * page_index)}).toString("yyyy-MM-dd");
-                        rangeEnd = dateEnd.add({days: (7 * page_index)+7}).toString("yyyy-MM-dd");
+                        rangeStart = dateStart.add({days: (7 * page_index)}).getTime();
+                        rangeEnd = dateEnd.add({days: (7 * page_index)+7}).getTime();
                         break;
                 case 'month':
-                        var date = new Date().add({months: page_index}) 
-                        rangeStart = date.moveToFirstDayOfMonth().toString("yyyy-MM-dd");
-                        rangeEnd = date.moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                        var date = Date.today().add({months: page_index}) 
+                        rangeStart = date.moveToFirstDayOfMonth().getTime();
+                        rangeEnd = date.moveToLastDayOfMonth().getTime();
                          break;
                 case 'year':
@@ -1737 +1791 @@
                         if(dateEnd.getMonth() != 11)
                                 dateEnd.moveToMonth(11) 
-                         rangeStart =    dateStart.moveToFirstDayOfMonth().toString("yyyy-MM-dd");
-                         rangeEnd = dateEnd.moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                         rangeStart =    dateStart.moveToFirstDayOfMonth().getTime();
+                         rangeEnd = dateEnd.moveToLastDayOfMonth().getTime();
                            break;  
                         }
@@ -1872 +1926 @@
     });
 }
+
+function copyAndMoveTo(calendar, eventId){
+
+    var type = $('.calendar-copy-move input[name="typeEvent"]').val();
+
+        var schedulable = DataLayer.get('schedulable' , ''+eventId);
+        
+        if(typeof(schedulable) == "array")
+                schedulable = schedulable[0];
+        
+        //Move eventos entre agendas
+        if(!!parseInt(type)){
+                
+                schedulable.calendar = calendar;        
+                DataLayer.put('schedulable', schedulable);
+        
+                DataLayer.commit();
+        //copia eventos entre agendas
+        }else{
+        
+                var newSchedulable = schedulable;
+        
+                delete newSchedulable.id;
+                delete newSchedulable.uid;
+                delete newSchedulable.sequence;
+                delete newSchedulable.dtstamp;
+                delete schedulable.calendar;
+                
+                schedulable.calendar = calendar;        
+        
+                newSchedulable.endTime = new Date(parseInt(newSchedulable.endTime) - (newSchedulable.allDay ? 86400000 : 0)).toString('yyyy-MM-dd hh:mm:00');
+                newSchedulable.startTime = new Date(parseInt(newSchedulable.startTime)).toString('yyyy-MM-dd hh:mm:00'); 
+                
+                var participants = DataLayer.copy(schedulable.participants);
+                delete schedulable.participants;
+                
+                schedulable.participants =  $.map( participants, function( attendee, i ){
+                        
+                        var participant = DataLayer.get('participant', attendee);
+                        
+                        if(typeof(participant) == 'array')
+                                participant = participant[0];
+        
+                        delete participant.id;
+                        
+                        return participant ;
+        });
+        
+        
+        
+                DataLayer.put('schedulable', newSchedulable);
+
+        }
+        
+
+}

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

@@ -97 +97 @@
                 }
         });
-                                
+        
+        //efetua pesquisas pelo click na lupa de pesquisa
+        $('.main-search span.ui-icon-search').click(function(event){
+                        add_events_list($(this).parent().find('input.search').val());
+                        $(this).parent().find('input.search').val();
+        });
+        
         $('.block-horizontal-toolbox .main-config-menu').menu({
                 content: $('.main-config-menu-content').html(),
@@ -226 +232 @@
 
                 eventDrop: function( event ){
+                        if(!event.disableDragging){
+                                DataLayer.put( "schedulable:calendar", event );
+
+                                event.editable = false;
+                                event.className = "blocked-event";
+                                calendar.fullCalendar( 'updateEvent', event );
+                        }else
+                                Calendar.rerenderView(true);
+                },
+
+                eventResize: function( event ){
+                        if(!event.disableDragging){
                         DataLayer.put( "schedulable:calendar", event );
 
@@ -231 +249 @@
                         event.className = "blocked-event";
                         calendar.fullCalendar( 'updateEvent', event );
-                },
-
-                eventResize: function( event ){
-                        DataLayer.put( "schedulable:calendar", event );
-
-                        event.editable = false;
-                        event.className = "blocked-event";
-                        calendar.fullCalendar( 'updateEvent', event );
+                        }else
+                                Calendar.rerenderView(true);
                 },
 
                 eventClick: function( evt, event, view ){
-                        eventDetails( DataLayer.get( "schedulable", evt.id), true);
+                        if(evt.selectable)
+                                eventDetails( DataLayer.get( "schedulable", evt.id), true);
                 }
         }, dateCalendar));
-          
+ 
+        contentMenu();
+         
+         $('body').click(function(){
+                $('#context-menu-event').html('');
+         });
+         
         if($(window).height() < $('body').height()){
                 var hei = $('body').height() - $(window).height();

trunk/prototype/modules/calendar/js/timezone.js

@@ -6 +6 @@
 
 var objTime = DataLayer.dispatch( "timezones" );
+
 Timezone = {
-  
-        daylightSaving:  isNaN(objTime.isDaylightSaving) ? parseInt( objTime.isDaylightSaving ) : 0,
+        currentOffset : new Date().getUTCOffset(),
+        daylightSaving: isNaN(parseInt( objTime.isDaylightSaving )) ? 0 : parseInt( objTime.isDaylightSaving ),
 
         timezones: objTime.timezones,     
@@ -16 +17 @@
 
         },
-
-        compareTZID: function( fromTZID, toTZID ){
-
-                return( this.timezones[ fromTZID ] === this.timezones[ toTZID ] );
-
-        },
-
-        checkTimezoneCalendar: function(idCalendar, tzId){
-
-                return idCalendar && this.compareTZID( DataLayer.get('calendar', idCalendar).timezone, tzId );
-
-        },
         
-        setDateTimezone: function (date, tzId, idCalendar){
-        
-                if( !!!tzId || this.checkTimezoneCalendar(idCalendar, tzId) )
-                        return date;
-
-                var timezone = this.timezone( tzId );
-
-                var timezoneOffset = parseInt(timezone.substr(2)) - this.daylightSaving * 100;
-
-                var timeCurrent = parseInt((date.getTimezoneOffset()/60)+'00') * ( ( timezone.charAt(0) != date.getUTCOffset().charAt(0) )? 1 : -1 );
-
-                var times = timezoneOffset + timeCurrent;
-
-                if(times == 0)
-                        return date;            
-                else if(times > 0)
-                        return date.setTimezoneOffset('-0'+(times));
-                else
-                        return date.setTimezoneOffset('+0'+((times * -1)));
-        },
-
-        getDateTimezone: function(date, tzId, recursive){
-
+        getDateCalendar: function(date, tzId, isDay){
                 var timezone = this.timezone( tzId );
 
@@ -57 +24 @@
                         return date;
 
-                var currentTimezone = parseInt((date.getTimezoneOffset()/60)+'00');
+                date = this.normalizeDate(date, false, true);
 
-                var timezoneOffset = parseInt(timezone.substr(2)) - this.daylightSaving * 100;
-
-                var times =  timezoneOffset - currentTimezone;
-
-                if(times == 0){
-                        if((timezone.charAt(0) == date.getUTCOffset().charAt(0)) && recursive)
-                                return date.setTimezoneOffset( timezone.charAt(0)+'0'+(currentTimezone));
-
-                        return  date;
-                }else if (times > 0)
-                        return date.setTimezoneOffset('+0'+(times));
-                else{
-                        return date.setTimezoneOffset('-0'+((times * -1) + (currentTimezone * 2)));
-                }
+                return date.add({hours: parseInt(timezone.charAt(0) + timezone.charAt(2))  +  parseInt(isDay) });
         },
         
-        getDateUTC: function (date, tzId){
+        getDateEvent: function(date, tzId, idCalendar, isDay, type){
+                var timezone = this.timezone( tzId );
+                var timezoneCurrent = this.timezone(DataLayer.get('calendar', idCalendar).timezone);
 
-                        var timezone = this.timezone( tzId ), currentTimezone = parseInt(timezone.substr(2)) - this.daylightSaving * 100;
-                        return(date.setTimezoneOffset(timezone.charAt(0)+'0'+currentTimezone));
+                if(timezone == timezoneCurrent)
+                        return date;
+                
+                var to = parseInt(timezone.charAt(0) + timezone.charAt(2)) + parseInt(isDay.event[type]);
+                var current = parseInt(timezoneCurrent.charAt(0) + timezoneCurrent.charAt(2)) + parseInt(isDay.calendar[type]);
+                
+                if(timezone.charAt(0) == timezoneCurrent.charAt(0))
+                        hours =   (  to + (current * - 1)) ;
+                else
+                        hours =  to + (( current ) * (timezone.charAt(0) ==  '+'  ? -1 : 1)) ;
+                
+                return date.add({hours: hours});
         },
-
-        createDateTimezone: function(date, tzId, idCalendar){                   
-                if(this.checkTimezoneCalendar(idCalendar, tzId))
-                        return this.getDateTimezone(date, tzId, true);
-
-                var times = 0, timezone = this.timezone( tzId );
-                
-                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));
+        
+        normalizeDate: function(date, current, inverse){
+                var offsetDate = !!current ? this.currentOffset : date.getUTCOffset();
+                return date.add({hours: (parseInt(offsetDate.charAt(0) + offsetDate.charAt(2)) * (!!inverse ? -1 : 1) )});
         }
-
-
-
 }