Changeset 5592

Timestamp:

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

Author:

acoutinho

Message:

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

Location:

trunk

Files:

• expressoCalendar/setup/tables_current.inc.php (modified) (4 diffs)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• expressoMail1_2/templates/default/expressoMail_reset.css (modified) (1 diff)
• prototype/api/datalayer.js (modified) (2 diffs)
• prototype/config/attachment.ini (modified) (1 diff)
• prototype/config/calendar.ini (modified) (2 diffs)
• prototype/config/calendarSignatureAlarm.ini (modified) (1 diff)
• prototype/config/calendarToPermission.ini (added)
• prototype/config/expressoCalendar.ini (modified) (1 diff)
• prototype/modules/calendar/constants.php (modified) (3 diffs)
• prototype/modules/calendar/css/layout.css (modified) (7 diffs)
• prototype/modules/calendar/css/style.css (modified) (1 diff)
• prototype/modules/calendar/interceptors/DBMapping.php (modified) (10 diffs)
• prototype/modules/calendar/js/calendar.codecs.js (modified) (16 diffs)
• prototype/modules/calendar/js/calendar.contentMenu.js (added)
• prototype/modules/calendar/js/calendar.shared.js (added)
• prototype/modules/calendar/js/helpers.js (modified) (16 diffs)
• prototype/modules/calendar/js/init.js (modified) (3 diffs)
• prototype/modules/calendar/js/timezone.js (modified) (3 diffs)
• prototype/modules/calendar/templates/attendee_add.ejs (modified) (1 diff)
• prototype/modules/calendar/templates/calendar_list.ejs (modified) (4 diffs)
• prototype/modules/calendar/templates/event_add.ejs (modified) (1 diff)
• prototype/modules/calendar/templates/index.ejs (modified) (4 diffs)
• prototype/modules/calendar/templates/menu_context_event.ejs (added)
• prototype/modules/calendar/templates/shared_calendar.ejs (added)
• prototype/modules/calendar/templates/user_shared_add_itemlist.ejs (added)
• prototype/post.php (modified) (1 diff)
• prototype/services/iCal.php (modified) (3 diffs)

trunk/expressoCalendar/setup/tables_current.inc.php

@@ -102 +102 @@
             
             
-            'calendar_object' => array(
+        'calendar_object' => array(
             'fd' => array(
                 'id' => array( 'type' => 'auto', 'nullable' => False),
@@ -114 +114 @@
                 'class_id' => array( 'type' => 'int', 'precision' => '8', 'nullable' => True),
                 'last_update' => array( 'type' => 'int', 'precision' => '8', 'nullable' => False),
-                'range_end' => array( 'type' => 'date', 'nullable' => True),
+                'range_end' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => True),
                 'summary' => array( 'type' => 'varchar', 'precision' => '255', 'nullable' => True),
-                'range_start' => array( 'type' => 'date', 'nullable' => False),
+                'range_start' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => True),
                 'allday' => array( 'type' => 'int', 'precision' => '2', 'default' => 0, 'nullable' => True),
                 'repeat' => array( 'type' => 'int', 'precision' => '2', 'default' => 0, 'nullable' => True),
@@ -152 +152 @@
                 'id' => array( 'type' => 'auto', 'nullable' => False),
                 'action_id' => array( 'type' => 'int', 'precision' => '8', 'nullable' => False),
-                'range_end' => array('type' => 'date', 'nullable' => False),
-                'range_start' => array('type' => 'date', 'nullable' => False),
+                'range_end' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => True),
+                'range_start' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => True),
                 'unit' => array('type' => 'varchar','precision' => '20','nullable' => True),
                 'time' => array('type' => 'varchar','precision' => '50','nullable' => True),
@@ -203 +203 @@
                 'object_id' => array(  'type' => 'int', 'precision' => '8', 'nullable' => False),
                 'object_type' => array(  'type' => 'int', 'precision' => '8', 'nullable' => False),
-                'permision' => array(  'type' => 'varchar','precision' => '50', 'nullable' => False)
+                'permission' => array(  'type' => 'varchar','precision' => '50', 'nullable' => False)
             ),
             'pk' => array('id'),

trunk/expressoMail1_2/js/draw_api.js

@@ -2884 +2884 @@
                         var endEvent = function(date){ 
                                 if(!!User.preferences.defaultCalendar){ 
-                                        return  parseInt(date.getTime()) + 
-                                                (       !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ?  
+                                        return  new Date(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); 
+                                        return new Date(parseInt(date.getTime()) + (User.preferences.defaultDuration * 60000)); 
                         };       
+
+                        var emails = $("#to_values_"+ID).val().split(',');
+                        
+                        
+                        //Normalização dos dados evita ter que reemplementar toda as funcionalidades do calendar
                         eventDetails({ 
+                                        
+                                        acl: {inviteGuests: true, organization: true ,participationRequired: false, read: true, write: true},
+                                        alarms: [],
+                                        allDay: false,
+                                        attachments: [],
+                                        attendee: '',//TODOOOOOO,
+                                        calendar: User.preferences.defaultCalendar ? User.preferences.defaultCalendar : Calendar.calendars[0],
+                                        calendars: Calendar.calendars,
+                                        category: '',
+                                        class: '1',
+                                        delegatedFrom: {},
+                                        endDate: startEvent.toString(User.preferences.dateFormat),
+                                        startDate: endEvent(startEvent).toString(User.preferences.dateFormat),
+                                        startHour: startEvent.toString(User.preferences.hourFormat),
+                                        endHour: endEvent(startEvent).toString(User.preferences.hourFormat),
+                                        timezone: User.preferences.defaultCalendar ? Calendar.calendarOf[User.preferences.defaultCalendar].timezone : User.preferences.timezone,
                                         summary : $("#subject_"+ID).text(),
                                         description : $("#body_" + ID).text(),
                                         startTime: startEvent.getTime(),
-                                        endTime: endEvent(startEvent)
-                        }, true, path);
-                        
-                        //TimePicker Não está funcionando corretamente, o motivo ainda é desconhecido.
-                        /*
-                        $(".new-event-win").find('input.time').timepicker({ 
-                                closeText: 'Ok',
-                                hourGrid: 4,
-                                minuteGrid: 10,
-                                //ampm : ((User.preferences.hourFormat.length > 5) ? true: false),
-                                timeFormat: "hh:mm tt",
-                                onSelect: function (selectedDateTime){
-                                        if(!(User.preferences.hourFormat.length == 5))
-                                                $(this).val(selectedDateTime.replace(/[\.]/gi, ""));                                                            
-                                },
-                                onClose : function (selectedDateTime){
-                                        if(!(User.preferences.hourFormat.length == 5))
-                                                $(this).val(selectedDateTime.replace(/[\.]/gi, ""));
-                                }
-                        });
-                        */
-                        
-                        var emails = $("#to_values_"+ID).val();
-                        emails = emails.split(",");
-                        var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6');
-                        var onShowToolTip = function(arg0) {
-                                $('.qtip-active .button.close').button({
-                                        icons: {primary: "ui-icon-close"},
-                                        text: false
-                                });
-                                $('.qtip-active .button').button()
-                                .filter('.save').click(function(event, ui) {
-                                        if (saveContact()) {                                            
-                                                lastEditAttendeeToolTip.qtip("destroy");
-                                        } else {
-                                                return false;
-                                        }
-                                }).end()
-                                .filter('.cancel').click(function(event, ui) {
-                                        lastEditAttendeeToolTip.qtip("destroy");
-                                })
-
-                                /** 
-                                 * Trata o ENTER no campo da tooltip, equivalente a salvar 
-                                 * o novo convidado.
-                                 */
-                                $('.qtip-active input').keydown(function(event) {
-                                        if (event.keyCode == '13') {                                            
-                                                if (saveContact()) {                                            
-                                                        lastEditAttendeeToolTip.qtip("destroy");
-                                                }
-
-                                                lastEditAttendeeToolTip.qtip("destroy");
-                                                event.preventDefault();
-                                        }
-                                })
-                                .filter('[name="name"]').Watermark("informe o nome do contato").end()
-                                .filter('[name="mail"]').Watermark("informe o email do contato");
-                        }
+                                        endTime: endEvent(startEvent),
+                                        timezones: Timezone.timezones,
+                                        me: {name: User.me.name, mail: User.me.mail, acl: 'rowi', status: '1', delegatedFrom: '0', id: User.me.id},
+                                        organizer: {name: User.me.name, mail: User.me.mail, acl: 'rowi', status: '1', delegatedFrom: '0' , id: User.me.id},
+                                        statusParticipants: {accepted: 0, cancelled: 0, tentative: 0, unanswered:emails.length},
+                                        location: '',
+                                        attendee: $.map(emails, function( mail ){                       
+                                                
+                                                var decoded =  Encoder.htmlDecode(mail);
+                                                var newAttendeeName = "";
+
+                                                var user = DataLayer.get('user', ["=", "mail", decoded.match(/<([^<]*)>[\s]*$/) ? decoded.match(/<([^<]*)>[\s]*$/)[1].toLowerCase() : decoded], true);
+                                                
+                                                if( $.type(user) == "array")
+                                                                user = user[0];
+
+                                                if(!user)
+                                                        user = {name : decoded.match(/"([^"]*)"/)[1] , mail : decoded.match(/[\w-]+(\.[\w-]+)*@(([A-Za-z\d][A-Za-z\d-]{0,61}[A-Za-z\d]\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])/)[1]};
+
+                                                if(User.me.mail == user.mail)
+                                                        return(null);
+                                                        
+                                                user.isExternal = (!!user && !(!!user.isExternal)) ? 0 : 1;
+
+                                                return  DataLayer.merge({
+                                                        name: user.name,
+                                                        mail: user.mail,
+                                                        acl:  'r',
+                                                        delegatedFrom: '0',
+                                                        status: '4'
+                                                }, !!user.id ? {id : DataLayer.put('participant', {user: user.id, isExternal: user.isExternal}) } : {id: DataLayer.put('participant', {user: user})}); 
+                                
+                                        })      
                                         
-                        $.each(emails, function(index, value) { 
-                                var decoded =  Encoder.htmlDecode(value);
-                                var newAttendeeName = "";
-                                if(decoded.match(/<([^<]*)>[\s]*$/)){
-                                        var user = DataLayer.get('user', ["=", "mail", decoded.match(/<([^<]*)>[\s]*$/)[1].toLowerCase()], true);
-                                        if(!(!!user)){
-                                                newAttendeeName = decoded.match(/"([^"]*)"/)[1];
-                                                var newAttendeeEmail = decoded.match(/<([^<]*)>[\s]*$/)[1];
-                                        }
-                                }
-                                else{
-                                        var user = DataLayer.get('user', ["=", "mail", decoded], true);
-                                        if(!(!!user)){
-                                                if(decoded.match(/^[\w!#$%&'*+\/=?^`{|}~-]+(\.[\w!#$%&'*+\/=?^`{|}~-]+)*@(([\w-]+\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/))
-                                                        var newAttendeeEmail = decoded;
-                                                else{
-                                                        var newAttendeeEmail = "";
-                                                        newAttendeeName = decoded;
-                                                }
-                                        }
-                                }
-                                        
-                                var isExternal = (!!user && !(!!user.isExternal)) ? 0 : 1;
-                                var add = false;
-                                if(user){
-                                        if(!(blkAddAtendee.find('label.mail[title="' + user[0].mail + '"]').length)){
-                                                user[0].id =  DataLayer.put('participant', {user: user[0].id, isExternal: isExternal});
-                                                blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
-                                                        DataLayer.render(path+'templates/participants_add_itemlist.ejs', user)
-                                                )
-                                                .find('.button.close').addClass('small').button({text:false, icons:{primary:'ui-icon-close'}}).click(function() {
-                                                        DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
-                                                        $(this).parent().remove();
-                                                }).end()
-                                                .scrollTo('max');
-                                                add = true;
-                                        }
-                                }else{
-                                        userId = DataLayer.put('user', {name: newAttendeeName, mail: newAttendeeEmail, isExternal: isExternal});
-                                        newAttendeeId = DataLayer.put('participant', {user: userId, isExternal: isExternal});
-                                        
-                                        blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
-                                                DataLayer.render(path+'templates/participants_add_itemlist.ejs', [{id:newAttendeeId, name: newAttendeeName, mail: newAttendeeEmail, isExternal: 1}])
-                                        ).find('.button.close').addClass('small').button({text:false, icons:{primary:'ui-icon-close'}}).click(function() {
-                                                DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
-                                                $(this).parent().remove();
-                                        }).end()
-                                        .scrollTo('max');
-                                        add = true;
-                                }
-                                if(add){
-                                        lastEditAttendeeToolTip = blkAddAtendee.find('dd.attendee-list li:last');
-                                        lastEditAttendeeToolTip.qtip({
-                                                show: {ready: false, solo: true, when: {event: 'click'}},
-                                                hide: false,
-                                                content: {
-                                                        text: $('<div></div>').html( DataLayer.render( path+'templates/attendee_quick_edit.ejs', {attendee:{name:( (!!user ? (!!user[0] ? (!!user[0].name ? user[0].name : newAttendeeName): newAttendeeName) : newAttendeeName)), mail:(!!user ? (!!user[0] ? (!!user[0].mail ? user[0].mail : newAttendeeEmail): newAttendeeEmail) : newAttendeeEmail)}} ) ), 
-                                                        title: {
-                                                                text:'Detalhes do participante', 
-                                                                button: '<a class="button close" href="#">close</a>'
-                                                        }
-                                                },
-                                                style: {name: 'blue', tip: {corner: 'leftMiddle'}, border: {width: 4, radius: 8}, width: {min: 230, max:230}},
-                                                position: {
-                                                        corner: {
-                                                                target: 'rightMiddle',
-                                                                tooltip: 'leftMiddle'
-                                                        },
-                                                        adjust: {x:0, y:0}
-                                                }
-                                        });
-                                        lastEditAttendeeToolTip.qtip("api").onShow = onShowToolTip;
-                                }
-                        });                                             
+                        }, true, path, true);
                 }
                 subject.appendChild(new_event_logo);

trunk/expressoMail1_2/templates/default/expressoMail_reset.css

@@ -58 +58 @@
         quotes: "" "";
 }
-
+.new-event-win.active .mail.name-special, .new-event-win.active .name.name-special{
+  padding: 0 0 0 35px;
+}
+
+.new-event-win.active .add-attendee-search.search-field {
+  width: 249px;
+ }
+ 
+ .new-event-win.active #calendar_addevent_details4 {
+  margin: 10px 0 0 0;
+ } 
+ 
+ .new-event-win.active input{
+  color: #000;
+ } 
+ 
+ .new-event-win.active #calendar_addevent_details5 {
+  margin: 10px 0 11px 0;
+ }
 
 .new-event-win.active select {

trunk/prototype/api/datalayer.js

@@ -1067 +1067 @@
         
         var result = false;
-
-        /*
-        *  TODO - Para correta aplicação de filtros campos com valores de datas
-        * devem ter tratamento diferenciado, sendo que como string os mesmos não serão 
-        * corretamente tratados. 
-        */
         
         if( bothSides || !oneSide )
-            //result = this.check( concept, id || filter );
-                result = concept == 'schedulable' ? false : this.check( concept, id || filter );
+            result = this.check( concept, id || filter );
+        
+        if (bothSides && filter.filter && filter.criteria)
+                result = false;
+
+                
         if( !result && (bothSides || oneSide) )
         {
@@ -1116 +1114 @@
         return( filtered );
     },
+
+        converterType: function( filter ){
+
+                        return isNaN(parseInt(filter)) ? filter : parseInt(filter);
+                
+        },
+
     
     compare: function( operator, base, test ){
       
-      switch( operator )
-      {
-          case '*':  return RegExp( ".*" + test + ".*" ).test( base );
-          case '^':  return RegExp( "^" + test +  ".*" ).test( base );
-          case '$':  return RegExp( ".*"  + test + "$" ).test( base );
-
-          case '&':  return ( base && test );
-          case '|':  return ( base || test );
-
-          case '=':  return ( base == test );
-          case '<=': return ( base <= test );
-          case '>=': return ( base >= test );
-          case '>':  return ( base <  test );
-          case '<':  return ( base >  test );
-      }
+        base = this.converterType(base);
+        test = this.converterType(test);
+         
+    switch( operator ){
+        
+        case '*':  return RegExp( ".*" + test + ".*" ).test( base );
+        case '^':  return RegExp( "^" + test +  ".*" ).test( base );
+        case '$':  return RegExp( ".*"  + test + "$" ).test( base );
+
+        case '&':  return ( base && test );
+        case '|':  return ( base || test );
+
+        case '=':  return ( base == test );
+        case '<=': return ( base <= test );
+        case '>=': return ( base >= test );
+        case '>':  return ( base <  test );
+        case '<':  return ( base >  test );
+        
+        default: return true;
+        }
       
     },

trunk/prototype/config/attachment.ini

@@ -17 +17 @@
 name = "name"
 size = "size"
-
+owner = "owner"

trunk/prototype/config/calendar.ini

@@ -4 +4 @@
 [model.hasMany]
 signatures = calendarSignature.calendar
+permissions = calendarToPermission.calendar
 
 [before.create]
@@ -15 +16 @@
 davcalDeleteCollection = modules/calendar/interceptors/DBMapping.php
 
-
 [PostgreSQL.mapping]
 id = "id"

trunk/prototype/config/calendarSignatureAlarm.ini

@@ -10 +10 @@
 [before.update]
 encodeSignatureAlarmType = modules/calendar/interceptors/DBMapping.php
-encodeUpdateConcept = modules/calendar/interceptors/DBMapping.php
 
 [before.create]
 encodeSignatureAlarmType = modules/calendar/interceptors/DBMapping.php
-encodeCreateConcept = modules/calendar/interceptors/DBMapping.php
 
 [before.delete]

trunk/prototype/config/expressoCalendar.ini

@@ -1 +1 @@
 folder = "calendar"
 useCaldav = false
+onRemoveCascadeCalDav = false
 
 ;Utilizar ou não caldav {TRUE or FALSE}
 ;useCaldav = TRUE
+
+; onRemoveCascadeCalDav Remover agenda no caldav automaticamente ao remover no expresso (TRUE or FALSE)
+;onRemoveCascadeCalDav = true

trunk/prototype/modules/calendar/constants.php

@@ -11 +11 @@
 define('STATUS_DELEGATED', 5);
 
-
 define('ALARM_ALERT', 1);
 define('ALARM_MAIL', 2);
@@ -23 +22 @@
 define('CLASS_CONFIDENTIAL', 3);
 
-
 define('ICAL_ACTION_IMPORT', 1);
 define('ICAL_ACTION_UPDATE', 2);
@@ -31 +29 @@
 define('ICAL_ACTION_SUGGESTION', 6);
 
+define('ATTENDEE_ACL_ORGANIZATION', 'o');
+define('ATTENDEE_ACL_WRITE', 2);
+define('ATTENDEE_ACL_PARTICIPATION_REQUIRED', 'w');
+define('ATTENDEE_ACL_INVITE_GUESTES', 'i');
+define('ATTENDEE_ACL_READ', 'r');
+
+define('CALENDAR_PRIVATE', 0);
+define('CALENDAR_PUBLIC', 1);
+
+define('CALENDAR_ACL_WRITE', 'w');
+define('CALENDAR_ACL_READ', 'r');
+define('CALENDAR_ACL_REMOVE', 'd');
+define('CALENDAR_ACL_BUSY', 'b');
+define('CALENDAR_ACL_SHARED', 's');
 ?>

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

@@ -34 +34 @@
 
 #wrap .search-field input { 
-        width: 150px; 
+        width: 160px; 
+        padding: 0 0 0 3px;
 }
 
@@ -88 +89 @@
 .fg-menu-container {
         z-index: 999;
+        min-width: 134px !important;
+}
+
+.fg-menu-container.evt-option{
+        min-width: 85px !important;
+        padding: 0;
+}
+
+.fg-menu-container.evt-option a{
+        padding: 0.1em 3%;
 }
 
@@ -181 +192 @@
         display: inline-block;
         border: none;
+        width: 215px;
 }
 
 fieldset.search-field span {
         display: inline-block;
-        margin:0 0 -3px 5px;
+        margin:0 0 -3px 0px;
+        cursor: pointer;
 }
 /* #search area definition */
@@ -225 +238 @@
 
 fieldset.block-add-attendee .add-attendee-search { max-width: 250px; margin: 5px;}
-fieldset.block-add-attendee .add-attendee-search input { max-width: 215px; width: 215px;}
+fieldset.block-add-attendee .add-attendee-search input { max-width: 220px; width: 220px;}
 fieldset.block-add-attendee .search-result-list { width: 255px; max-height: 215px; overflow: auto;}
 fieldset.block-add-attendee .search-result-list .ui-widget-content { border: none;}
@@ -409 +422 @@
 }
 
+.evt-list-options.my-evt-list-options{
+        position: absolute;
+        width: 110px;
+        display: block;
+        
+}
+
 
 .colors-options { padding-left: 5px; }
@@ -428 +448 @@
 }
 
+.user-list .hover-user { background-color: #DFEFFC;}
+
+.user-acls-shared-calendar{
+        width: 130px;
+        float: right;
+        margin-right: 20px;
+}
+
+.user-acls-shared-calendar.calendar{
+        text-align: right;
+}
+
+
+.calendars-list .search-field.calendar-shared-search {
+        max-width: 193px !important;
+        width: 193px !important;
+        float: right;
+}
+
+.calendars-list .search-field input.search{
+        width:165px !important;
+}
+
+.calendars-list .status-list-shared{
+        display: inline-block;
+        margin: 0 0 -4px -5px;
+        cursor: pointer;
+}
+
+.calendars-list .title-signed-calendars{
+        cursor: pointer;
+}
+
 .my-calendars a.new-calendar .ui-button-text {
     padding: 0;
+}
+
+.new-calendar-shared{
+        float: right;
 }
 
@@ -436 +493 @@
         padding-top: 3px;
         padding-bottom: 3px;
+}
+
+dl.block-add-user {
+        max-width: 290px;
+        min-height: 260px;
+        display: block;
+        float:right;
+        margin: 0 10px 10px 0;
+}
+
+dl.block-add-calendar {
+        max-width: 290px;
+        min-height: 185px;
+        display: block;
+        float:right;
+        margin: 0 10px 10px 0;
+}
+
+dl.block-public-calendar {
+        max-width: 290px;
+        min-height: 30px;
+        display: block;
+        float:right;
+        margin: 0 10px 1px 0;
+}
+
+fieldset.block-add-user, .block-add-user li{
+        border: none;
+}
+
+fieldset.add-user-search{
+        margin: 0 0 5px 0;
+}
+
+dl.block-user-list{
+        float:left;
+        margin: 0 0 10px 10px;
+}
+
+dt.user-list{
+        width: 117px;
+        margin-right: 5px;
+}
+
+dt.calendar-list{
+        width: 144px;
+        margin-right: 5px;
+}
+
+dt.calendar-shared, dt.user-list, dt.add-user, dt.calendar-list, dt.calendar-public{
+        background-color: white;
+        margin: 5px 0 -6px 5px;
+        font-weight: bold;
+        display: table;
+        position: relative;
+}
+
+dd.add-user{height: 240px;}
+dd.add-user-calendar{height: 192px;}
+
+dd.calendar-public{height: 23px;}
+
+dd.add-user-calendar, dd.calendar, dd.user-list, dd.add-user, dd.calendar-list, dd.calendar-public{
+        border: 1px solid #BFBFBF;
+        border-image: initial;
+        width: 330px;
+        padding: 7px 0px 4px 4px;
+}
+
+dd.add-user-calendar ul{
+        width: 250px;
+        max-height: 166px;
+}
+
+dd.add-user-calendar, dd.add-user,  dd.calendar-public{
+        width: 250px;
+}
+
+div.shared-calendar fieldset.shared-calendar-configure{
+        margin-top: 10px;
+}
+
+.add-user fieldset.block-add-user{
+        width: 245px;
+}
+
+dd.user-list{
+        height: 193px;
+}
+
+dd.calendar-list{
+        height: 240px;
 }
 

trunk/prototype/modules/calendar/css/style.css

@@ -47 +47 @@
 
 .new-event-win fieldset { border: none; margin: 0; padding: 0; }
-.new-event-win fieldset.tab-level2 { padding: 15px 5px; }
+.new-event-win fieldset.tab-level2 { padding: 0px 5px; }
 .new-event-win fieldset fieldset, .new-event-win fieldset.tab-level2 fieldset { padding: 5px 0; }
 

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -9 +9 @@
     public function encodeCreateSchedulable( &$uri , &$params , &$criteria , $original ){                       
         $params['type_id'] = EVENT_ID;
-              
-        $params['rangeStart'] = gmdate( 'd-m-Y' , (int)($params['startTime'] / 1000) );
+        
+                $params['startTime'] =  strtotime( $params['startTime'] . ' ' .$params['timezone']).'000';
+        
+                $params['endTime'] =   strtotime( $params['endTime'] . ' ' .$params['timezone']).'000';
+                
+                if($params['allDay'])
+                        $params['endTime'] =  $params['endTime']  + 86400000;
 
     //        if( !isset( $new['repeat'] ))
     //            $new['range_end'] = '7287926400'; // 12/12/2200
     //        else
-            $params['rangeEnd'] = gmdate( 'd-m-Y' , (int)($params['endTime'] / 1000) );
+            $params['rangeEnd'] = $params['endTime'];
+                        $params['rangeStart'] =  $params['startTime'];
+
             ///////////////////////////////////////////////////////////////////
 
@@ -24 +31 @@
             
         }       
+                
     public function encodeCreateAlarm( &$uri , &$params , &$criteria , $original ){
         
@@ -59 +67 @@
                                 $params =  $_FILES[$params['source']];
                 
-                //$params['source'] = base64_encode( $params['source'] );       
+                if(isset($params['owner']))
+                        $params['owner'] = Config::me('uidNumber');
                 
         }
@@ -112 +121 @@
     public function encodeUpdateSchedulable( &$uri , &$params , &$criteria , $original ){       
         if(isset($params['startTime']))
-                $params['rangeStart'] = gmdate( 'd-m-Y' , (int)($params['startTime'] / 1000) );
+                $params['rangeStart'] = $params['startTime'] ;
         if(isset($params['endTime']))
-                $params['rangeEnd'] = gmdate( 'd-m-Y' , (int)($params['endTime'] / 1000) );       
+                $params['rangeEnd'] = $params['endTime'] ;       
                 
                 
@@ -172 +181 @@
         }
      
+         public function deepnessFindCalendarShared( &$uri , &$result , &$criteria , $original ){                               
+                if(isset($original['criteria']['deepness']) && count($result) > 0){
+                        $calendarIds = array();
+                        foreach($result as $key => $value)
+                                array_push($calendarIds, $value['calendar']);
+                        
+                        $calendar = Controller::find( array( 'concept' => 'calendar' ) , false ,array( 'filter' => array('AND', array('IN','id', $calendarIds), $original['criteria']['filter']))); 
+                        
+                        if(!is_array($calendar))
+                                $result = '';
+
+                        $newResult = array();
+                        foreach($calendar as $key => $value){
+                                foreach($result as $k => $r){
+
+                                        if($r['calendar'] == $value['id']){
+                                                $r['calendar'] = $value;
+                                                array_push($newResult, $r);
+                                        }
+                                }
+                        }
+                        
+                        foreach($newResult as $key => &$value){
+                                if($value['user']  != 0)
+                                        $value['user'] = Controller::read( array( 'concept' => 'user' , 'id' => $value['user'] ));
+                        }
+
+
+                $result = $newResult;
+                }
+    }   
+ 
     //TODO: Remover apos suporte a deepness na api 
     public function deepnessFindEvent( &$uri , &$result , &$criteria , $original ){             
-       
+
        if(isset($original['criteria']['deepness']))
        {
+                        
+                        $Time = new DateTime( 'now', new DateTimeZone('UTC') );
+                        $DayLigth = array();
            foreach ($result as $i => $v)
            {
+
+                                if(!isset($currentTimezone) || $currentTimezone  != $original['criteria']['timezones'][$v['calendar']]){
+                                        $currentTimezone = $original['criteria']['timezones'][$v['calendar']];
+                                        $Time->setTimezone(new DateTimeZone($currentTimezone));
+                                }
+
+                                $Time->setTimestamp( (int)($v['startTime'] / 1000));
+                                $DayLigth['calendar']['startTime'] =  $Time->format('I') ? 1 : 0;
+                                
+                                $Time->setTimestamp( (int)($v['endTime'] / 1000));
+                                $DayLigth['calendar']['endTime'] =  $Time->format('I') ? 1 : 0;
+                                
+                                if($currentTimezone != $v['timezone']){
+                                        $currentTimezone = $v['timezone'];
+                                        $Time->setTimezone(new DateTimeZone($v['timezone']));
+                                
+                                        $Time->setTimestamp( (int)($v['startTime'] / 1000));
+                                        $DayLigth['event']['startTime'] =  $Time->format('I') ? 1 : 0;
+
+                                        $Time->setTimestamp( (int)($v['endTime'] / 1000));
+                                        $DayLigth['event']['endTime'] =  $Time->format('I') ? 1 : 0;
+                                }else
+                                        $DayLigth['event'] = $DayLigth['calendar'];
+                                        
+                                
+                                $result[$i]['DayLigth'] = $DayLigth;
+                                
                 if(isset($v['id']))
                 {
@@ -195 +266 @@
                     }       
                     $result[$i]['participants'] = $participants;
-                
+                                        
+                                        
+                                        
                                         $attachmentRelation = Controller::find( array( 'concept' => 'schedulableToAttachment' ) , false ,array( 'filter' => array('=', 'schedulable'  ,  $v['id']) )); 
                                         if(is_array($attachmentRelation)){
@@ -214 +287 @@
        
    } 
-   
+
     //TODO: Remover apos suporte a deepness na api 
     public function deepnessReadEvent( &$uri , &$result , &$criteria , $original ){             
@@ -295 +368 @@
                 if(isset($v['calendar'])){
                     $result[$i]['calendar'] = Controller::read( array( 'concept' => 'calendar' , 'id' => $v['calendar'])); 
-                                        $result[$i]['defaultAlarms'] = Controller::find( array( 'concept' => 'calendarSignatureAlarm' ) , false ,array( 'filter' => array('=', 'calendarSignature'  ,  $v['id']) ));     
+                                        $result[$i]['defaultAlarms'] = Controller::find( array( 'concept' => 'calendarSignatureAlarm' ) , false ,array( 'filter' => array('=', 'calendarSignature'  ,  $v['id']) ));    
+                                        //Caso não seja o dono da agenda retorna o objeto permission com as acls
+                                        if($result[$i]['isOwner'] == 0){
+                                                $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'user', Config::me('uidNumber') ) ) ) ); 
+
+                                                
+        
+                                                
+                                                if(!is_array($permission) || !$permission  ){
+                                                        ob_start();
+                                                        var_dump($permission);
+                                                        
+                                                        $output = ob_get_clean();
+                                                        file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+                                                        $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'type', '1' ) ) ) );    
+                                                        
+                                                        ob_start();
+                                                var_dump($permission);
+                                                
+                                                $output = ob_get_clean();
+                                                file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+                                                        
+                                                }
+                                                $result[$i]['permission'] = $permission[0];
+                                        }
                                 }
            }
@@ -627 +724 @@
                         }         
         }
- 
-                
         }
 
@@ -640 +735 @@
     
    public function davcalDeleteCollection( &$uri , &$params , &$criteria , $original ){ 
-        if( Config::module('useCaldav') )
+        if( Config::module('useCaldav') &&  Config::module('onRemoveCascadeCalDav'))
         {
            require_once ROOTPATH.'/modules/calendar/interceptors/DAViCalAdapter.php';

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) )});
         }
-
-
-
 }

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

@@ -160 +160 @@
                 <fieldset class="block-add-attendee" title="Participantes">
                         <fieldset class="add-attendee-search search-field ui-corner-all">
+                                <input class="search" type="text" />
                                 <span class="ui-icon ui-icon-search"></span>
-                                <input class="search" type="text" />
                         </fieldset>
                         <ul class="search-result-list ui-corner-all">

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

@@ -1 +1 @@
 <div class="all-list-calendars">
-<% var agendas_usuario = data.calendars %>
+<% var signature = data.signatures %>
 <% var external = false %>
 <div class="my-calendars">
@@ -7 +7 @@
         <a href="#" class="button new new-calendar">Nova Agenda</a>
         <ul class="list-calendars my-list-calendars">
-                                <% for (var i=0; i < agendas_usuario.length; i++) {
-
-                                        if(data.signatureOf[agendas_usuario[i].id].isOwner == 1){
-                                        
-                                                var assinatures = data.signatureOf[agendas_usuario[i].id];
-
+                                <% for (var i=0; i < signature.length; i++) {
+                                        if(signature[i].isOwner == 1){
                                 %>
-                                        <li class="list-calendars-item list-calendars-item-<%= agendas_usuario[i].id %>">
+                                        <li class="list-calendars-item list-calendars-item-<%= signature[i].calendar.id %>">
                                                 
                                                 <div>
-                                                        <input class="calendar-view" type="checkbox" name="" value="<%= agendas_usuario[i].id %>" checked="checked"/>
-                                                        <label><%= agendas_usuario[i].name %></label>
+                                                        <input class="calendar-view" type="checkbox" name="" value="<%= signature[i].calendar.id %>" checked="checked"/>
+                                                        <label><%= signature[i].calendar.name %></label>
                                                         
                                                 </div> 
-                                                        <a class="cal-list-options-btn my-cal-list-options-btn-<%= agendas_usuario[i].id %>" style="background-color:#<%=assinatures.backgroundColor%>; border-color:#<%= assinatures.borderColor%>;">
+                                                        <a class="cal-list-options-btn my-cal-list-options-btn-<%= signature[i].calendar.id %>" style="background-color:#<%=signature[i].backgroundColor%>; border-color:#<%= signature[i].borderColor%>;">
                                                                 <img src="../prototype/modules/calendar/img/arrow_down.png" width="10" height="10" class="cal-list-img"/>
                                                         </a>
                                                         
                                                         
-                                                <div class="cal-list-options my-cal-list-options-<%= agendas_usuario[i].id %> hidden">
+                                                <div class="cal-list-options my-cal-list-options-<%= signature[i].calendar.id %> hidden">
                                                         <ul>
-                                                                <li><a href="#" onclick="add_tab_configure_calendar(<%= agendas_usuario[i].id%>);">Configurações</a></li>
-                                                                <li><a href="#" onclick="show_modal_import_export(0, <%= agendas_usuario[i].id%>);">Importar</a></li>
-                                                                <li><a href="#" onclick="show_modal_import_export(1, <%= agendas_usuario[i].id%>);">Exportar</a></li>
+                                                                <li><a href="#" onclick="add_tab_configure_calendar(<%= signature[i].calendar.id%>);">Configurações</a></li>
+                                                                <li><a href="#" onclick="show_modal_import_export(0, <%= signature[i].calendar.id%>);">Importar</a></li>
+                                                                <li><a href="#" onclick="show_modal_import_export(1, <%= signature[i].calendar.id%>);">Exportar</a></li>
+                                                                <li><a href="#" onclick="show_modal_shared(<%= signature[i].calendar.id%>);">Compartilhar agenda</a></li>
                                 <li><a href="#" onclick="remove_calendar();">Remover agenda</a></li>
                                                         </ul>
@@ -44 +41 @@
         </ul>
 </div>
-<% if (external) { %>
+
 <div class="signed-calendars">
         <a title='Agendas assinadas' class="title-signed-calendars" aria-expanded='false' role='button' tabindex='0'>Agendas assinadas</a>                      
+        <span class="status-list-shared ui-icon ui-icon-triangle-1-s"></span>
+        <a href="#" class="button new new-calendar-shared tiny">Nova Agenda</a>
+        
+        <% if (external) { %>   
                 <ul class="list-calendars signed-list-calendars">
-                        
-                                        <% for (var i=0; i < agendas_usuario.length; i++) {
-                                                if(data.signatureOf[agendas_usuario[i].id].isOwner == 0){
+                                <% for (var i=0; i < signature.length; i++) {
+                                                if(signature[i].isOwner == 0){
                                         %>
-                                                <li class="list-calendars-item list-calendars-item-<%= agendas_usuario[i].id %>">
-                                                        <input class="calendar-view" type="checkbox" name="" value="<%= agendas_usuario[i].id %>" checked="checked"/>
-                                                        <label><%= agendas_usuario[i].name %></label>
+                                                <li class="list-calendars-item list-calendars-item-<%= signature[i].calendar.id %>">
+                                                        <input class="calendar-view" type="checkbox" name="" value="<%= signature[i].calendar.id %>" checked="checked"/>
+                                                        <label><%= signature[i].calendar.name %></label>
 
-                                                        <a class="cal-list-options-btn signed-cal-list-options-btn-<%= agendas_usuario[i].id %>" onclick="show_cal_list_options('signed-cal-list-options-', <%= agendas_usuario[i].id %>)"  style="background-color:#<%=assinatures.backgroundColor%>; border-color:#<%= assinatures.borderColor%>"><img src="img/arrow_down.png" width="10" height="10" class="cal-list-img"></a>
-                                                        <div class="cal-list-options signed-cal-list-options-<%= agendas_usuario[i].id %> hidden">
+                                                        <a class="cal-list-options-btn my-cal-list-options-btn-<%= signature[i].calendar.id %>" style="background-color:#<%=signature[i].backgroundColor%>; border-color:#<%= signature[i].borderColor%>;">
+                                                        <img src="../prototype/modules/calendar/img/arrow_down.png" width="10" height="10" class="cal-list-img"/></a>
+                                                        <div class="cal-list-options my-cal-list-options-<%= signature[i].calendar.id  %> hidden">
                                                                 <ul>
-                                                                        <li><a href="#">Configurações</a></li>
-                                                                        <li><a href="#">Importar</a></li>
-                                                                        <li><a href="#">Exportar</a></li>
-                                    <li><a href="#">Cancelar assinatura</a></li>
+                                                                        <li><a href="#" onclick="add_tab_configure_calendar(<%= signature[i].calendar.id %>);">Configurações</a></li>
+                                                                        <li><a href="#" onclick="show_modal_import_export(0, <%= signature[i].calendar.id %>);">Importar</a></li>
+                                                                        <li><a href="#" onclick="show_modal_import_export(1, <%= signature[i].calendar.id %>);">Exportar</a></li>
+                                                                        <li><a href="#" onclick="cancel_signature(<%= signature[i].id %>);">Cancelar assinatura</a></li>
                                                                 </ul>
-                                                        </div>
+
+                                                </div>
 
                                                 </li>
@@ -72 +74 @@
                                         %>
                 </ul>
+        <% } %>
         </div>
-<% } %>
 </div>

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

@@ -123 +123 @@
                                 <label>Avisar-me por </label>
                                 <select name="alarmType[]">
-                                        <option value="alert" <%= data.event.alarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option>
-                                        <option value="mail" <%= data.event.alarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option>
+                                <!--<option value="alert" <%= data.event.alarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option>
+                                        <option value="mail" <%= data.event.alarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option>-->
                                         <option value="sms" <%= data.event.alarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>
                                 </select>
                                 <input type="text" name="alarmTime[]" class="number input-small" value="<%= data.event.alarms[i].time %>"/>
                                 <select name="alarmUnit[]">
+                                        <option value="m" <%= data.event.alarms[i].unit=='m' ? 'selected="selected"':'' %>>Minutos</option>
+                                        <option value="h" <%= data.event.alarms[i].unit=='h' ? 'selected="selected"':'' %>>Horas</option>
                                         <option value="d" <%= data.event.alarms[i].unit=='d' ? 'selected="selected"':'' %>>Dias</option>
-                                        <option value="h" <%= data.event.alarms[i].unit=='h' ? 'selected="selected"':'' %>>Horas</option>
-                                        <option value="m" <%= data.event.alarms[i].unit=='m' ? 'selected="selected"':'' %>>Minutos</option>
                                 </select>
                                 <input type="hidden" name="alarmId[]" value="<%=data.event.useAlarmDefault ? '' : data.event.alarms[i].id%>" />

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

@@ -68 +68 @@
 <script type="text/javascript" src="<?= PLUGINSURL ?>/fgmenu/fg.menu.js"></script>
 <script type="text/javascript" src="<?= PLUGINSURL ?>/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
+<script type="text/javascript" src="<?= PLUGINSURL ?>/contextmenu/jquery.contextMenu.js"></script>
 
 <!-- JPicker -->
@@ -84 +85 @@
 
 <script type='text/javascript' src='<?= MODULESURL ?>/js/helpers.js'></script>
+<script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.shared.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/timezone.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.codecs.js'></script>
 
 <script type='text/javascript' src='<?= MODULESURL ?>/js/I18n.js'></script>
+<script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.contentMenu.js'></script>
 <script type="text/javascript" src="<?= MODULESURL ?>/js/init.js"></script>
 
@@ -105 +108 @@
                         </div>          
                         <fieldset class="search-field main-search ui-corner-all">
+                                <input class="search" type="text" />
                                 <span class="ui-icon ui-icon-search"></span>
-                                <input class="search" type="text" />
                         </fieldset>
                 </div>
@@ -129 +132 @@
                         <div id="tab_events_list_"> </div>
                         <div id="sandbox2">     </div>
+                        <div id="calendarShared">       </div>
+                        <div id="context-menu-event">   </div>
                 </div>
                 
                 <div id="sandbox" class="expresso-calendar-container hidden"> </div>
                 <div id="div-import-export-calendar" class="expresso-calendar-container"> </div>
+                <div id="div-copy-move-calendar" class="expresso-calendar-container"> </div>
                 <div id="div-alarm" class="expresso-alarm-container"> </div>
         </div>

trunk/prototype/post.php

@@ -22 +22 @@
         } 
         
-        $_FILES = $files;
+        $_FILES = $files;       
 }
 

trunk/prototype/services/iCal.php

@@ -511 +511 @@
                 $objTimezone =  new DateTimeZone($schedulable['timezone']);  
                 
-                if($startTime['params']['VALUE'] === 'DATE' && isset($params['calendar_timezone']) )
+                if(isset($startTime['params']['VALUE']) &&  $startTime['params']['VALUE'] === 'DATE' && isset($params['calendar_timezone']) )
                 {
                     $schedulable['allDay'] = 1;
@@ -555 +555 @@
         
 
-            $schedulable['summary'] = mb_convert_encoding ( $component->getProperty( 'summary' , false , false ) , 'UTF-8' , 'UTF-8,ISO-8859-1');
+            $schedulable['summary'] = mb_convert_encoding ( $component->getProperty( 'summary' , false , false ) , 'ISO-8859-1' , 'UTF-8,ISO-8859-1');
 
             /* Definindo Description */
                 if($desc = $component->getProperty( 'description' , false , false ))
-                    $schedulable['description'] = mb_convert_encoding (str_ireplace (array('\n','\t'), array("\n","\t"), $desc) ,'UTF-8' , 'UTF-8,ISO-8859-1');
+                    $schedulable['description'] = mb_convert_encoding (str_ireplace (array('\n','\t'), array("\n","\t"), $desc) ,'ISO-8859-1'  , 'UTF-8,ISO-8859-1');
 
              /* Definindo location */
                 if($location = $component->getProperty( 'location' , false , false ))
-                    $schedulable['location'] = mb_convert_encoding ( $location , 'UTF-8' , 'UTF-8,ISO-8859-1') ;
+                    $schedulable['location'] = mb_convert_encoding ( $location , 'ISO-8859-1' , 'UTF-8,ISO-8859-1') ;
 
 
@@ -701 +701 @@
       
             /* Definindo TRANSP */
-            if(($tranp = $component->getProperty( 'transp', false , true )) && strtoupper($tranp) == 'OPAQUE')
+            if(($tranp = $component->getProperty( 'transp', false , true )) && $tranp && strtoupper($tranp) == 'OPAQUE')
                 $schedulable['transparent'] = 1;