Changeset 5514

Timestamp:

02/14/12 16:52:04 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Implementacao anexos, acls e delegacao de participantes

Location:

trunk

Files:

• expressoCalendar/setup/default_records.inc.php (modified) (2 diffs)
• expressoCalendar/setup/tables_current.inc.php (modified) (3 diffs)
• expressoMail1_2/inc/class.db_functions.inc.php (modified) (1 diff)
• expressoMail1_2/js/main.js (modified) (1 diff)
• prototype/Sync.php (modified) (1 diff)
• prototype/api/controller.php (modified) (7 diffs)
• prototype/api/datalayer.js (modified) (21 diffs)
• prototype/config/alarm.ini (modified) (1 diff)
• prototype/config/attachment.ini (modified) (1 diff)
• prototype/config/calendar.ini (modified) (1 diff)
• prototype/config/calendarSignature.ini (modified) (1 diff)
• prototype/config/calendarSignatureAlarm.ini (modified) (1 diff)
• prototype/config/notification.ini (added)
• prototype/config/participant.ini (modified) (3 diffs)
• prototype/config/repeat.ini (modified) (1 diff)
• prototype/config/schedulable.ini (modified) (1 diff)
• prototype/config/schedulableToAttachment.ini (added)
• prototype/config/user.ini (modified) (1 diff)
• prototype/converter.php (modified) (2 diffs)
• prototype/getArchive.php (added)
• prototype/links.php (modified) (1 diff)
• prototype/modules/calendar/constants.php (modified) (2 diffs)
• prototype/modules/calendar/css/layout.css (modified) (5 diffs)
• prototype/modules/calendar/css/style.css (modified) (1 diff)
• prototype/modules/calendar/export.php (modified) (2 diffs)
• prototype/modules/calendar/interceptors/DBMapping.php (modified) (6 diffs)
• prototype/modules/calendar/interceptors/Notifications.php (modified) (12 diffs)
• prototype/modules/calendar/js/calendar.codecs.js (modified) (13 diffs)
• prototype/modules/calendar/js/helpers.js (modified) (9 diffs)
• prototype/modules/calendar/templates/alarms_add_itemlist.ejs (modified) (2 diffs)
• prototype/modules/calendar/templates/attachment_add_itemlist.ejs (added)
• prototype/modules/calendar/templates/attendee_add.ejs (modified) (3 diffs)
• prototype/modules/calendar/templates/attendee_permissions.ejs (added)
• prototype/modules/calendar/templates/event_add.ejs (modified) (8 diffs)
• prototype/modules/calendar/templates/index.ejs (modified) (1 diff)
• prototype/modules/calendar/templates/notify_create_delegated_body.tpl (added)
• prototype/modules/calendar/templates/notify_delegated_body.tpl (added)
• prototype/modules/calendar/templates/notify_delegated_status_body.tpl (added)
• prototype/modules/calendar/templates/notify_response_delegated_status_body.tpl (added)
• prototype/modules/calendar/templates/notify_suggestion_body.tpl (added)
• prototype/modules/calendar/templates/notify_suggestion_response_body.tpl (added)
• prototype/modules/calendar/templates/participants_add_itemlist.ejs (modified) (1 diff)
• prototype/post.php (modified) (1 diff)
• prototype/services/PostgreSQL.php (modified) (2 diffs)
• prototype/services/iCal.php (modified) (18 diffs)

trunk/expressoCalendar/setup/default_records.inc.php

@@ -28 +28 @@
                 $oProc->query("ALTER TABLE calendar_signature ADD CONSTRAINT fk_calendar_signature_calendar_espec FOREIGN KEY (calendar_id) REFERENCES calendar (id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE CASCADE;");
                 
-                //calendar_signature_alarm
+        //calendar_signature_alarm
                 $oProc->query("ALTER TABLE calendar_signature_alarm ADD CONSTRAINT fk_calendar_signature_alarm_calendar_signature FOREIGN KEY (calendar_signature_id) REFERENCES calendar_signature (id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE CASCADE;");
                 
@@ -37 +37 @@
                 $oProc->query("INSERT INTO calendar_object_type( \"id\", \"name\") VALUES ('1','VEVENT');");
                 $oProc->query("INSERT INTO calendar_class( \"id\", \"name\") VALUES ('1','Public'),('2','Private'),('3','Confidential');");
-                $oProc->query("INSERT INTO calendar_participant_status( \"id\", \"name\") VALUES ('1','CONFIRMED'),('2','TENTATIVE'),('3','CANCELLED'),('4','UNANSWERED');");
+                $oProc->query("INSERT INTO calendar_participant_status( \"id\", \"name\") VALUES ('1','CONFIRMED'),('2','TENTATIVE'),('3','CANCELLED'),('4','UNANSWERED'),('5', 'DELEGATED');");
                 
 ?>

trunk/expressoCalendar/setup/tables_current.inc.php

@@ -31 +31 @@
                                 'type' => array('type' => 'varchar','precision' => '50','nullable' => False),
                                 'name' => array('type' => 'varchar','precision' => '255','nullable' => False),
-                                'size' => array('type' => 'varchar','precision' => '255','nullable' => False)
+                                'size' => array('type' => 'varchar','precision' => '255','nullable' => False),
+                                'owner' => array('type' => 'int', 'precision' => '8','nullable' => True)
                         ),
                         'pk' => array('id'),
@@ -38 +39 @@
                         'uc' => array()
                 ),
-                
-        
-                
+                                
                 'calendar' => array(
             'fd' => array(
@@ -136 +135 @@
                 'user_info_id' => array(  'type' => 'int', 'precision' => '8', 'nullable' => False),
                 'object_id' => array(  'type' => 'int', 'precision' => '8', 'nullable' => True),
-                'delegated_to' => array( 'type' => 'int', 'precision' => '8','default' => 0, 'nullable' => False),
+                'delegated_from' => array( 'type' => 'int', 'precision' => '8','default' => 0, 'nullable' => False),
                 'is_organizer' => array( 'type' => 'int', 'precision' => '2', 'default' => 0, 'nullable' => False),
                 'is_external' => array( 'type' => 'int', 'precision' => '2', 'default' => 0, 'nullable' => False),
-                'participant_status_id' => array( 'type' => 'int', 'precision' => '8', 'nullable' => false , 'default' => 4)
+                'participant_status_id' => array( 'type' => 'int', 'precision' => '8', 'nullable' => false , 'default' => 4),
+                                'acl' => array('type' => 'varchar', 'precision' => '10' ,'default' => 'r', 'nullable' => False),
+                                'receive_notification' => array( 'type' => 'int', 'precision' => '2', 'default' => 1, 'nullable' => False)
             ),
             'pk' => array('id'),

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

@@ -410 +410 @@
                                 $_REQUEST['params']['calendar'] = $params['selected'];
                                 $_REQUEST['readable'] = $params['readable'] ? true : false;
-                                $_REQUEST['analize'] = isset($params['readable']) ? true : false;
+                $_REQUEST['analize'] = isset($params['analize']) ? true : false;
                                 $_REQUEST['params']['status'] = $params['status'];
                                 $_REQUEST['params']['owner'] = $_SESSION['phpgw_info']['expressomail']['user']['account_id'];
+                                if(isset($params['acceptedSuggestion'])){
+                                        $_REQUEST['params']['acceptedSuggestion'] = $params['acceptedSuggestion'];
+                                        $_REQUEST['params']['from'] = $params['from'];
+                                }
+                                
                                 ob_start();
                                 include_once(PHPGW_INCLUDE_ROOT.'/prototype/converter.php');

trunk/expressoMail1_2/js/main.js

@@ -3633 +3633 @@
                         closeOnEscape: true
                 });
-                $.ajax({
-                        url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&readable=true&cirus_delimiter='+cyrus_delimiter+'&analize=true',
-                        async: false,
-                        success: function(data){
-                                data = connector.unserialize(data);
-
-
-                                var createDialog = function(typeImport, propaget){
-
-                                        if(typeImport == '1'){
-                                                $("#select-agenda").html('');
-                                                for(var calendario in Calendar.calendarIds){
-                                                        var doc = document .createElement("OPTION");
-                                                        doc.value = Calendar.signatures[parseInt(calendario)].calendar.id;
-                                                        doc.innerHTML = Calendar.signatures[parseInt(calendario)].calendar.name;
-                                                        $("#select-agenda").append(doc);
-                                                      
-                                                };
-                                                $("#import-dialog" ).dialog({
-                                                    buttons: {
-                                                        Cancel: function() {
-                                                                $( this ).dialog( "close" );
-                                                        },
-                                                        "Importar" : function(){
-
-                                                             $.ajax({
-                                                                     url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val(),
-                                                                     success: function(msg){
-
-                                                                            var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";
-                                                                            alert( alt + $("#select-agenda option:selected").text() );
-                                                                    }
-                                                                });
-                                                        
-                                                                                                                        $( this ).dialog( "close" );
-                                                                                                                }
-                                                    }
-                                                 });                                    
-
-                                        }else if(data == '4'){
-                                            alert('Seu evento já se encontra atualizado');
-                                            return;
-                                        }else if(data == '3'){
-                                           $.ajax({
-                                                        url: "controller.php?action="+import_url+'&from_ajax=true&selected=true',
-                                                        success: function(msg){
-                                                        alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento foi removido " : "Ocorreu um erro ao remover o evento" );
-                                                        }
-                                                });
-                                                return;
-                                        }
-                                        else if(data == '5'){
-                                                $.ajax({
-                                                        url: "controller.php?action="+import_url+'&from_ajax=true&selected=true',
-                                                        success: function(msg){
-                                                        alert( ( ( connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" );
-                                                        }
-                                                });
-                                                return;
-                                        }else {
-                                                up = true;
-                                                $("#select-agenda").css("display", "none");
-                                                $("#import-dialog" ).children("p:first-child").css("display", "none");
-                                                $("#import-dialog" ).dialog({
-                                                        height: 160,
-                                                        title: 'Atualizar Evento',
-                                                        buttons: {
-                                                            Cancel: function() {
-                                                                    $( this ).dialog( "close" );
-                                                            },
-                                                           "Atualizar": function() {
-                                                                
-                                                                $.ajax({
-                                                                     url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val(),
-                                                                     success: function(msg){
-                                                                            alert( ( (msg = connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso para " : "Ocorreu um erro ao atualizar o evento" );
-                                                                    }
-                                                                });
-                                                        
-                                                                $( this ).dialog( "close" );
-                                                        }
-                                                    }
-                                                });
-                                        $(".ui-dialog-buttonpane").find(".ui-button:last").children().html("Atualizar");                
-                                        };
-                                        $( "#import-dialog" ).dialog( "open" ); 
-                                };
-                                createDialog(data, true);
+                $.ajax({
+                        url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&readable=true&cirus_delimiter='+cyrus_delimiter+'&analize=true',
+                        async: false,
+                        success: function(data){
+                                        data = connector.unserialize(data);
+
+
+                                        var createDialog = function(typeImport, propaget){
+                                                        
+                                                switch(parseInt(typeImport)){
+                                                case 1:
+                                                        $("#select-agenda").html('');
+                                                                for(var calendario in Calendar.calendarIds){
+                                                                                var doc = document .createElement("OPTION");
+                                                                                doc.value = Calendar.signatures[parseInt(calendario)].calendar.id;
+                                                                                doc.innerHTML = Calendar.signatures[parseInt(calendario)].calendar.name;
+                                                                                $("#select-agenda").append(doc);
+                                                                          
+                                                                };
+                                                                $("#import-dialog" ).dialog({
+                                                                        buttons: {
+                                                                                Cancel: function() {
+                                                                                                $( this ).dialog( "close" );
+                                                                                },
+                                                                                "Importar" : function(){
+
+                                                                                         $.ajax({
+                                                                                                         url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val(),
+                                                                                                         success: function(msg){
+
+                                                                                                                        var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";
+                                                                                                                        alert( alt + $("#select-agenda option:selected").text() );
+                                                                                                        }
+                                                                                                });
+                                                                                
+                                                                                        $( this ).dialog( "close" );
+                                                                                }
+                                                                        }
+                                                                 });
+                                                        break;
+                                                case 2:
+                                                        $.ajax({
+                                                                url: "controller.php?action="+import_url+'&from_ajax=true&selected=true',
+                                                                success: function(msg){
+                                                                        alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento foi removido " : "Ocorreu um erro ao remover o evento" );
+                                                                }
+                                                        });
+                                                        return;
+                                                        break;
+                                                case 4:
+                                                        alert('Seu evento já se encontra atualizado');
+                                                        return;
+                                                        break;
+                                                case 5:
+                                                        $.ajax({
+                                                                url: "controller.php?action="+import_url+'&from_ajax=true&selected=true',
+                                                                success: function(msg){
+                                                                alert( ( ( connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" );
+                                                                }
+                                                        });
+                                                        return;
+                                                        break;
+                                                case 6:
+                                                        var acceptedSuggestion = confirm("Deseja atualizar o evento de acordo com a sugestão ?");
+                                                        $.ajax({
+                                                                url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&selected=true&cirus_delimiter='+cyrus_delimiter+'&acceptedSuggestion='+acceptedSuggestion+"&from="+document.getElementById('from_values_'+currentTab).value,
+                                                                success: function(msg){
+                                                                        if(acceptedSuggestion)
+                                                                                alert( ( ( connector.unserialize(msg)) == "ok") ? "Evento atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" );
+                                                                }
+                                                        });
+                                                        return;
+                                                        break;
+                                                default:
+                                                        up = true;
+                                                        $("#select-agenda").css("display", "none");
+                                                        $("#import-dialog" ).children("p:first-child").css("display", "none");
+                                                        $("#import-dialog" ).dialog({
+                                                                height: 160,
+                                                                title: 'Atualizar Evento',
+                                                                buttons: {
+                                                                        Cancel: function() {
+                                                                                $( this ).dialog( "close" );
+                                                                        },
+                                                                   "Atualizar": function() {
+                                                                                
+                                                                                $.ajax({
+                                                                                         url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val(),
+                                                                                         success: function(msg){
+                                                                                                        alert( ( (msg = connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso para " : "Ocorreu um erro ao atualizar o evento" );
+                                                                                        }
+                                                                                });
+                                                                                $( this ).dialog( "close" );
+                                                                        }
+                                                                }
+                                                        });
+                                                        $(".ui-dialog-buttonpane").find(".ui-button:last").children().html("Atualizar");
+                                                }
+                                                $( "#import-dialog" ).dialog( "open" ); 
+                                                                                                                                
+                                        };
+                                        createDialog(data, true);
                                 
                 }});

trunk/prototype/Sync.php

@@ -64 +64 @@
                     if( isset( $dt[$linkName] ) )
                     {
-                            if( $notArray = Controller::isConcept( $linkName ) )
+                            if( $notArray = Controller::isConcept( $concept, $linkName ) )
                                     $dt[$linkName] = array( $dt[$linkName] );
 

trunk/prototype/api/controller.php

@@ -1 +1 @@
 <?php
+
 
 if( !defined( 'ROOTPATH' ) )
@@ -25 +26 @@
         static $includes = array();
         static $tx = array();
+        static $isConcept = array();
         static $txID = 0;
         static $wallet;
@@ -150 +152 @@
 
         //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados
-        public static function links( $concept = false )
-        {
+        public static function links( $concept = false, $linkage = false )
+        {
+            
+
             if( !isset(self::$config[ $concept ]) )
               self::$config[ $concept ] = self::loadConfig( $concept );
 
-            return( isset(self::$config[ $concept ]['links']) ? 
-                          self::$config[ $concept ]['links'] : array() );
-        }
-
-        public static function isConcept( $concept )
+            $links = array();
+            self::$isConcept[ $concept ] = array();
+
+            if( isset(self::$config[ $concept ][ 'model.hasOne' ]) )
+                foreach( self::$config[ $concept ][ 'model.hasOne' ] as $linkName => $linkTarget )
+                {
+                    list( $target, $link ) = explode( '.', $linkTarget );
+
+                    if( $linkage === $linkName )
+                        $return = $link;
+
+                    $links[$linkName] = $target;
+                    self::$isConcept[ $concept ][ $linkName ] = true;
+                }
+            if( isset(self::$config[ $concept ][ 'model.depends' ]) )
+                foreach( self::$config[ $concept ][ 'model.depends' ] as $linkName => $linkTarget )
+                {
+                    list( $target, $link ) = explode( '.', $linkTarget );
+
+                     if( $linkage === $linkName )
+                        $return = $link;
+
+                    $links[$linkName] = $target;
+                    self::$isConcept[ $concept ][ $linkName ] = true;
+                }
+            if( isset(self::$config[ $concept ][ 'model.hasMany' ]) )
+                foreach( self::$config[ $concept ][ 'model.hasMany' ] as $linkName => $linkTarget )
+                {
+                    list( $target, $link ) = explode( '.', $linkTarget );
+
+                     if( $linkage === $linkName )
+                        $return = $link;
+
+                    $links[$linkName] = $target;
+                }
+
+            return( isset($return) ? $return : $links );
+        }
+
+        public static function isConcept( $concept, $linkName )
         { 
-            if( isset( self::$config[ $concept ] ) && 
-                self::$config[ $concept ] )
-                return( true );
-                else
-                return file_exists( ROOTPATH."/config/$concept.ini" );
+            if( !isset( self::$isConcept[ $concept ] ) )
+                self::links( $concept );
+
+            return( isset(self::$isConcept[ $concept ][ $linkName ]) );
         }
 
@@ -576 +614 @@
 
                 $postpone = array();
+                $linkNames = array();
 
                 if( $data )
@@ -585 +624 @@
                         if( isset( $data[$linkName] ) && is_array( $data[$linkName] ) )
                         {
-                            if( self::isConcept( $linkName ) )
+                                if( self::isConcept( $URI['concept'], $linkName ) )
                                     $data[$linkName] = self::put( array( 'concept' => $linkTarget ), $data[$linkName], &$txIds );
                             else
-                                    $postpone[$linkTarget] = $data[$linkName];
+                            {
+                                    $postpone[ $linkTarget ] =  $data[$linkName];
+                                    $linkNames[ $linkTarget ] = $linkName;
+                            }
                         }
                     }
@@ -609 +651 @@
                             $value = array( 'id' => $value );
 
-                          $value[ $URI['concept'] ] = $URI['id'];
-
+                          $value[ self::links( $URI['concept'], $linkNames[ $linkTarget ] ) ] = $URI['id'];
+  
                           self::put( array( 'concept' => $linkTarget ), $value, &$txIds );
                       }
@@ -658 +700 @@
 
 Controller::$cache = Controller::loadCache();
-?>
+// ?>

trunk/prototype/api/datalayer.js

@@ -4 +4 @@
 arrayName = /^([A-z0-9-_]+)\[\]$/;
 startsDoubleDot = /^:/;
+isIframe = /^iframe.*/;
+FILE = 'files';
 // cached_urls = {};
 
@@ -13 +15 @@
 //            return;
 //        alert( options.url + " dentro" );
-          jqXHR.abort(); 
-
-          var callback = ( options.success || options.complete || $.noop );
+
+           var callback = ( options.success || options.complete || $.noop );
+
+          if( isIframe.test( options.dataType ) || options.data instanceof FormData )
+          {    
+              res = internalUrl.exec( options.url );
+
+              var data = {};
+
+              data[ res[1] ] = DataLayer.form( options.fileInput.parents( 'form' ), options.fileInput );
+
+              options.formData = DataLayer.serializeForm( data );
+
+              callback = function( data ){
+
+                    //coutinho, escreva seu codigo aqui.
+
+                    return callback( DataLayer.encode( res[2], data ) );
+
+              }
+
+              options.url = DataLayer.dispatchPath + 'post.php';
+
+              if( options.data instanceof FormData )
+              {
+                  options.data = new FormData();
+
+                  $.each(options.formData, function (index, field) {
+                            options.data.append(field.name, field.value);
+                        });
+                  
+                  $.each(options.files, function (index, file) {
+                            options.data.append(options.paramName, file);
+                        });
+              }
+
+              return( true );
+          }
+
+          jqXHR.abort();
 
           switch( options.type.toUpperCase() )
@@ -62 +101 @@
                         //TODO: check the type for conversion
                         DataLayer.receive, 
-                        false, { 'formData': $this.serializeArray(),  'fileInput': fileInputs } );
+                        false, { 'formData': $this.serializeArray(),  'fileInput': fileInputs, 'paramName': FILE + '[]' } );
 
         return( false );
@@ -79 +118 @@
 
           case 'POST':
-        DataLayer.put( res[1], data );
+                DataLayer.put( res[1], data );
         }
 
@@ -93 +132 @@
 
     links: {},
+    nestedLinks: {},
     concepts: {},
     listeners: {},
@@ -216 +256 @@
     },
 
-    form: function( target ){
-
-        var params = {}, $this = $(target);
+    form: function( target, fileInputs ){
+
+        var params = {}, $this = $(target), inputArray = $this.serializeArray();
 
         if( !$this.is( "form" ) )
             $this = $this.parents( "form" );
-
-        $.each( $this.serializeArray(), function( i, el ){
+                
+        if( fileInputs )
+                fileInputs.each( function( i, el ){
+
+              inputArray[ inputArray.length ] = { name: $(this).prop("name"), value: FILE + i };
+
+                });
+
+        $.each( inputArray, function( i, el ){
 
             if( newName = arrayName.exec( el.name ) )
@@ -242 +289 @@
         return this.decode( $this.attr( "action" ), params );
     },
+        
+        serializeForm: function( data, level ){
+        
+                var formData = [];
+        
+                for( key in data )
+                {
+                        var value = data[key];
+
+                        if( level !== undefined )
+                                key = level+'['+key+']';
+
+                        if( $.isArray(value) || $.isPlainObject(value) )
+                                formData = formData.concat( this.serializeForm( value, key ) );
+                        else
+                                formData[ formData.length ] = { name: key, value: value };
+                }
+                
+                return( formData );
+        },
 
     blend: function( action, data ){
@@ -307 +374 @@
         if( bothSides || !oneSide )
         {
-            var result = false, links = this.links( concept ), 
+            var result = false, links = this.links( concept ), nestedLinks = this.links( concept, true ), 
             current = this.check( concept ) || {}, ids = [];
 
@@ -333 +400 @@
                                     el = { id: el };
 
-                                var nestedLinks = _this.links( links[link], true );
-                                
+                                //removido pois o mesmo esta gerando inconsistencia em tudo
+//                              if( DataLayer.isConcept( links[link], nestedLinks[link] ) )
                                 if( isConcept )
                                 {
-                                    el[ nestedLinks[concept] ] = el[ nestedLinks[concept] ] || [];
-                                    el[ nestedLinks[concept] ].push( key );
+                                    el[ nestedLinks[link] ] = el[ nestedLinks[link] ] || [];
+                                    el[ nestedLinks[link] ].push( key );
                                 }
                                 else
-                                    el[ nestedLinks[concept] ] = key;
+                                    el[ nestedLinks[link] ] = key;
 
                                 if( isRef && ( !current[ key ] || !current[ key ][ link ] || 
@@ -393 +460 @@
         var bothSides = (typeof oneSide === "undefined"),
 
-        links = this.links( concept ), ids = [],
+        links = this.links( concept ), nestedLinks = this.links( concept, true ), ids = [],
 
         current = this.check( concept, id );
@@ -399 +466 @@
         if( !current ) return;
         
-        if( id )
+        if( typeof id === "string" )
             current.id = id;
 
@@ -420 +487 @@
                     continue;
 
-                var nestedLinks = this.links( links[link], true );
-
                 if( isConcept = this.isConcept( concept, link ) )
                     current[i][link] = [ current[i][link] ];
@@ -429 +494 @@
                         el = DataLayer.storage.cache[links[link]][el];
 
-                        if( notArrayNested = ( $.type( el[ nestedLinks[concept] ] ) !== "array" ) )
-                            el[ nestedLinks[concept] ] = [ el[nestedLinks[concept]] ];
-
-                        el[ nestedLinks[concept] ] = $.grep( el[ nestedLinks[concept] ], function( nested, iii ){
+                        if( notArrayNested = ( $.type( el[ nestedLinks[link] ] ) !== "array" ) )
+                            el[ nestedLinks[link] ] = [ el[nestedLinks[link]] ];
+
+                        el[ nestedLinks[link] ] = $.grep( el[ nestedLinks[link] ], function( nested, iii ){
                             return ( currentId !== nested );
                         });
 
                         if( notArrayNested )
-                            el[ nestedLinks[concept] ] = el[ nestedLinks[concept] ][0] || false;
-                        if(!el[ nestedLinks[concept] ] || !el[ nestedLinks[concept] ].length)
-                                delete el[ nestedLinks[concept] ];
+                            el[ nestedLinks[link] ] = el[ nestedLinks[link] ][0] || false;
+                        if(!el[ nestedLinks[link] ] || !el[ nestedLinks[link] ].length)
+                                delete el[ nestedLinks[link] ];
                 });
             }
@@ -905 +970 @@
 
             this.links[ concept ] =  result['links'] || {};
+
+           this.nestedLinks[ concept ] = result['nestedLinks'] || {};
         }
 
         if( reverse )
         {
-            var reverted = {}, llinks = this.links[ concept ];
-    
-            for( var key in llinks )
-                reverted[ llinks[key] ] = key;
-
-            return( reverted );
+            return( this.nestedLinks[ concept ] );
         }
 
@@ -1014 +1076 @@
 
             if( result && bothSides && (!filter || 
-                                                                        !filter.criteria || 
-                                                                        !filter.criteria.format) )
+                                        !filter.criteria || 
+                                        !filter.criteria.format) )
             {
               var newResult = [];
@@ -1032 +1094 @@
     },
     
-    
-    filter: function( base, filter ){
+    filter: function( base, filter, criteria ){
       
+        if( !$.isArray( filter || [] ) )
+            filter = filter.filter || false;
+
+        if( !filter )
+            return( base );
+
         var filtered = [];
       
-//      var operator = filter.shift();
-      
-        /*for( var key in base )
-        {
-            switch( operator )
-            {
-                case 'AND':
-                  for( var i = 0, current = true; i < filter.length && current; i++ )
-                    current = this.compare( '&', current, this.compare( base[key], filter[i] ) );
-                break;
-                case 'OR':
-                  for( var i = 0, current = false; i < filter.length && !current; i++ )
-                    current = this.compare( '|', current, this.compare( base[key], filter[i] ) );
-                break;
-                case 'IN':
-                  for( var i = 0, current = false; i < filter[1].length && !current; i++ )
-                    current = this.compare( '|', current, this.compare( base[key], [ '=', filter[0], filter[1][i] ] ) );
-                break;
-                default : current = this.compare( operator, base[key], );
-            }
-        */    
-//          if( !noGroup )
-//              for( var i = 0, current = original; i < filter.length && ( current === original ); i++ )
-//                  current = this.compare( operator, current, this.compare( base[key], filter[i] ) );
-
-//          if( current )
-//              filtered[ filtered.length ] = key;
-//      }
+        for( var key in base )
+            if( this.storage.filter( base[key], filter ) )
+                filtered[ filtered.length ] = key;
 
         return( filtered );
@@ -1073 +1115 @@
       switch( operator )
       {
-          case '*':  return  RegExp( "*" + base + "*" ).test( test );
-          case '^':  return  RegExp( "^" + base +  "" ).test( test );
-          case '$':  return  RegExp( ""  + base + "$" ).test( test );
-
-          case '&': return ( base && test );
-          case '|': return ( base || test );
+          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 );
@@ -1095 +1137 @@
 //     },
 
-    check: function( namespace, keys ){
+    check: function( namespace, filter ){
 
         if( !namespace )
@@ -1102 +1144 @@
         var result = this.storage.get( namespace );
 
-        if( !keys || !result )
+        if( !filter || !result )
           return( result || false );
+
+        var keys = DataLayer.copy( filter );
 
         if( notArray = $.type(keys) === "string" )
             keys = [ keys ];
         else if( $.type(keys) !== "array" )
-            keys = this.filter( result, keys.filter );
+                keys = this.filter( result, keys.filter, keys.criteria );
 
         var res = [];
@@ -1136 +1180 @@
             delete this.cache[key];
 
+        },
+        
+        filter: function( base, filter ){
+      
+            var bool, op = filter.shift();
+
+            switch( op )
+            {
+                case 'IN':
+                  for( var i = 0, f = []; i < filter[1].length || !(filter = f); i++ )
+                      f[i] = [ '=', filter[0], filter[1][i] ];
+                case 'OR':
+                    op = '|';
+                    bool = false;
+                break;
+                case 'AND': 
+                    op = '&';
+                    bool = true;
+                break;
+                default : return DataLayer.compare( op, base[ filter[0] ], filter[1] );
+            }
+            
+            for( var strict = bool; 
+
+                filter.length && ( strict ? bool : !bool ); 
+            
+                bool = DataLayer.compare( op, bool, this.filter( base, filter.shift() ) ) );
+
+            return( bool );
         }
     },
@@ -2431 +2504 @@
 //       }
 // }
+
+// internalUrl = /^([A-z0-9-_]+)(:[A-z0-9-_]+)?$/;
+// internalUri = /^([a-zA-Z0-9-_]+)\(([a-zA-Z0-9-_]+)\):\/\/(.*)|([a-zA-Z0-9-_]+):\/\/(.*)$/;
+// isGeneratedId = /^\d+\(javascript\)$/;
+// arrayName = /^([A-z0-9-_]+)\[\]$/;
+// startsDoubleDot = /^:/;
+// FILE = 'files';
+// // cached_urls = {};
+// 
+// $.ajaxPrefilter(function( options, originalOptions, jqXHR ){
+// 
+//       if( options.url != 'undefined' && internalUrl.test( options.url ) ){
+// 
+// //     if( !cached_urls[options.url] )
+// //         return;
+// //     alert( options.url + " dentro" );
+//        jqXHR.abort(); 
+// 
+//        var callback = ( options.success || options.complete || $.noop );
+// 
+//        switch( options.type.toUpperCase() )
+//        {
+//          case 'GET':
+//                return callback( DataLayer.get( options.url, /*false,*/ options.data ) );
+// 
+//          case 'POST':
+//                return callback( DataLayer.put( options.url, options.data ) );
+//        }
+// 
+//        //return( false );
+// 
+// //     options.url = params[1];
+// //     options.data = ( options.data || "" ) + "&" + params[2];
+//       }
+// 
+// });
+// 
+// // $("a").live("click", function( event ){
+// // 
+// //     event.preventDefault();
+// // 
+// //     $.ajax({
+// // 
+// //   
+// // 
+// //     });
+// // 
+// // });
+// 
+// $("form").live( "submit", function( event ){
+// 
+//     var $this = $(this), action = $this.attr('action'), res = false,
+//     
+//     method = $this.attr( 'method' ),
+//     
+//     fileInputs = $this.find('input[type="file"]');
+//     
+//     if( fileInputs.length && !$this.is('[enctype="multipart/form-data"]') )
+//     {
+//      event.preventDefault();
+//      
+//      var formData = $this.serializeArray(), callback = DataLayer.receive;
+//       
+//      if( res = internalUrl.exec( action ) )
+//      {
+//          var data = {}, action = res[1];
+// 
+//          data[action] = DataLayer.form( this, fileInputs );
+// 
+//          formData = DataLayer.serializeForm( data );
+//             
+//              action = DataLayer.dispatchPath + 'post.php';
+//          callback = $.noop;
+//      }
+// 
+//      DataLayer.send( action, 
+//                      [ method, 'iframe json' ], {}, 
+//                      //TODO: check the type for conversion
+//                      callback, 
+//                      false, { 'formData': formData,  'fileInput': fileInputs, 'paramName': FILE + '[]' } );
+// 
+//      return( false );
+//     }
+//     
+//     if( res = internalUrl.exec( action ) )
+//     {
+//      event.preventDefault();
+// 
+//      var data = DataLayer.form( this );
+//      
+//      switch( method.toUpperCase() )
+//      {
+//        case 'GET':
+//              DataLayer.get( res[0], data );
+// 
+//        case 'POST':
+//              DataLayer.put( res[1], data );
+//      }
+// 
+//      return( false );
+//     }
+// 
+//     return( true );
+// });
+// 
+// this.storage = new $.store();
+// 
+// DataLayer = {
+// 
+//     links: {},
+//     concepts: {},
+//     listeners: {},
+//     encoders: {},
+//     decoders: {},
+//     templates: {},
+//     criterias: {},
+//     tasks: [],
+// 
+//     render: function( templateName, data, filter, formatter, force ){
+// 
+//      if( $.isFunction( filter ) )
+//      {
+//          force = formatter;
+//          formatter = filter;
+//          filter = false;
+//      }
+// 
+//      if( typeof data === "string" )
+//      {
+//          data = this.get( data, filter, force ) || {};
+//      }
+//      
+//      var formatting = function( template ){
+// 
+//            if( template === false ) return( false );
+// 
+//            if( template )
+//                DataLayer.templates[ templateName ] = new EJS({ text: template, cache: false });
+// 
+//            var html = DataLayer.templates[ templateName ].render( { data: data } );
+// 
+//            if( !formatter )
+//                return( html );
+// 
+//            return formatter( html );
+//      }
+// 
+//      if( this.templates[ templateName ] )
+//      {
+//          return formatting();
+//      }
+// 
+//      return this.send( DataLayer.templatePath + templateName, 'get', false, formatting, !!!formatter );
+//     },
+//     
+//     send: function( url, type, data, callback, sync, extraOptions ){
+//       
+//        var result = false, fired = false;
+//       
+//        var envelope = {
+// 
+//            'async': ( typeof sync !== "undefined" ? !sync : !!callback ),
+//            'url': url,
+//            'success': function( dt, textStatus, jqXHR ){
+// 
+//                  if( callback )
+//                  {
+//                      fired = true;
+//                      result = callback( dt, textStatus, jqXHR );
+//                  }
+//                  else
+//                      result = dt;
+// 
+//              },
+//            'complete': function( jqXHR, textStatus ){
+// 
+//                if( !fired && callback )
+//                    result = callback( false, textStatus, jqXHR );
+// 
+//            },
+// 
+//            'type': $.isArray( type ) ? type[0] : type,
+//            'data': data
+// 
+//          };
+// 
+//        if( $.isArray( type ) && type[1] )
+//            envelope['dataType'] = type[1];
+// 
+//        if( extraOptions )
+//            envelope = $.extend( envelope, extraOptions );
+// 
+//        $.ajax( envelope );
+//       
+//        return( result );
+//     },
+//     
+//     dispatch: function( dispatcher, data, callback, isPost, dataType ){
+//       
+//       return this.send( this.dispatchPath + dispatcher + ".php", 
+//                      [ ( isPost ? 'post' : 'get' ), dataType || 'json' ],
+//                      data,
+//                      callback );
+// 
+// //       $.ajax({
+// //         'async': !!callback,
+// //         'url': this.dispatchPath + dispatcher + ".php",
+// //         'type': ( isPost ? 'post' : 'get' ),
+// //         'dataType': 'json',
+// //         'data': data,
+// //         'success': function( dt, textStatus, jqXHR ){
+// // 
+// //               if( callback )
+// //               {
+// //                   fired = true;
+// //                   callback( dt, textStatus, jqXHR );
+// //               }
+// //               else
+// //                   result = dt;
+// // 
+// //           },
+// //         'complete': function( jqXHR, textStatus ){
+// // 
+// //             if( !fired && callback )
+// //                 callback( false, textStatus, jqXHR );
+// // 
+// //         }/*,
+// //         'processData': false*/
+// //     });
+// 
+//       //return( result );
+//     },
+// 
+//     form: function( target, fileInputs ){
+// 
+//      var params = {}, $this = $(target), inputArray = $this.serializeArray();
+// 
+//      if( !$this.is( "form" ) )
+//          $this = $this.parents( "form" );
+//              
+//      if( fileInputs )
+//              fileInputs.each( function( i, el ){
+// 
+//            inputArray[ inputArray.length ] = { name: $(this).prop("name"), value: FILE + i };
+// 
+//              });
+// 
+//      $.each( inputArray, function( i, el ){
+// 
+//          if( newName = arrayName.exec( el.name ) )
+//              el.name = newName[1];
+//          else if( !params[ el.name ] )
+//              return( params[ el.name ] = el.value );
+// 
+//          params[ el.name ] = params[ el.name ] || [];
+// 
+//          if( $.type(params[ el.name ]) !== "array" )
+//              params[ el.name ] = [ params[ el.name ] ];
+// 
+//          params[ el.name ].push( el.value );
+//      });
+// 
+// //   alert(dump(params));
+// 
+//      return this.decode( $this.attr( "action" ), params );
+//     },
+//      
+//      serializeForm: function( data, level ){
+//      
+//              var formData = [];
+//      
+//              for( key in data )
+//              {
+//                      var value = data[key];
+// 
+//                      if( level !== undefined )
+//                              key = level+'['+key+']';
+// 
+//                      if( $.isArray(value) || $.isPlainObject(value) )
+//                              formData = formData.concat( this.serializeForm( value, key ) );
+//                      else
+//                              formData[ formData.length ] = { name: key, value: value };
+//              }
+//              
+//              return( formData );
+//      },
+// 
+//     blend: function( action, data ){
+// 
+// //   if( notArray = (!$.isArray(data)) )
+// //       data = [ data ];
+// 
+//      var form = $('form[action="'+action+'"]');
+// 
+//      form.get(0).reset();
+// 
+//      var named = form.find( 'input[name]' );
+// 
+//      for( var name in data )
+//      {
+//          named.filter( '[name="'+name+'"]' ).val( data[name] );
+//      }
+//     },
+// 
+//  
+//     
+//     put: function( concept, filter, data, oneSide ){
+//       
+//       ///////////////////////////// normalize ////////////////////////////////
+//      if( arguments.length == 2 )
+//      {
+//          data = filter;
+//          filter = false;
+//      }
+//      if( typeof data === "undefined" ||
+//          $.type(data) === "boolean" )
+//      {
+//          oneSide = data;
+//          data = filter;
+//          filter = false;
+//      }
+//      
+//      if( !concept || !data )
+//          return( false );
+// 
+//      var decoder = "", id = false, bothSides = (typeof oneSide === "undefined"), notArray, res;
+//      
+//      if( $.type(filter) === "string" )
+//      {
+//          id = filter;
+//          filter = false;
+//      }
+// 
+//      if( id )
+//          data.id = id;
+// 
+//      if( notArray = ( $.type( data ) !== "array" ) )
+//          data = [ data ];
+// 
+//      if( res = internalUrl.exec( concept ) )
+//      {
+//          //TODO: verificar se a decodificaçao deve ser feita em cada item do array
+//          data = this.decode( concept, data );
+//          concept = res[1];
+//          decoder = res[2];
+//      }
+// 
+//       ////////////////////////////////////////////////////////////////////////
+// 
+//      if( bothSides || !oneSide )
+//      {
+//          var result = false, links = this.links( concept ), 
+//          current = this.check( concept ) || {}, ids = [];
+// 
+//          for( var i = 0; i < data.length; i++ )
+//          {
+//              var key = ids[ ids.length ] = data[i].id || this.generateId( concept ), updateSet = {};
+// 
+//              ////////////////////////////// linkage /////////////////////////////////    
+//              for( var link in links )
+//              {
+//                  if( data[i][link] )
+//                  {
+//                      var isConcept = false;
+//                    
+//                      if( isConcept = this.isConcept( concept, link ) )
+//                          data[i][link] = [ data[i][link] ];
+// 
+//                      var _this = this;
+// 
+//                      $.each( data[i][link], function( ii, el ){
+// 
+//                              var isRef = false;
+// 
+//                              if( isRef = ($.type(el) === "string") )
+//                                  el = { id: el };
+// 
+//                              var nestedLinks = _this.links( links[link], true );
+//                              //removido pois o mesmo esta gerando inconsistencia em tudo
+//                              //if( DataLayer.isConcept( links[link], nestedLinks[concept] ) )
+//                              if( isConcept )
+//                              {
+//                                  el[ nestedLinks[link] ] = el[ nestedLinks[link] ] || [];
+//                                  el[ nestedLinks[link] ].push( key );
+//                              }
+//                              else
+//                                  el[ nestedLinks[link] ] = key;
+// 
+//                              if( isRef && ( !current[ key ] || !current[ key ][ link ] || 
+//                                             (isConcept ? current[ key ][ link ] !== el.id : !$.inArray( el.id, current[ key ][ link ] )) ) )
+//                              {
+//                                  updateSet[ links[link] ] = updateSet[ links[link] ] || [];
+//                                  updateSet[ links[link] ].push( el );
+//                              }
+//                              else if( !isRef )
+//                                  data[i][link][ii] = _this.put( links[link], el, oneSide );
+//                          });
+// 
+//                      if( isConcept )
+//                          data[i][link] = data[i][link][0];
+//                  }
+//              }
+//              //////////////////////////////////////////////////////////////////////////
+// 
+//              if( data[i].id )
+//                  data[i] = this.merge( current[ data[i].id ], data[i] );
+// 
+//               current[ key ] = data[i];
+// 
+//              if( bothSides )
+//                this.report( concept, key, data[i] );
+//          }
+// 
+//          this.store( concept, current );
+// 
+//          for( var setKey in updateSet )
+//          {
+//              if( bothSides )
+//                  for( var i = 0; i < updateSet[ setKey ].length; i++ )
+//                    this.report( setKey, updateSet[ setKey ][i].id, updateSet[ setKey ][i] );
+//                  
+//              DataLayer.put( setKey, updateSet[ setKey ], false );
+//          }
+//      }
+// 
+//      if( oneSide ) 
+//          this.commit( concept, ids/*, true */);
+// 
+//      this.broadcast( concept, oneSide ? 'server' : bothSides ? 'serverclient' : 'client', true );
+// 
+//      return( notArray ? ids[0] : ids );
+// 
+//     },
+//     
+//     remove: function( concept, id, oneSide ){
+//       
+//      var bothSides = (typeof oneSide === "undefined"),
+// 
+//      links = this.links( concept ), ids = [],
+// 
+//      current = this.check( concept, id );
+// 
+//      if( !current ) return;
+//      
+//      if( id )
+//          current.id = id;
+// 
+//      if( notArray = ( $.type( current ) !== "array" ) )
+//          current = [ current ];
+// 
+//      for( var i = 0; i < current.length; i++ )
+//      {
+//          var currentId = ids[ ids.length ] = current[i].id;
+// 
+//          if( bothSides )
+//            this.report( concept, currentId, false );
+// 
+//          if( bothSides || !oneSide )
+//            this.del( concept, currentId );
+// 
+//          for( var link in links )
+//          {
+//              if( !current[i][link] )
+//                  continue;
+// 
+//              var nestedLinks = this.links( links[link], true );
+// 
+//              if( isConcept = this.isConcept( concept, link ) )
+//                  current[i][link] = [ current[i][link] ];
+// 
+//              $.each( current[i][link], function( ii, el ){
+// 
+//                      el = DataLayer.storage.cache[links[link]][el];
+// 
+//                      if( notArrayNested = ( $.type( el[ nestedLinks[link] ] ) !== "array" ) )
+//                          el[ nestedLinks[link] ] = [ el[nestedLinks[link]] ];
+// 
+//                      el[ nestedLinks[link] ] = $.grep( el[ nestedLinks[link] ], function( nested, iii ){
+//                          return ( currentId !== nested );
+//                      });
+// 
+//                      if( notArrayNested )
+//                          el[ nestedLinks[link] ] = el[ nestedLinks[link] ][0] || false;
+//                      if(!el[ nestedLinks[link] ] || !el[ nestedLinks[link] ].length)
+//                              delete el[ nestedLinks[link] ];
+//              });
+//          }
+//      }
+// 
+//      if( oneSide )
+//          this.commit( concept, ids );
+// 
+//      this.broadcast( concept, oneSide ? 'server' : bothSides ? 'serverclient' : 'client', false );
+//     },
+//     
+//     report: function( concept, id, data )
+//     {      
+//      var current = this.check( ':current', concept ) || {};
+// 
+//      if( !current[ id ] )
+//          current[ id ] = this.check( concept, id ) || {};
+//      
+//      this.store( ':current', concept, current );
+// 
+//      var diff = this.diff( current[ id ], data );
+// 
+//      var diffs = this.check( ':diff', concept ) || {};
+// 
+//      if( diffs[ id ] )
+//          diff = this.merge( diffs[ id ], diff );
+// 
+//      if( !diff || !$.isEmptyObject( diff ) )
+//          diffs[ id ] = diff;
+// 
+//      this.store( ':diff', concept, diffs );
+//     },
+// 
+// //     enqueue: function( queueName, concept, id, data ){
+// // 
+// //   var queue = this.check( ':' + queueName, concept ) || {};
+// // 
+// // 
+// //     },
+// //     
+// //     dequeue: function( queueName, concept, id ){
+// // 
+// //   
+// // 
+// //     },
+//     
+//     
+//     
+//     rollback: function( concept, ids ){
+//       
+//      var queue = this.prepareQ( 'current', concept, ids );
+// 
+//      ids = [];
+// 
+//      for( var id in queue )
+//      {
+//           this.put( concept, id, queue[id], false );
+// 
+//           ids[ ids.length ] = id;
+//      }
+// 
+//      this.clearQ( concept, ( ids.length ? ids : false ) );
+// 
+//      this.broadcast( concept, 'revert' );
+//       
+//     },
+//     
+//     prepareQ: function( queueName, concept, ids ){
+//       
+//       var notArray = false;
+//       
+//       if( notArray = ($.type(concept) !== "array") )
+//        concept = [ concept ];
+//       
+//       var q = {};
+//       
+//       for( var i = 0; i < concept.length; i++ )
+//       {
+//        var queue = this.check( ':' + queueName, concept[i] || false );
+//        
+//        if( !queue ) continue;
+// 
+//        if( ids )
+//        {
+//            if( $.type(ids) !== "array" )
+//                ids = [ ids ];
+// 
+//            var filtered = {};
+// 
+//            for( var ii = 0; ii < ids.length; ii++ )
+//            {
+//                filtered[ ids[ii] ] = queue[ ids[ii] ];
+//            }
+// 
+//            queue = filtered;
+//        }
+// 
+//        q[ concept[i] ] = queue;
+//       }
+//       
+//       return( notArray ? q[ concept[0] ] : q );
+//     },
+//     
+//     clearQ: function( concept, ids ){
+//       
+//              var current = this.check( ':current', concept || false );
+//      var diffs = this.check( ':diff', concept || false );
+// 
+//      if( !ids )
+//          current = diffs = {};
+//      else
+//      {
+//          if( notArray = ($.type(ids) !== "array") )
+//            ids = [ ids ];
+// 
+//          for( var i = 0; i < ids.length; i++ )
+//          {
+//              delete current[ ids[i] ];
+//              delete diffs[ ids[i] ];
+//          }
+//      }
+// 
+//      this.store( ':current', concept, current );
+//      this.store( ':diff', concept, diffs );
+//     },
+// 
+//     commit: function( concept, ids, callback ){
+//       
+//      var queue = this.prepareQ( 'diff', concept, ids );
+// 
+//      this.sync( queue, !$.isArray(concept) && concept || false, callback );
+//     },
+//     
+//     sync: function( queue, concept, callback ){
+// 
+//      if( !queue || $.isEmptyObject( queue ) )
+//          return;
+// 
+//      if( concept )
+//      {
+//        var helper = {}; 
+//        helper[concept] = queue; 
+//        queue = helper;
+//      }
+// 
+//      var data = {}, URIs = {};
+// 
+//      for( var concept in queue )
+//          for( var id in queue[concept] )
+//          {
+//              data[ this.URI( concept, id ) ] = queue[concept][id];
+//              URIs[ this.URI( concept, id ) ] = { concept: concept, id: id };
+//          }
+// 
+//      if( $.isEmptyObject( data ) )
+//          return;
+// 
+//      this.dispatch( "Sync", data, function( data, status, jqXHR ){
+// 
+// //       switch( status )
+// //       {
+// //         case "error":
+// //         case "parsererror":
+// //           return DataLayer.rollback( concept, URI );
+// //         case "success":
+// //           return DataLayer.commit();
+// //         case "timeout":
+// //         case "notmodified":
+// //       }
+// 
+//          var received = DataLayer.receive( data );
+// 
+//          for( var URI in URIs )
+//              if( typeof received[URI] !== "undefined" )
+//                  DataLayer.clearQ( URIs[URI].concept, URIs[URI].id );
+// 
+//          if( callback )
+//              callback( received );
+// 
+// //       for( var URI in data )
+// //       { 
+// //           var parsed = DataLayer.parseURI( URI ),
+// //    
+// //           concept = parsed[1], id = parsed[3];
+// // 
+// //           if( $.type(data[URI]) === "string" )
+// //           {
+// //             //TODO:threat the exception thrown
+// //             DataLayer.rollback( concept, id );
+// //             delete URIs[ URI ];
+// //             continue;
+// //           }
+// // 
+// //           if( data[URI] === false ){
+// //             DataLayer.remove( concept, id, false );
+// //             continue;
+// //           }
+// // 
+// //           if( id !== data[URI].id )
+// //             DataLayer.move( concept, id, data[URI].id );
+// //           
+// //           DataLayer.put( concept, id, data[URI], false );
+// //       }
+// //       
+// //       for( var URI in URIs )
+// //            DataLayer.clearQ( URIs[URI].concept, URIs[URI].id );
+// //       
+// //       if( callback )
+// //           callback();
+// 
+//      }, true );
+// 
+//     },
+//     
+//     receive: function( data ){
+//       
+//      var received = {};
+//      
+//          for( var URI in data )
+//          { 
+//              var parsed = DataLayer.parseURI( URI ),
+//    
+//          concept = parsed[4], id = parsed[5];
+// 
+//          received[ URI ] = data[ URI ];
+// 
+//              if( $.type(data[URI]) === "string" )
+//              {
+//                //TODO:threat the exception thrown
+//                DataLayer.rollback( concept, id );
+//                continue;
+//              }
+// 
+//              if( data[URI] === false ){
+//                DataLayer.remove( concept, id, false );
+//                continue;
+//              }
+// 
+//              if( id !== data[URI].id )
+//                DataLayer.move( concept, id, data[URI].id );
+//              
+//              DataLayer.put( concept, id, data[URI], false );
+//          }
+//          
+//      return( received );
+//          
+//     },
+//     
+//     unique: function( origArr ){ 
+// 
+//      var newArr = [];
+//       
+//      for ( var x = 0; x < origArr.length; x++ )
+//      {
+//              var found = false;
+//          for ( var y = 0; !found && y < newArr.length; y++ ) 
+//              if ( origArr[x] === newArr[y] )  
+//                found = true;
+// 
+//          if ( !found ) 
+//              newArr[ newArr.length ] = origArr[x];
+//      }
+// 
+//      return newArr;
+//     },
+// 
+//     merge: function( current, data ){
+//       
+//      return this.copy(  data, current );
+// 
+// //   return $.extend( current, data );
+// 
+//     },
+//     
+//     // clone objects, skip other types.
+//     clone: function(target) {
+//          if ( typeof target == 'object' ) {
+//                  Clone.prototype = target;
+//                  return new Clone();
+//          } else {
+//                  return target;
+//          }
+//     },
+//       
+//     // Shallow Copy 
+//     shallowCopy: function(target) {
+//          if (typeof target !== 'object' ) {
+//                  return target;  // non-object have value sematics, so target is already a copy.
+//          } else {
+//                  var value = target.valueOf();
+//                  if (target != value) { 
+//                          // the object is a standard object wrapper for a native type, say String.
+//                          // we can make a copy by instantiating a new object around the value.
+//                          return new target.constructor(value);
+//                  } else {
+//                          // ok, we have a normal object. If possible, we'll clone the original's prototype 
+//                          // (not the original) to get an empty object with the same prototype chain as
+//                          // the original.  If just copy the instance properties.  Otherwise, we have to 
+//                          // copy the whole thing, property-by-property.
+//                          if ( target instanceof target.constructor && target.constructor !== Object ) { 
+//                                  var c = clone(target.constructor.prototype);
+//       
+//                                  // give the copy all the instance properties of target.  It has the same
+//                                  // prototype as target, so inherited properties are already there.
+//                                  for ( var property in target) { 
+//                                          if (target.hasOwnProperty(property)) {
+//                                                  c[property] = target[property];
+//                                          } 
+//                                  }
+//                          } else {
+//                                  var c = {};
+//                                  for ( var property in target ) c[property] = target[property];
+//                          }
+//                          
+//                          return c;
+//                  }
+//          }
+//     },
+// 
+//     // entry point for deep copy.
+//     // source is the object to be deep copied.
+//     // depth is an optional recursion limit. Defaults to 256.
+//     // deep copy handles the simple cases itself: non-objects and object's we've seen before.
+//     // For complex cases, it first identifies an appropriate DeepCopier, then delegate the details of copying the object to him.
+//     copy: function(source, result, depth) {
+//       
+//          // null is a special case: it's the only value of type 'object' without properties.
+//          if ( source === null ) return null;
+// 
+//          // All non-objects use value semantics and don't need explict copying.
+//          if ( typeof source !== 'object' ) return source;
+// 
+//          if( !depth || !(depth instanceof RecursionHelper) ) depth = new RecursionHelper(depth);
+// 
+//          var cachedResult = depth.getCachedResult(source);
+// 
+//          // we've already seen this object during this deep copy operation
+//          // so can immediately return the result.  This preserves the cyclic
+//          // reference structure and protects us from infinite recursion.
+//          if ( cachedResult ) return cachedResult;
+// 
+//          // objects may need special handling depending on their class.  There is
+//          // a class of handlers call "DeepCopiers"  that know how to copy certain
+//          // objects.  There is also a final, generic deep copier that can handle any object.
+//          for ( var i=0; i<this.comparators.length; i++ ) {
+// 
+//                  var comparator = this.comparators[i];
+// 
+//                  if ( comparator.can(source) ) {
+//      
+//                          // once we've identified which DeepCopier to use, we need to call it in a very
+//                          // particular order: create, cache, populate.  This is the key to detecting cycles.
+//                          // We also keep track of recursion depth when calling the potentially recursive
+//                          // populate(): this is a fail-fast to prevent an infinite loop from consuming all
+//                          // available memory and crashing or slowing down the browser.
+//       
+//                          if( !result )
+//                              // Start by creating a stub object that represents the copy.
+//                              result = comparator.create(source);
+//                          else if( !comparator.can(result) )
+//                              throw new Error("can't compare diferent kind of objects.");
+// 
+//                          // we now know the deep copy of source should always be result, so if we encounter
+//                          // source again during this deep copy we can immediately use result instead of
+//                          // descending into it recursively.  
+//                          depth.cacheResult(source, result);
+// 
+//                          // only DeepCopier.populate() can recursively deep copy.  So, to keep track
+//                          // of recursion depth, we increment this shared counter before calling it,
+//                          // and decrement it afterwards.
+//                          depth.depth++;
+//                          if ( depth.depth > depth.maxDepth ) {
+//                                  throw new Error("Exceeded max recursion depth in deep copy.");
+//                          }
+// 
+//                          // It's now safe to let the comparator recursively deep copy its properties.
+//                          var returned = comparator.populate( function(source, result) { return DataLayer.copy(source, result, depth); }, source, result );
+//      
+//                              if(returned)
+//                                      result = returned;
+// 
+//                          depth.depth--;
+// 
+//                          return result;
+//                  }
+//          }
+//          // the generic copier can handle anything, so we should never reach this line.
+//          throw new Error("no DeepCopier is able to copy " + source);
+//     },
+// 
+//     // publicly expose the list of deepCopiers.
+//     comparators: [],
+// 
+//     // make deep copy() extensible by allowing others to 
+//     // register their own custom Comparators.
+//     registerComparator: function(comparatorOptions) {
+// 
+//        // publicly expose the Comparator class.
+//        var comparator = {
+// 
+//            // determines if this Comparator can handle the given object.
+//            can: function(source) { return false; },
+//     
+//            // starts the deep copying process by creating the copy object.  You
+//            // can initialize any properties you want, but you can't call recursively
+//            // into the copy().
+//            create: function(source) { },
+// 
+//            // Completes the deep copy of the source object by populating any properties
+//            // that need to be recursively deep copied.  You can do this by using the
+//            // provided deepCopyAlgorithm instance's copy() method.  This will handle
+//            // cyclic references for objects already deepCopied, including the source object
+//            // itself.  The "result" passed in is the object returned from create().
+//            populate: function(deepCopyAlgorithm, source, result) {}
+//        };
+// 
+//        for ( var key in comparatorOptions ) comparator[key] = comparatorOptions[key];
+// 
+//        this.comparators.unshift( comparator );
+//     },
+//  
+//     diff: function( base, toDiff ){
+// 
+//      if( typeof base === 'undefined' || $.isEmptyObject(base) )
+//          return( toDiff );
+// 
+//      if( toDiff === false )
+//          return( false );
+// 
+//      toDiff = $.extend( {}, toDiff );
+// 
+//      for( var key in toDiff )
+//      {
+//          switch( $.type(toDiff[key]) )
+//          {
+//            case 'object': 
+//              if( $.isEmptyObject(toDiff[key] = this.diff( base[key], toDiff[key] )) )
+//                delete toDiff[key];
+//            break;
+//            case 'array':
+//              if( base[key] && !(toDiff[key] = $.grep( toDiff[key], function( el, i ){ return( $.inArray( el, base[key] ) === -1 ); } )).length )
+//                delete toDiff[key];
+//            break;
+//            default:
+//              if( base[key] == toDiff[key] )
+//                delete toDiff[key];
+//          }
+//      }
+// 
+//      return( toDiff );
+// 
+//     },
+//     
+//     links: function( concept, reverse ){
+// 
+//      if( !this.links[ concept ] )
+//      {
+//          var result = this.dispatch( "links", { concept: concept } ) || false;
+// 
+//          if( !result )
+//              return( false );
+// 
+//          this.concepts[ concept ] = $.extend( this.concepts[ concept ] || {}, 
+//                                               result['concepts'] || {} );
+// 
+//          this.links[ concept ] =  result['links'] || {};
+//          this.nestedLinks[ concept ] = result['nestedLinks'] || {};
+//      }
+// 
+//      if( reverse )
+//      {
+//          return( this.nestedLinks[ concept ] );
+// //       var reverted = {}, llinks = this.links[ concept ];
+// //     
+// //       for( var key in llinks )
+// //           reverted[ llinks[key] ] = key;
+// // 
+// //       return( reverted );
+//      }
+// 
+//      return( this.links[ concept ] );
+// 
+//     },
+//     
+//     isConcept: function( concept, attr ){
+//       
+//      if( typeof this.concepts[concept] === "undefined" )
+//      {
+//          this.links( concept );
+//      }
+// 
+//      return !!this.concepts[ concept ][ attr ];
+//     },
+//     
+//     URI: function( concept, URI, context ){
+//       
+//      if( res = internalUrl.exec( concept ) )
+//          concept = res[1];
+//      
+//      context = context ? "(" + context + ")" : "";
+//       
+//      if( URI )
+//          return( concept + context + "://" + URI );
+//      else
+//          return( concept );
+//       
+//     },
+//     
+//     parseURI: function( URI ){
+// 
+//      return internalUri.exec( URI ) || false;
+// 
+//     },
+//     
+//     
+//    
+//     
+//     generateId: function( concept ){
+//       
+//      var newId = this.counter + "(javascript)";
+//       
+//      this.store( ":counter", (this.counter++) + "" );
+//      
+//      return( newId );
+//     },
+//    
+// 
+//    
+// 
+//     get: function( concept, /*URI, */filter, oneSide ){
+// 
+//      ///////////////////////////// normalize ////////////////////////////////
+//      if( arguments.length == 2 && $.type(filter) === "boolean" )
+//      {
+//          oneSide = filter;
+//          filter = false;
+//      }
+//      
+//      var encoder = false, id = false, bothSides = (typeof oneSide === 'undefined'), res;
+//      
+//      if( $.type(filter) === "string" )
+//      {
+//          id = filter;
+//          filter = false;
+//      }
+// 
+//      filter = filter || false;
+// 
+//      if( !concept )
+//          return( false );
+// 
+//      if( res = internalUrl.exec( concept ) )
+//      {
+//          encoder = concept;
+//          concept = res[1];
+// 
+//          if( filter )
+//              filter = this.criteria( encoder, filter );
+//      }
+//      
+//      if ( $.type(filter) === "array" )
+//      {
+//          filter = { filter: filter, criteria: false };
+//      }
+//      
+//      //////////////////////////////////////////////////////////////////////////
+//      
+//      var result = false;
+// 
+//      if( bothSides || !oneSide )
+//          result = this.check( concept, id || filter );
+// 
+//      if( !result && (bothSides || oneSide) )
+//      {
+//          result = this.request( concept, id || filter.filter, filter.criteria );
+// 
+//          if( result && bothSides && (!filter || 
+//                                      !filter.criteria || 
+//                                      !filter.criteria.format) )
+//          {
+//            var newResult = [];
+//          
+//            for( var i = 0; i < result.length; i++ )
+//                newResult[i] = $.extend( {}, result[i] );
+// 
+//            this.put( concept, id, newResult, false );
+//          }
+//      }
+// 
+//      if( /*result &&*/ encoder )
+//          result = this.encode( encoder, result, filter ); //TODO: retirar o filtro no método encode
+// 
+//      return( result );
+//     },
+//     
+//     filter: function( base, filter, criteria ){
+//       
+//      var filtered = [];
+//       
+//      for( var key in base )
+//      {
+// //       if( !noGroup )
+// //           for( var i = 0, current = original; i < filter.length && ( current === original ); i++ )
+// //               current = this.compare( operator, current, this.compare( base[key], filter[i] ) );
+// 
+//          if( this.storage.filter( base[key], filter ) )
+//              filtered[ filtered.length ] = key;
+//      }
+// 
+//      return( filtered );
+//     },
+//     
+//     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 );
+//       }
+//       
+//     },
+//     
+// //     clone: function( object ){
+// // 
+// //   new { prototype: object };
+// // 
+// //     },
+// 
+//     check: function( namespace, keys ){
+// 
+//      if( !namespace )
+//          return( false );
+// 
+//      var result = this.storage.get( namespace );
+// 
+//      if( !keys || !result )
+//        return( result || false );
+// 
+//      if( notArray = $.type(keys) === "string" )
+//          keys = [ keys ];
+//      else if( $.type(keys) !== "array" )
+//          keys = this.filter( result, keys.filter, keys.criteria );
+// 
+//      var res = [];
+// 
+//      for( var i = 0; i < keys.length; i++ )
+//          res[ res.length ] = result[keys[i]];
+// 
+//      return( notArray ? res[0] || false : res.length ? res : false );
+//     },
+// 
+//     storage: {
+//       
+//      cache: {},
+//       
+//      set: function( key, value ){
+// 
+//          this.cache[key] = value;
+// 
+//      },
+//      get: function( key ){
+// 
+//          return DataLayer.copy( this.cache[key] );
+// 
+//      },
+//      del: function( key ){
+// 
+//          delete this.cache[key];
+// 
+//      },
+//      
+//      filter: function( base, filter ){
+//       
+//          var bool, op = filter.shift();
+// 
+//          switch( op )
+//          {
+//              case 'IN':
+//                for( var i = 0, f = []; i < filter[1].length || !(filter = f); i++ )
+//                    f[i] = [ '=', filter[0], filter[1][i] ];
+//              case 'OR':
+//                  op = '|';
+//                  bool = false;
+//              break;
+//              case 'AND': 
+//                  op = '&';
+//                  bool = true;
+//              break;
+//              default : return DataLayer.compare( op, base[ filter[0] ], filter[1] );
+//          }
+//          
+//          for( var strict = bool; 
+// 
+//              filter.length && ( strict ? bool : !bool ); 
+//          
+//              bool = DataLayer.compare( op, bool, this.filter( base, filter.shift() ) ) );
+// 
+//          return( bool );
+//      }
+//     },
+// 
+//     flush: function(){
+// 
+//     },
+//     
+//     restore: function(){
+//       
+//     },
+// 
+//     store: function( namespace, key, data ){
+// 
+//      if( !data )
+//        return this.storage.set( namespace, key );
+// 
+//      var res = this.check( namespace ) || {};
+// 
+//      res[key] = data;
+// 
+//      return this.storage.set( namespace, res );
+//     },
+// 
+//     del: function( namespace, key ){
+//       
+//      if( !key )
+//        return this.storage.del( namespace );
+// 
+//      var res = this.check( namespace ) || {};
+// 
+//      delete res[key];
+// 
+//      return this.storage.set( namespace, res );
+//       
+//     },
+//     
+//      move: function( concept, oldId, newId ){
+// 
+//      this.put( concept, newId, this.check( concept, oldId ), false );
+// 
+//      this.remove( concept, oldId, false );
+//     },
+//     
+// 
+//     
+//     
+//     
+//     request: function( concept, filter, criteria ){
+// 
+//       var id = false, criteria = criteria || {};
+// 
+//       if( $.type(filter) === "string" )
+//       {
+//        id = filter;
+//        filter = false;
+//       }
+// 
+//       return this.dispatch( "request", { 
+// 
+//        concept: concept || '',
+//        id: id || '',
+//        filter: filter || '',
+//        criteria: criteria || '',
+//        service: criteria.service || '',
+//        properties: criteria.properties || ''
+// 
+//       } );
+//     },
+// 
+//     
+//     //         sync: function( data, callback ){
+// // 
+// //   if( !data || $.isEmptyObject( data ) )
+// //       return;
+// //       
+// //   this.send( "Sync", data, function( data, status, jqXHR ){
+// // 
+// // //            switch( status )
+// // //            {
+// // //              case "error":
+// // //              case "parsererror":
+// // //                return DataLayer.rollback( concept, URI );
+// // //              case "success":
+// // //                return DataLayer.commit();
+// // //              case "timeout":
+// // //              case "notmodified":
+// // //            }
+// // 
+// //       if( callback )
+// //       {
+// //           var result = callback( data, status, jqXHR );
+// // 
+// //           if( result === false )
+// //               return;
+// //           else if( typeof result != "undefined" )
+// //               data = result;
+// //       }
+// // 
+// //       for( var URI in data )
+// //       { 
+// //           var parsed = DataLayer.parseURI( URI ), 
+// //    
+// //           concept = parsed[1], /*URI = parsed[3],*/
+// // 
+// //           links = DataLayer.links( concept );
+// // 
+// //           for( var linkName in links )
+// //           {
+// //               var subURI = data[URI][linkName];
+// // 
+// //               if( subURI && data[subURI] )
+// //               {
+// //                   data[URI][linkName] = DataLayer.put( linkName, subURI, data[subURI], false );
+// // 
+// //                   delete( data[subURI] );
+// //               }
+// //           }
+// // 
+// //           DataLayer.put( concept, URI, data[URI], false );
+// //       }
+// //   }, true );
+// // 
+// //     },
+// 
+// //     report: function( concept, URI, data, sync )
+// //     {
+// //   var current = this.dequeue( 'current', concept, URI );
+// // 
+// //   if( !current )
+// //       this.enqueue( 'current', concept, URI, ( current = this.check( concept, URI ) || {} ) );
+// // 
+// //   var diff = this.diff( current, data );
+// // 
+// //   if( !diff )
+// //       this.dequeue( 'current', concept, URI, true );
+// //   else
+// //       this.enqueue( 'diff', concept, URI, diff );
+// //   
+// //   if( sync )
+// //       this.commit( concept, URI, function(){ 
+// // 
+// //           DataLayer.set( concept, URI, data, false );
+// // 
+// //       });
+// //     },
+//     
+// //     enqueue: function( type, concept, URI, obj ){
+// //       
+// //   //var newURI = this.URI( concept, URI );
+// //   
+// //   if( !this.queue[type] )
+// //       this.queue[type] = {};
+// // 
+// //   if( !this.queue['all'] )
+// //       this.queue['all'] = {};
+// //   
+// //   if( !this.queue[type][concept] )
+// //       this.queue[type][concept] = {};
+// //   
+// //   if( !this.queue['all'][type] )
+// //       this.queue['all'][type] = {};
+// //   
+// //   if( !this.queue['all'][type][/*new*/URI] )
+// //       this.queue[type][concept][URI] = this.queue['all'][type][/*new*/URI] = obj;
+// // 
+// //   this.store( ':queue', this.queue );
+// //     },
+// //     
+// //     dequeue: function( type, concept, URI, remove ){
+// //       
+// //       ///////////////////////////// normalize ////////////////////////////////
+// //   if( arguments.length < 4 && $.type(URI) === 'boolean' )
+// //   {
+// //       remove = URI;
+// //       URI = false;
+// //   }
+// //   if( arguments.length < 3 && $.type(concept) === 'boolean' )
+// //   {
+// //       remove = concept;
+// //       concept = false;
+// //   }
+// //       //////////////////////////////////////////////////////////////////////////
+// //       
+// //   if( !this.queue[type] || !this.queue['all'] )
+// //       return( false );
+// //   
+// //   if( !concept )
+// //   {
+// //       var obj = this.queue['all'][type];
+// //       
+// //       if( remove )
+// //       {
+// //           delete this.queue['all'][type];
+// //           delete this.queue[type];
+// //       }
+// // 
+// //       this.store( ':queue', this.queue );
+// //       return( obj );
+// //   }
+// // 
+// //   if( !this.queue[type][concept] )
+// //       return( false );
+// //   
+// //   if( !URI )
+// //   {
+// //       var obj = this.queue[type][concept];
+// // 
+// //       if( remove )
+// //       {
+// //           var URIs = this.queue[type][concept];
+// // 
+// //           for( var subURI in URIs )
+// //                delete this.queue['all'][type][subURI];
+// // 
+// //           delete this.queue[type][concept];
+// //       }
+// // 
+// //       this.store( ':queue', this.queue );
+// //       return( obj );
+// //   }
+// // 
+// // //        var newURI = URI ? this.URI( concept, URI ) : concept;
+// //   
+// //   var obj = this.queue['all'][type][/*new*/URI];
+// //   
+// //   if( remove )
+// //   {
+// //       delete this.queue['all'][type][/*new*/URI];
+// //       delete this.queue[type][concept][URI];
+// //   }
+// // 
+// //   this.store( ':queue', this.queue );
+// //   return( obj );
+// //     },
+//     
+//            //TODO: definir a 'usage' desta função e refatora-la
+// //     set: function( concept, filter, data, oneSide ){
+// // 
+// //   ///////////////////////////// normalize ////////////////////////////////
+// //   if( arguments.length == 2 )
+// //   {
+// //       data = filter;
+// //       filter = false;
+// //   }
+// //   if( $.type(data) === "boolean" )
+// //   {
+// //       oneSide = data;
+// //       data = filter;
+// //       filter = false;
+// //   }
+// //   
+// //   if( !concept || !data )
+// //       return( false );
+// // 
+// //   var decoder = "", URI = false, bothSides = (typeof oneSide === "undefined");
+// //   
+// //   if( $.type(filter) === "string" )
+// //   {
+// //       URI = filter;
+// //       filter = false;
+// //   }
+// // 
+// //   if( res = internalUrl.exec( concept ) )
+// //   {
+// //       //TODO: verificar se a decodificaçao deve ser feita em cada item do array
+// //       data = this.decode( concept, data );
+// //       concept = res[1];
+// //       decoder = res[2];
+// //   }
+// //   ///////////////////////////////////////////////////////////////////////////
+// // 
+// //   if( bothSides || oneSide )
+// //       this.report( concept, URI, data, !bothSides );
+// // 
+// //   if( bothSides || !oneSide )
+// //   {
+// //       if( URI )
+// //       {
+// //         var helper = {}; 
+// //         helper[URI] = data; 
+// //         data = helper;
+// //       }
+// // 
+// //       for( var URI in data )
+// //       {
+// //           var current = this.check( concept, URI ) || {};
+// // 
+// //           data[URI] = this.merge( current, data[URI] );
+// // 
+// //           this.store( concept, URI, data[URI] );
+// //       }
+// // 
+// //   }
+// // 
+// //   this.broadcast( concept, oneSide ? 'client' : 'server' );
+// // 
+// //   return( true );
+// //     },
+// //     put: function( concept, URI, data, oneSide ){
+// //       
+// //       ///////////////////////////// normalize ////////////////////////////////
+// //   if( $.type(URI) !== "string" && arguments.length < 4 )
+// //   {
+// //       oneSide = data;
+// //       data = URI;
+// //       URI = false;
+// //   }
+// //       ////////////////////////////////////////////////////////////////////////
+// //       
+// //       ////////////////////////////// linkage /////////////////////////////////
+// //   var result = false, links = this.links( concept );
+// // 
+// //   for( var link in links )
+// //   {
+// //       if( data[link] )
+// //       {
+// //           if( $.isArray( data[link] ) )
+// //           {
+// //               data[link] = this.put( links[link], data[link].URI, data[link], oneSide );
+// //           }
+// //           else if( $.isObject( data[link] ) )
+// //           {
+// //               $.each( data[link], function( i, el ){
+// // 
+// //                     data[link][i] = this.put( links[link], el.URI, el, oneSide );
+// // 
+// //               });
+// //           }
+// //       }
+// //   }
+// //       //////////////////////////////////////////////////////////////////////////
+// //     
+// //   if( typeof data.URI === "undefined" )
+// //   {
+// //       URI = this.add( concept, data, oneSide );
+// //   }
+// //   else if( data.URI === false )
+// //   {
+// //       status = this.remove( concept, URI, oneSide );
+// //   }
+// //   else
+// //   {
+// //       status = this.set( concept, URI, data, oneSide );
+// //   }
+// // 
+// //   if( URI && data.URI && URI !== data.URI )
+// //       this.move( concept, URI, data.URI );
+// // 
+// //   return( data.URI || URI );
+// // 
+// //     },
+//     
+//     //     add: function( concept, data, oneSide ){
+// //       
+// //       ///////////////////////////// normalize ////////////////////////////////
+// //   if( !concept || !data )
+// //       return( false );
+// // 
+// //   if( res = internalUrl.exec( concept ) )
+// //   {
+// //       //TODO: verificar se a decodificaￜￜo deve ser feita em cada item do array
+// //       data = this.decode( concept, data );
+// //       concept = res[1];
+// //       decoder = res[2];
+// //   }
+// // 
+// //   var bothSides = (typeof oneSide === "undefined"), uris = [];
+// // 
+// //   if( notArray = $.type(data) !== "array" )
+// //       data = [ data ];
+// //       //////////////////////////////////////////////////////////////////////////
+// // 
+// //   for( var i = 0; i < data.length; i++ )
+// //   {
+// //       var URI = uris[i] = this.generateURI( concept );
+// // 
+// //       this.set( concept, URI, data[i], oneSide );
+// //   }
+// // 
+// //   return( notArray ? uris[0] : uris );
+// //     },
+// //      put: function( concept, data ){
+// // 
+// //   var decoder = "";
+// // 
+// //   if( res = internalUrl.exec( concept ) )
+// //   {
+// //       data = this.decode( concept, data );
+// //       concept = res[1];
+// //       decoder = res[2];
+// //   }
+// // 
+// //   var New = [], Update = [], uris = [];
+// // 
+// //   if( notArray = $.type(data) !== "array" )
+// //       data = [ data ];
+// //   
+// //   for( var i = 0; i < data.length; i++ )
+// //   {
+// //       if( !data[i].URI )
+// //       {
+// //           uris[ uris.length ] = data[i].URI = this.create( concept, data[i] );
+// //           New[ New.length ] = data[i];
+// //           continue;
+// //       }
+// // 
+// //       for( var key in data[i] )
+// //           if( klass = this.isReference( concept, key, data[i][key] ) )
+// //                 data[i][key] = this.put( klass + decoder, data[i][key] );
+// // 
+// //       Update[ Update.length ] = this.update( concept, data[i].URI, data[i] );
+// //   }
+// // 
+// //   this.report( concept, { "created": New, "updated": Update });
+// // 
+// //   return( notArray ? uris[0] : uris );
+// //     },
+// //     merge: function( concept, current, data ){
+// // 
+// //   current = current || {};
+// // 
+// //   for( var key in data )
+// //       current[key] = (klass = this.isReference( concept, key, data[key] )) ? 
+// //                      this.merge( klass, current[key], data[key] ) : data[key];
+// // 
+// //   return( current );
+// //     },
+// // 
+// //     isReference: function( concept, key, value ){
+// // 
+// //       return( ($.type(value) === "object" || 
+// //          $.type(value) === "array" )? this.links[concept][key] : false );
+// // 
+// //     },
+// //     
+// //     set: function( concept, data, URI, mergeable ){
+// //   
+// //   if( URI )
+// //   {
+// //       var res = this.get( concept, true ) || {};
+// //       
+// //       if( mergeable )
+// //           data = this.merge( res[URI] || {}, data );
+// // 
+// //       res[URI] = data;
+// // 
+// //       data = res;
+// //   }
+// // 
+// //   return this.store( concept, data );
+// //     },    
+// // 
+// //     create: function( concept, data ){
+// // 
+// //       if( notArray = ($.type(data) !== "array") )
+// //       data = [ data ];
+// // 
+// //       var uris = [];
+// // 
+// //       for( var i = 0; i < data.length; i++ )
+// //       {
+// //     uris[ uris.length ] = data[i].URI = "javascript://" + (this.counter + i);
+// // 
+// //     this.set( concept, data[i], data[i].URI );
+// //       }
+// //  
+// //       this.set( ":counter", (this.counter += data.length) );
+// // 
+// //       return notArray ? uris[0] : uris;
+// //     },
+// // 
+// //     update: function( concept, URI, data )
+// //     {
+// //   var target = this.check( concept, URI ) || {};
+// // 
+// //   target = this.merge( concept, target, data );
+// // 
+// //   if( target.URI !== URI )
+// //       this.remove( concept, URI );
+// // 
+// //   this.set( concept, target, target.URI );
+// // 
+// //   return( target );
+// //     },
+// // 
+// //     remove: function( concept, URI ){
+// // 
+// //   if( !URI )
+// //       return this.storage.del( concept );
+// // 
+// //   var res = this.check( concept );
+// // 
+// //   delete res[URI];
+// //   
+// //   this.set( concept, res );
+// //     },
+// // 
+// //     del: function( concept, URI ){
+// // 
+// //   this.remove( concept, URI );
+// // 
+// //   this.report( concept, { "deleted": { 'URI': URI } });
+// //     },
+// // 
+// //     report: function( concept, changes ){
+// // 
+// //       this.broadcast( concept, changes.created, changes.updated, changes.deleted );
+// // 
+// //   if( changes.created )
+// //       this.sync( concept, changes.created, 'create' );
+// //   if( changes.updated )
+// //       this.sync( concept, changes.updated, 'update' );
+// //   if( changes.deleted )
+// //       this.sync( concept, changes.deleted, 'delete' );
+// // 
+// //     },
+// // 
+// // 
+// //    sync: function( concept, data, type ){
+// // 
+// //   if( $.type(data) !== "array" )
+// //       data = [ data ];
+// // 
+// //   $.each( data, function( i, el ){
+// // 
+// //      DataLayer.send( concept, el, type );
+// // 
+// //   });
+// // 
+// //     },
+// //     
+// //     
+// //     
+// //     
+// // 
+// //     request: function( concept, URI, filter ){
+// // 
+// // //       if( startsDoubleDot.test(concept) )
+// // //          return( false );
+// // 
+// //       filter = filter || {};
+// // 
+// //       if( URI )
+// //   filter.URI = URI;
+// // 
+// //       return this.send( concept, filter, "read", true );
+// // 
+// //     },
+// // 
+// //     send: function( concept, data, type, wait ){
+// // 
+// //       switch( type )
+// //       {
+// //   case "create": type = "POST"; break;
+// //   case "update": type = "PUT"; break;
+// //   case "delete": type = "DELETE"; break;
+// //   case "read": type = "GET"; break;
+// //       }
+// // 
+// //       var url = this.basePath + concept;
+// // 
+// //       var result = [], notArray = false;
+// // 
+// // //      alert( data.URI );
+// // 
+// //       if( data.URI && data.URI.indexOf("javascript://") !== 0 )
+// //     url += "/" + data.URI;
+// // 
+// //       var callback = function( dt, textStatus, jqXHR ){
+// // 
+// //       if( notArray = (!$.isArray( dt )) )
+// //           dt = [ dt ];
+// // 
+// //       $.each( dt, function( i, el ){
+// // 
+// //           if( !el || !el.URI )
+// //               return;
+// // 
+// //           if( data.URI )
+// //               el = DataLayer.update( concept, data.URI, el );
+// //           else
+// //               DataLayer.set( concept, el, el.URI );
+// // 
+// //           result[ result.length ] = el;
+// //           DataLayer.broadcast( concept );
+// //     });
+// //       };
+// // 
+// //       $.ajax({
+// //         'async': ( !wait ),
+// //         'url': url,
+// //         'type': type,
+// //         'success': callback,
+// //         'dataType': 'json',
+// //         'data': data/*,
+// //         'processData': false*/
+// //     });
+// // 
+// //       return( notArray ? result[0] || false : result );
+// //     },
+//     
+//     
+//     generateURI: function( concept ){
+//       
+//      return this.URI( concept, this.generateId( concept ), "javascript" );
+// 
+//     },
+//     
+// 
+//     broadcast: function( concept, status, diff ){
+// 
+//      if( this.listeners[ concept ] )
+//          for( var i = 0; 
+//              i < this.listeners[ concept ].length; 
+//              this.listeners[ concept ][ i++ ]( status, diff ) );
+//     },
+// 
+//     listen: function( concept, listener ){
+// 
+//      this.register( "listeners", concept, listener );
+// 
+//     },
+// 
+//     codec: function( concept, namespace, codec ){
+// 
+//      if( codec.encoder )
+//          this.encoder( concept, namespace, codec.encoder );
+//      if( codec.decoder )
+//          this.decoder( concept, namespace, codec.decoder );
+//      if( codec.criteria )
+//          this.register( "criterias", concept + ":" + namespace, codec.criteria );
+// 
+//     },
+// 
+//     encoder: function( concept, namespace, encoder ){
+// 
+//      this.register( "encoders", concept + ":" + namespace, encoder );
+// 
+//     },
+// 
+//     encode: function( encoder, data, filter ){
+// 
+//      if( this.encoders[ encoder ] )
+//          for( var i = 0;
+//              i < this.encoders[ encoder ].length;
+//              data = this.encoders[ encoder ][ i++ ]( data, filter ) );
+// 
+//      return( data );
+//     },
+// 
+//     decoder: function( concept, namespace, decoder ){
+// 
+//      this.register( "decoders", concept + ":" + namespace, decoder );
+// 
+//     },
+// 
+//     decode: function( decoder, data ){
+// 
+//      if( this.decoders[ decoder ] )
+//          for( var i = 0;
+//              i < this.decoders[ decoder ].length;
+//              data = this.decoders[ decoder ][ i++ ]( data ) );
+// 
+//      return( data );
+//     },
+// 
+//     criteria: function( codec, filter ){
+// 
+//      if( this.criterias[ codec ] )
+//          for( var i = 0;
+//              i < this.criterias[ codec ].length;
+//              filter = this.criterias[ codec ][ i++ ]( filter ) );
+// 
+//      return( filter );
+// 
+//     },
+// 
+//     register: function( kind, concept, deployable ){
+// 
+//       if( arguments.length < 3 )
+//       {
+//        deployable = concept;
+//        concept = kind;
+//        kind = 'global';
+//       }
+// 
+//       if( !this[ kind ][ concept ] )
+//          this[ kind ][ concept ] = [];
+// 
+//      this[ kind ][ concept ][ this[ kind ][ concept ].length ] = deployable;
+// 
+//     },
+//     
+//     start: function(){
+// 
+//      var timer = function(){
+// 
+//            setTimeout( timer, 1 );
+// 
+//            var now = parseInt( $.now() / 1000 );
+// 
+//            var tasks = DataLayer.tasks[ now ];
+// 
+//            if( !tasks ) return;
+// 
+//            for( var i = 0; i < tasks.length; i++ )
+//            {
+//                var result = tasks[i].task( now );
+// 
+//                if( tasks[i].factor )
+//                DataLayer.schedule( tasks[i].task, tasks[i].factor );
+//            }
+//       
+//            delete DataLayer.tasks[ now ];
+//      };
+// 
+//      setTimeout( timer, 1 );
+//     },
+//     
+//     task: function( timestamp, task, factor )
+//     {
+//      if( !this.tasks[ timestamp ] )
+//          this.tasks[ timestamp ] = [];
+// 
+//      this.tasks[ timestamp ][ this.tasks[ timestamp ].length ] = { task: task, factor: factor || false };
+//     },
+// 
+//     schedule: function( task, time ){
+// 
+//      time = time || 1;
+//      
+//      var index = parseInt( $.now() / 1000 ) + time;
+// 
+//      this.task( index, task, time );
+//     },
+//     
+//     poll: function( concept, time ){
+//       
+//       this.schedule( function( now ){
+//   
+//        DataLayer.commit( concept );
+// 
+//      }, time || 5 );
+//     },
+//     
+//     init: function(){
+//       
+//      this.counter = parseInt( this.get( ":counter", false ) ) || 0;
+// 
+//      if( !this.dispatchPath )
+//          this.dispatchPath = "../../";
+// 
+//      if( !this.templatePath )
+//          this.templatePath = "";
+// 
+//      if( !this.basePath )
+//          this.basePath = this.dispatchPath + "REST.php?q=";
+// 
+//      this.schedule( function( now ){
+// 
+//          DataLayer.flush();
+// 
+//      });
+// 
+//      this.start();
+//     }
+// }
+// 
+// // the re-usable constructor function used by clone().
+// function Clone() {}
+// 
+// //Recursion Helper
+// function RecursionHelper(){ this.clear(); };
+// 
+// RecursionHelper.prototype = {
+//   
+//      constructor: RecursionHelper,
+// 
+//      // copiedObjects keeps track of objects already copied by this
+//      // deepCopy operation, so we can correctly handle cyclic references.
+//      copiedObjects: [],
+// 
+//      depth: 0,
+// 
+//      maxDepth: 256,
+// 
+//      //reset the recursion helper cache
+//      clear: function(){
+//              this.copiedObjects = [];
+//              this.depth = 0;
+//      },
+// 
+//      // add an object to the cache.  No attempt is made to filter duplicates;
+//      // we always check getCachedResult() before calling it.
+//      cacheResult: function(source, result) {
+//              this.copiedObjects.push([source, result]);
+//      },
+// 
+//      // Returns the cached copy of a given object, or undefined if it's an
+//      // object we haven't seen before.
+//      getCachedResult: function(source) {
+// 
+//              for ( var i=0; i<this.copiedObjects.length; i++ ) {
+//                      if ( this.copiedObjects[i][0] === source ) {
+//                              return this.copiedObjects[i][1];
+//                      }
+//              }
+// 
+//              return undefined;
+//      }
+// };
+// 
+// // Generic Object copier
+// // the ultimate fallback DeepCopier, which tries to handle the generic case.  This
+// // should work for base Objects and many user-defined classes.
+// DataLayer.registerComparator({
+//      can: function(source) { return true; },
+// 
+//      create: function(source) {
+//              if ( source instanceof source.constructor ) {
+//                      return DataLayer.clone(source.constructor.prototype);
+//              } else {
+//                      return {};
+//              }
+//      },
+// 
+//      populate: function(deepCopy, source, result) {
+//              for ( var key in source ) {
+//                      if ( source.hasOwnProperty(key) ) {
+//                              result[key] = deepCopy(source[key], result[key]);
+//                      }
+//              }
+//              return result;
+//      }
+// });
+// 
+// // Array copier
+// DataLayer.registerComparator({
+//      can: function(source) {
+//              return ( source instanceof Array );
+//      },
+// 
+//      create: function(source) {
+//              return new source.constructor();
+//      },
+// 
+//      populate: function(deepCopy, source, result) {
+//              for ( var i=0; i<source.length; i++) {
+//                      result.push( deepCopy(source[i], result[i]) );
+//              }
+//              result =  DataLayer.unique( result )
+//              return result;
+//      }
+// });
+// 
+// // Date copier
+// DataLayer.registerComparator({
+//      can: function(source) {
+//              return ( source instanceof Date );
+//      },
+// 
+//      create: function(source) {
+//              return new Date(source);
+//      }
+// });
+// 
+// // HTML DOM Node copier
+// DataLayer.registerComparator({
+// 
+//      // function to detect Nodes.  In particular, we're looking
+//      // for the cloneNode method.  The global document is also defined to
+//      // be a Node, but is a special case in many ways.
+//      can: function(source) { 
+//        
+//        if ( window.Node ) {
+//                return source instanceof Node;
+//        } else {
+//                // the document is a special Node and doesn't have many of
+//                // the common properties so we use an identity check instead.
+//                if ( source === document ) return true;
+//                return (
+//                        typeof source.nodeType === 'number' &&
+//                        source.attributes &&
+//                        source.childNodes &&
+//                        source.cloneNode
+//                );
+//        } 
+//       },
+// 
+//       create: function(source) {
+//            // there can only be one (document).
+//            if ( source === document ) return document;
+// 
+//            // start with a shallow copy.  We'll handle the deep copy of
+//            // its children ourselves.
+//            return source.cloneNode(false);
+//       },
+//       
+//       diff: function(base, source){
+//      
+//       },
+// 
+//       populate: function(deepCopy, source, result) {
+//            // we're not copying the global document, so don't have to populate it either.
+//            if ( source === document ) return document;
+// 
+//            // if this Node has children, deep copy them one-by-one.
+//            if ( source.childNodes && source.childNodes.length ) {
+//                    for ( var i=0; i<source.childNodes.length; i++ ) {
+//                            var childCopy = deepCopy(source.childNodes[i], result.childNodes[i] || false );
+//                            result.appendChild(childCopy);
+//                    }
+//            }
+//              return result;
+//       }
+// });
+// 
+// DataLayer.init();
+// 
+// // setTimeout(function(){
+// //  
+// //     
+// // 
+// // }, 1000 );
+// 
+// // var DataLayer = {
+// // 
+// //     get: function( concept, filter ){
+// // 
+// //   var data = this.storage.get( concept );
+// // 
+// //   if( !filter )
+// //       return( data );
+// // 
+// //   return this.filter( data, filter );
+// //     },
+// //     
+// //     filter:function( data, filter ){
+// //       
+// //   if( filter.charAt )
+// //       filter = { URI: filter };
+// //   
+// //   var filtered = [];
+// // 
+// //   $.each(data, function(i, obj){
+// //     
+// //       for( var attr in filter )
+// //           if( filter[attr] !== obj[attr] )
+// //               return( true );
+// // 
+// //       filtered[i] = obj;
+// //   });
+// // 
+// //   return( filtered );
+// //     },
+// // 
+// //     find: function( concept, filter, callback ){
+// // 
+// //   var data = this.get( concept, filter ); 
+// // 
+// //   if( data )
+// //       return callback( data );
+// // 
+// //   //TODO: register callback like a weak listener
+// // 
+// // //        $.ajax({ 
+// // //              type: 'GET',
+// // //              data: $.param( filter ),
+// // //              success: callback,  
+// // //              url: BASE_PATH + filter.URI || concept
+// // //        });
+// //   this.report( concept, filter );
+// //     },
+// // 
+// //     put: function( concept, data, filter ){
+// // 
+// //   var beforeDiff = this.store( concept, $.extend({},data) );
+// // 
+// //   this.report( concept, data, filter, beforeDiff );
+// //     },
+// //     
+// //     
+// //     /*var data = {
+// //                   startTime: $.now(),
+// //                   endTime: $.now() + 1800000,
+// //                   summary: "meu querido evento",
+// //                   description: "desc do evento",
+// //                   location: "prognus software livre",
+// //                   class: 1,
+// //                   calendar: 1,
+// //                   category: 1,
+// //                   participants: [ { 
+// //                                      user: { isExternal: true, mail: "user7@prognus.org", name: "user7" }
+// //                                 },{ 
+// //                                      user: "1003"
+// //                                 } ]
+// // 
+// //             };*/
+// //     
+// // 
+// //     merge:function( data, target ){
+// //       
+// //   var diff = { New: {}, Update:{}, Delete: {} };
+// //       
+// //   for( var key in data )
+// //   {
+// //       if( !target[ key ] )
+// //           diff.New[ key ] = target[ key ] = data[ key ];
+// // 
+// //       
+// //     
+// //   }
+// //       
+// //     }
+// // 
+// //     store: function( concept, data, filter ){
+// // 
+// //   if( !data.spline )
+// //       data = [ data ];
+// // 
+// //   var target = this.storage.get( concept );
+// //   
+// //   var diff = { New: {}, Update:{}, Delete: {} };
+// // 
+// //   for( var i = 0; i < data.length; i++ )
+// //   {
+// //       if( data[i].URI && target[ data[i].URI ] )
+// //       {
+// //           diff.Update[ data[i].URI ] = this.merge( target[ data[i].URI ], data[i] );
+// //       }
+// //       else
+// //       {
+// //           diff.New[] = data[i];
+// //       }
+// //   }
+// // 
+// //   
+// // 
+// //   this.broadcast( concept, data );
+// // 
+// //   if( filter )
+// //       target = this.filter( target, filter );
+// // 
+// //   if( target )
+// //       data = $.extend( target, data );
+// // 
+// //   this.storage.set( concept, data );
+// // 
+// // //        return;
+// //     },
+// //     
+// //     set: function( concept, data, filter ){
+// // 
+// //       
+// // 
+// //     },
+// // 
+// //     post: function( concept, data, filter, isNew ){
+// // 
+// //   var callback = function(  ){ DataLayer.store( concept, data, filter ) };
+// // 
+// //   //TODO: register callback like a weak listener
+// // 
+// //   this.report( concept, data, filter, isNew );
+// //     },
+// //     
+// //     report: function( concept, filter, postData, isNew ){
+// //       
+// //   $.ajax({ 
+// //           type: postData ? isNew ? 'POST' : 'PUT' : 'GET',
+// //           data: postData || $.param( filter ),
+// //           success: function( data ){ DataLayer.broadcast( concept ) },
+// //           url: BASE_PATH + filter.URI || concept
+// //     });
+// //     },
+// //     
+// //     del:function( concept, filter ){
+// // 
+// //       
+// // 
+// //     }
+// //     
+// //     broadcast: function( concept, data ){
+// // 
+// //   
+// // 
+// //     },
+// // 
+// //     pool: function(){
+// //       
+// //     },
+// //
+// //     refresh: function(){
+// //       
+// //     }
+// // };
+// 
+// // 
+// // DataLayer = {
+// //   
+// //     get: function( concept, filter ){
+// // 
+// //   var data = this.storage.get( concept );
+// // 
+// //   if( !filter )
+// //       return( data );
+// // 
+// //   if( filter.charAt )
+// //       filter = { URI: filter };
+// //   
+// //   var filtered = [];
+// // 
+// //   $.each(data, function(i, obj){
+// //     
+// //       for( var attr in filter )
+// //           if( filter[attr] !== obj[attr] )
+// //               return( true );
+// // 
+// //       filtered[i] = obj;
+// //   });
+// // 
+// //   return( filtered );
+// //     },
+// // 
+// //     find: function( concept, filter, callback ){
+// // 
+// //   var data = this.get( concept, filter ); 
+// // 
+// //   if( data )
+// //       return callback( data );
+// // 
+// //    $.ajax({ 
+// //         type: 'GET', 
+// //         data: $.param( filter ),
+// //         success: callback,  
+// //         url: filter.URI || concept
+// //   });
+// //     },
+// // 
+// //     put: function( concept, data, filter ){
+// // 
+// //   var target = this.get( concept, filter );
+// // 
+// //   if( target )
+// //       data = $.extend( target, data );
+// //       
+// //   this.storage.set( concept, data );
+// //   
+// //   //diff
+// //     },
+// //     
+// //     post: function( concept, data, filter ){
+// // 
+// //   
+// // 
+// //     },
+// //     
+// //     pool: function(){
+// //       
+// //     },
+// //     
+// //     queue: function(){
+// //       
+// //     },
+// //     
+// //     dequeue: function(){
+// //       
+// //     },
+// //     
+// //     refresh: function(){
+// //       
+// //     }
+// // }
+// 
+// // var DataLayer = {
+//   
+// //       cache: {},
+//   
+// //       get: function( concept, location ){
+//      
+//         /* if( location )
+//          {*/
+// //           var schema = $.data( this.cache, concept + ':schema' );
+// //           var uri = [];
+// // 
+// //           $.each( schema, function( i, addrs ){
+// //                 uri[ uri.length ] = location[addrs];
+// //           });
+// 
+//              /*var filter = [], result = false;
+// 
+//              while( !(result = $.data( this.cache, uri.join( '.' ) )) || !(uri = uri.join('.')) )
+//                filter[ filter.length ] = uri.pop();
+//   
+//              if( !filter.length )
+//              {
+//                  var indexes = $.data( this.cache, uri + ':indexes' );
+// 
+//                  if( indexes )
+//                      Array.prototype.concat.apply( result, indexes );
+//                  
+//                  return( result );
+//              }
+// 
+//              for( var i = 0; i < result.length; i++ )
+//              {
+//                  
+//              }
+// 
+//              if( result.length )
+//                  return( result );
+//          }*/
+// 
+// //       var data = $.data( this.cache, concept );
+// 
+// //       if( !data )
+// //           $.ajax( );
+// 
+// //       return( data );
+// //       },
+//       
+// //       data: function(){
+// // 
+// //     
+// // 
+// //       }
+// //       
+// //       search: function( concept, filter ){
+// // 
+// //     var schema = $.data( this.cache, concept + ':schema' );
+// //     var uri = [];
+// // 
+// //     $.each( schema, function( i, addrs ){
+// //           uri[ uri.length ] = location[addrs];
+// //     });
+// //       }
+// //       put: function( concept, data, location ){
+// 
+// //       if( location )
+// //       {
+// //           var schema = $.data( this.cache, concept + ':schema');
+// //           var uri = [];
+// 
+// //           $.each( schema, function( i, addrs ){
+// //                 uri[ uri.length ] = location[addrs];
+// //           });
+// 
+// //           var result = false, filter = [];
+// 
+// //           while( !(result = $.data( this.cache, uri.join('.')) )
+// //               filter[ filter.length ] = uri.pop();
+// 
+// //           $.data( this.cache, '
+// 
+// //       }
+// 
+// //           var model = this.storage.get( concept );
+// // 
+// //           $.each( model, function( i, o ){
+// //               $.each( location, function( ii, attr ){
+// //                    if( o[ii] === attr )
+// //                       return( false );
+// //               }); 
+// //           });
+// 
+// //       return $.data( this.cache, concept, data );
+// 
+// //       },
+// //       del: function( concept, location ){
+// // 
+// //       if( location )
+// //       {
+// //           var schema = $.data( this.cache, 'concepts', concept );
+// //           var uri = [];
+// // 
+// //           $.each( schema, function( i, addrs ){
+// //                 uri[ uri.length ] = location[addrs];
+// //           });
+// // 
+// //           concept = uri.join( '.' );
+// 
+// //           var model = this.storage.get( concept );
+// // 
+// //           $.each( model, function( i, o ){
+// //               $.each( location, function( ii, attr ){
+// //                    if( o[ii] === attr )
+// //                       return( false );
+// //               }); 
+// //           });
+// //       }
+// //       
+// //   
+// //       $.removeData( this.cache, concept );
+// //       }
+// // }

trunk/prototype/config/alarm.ini

@@ -2 +2 @@
 PostgreSQL.concept = calendar_alarm
 
-[links]
-participant = participant
+[model.depends]
+participant = participant.alarm
 
 [before.find]

trunk/prototype/config/attachment.ini

@@ -1 +1 @@
 service = PostgreSQL
+PostgreSQL.concept = attachment
+
+[model.hasOne]
+schedulable = schedulable.attachments
 
 [before.create]
-beginWork = services/PostgreSQL.php
 encodeCreateAttachment = modules/calendar/interceptors/DBMapping.php
 
+[after.delete]
+deleteAttachmentDependences = modules/calendar/interceptors/DBMapping.php
 
-[after.create]
-endWork = services/PostgreSQL.php
+[PostgreSQL.mapping]
+id = "id"
+source = "source"
+type = "type"
+name = "name"
+size = "size"
+

trunk/prototype/config/calendar.ini

@@ -2 +2 @@
 PostgreSQL.concept = calendar
 
-[links]
-signatures = calendarSignature
+[model.hasMany]
+signatures = calendarSignature.calendar
 
 [before.create]

trunk/prototype/config/calendarSignature.ini

@@ -2 +2 @@
 PostgreSQL.concept = calendar_signature
 
-[links]
-calendar = calendar
-calendarSignatureAlarms = calendarSignatureAlarm
+[model.hasMany]
+calendarSignatureAlarms = calendarSignatureAlarm.calendarSignature
+[model.depends]
+calendar = calendar.signatures
 
 [before.delete]

trunk/prototype/config/calendarSignatureAlarm.ini

@@ -2 +2 @@
 PostgreSQL.concept = calendar_signature_alarm
 
-[links]
-calendarSignature = calendarSignature
+[model.depends]
+calendarSignature = calendarSignature.calendarSignatureAlarms
 
 [after.find]

trunk/prototype/config/participant.ini

@@ -2 +2 @@
 PostgreSQL.concept = calendar_participant
 
-[links]
-user = user
-schedulable = schedulable
-alarms = alarm
+[model.hasOne]
+delegatedFrom = participant.delegateTo
+delegateTo = participant.delegatedFrom
+
+[model.hasMany]
+alarms = alarm.participant
+
+[model.depends]
+user = user.participants
+schedulable = schedulable.participants
 
 [after.commit]
@@ -12 +18 @@
 [PostgreSQL.mapping]
 id = id
-delegatedTo = delegated_to
+delegatedFrom = delegated_from
 isOrganizer = is_organizer
 isExternal = is_external
@@ -18 +24 @@
 schedulable = object_id
 user = user_info_id
+acl = acl
+receiveNotification = receive_notification

trunk/prototype/config/repeat.ini

@@ -1 +1 @@
 service = PostgreSQL
 
-[links]
-schedulable = schedulable
+[model.depends]
+schedulable = schedulable.repeat
 

trunk/prototype/config/schedulable.ini

@@ -2 +2 @@
 PostgreSQL.concept = calendar_object
 
-[links]
-participants = participant
-repeat = repeat
+[model.hasMany]
+participants = participant.schedulable
+attachments = schedulableToAttachment.schedulable
+        
+[model.hasOne]
+repeat = repeat.schedulable
 
 [before.create]

trunk/prototype/config/user.ini

@@ -9 +9 @@
 PostgreSQL.concept = calendar_ex_participant
 
-[links]
-participants = participant
+[model.hasMany]
+participants = participant.user
 
 [PostgreSQL.before.create]

trunk/prototype/converter.php

@@ -3 +3 @@
 require_once 'api/controller.php';
 
-$method =  $_REQUEST['analize'] ? 'analize' : 'parse';
+$method =  isset($_REQUEST['analize']) && $_REQUEST['analize'] ? 'analize' : 'parse';
 
 $args = Controller::call( $method,
@@ -9 +9 @@
                           array( 'service' => $_REQUEST['type'] ),
 
-                          isset( $_FILES['data'] ) ? file_get_contents( $_FILES['data']['tmp_name'] ) : $_REQUEST['data'],
+                          isset( $_FILES['files'] ) ? file_get_contents( $_FILES['files']['tmp_name'][0], $_FILES['files']['size'][0] ) : $_REQUEST['data'],
 
                           $_REQUEST['params'] );
 
-if(!$_REQUEST['readable'])
+if( !$_REQUEST['readable'])
         require_once 'Sync.php';
 else

trunk/prototype/links.php

@@ -15 +15 @@
 {
     $concepts = array();
+    $nestedLinks = array();
 
     foreach( $link as $linkName => $linkTarget )
-         if( Controller::isConcept( $linkName ) )
+    {
+         if( Controller::isConcept( $concept, $linkName ) )
             $concepts[ $linkName ] = true;
 
-    $return[ $target ] = array( 'concepts' => $concepts, 'links' => $link );
+          $nestedLinks[ $linkName ] = Controller::links( $concept, $linkName );
+    }
+
+    $return[ $target ] = array( 'concepts' => $concepts, 'links' => $link, 'nestedLinks' => $nestedLinks );
 }
 

trunk/prototype/modules/calendar/constants.php

@@ -5 +5 @@
 define('STATUS_CONFIRMED', 1);
 define('STATUS_ACCEPTED', 1);
-define('STATUS_TENATIVE', 2);
+define('STATUS_TENTATIVE', 2);
 define('STATUS_DECLINED', 3);
 define('STATUS_CANCELLED', 3);
@@ -29 +29 @@
 define('ICAL_ACTION_NONE', 4);
 define('ICAL_ACTION_REPLY', 5);
+define('ICAL_ACTION_SUGGESTION', 6);
 
 ?>

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

@@ -211 +211 @@
 }
 
-.new-event-win fieldset.block-add-attendee-permissions { 
-        width: 220px; 
-        float:left; 
-        margin: 105px 0 0 10px;
-}
+.new-event-win ul.attendee-permissions-list, li.attendee-permissions-list{text-align: left;}
+
+li.attendee-permissions-list input{width: 20px !important; margin: 3px 0 0 0; !important}
+
+p.request-update{display: inline; position: relative; top: 2px;}
+
+
+p.request-update label{width: 150px !important;}
 
 .new-event-win .menu-addevent {
@@ -221 +224 @@
 }
 
-fieldset.block-add-attendee .add-attendee-search { max-width: 200px; margin: 5px;}
-fieldset.block-add-attendee .add-attendee-search input { max-width: 170px; }
+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 .search-result-list { width: 255px; max-height: 215px; overflow: auto;}
 fieldset.block-add-attendee .search-result-list .ui-widget-content { border: none;}
@@ -256 +259 @@
 .attendees-list .me select.status { margin:10px 5px 5px 5px; }
 .attendees-list .me .add-attendee-search { max-width: 155px; width:155px; display: inline; padding: 0; margin: 10px 0 5px 0;}
+
+.attendees-list .me .add-attendee-options { max-height: 16px; height:16px;  max-width: 50px; width:50px; display: inline; padding: 0; margin: 0 0 5px 0;}
+.attendees-list .me .add-attendee-options-read { max-height: 16px; height:16px;  max-width: 16px; width:16px; display: inline; padding: 0; margin: 0 0 5px 0;}
+
+.attendees-list .me .add-attendee-options-button {position: absolute; top: 171px;}
+.attendees-list .hover-attendee { background-color: #DFEFFC;}
+/*
+.attendees-list .attendee-options-button-edit { position: absolute; top:0; right:25px;}
+.attendees-list .attendee-options-button-key { position: absolute; top:0; right:45px;}
+.attendees-list .attendee-options-button-delegate { position: absolute; top:0; right:65px;}
+*/
+
+.attendee-options{ position: absolute; top: 0; left: 300px; background-color: white; z-index: 100; width: 90px; background-color: #FFF; padding: 0 5px 0 3px; text-align: right;}
+.attendees-list .not-attendee { height:16px; }
+
+.list-delegates{margin: 0 0 0 25px;}
+
+.status-delegate{position: absolute; left:3px;}
+
 .attendees-list .me .add-attendee-search input { max-width: 125px; }
-.attendees-list li.organizer {margin-bottom: 3px;}
+.attendees-list li.organizer, .attendees-list li.me-delegated  {margin-bottom: 3px;}
 .attendees-list .organizer .button.swap {
         float: right;
         margin-top: -1.5em;
 }
+
+.name-status-delegated{text-decoration: line-through; padding: 0 0 0 18px;}
+.name-status-delegated-delegated{text-decoration: line-through; padding: 0 0 0 12px;}
+.name-status-delegated-none{ padding: 0 0 0 12;}
+
+.name-status{padding: 0 0 0 18px;}
+
+.name-special{padding: 0 0 0 33px;}
+.name-special-delegated{text-decoration: line-through; padding: 0 0 0 33px;}
+
+.open-delegate{position: absolute; left: 20px; display: block; cursor: hand;}
+.space-status{position: absolute; left: 20px; display: block;}
+.space-special{position: absolute; left: 35px; display: block;}
+.space-special-delegated{position: absolute; left: 20px; display: block;}
+
+.attendee-permissions-change{background-image: url(../../../plugins/jquery/images/ui-icons_f9bd01_256x240.png) !important;}
+.attendee-permissions-change-button{border: 1px solid #79B7E7 !important; background: #F5F8F9 !important; font-weight: bold !important; color: #E17009 !important;}
+
+.attendee-permissions-conflict{opacity: 0.5}
 
 dd.attendee-list ul.attendee-list li {
@@ -275 +316 @@
 dd.attendee-list ul.attendee-list li label.name,
 dd.attendee-list ul.attendee-list li label.mail {
-        width: 6000px;
-        min-width: 6000px;
+        width: 99999px;
+        min-width: 99999px;
         vertical-align: middle;
 }
 dd.attendee-list ul.attendee-list li label[title=''] { display:none }
+/*
 dd.attendee-list ul.attendee-list li .button.close {
         position: absolute;
-    right: 0;
+    right: 5px;
     top: 0;
 }
-
+*/
 /*
 .attendees-list li .ui-icon-float-right {
@@ -482 +524 @@
 }
 
+.button.add.button-add-attachment{margin: -9px 0 0 8px;}
+.button.upload{margin-bottom: 4px;}
+div.fileupload-buttonbar{padding: 0.2em 0.5em }
+.archive-error{color: #F00;}
+
+.progress.in-progress{width: 100px; height: 12px;}
+
+
+.lbl-archive-nome, .lbl-archive-size{font-weight: bold !important;}
+.lbl-archive-nome{width:40px !important;}
+.row.fileupload-buttonbar{margin-top: -14px; padding: 0.2em 0.7em;}
+
+.archive-nome{width: 73px;}
+.archive-nome label{display: block; position: absolute; left: 136px; top: 194px;}
+.archive-size{min-width:100px; max-width:100px;}
+
+
 .input-group.date-info input {
         width: 100px;

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

@@ -90 +90 @@
 
 .ui-dialog .ui-dialog-content { padding: 0; }
-.new-event-win form.form-addevent { padding: 10px; }
+.new-event-win div.div-addevent { padding: 0; width: 700px; border: 0;}
+.new-event-win form.form-addevent { padding: 9px; }
 
 .expresso-calendar-container input[type="text"] { height: 18px; }

trunk/prototype/modules/calendar/export.php

@@ -31 +31 @@
        $eventsIds[] = $eventLink['schedulable'];
 
-    $events = Controller::find(array('concept' => 'schedulable') , false , array('filter' => array('IN','id',$eventsIds) , 'deepness' => '2' ));
+    $events = Controller::find(array('concept' => 'schedulable') , false , array('filter' => array('IN','id',$eventsIds) , 'deepness' => '2' ));        
     $ics = Controller::format( array( 'service' => 'iCal' ) , $events , array('defaultTZI' => $calendar['timezone']) );
 
@@ -45 +45 @@
 {    
     $event = Controller::read(array('concept' => 'schedulable' , 'id' => $params['event']));
+        $attachmentRelation = Controller::find( array( 'concept' => 'schedulableToAttachment' ) , false ,array( 'filter' => array('=', 'schedulable'  ,  $event['id']) )); 
+        if(is_array($attachmentRelation)){
+                $attachments = array();
+                foreach($attachmentRelation as $key => $value)
+                        if(isset($value['attachment']) || !!$value['attachment'])
+                                $attachments[$key]  = $value['attachment'];
+                //Pega os anexos sem source
+                $event['attachments'] = Controller::find( array( 'concept' => 'attachment' ) , false ,array( 'filter' => array('IN', 'id' , $attachments) )); 
+        }
+                
     $ics = Controller::format( array( 'service' => 'iCal' ) , array($event) , array('defaultTZI' => $event['timezone']) );
     

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

@@ -40 +40 @@
         }  
         
+        public function encodeCreateSuggestion( &$uri , &$params , &$criteria , $original ){                    
+        $params['dtstamp'] = (isset($params['dtstamp'])) ? $params['dtstamp'] :time().'000';          
+    }   
+        
         public function encodeUpdateAlarm( &$uri , &$params , &$criteria , $original ){
             if(isset($params['type']))
@@ -46 +50 @@
         
     public function encodeCreateAttachment( &$uri , &$params , &$criteria , $original ){
-        $params['source'] = base64_encode( $params['source'] );
+        
+                if(!isset($params['source'])) return false;
+                
+                if(isset($_FILES[$params['source']]))
+                        if(isset($params['id']))
+                                $params =  array_merge($_FILES[$params['source']], array('id' => $params['id']));
+                        else
+                                $params =  $_FILES[$params['source']];
+                
+                //$params['source'] = base64_encode( $params['source'] );       
+                
         }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         
@@ -145 +160 @@
     public function createCalendarToSchedulable( &$uri , &$result , &$criteria , $original ){           
 
-       Controller::create(array('concept' => 'calendarToSchedulable'), array('calendar' => $original['properties']['calendar'], 'schedulable' => $result['id'] ));
-            
-   }   
+                Controller::create(array('concept' => 'calendarToSchedulable'), array('calendar' => $original['properties']['calendar'], 'schedulable' => $result['id'] ));
+
+   }
+
+        public function createCreateSchedulableToAttachment( &$uri , &$params , &$criteria , $original ){               
+                if(array_key_exists('attachments', $original['properties']))    
+                        foreach($original['properties']['attachments'] as $key => $value){                              
+                                if(isset($params['id']))
+                                        Controller::create(array('concept' => 'schedulableToAttachment'), array('attachment' => $value['attachment'], 'schedulable' => $params['id'] ));
+                        }
+        }
      
     //TODO: Remover apos suporte a deepness na api 
@@ -172 +195 @@
                     }       
                     $result[$i]['participants'] = $participants;
-                }               
+                
+                                        $attachmentRelation = Controller::find( array( 'concept' => 'schedulableToAttachment' ) , false ,array( 'filter' => array('=', 'schedulable'  ,  $v['id']) )); 
+                                        if(is_array($attachmentRelation)){
+                                                $attachments = array();
+                                                foreach($attachmentRelation as $key => $value)
+                                                        if(isset($value['attachment']) || !!$value['attachment'])
+                                                                $attachments[$key]  = $value['attachment'];
+                                                //Pega os anexos sem source
+                                                $result[$i]['attachments'] = Controller::find( array( 'concept' => 'attachment' ) , array('id', 'name', 'type', 'size') ,array( 'filter' => array('IN', 'id' , $attachments) )); 
+                                        }
+                                
+                                }               
                 
            }
@@ -294 +328 @@
         }
     }
+
+    public function decodeFindAttachment( &$uri , &$result , &$criteria , $original ){          
+                if(isset($result))
+                foreach($result as $key => &$value)
+                        $value['source'] = base64_decode($value['source']);
+    }
+
         
         public function decodeSignatureAlarmType( &$uri , &$result , &$criteria , $original ){  
@@ -389 +430 @@
         }
         
-     }
+     } 
+         
+        public function deleteAttachmentDependences( &$uri , &$params , &$criteria , $original ){
+
+                if(isset($original['URI']['id']))
+                        Controller::delete(array('concept' => 'schedulableToAttachment', null , array('filter' => array('=' , 'attachment' , $original['URI']['id']))));
+    }
 
     public function createDefaultSignature( &$uri , &$result , &$criteria , $original ){

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

@@ -8 +8 @@
 {
     
-    /**
+        public function formatNotification(&$uri , &$params , &$data , $original){      
+                switch ($params['type']) {
+                        case 'suggestion':
+                                self::formatSuggestion($params);    
+                                break;
+                        case 'suggestionResponse':
+                                self::formatSuggestionResponse($params);    
+                                break;
+                        } 
+        }
+        
+        
+        /**
     * Analisa o commit do conceito participant e encaminha cada participant para seu devido metodo de notrificação
     *
@@ -19 +31 @@
     */
     public function commitParticipant(&$uri , &$result , &$data , $original)
-    {    
+    {                           
         if(Config::regGet('noAlarm') !== false) return; //Escapa notificações caso a flag de noAlarm esteja ativa.
-              
+                
         $organizers = array(); //Cache Organizadores
         $schedulables = array(); //Cache Schedulables
-        
+
         foreach ($data as $i => $concept) 
         {
@@ -39 +51 @@
                 foreach ($schedulables[ $concept['id'] ]['participants'] as $i => $v) //salva em $organizers as informações do organizador      
                     if(($v['isOrganizer'] === '1') && ($organizers[$concept['id']] = $v) ) break;
-            }
+                        }else if($concept['concept'] === 'schedulableToAttachment')
+                        {
+                                $relationAttachment = Controller::find( array( 'concept' => 'schedulableToAttachment' ) , false ,array( 'filter' => array('=', 'id' , $concept['id'])));                        
+                                                        
+                                
+                                        
+                                foreach($relationAttachment as $key => $value){
+                                        if(!array_key_exists('attachments',$schedulables[$value['schedulable']]))
+                                                $schedulables[$value['schedulable']]['attachments'] = array();
+
+                                        $temp = Controller::find( array( 'concept' => 'attachment' ) , false ,array( 'filter' => array('=', 'id' , $value['attachment'])));
+                                        array_push($schedulables[$value['schedulable']]['attachments'] , $temp[0]);                             
+                                }
+                        }
         }
         
         if( isset( $created ) )
         {
-           $psCreated =  Controller::find(array('concept' => 'participant'), false , array('deepness' => '1' , 'filter' => array('IN', 'id' , $created )));
-           foreach ($psCreated as $i => $pCreated)   
+           $psCreated =  Controller::find(array('concept' => 'participant'), false , array('deepness' => '1' , 'filter' => array('IN', 'id' , $created )));                
+                   foreach ($psCreated as $i => $pCreated)   
            {    
                if($pCreated['isOrganizer'] == '1') continue; //escapa organizador
@@ -52 +77 @@
                
                $organizer = isset( $organizers[$pCreated['schedulable']] ) ? $organizers[ $pCreated['schedulable'] ] : self::getOrganizer( $pCreated['schedulable'] );
-               
+                           
+                                if($pCreated['delegatedFrom'] != 0){
+                                        self::participantDelegated( $pCreated , $schedulable , $organizer);    
+                                        continue;
+                                }
+                           
                switch ($pCreated['status']) 
                {
@@ -68 +98 @@
         {
             $psUpdated  = Controller::find(array('concept' => 'participant'), false , array('deepness' => '1' , 'filter' => array('IN', 'id' , $updated )));
-            foreach ($psUpdated as $i => $pUpdated)   
-            {
+                        foreach ($psUpdated as $i => $pUpdated)   
+            {                   
                 if($pUpdated['isOrganizer'] == '1') continue; //escapa organizador
                 $schedulable = isset( $schedulables[$pUpdated['schedulable']] ) ? $schedulables[ $pUpdated['schedulable'] ] : Controller::read( array('concept' => 'schedulable', 'id' => $pUpdated['schedulable']) , false , array('deepness' => '2'));
@@ -77 +107 @@
                     if(($v['isOrganizer'] === '1') && ($organizer = $v) ) break;
                     
-                
-                if( $pUpdated['status'] != STATUS_UNANSWERED)
-                self::participantStatusChange( $pUpdated['id'] , $schedulable , $organizer , $pUpdated['status'] );    
+                if($pUpdated['delegatedFrom'] != 0){
+                                        self::participantDelegatedStatusChange( $pUpdated , $schedulable , $organizer , $pUpdated['status'] );    
+                }else if( $pUpdated['status'] != STATUS_UNANSWERED && $pUpdated['status'] != STATUS_DELEGATED)
+                                        self::participantStatusChange( $pUpdated['id'] , $schedulable , $organizer , $pUpdated['status'] );    
             }
         }
     }
-    
-
-    /**
-    * Monta o email de convite que sera enviado ao participant
-    *
-    * @license    http://www.gnu.org/copyleft/gpl.html GPL
-    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
-    * @sponsor    Caixa Econômica Federal
-    * @author     Cristiano Corrêa Schmidt
-    * @return     void
-    * @access     public
-    */
-    public static function participantCreated( &$partID , &$schedulable )
-    {
+        
+        public function formatSuggestion(&$params){
+            
+                $schedulable =  Controller::read(  array( 'concept' => 'schedulable' , 'id' => $params['schedulable'] ) , null , array('deepness' => '2') ) ;
+                
+                foreach ($schedulable['participants'] as $i => $v) //salva em $organizer as informações do organizador      
+            if(($v['isOrganizer'] === '1') && ($organizer = $v) ) break;
+                
+                $method = 'COUNTER';
+                $notificationType = 'Sugestão de horário';
+                $part = 'other';
+                
+                $schedulableReference = $schedulable;
+                
+                $referenceSuggestion = array( 'startTime' => $params['startTime'],
+                                                                        'endTime' => $params['endTime'],
+                                                                        'allDay' => $params['allDay']
+                                                                );
+                $schedulable = array_merge($schedulable, $referenceSuggestion);
+                
+                self::mountStruture(false, $schedulable, false , $data,  $subject, $ical, $part, $method, $notificationType);
+                       
+
+                $timezone = new DateTimeZone('UTC');
+                $sTime = new DateTime( '@'.(int)($schedulableReference['startTime'] / 1000) , $timezone );
+                $eTime =  new DateTime( '@'.(int)($schedulableReference['endTime'] / 1000) , $timezone ); 
+           
+                if(isset($schedulableReference['timezone']))
+                {
+                        $sTime->setTimezone(new DateTimeZone($schedulableReference['timezone']));
+                        $eTime->setTimezone(new DateTimeZone($schedulableReference['timezone']));
+                }
+
+                $data['nowStartDate'] = date_format( $sTime , 'd/m/Y');
+        $data['nowStartTime'] = ($schedulableReference['allDay']) ? '' : date_format( $sTime , 'H:i');
+        $data['nowEndDate'] = date_format( $eTime , 'd/m/Y');
+        $data['nowEndTime'] = ($schedulableReference['allDay']) ? '' :  date_format( $eTime , 'H:i');
+                $data['userRequest'] = Config::me('uid');
+                
+                $params['attachments'][] = $ical;
+                $params['isHtml'] = true;                         
+                $params['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/notify_suggestion_body.tpl');
+                $params['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
+                $params['from'] = Config::me('mail');   
+                $params['to'] = $organizer['user']['mail'];
+                
+        }  
+        
+        public function formatSuggestionResponse(&$params){     
+                $schedulable = $params['schedulable'];
+                foreach ($schedulable['participants'] as $i => $v) {//salva em $organizer as informações do organizador      
+            if($v['isOrganizer'] === '1') $organizer = $v;
+                        if($v['user']['mail'] == Config::me('mail')) $me = $v;
+                }
+                $method = 'DECLINECOUNTER';
+                $notificationType = 'Sugestão de horário';
+                $part = 'other';
+                
+                $schedulable['participants'] = array();
+                array_push($schedulable['participants'], $me, $organizer);
+                
+                self::mountStruture(false, $schedulable, false , $data,  $subject, $ical, $part, $method, $notificationType);
+                
+                if($params['status'] == 'DECLINECOUNTER')
+                        $data['status'] = 'não pode ser aceito';
+                        
+                $params['attachments'][] = $ical;
+                $params['isHtml'] = true;                         
+                $params['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/notify_suggestion_response_body.tpl');
+                $params['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
+                $params['to'] = $params['from'];
+                $params['from'] = Config::me('mail');   
+        }
+        
+        
+        public static function _getAttendeeById($attendeId, $schedulable){
+                foreach ($schedulable['participants'] as $id => $dv) 
+                        if($dv['id'] == $attendeId )
+                                return $dv;
+        }
+        
+        /**
+    * Prepara para criação de email de delegação
+    *
+    * @license    http://www.gnu.org/copyleft/gpl.html GPL
+    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+    * @sponsor    Caixa Econômica Federal
+    * @author     Adriano Coutinho da Silva
+    * @return     void
+    * @access     public
+    */
+        public static function participantDelegated( &$partID , &$schedulable , &$organizer){
+        
+                $delegatedParams = array();
+                
+                $delegatedFrom = self::_getAttendeeById($partID['delegatedFrom'], $schedulable);
+                $delegatedParams['delegatedFrom'] = $delegatedFrom['user']['uid'];
+                
+                self::participantCreated( $partID['id'] , $schedulable , STATUS_DELEGATED, $delegatedParams );          
+                
+                $delegatedTo = self::_getAttendeeById($partID['id'], $schedulable);
+                $delegatedParams['delegated'] = $delegatedTo['user']['uid'];
+                
+                self::participantStatusChange( $partID['delegatedFrom'] , $schedulable , $organizer , STATUS_DELEGATED, $delegatedParams );
+        }
+        
+        /**
+    * Monta o email de resposta que sera enviado ao delegatedFrom
+    *
+    * @license    http://www.gnu.org/copyleft/gpl.html GPL
+    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+    * @sponsor    Caixa Econômica Federal
+    * @author     Cristiano Corrêa Schmidt
+    * @return     void
+    * @access     public
+    */
+    public static function participantDelegatedStatusChange( &$partID , &$schedulable, $organizer, &$type = false){
+        
+                $delegatedParams = array();
+                                        
+                $delegated = self::_getAttendeeById($partID['id'], $schedulable);
+                $delegatedParams['delegated'] = $delegated['user']['uid'];              
+                
+                switch($partID['status']){
+            case STATUS_ACCEPTED:
+                $delegatedParams['status'] = 'aceitou';
+            break;
+            case STATUS_TENTATIVE:
+                $delegatedParams['status'] = 'marcou como tentativa';
+            break;
+            case STATUS_CANCELLED:
+                $delegatedParams['status'] = 'rejeitou';
+            break;
+                        case STATUS_DELEGATED:
+                                $delegatedParams['status'] = 'delegou para um novo participante';
+            break;
+                }
+                        //notifica o organizador a resposta do delegado
+                        self::participantStatusChange( $partID['delegatedFrom'] , $schedulable , $organizer , $type, $delegatedParams );
+        
+                        $method = 'REQUEST';
+                        $notificationType = 'Resposta Delegação'; 
+                        $part = 'attendees';
+                        self::mountStruture($partID['delegatedFrom'], $schedulable, $type , $data,  $subject, $ical, $part, $method, $notificationType );
+                        
+                        $data = array_merge($data, $delegatedParams);
+                        
+            self::sendMail($data, $ical , $part['user']['mail'] , $subject , 'notify_response_delegated_status_body');
+       
+    }
+
+        public static function mountStruture( $partID , &$schedulable, $type = false, &$data, &$subject, &$ical, &$part = false, &$method, &$notificationType, $regSet = false) {
+                
+                if( (Config::regGet('ical://'.$schedulable['id'].'/'.$method) === false) || ($method == 'CANCEL') ) //Verifica se o ical ja não esta no reg
+                {
+                        $schedulable['URI']['concept'] = 'schedulable';
+                        $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => $method) );  
+                        $ical['type'] = 'text/calendar';
+                        $ical['name'] = 'calendar.ics';
+                        if($regSet)
+                                Config::regSet('ical://'.$schedulable['id'].'/'.$method, $ical);
+                }
+                else
+                        $ical = Config::regGet('ical://'.$schedulable['id'].'/'.$method);
         
-           $part = false;
-           if( Config::regGet('ical://'.$schedulable['id'].'/REQUEST') === false ) //Verifica se o ical ja não esta no reg
-           {
-                  $schedulable['URI']['concept'] = 'schedulable';
-                  $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => 'REQUEST') );  
-                  $ical['type'] = 'text/calendar';
-                  $ical['name'] = 'calendar.ics';
-                  Config::regSet('ical://'.$schedulable['id'].'/REQUEST', $ical);
-           }
-           else
-                $ical = Config::regGet('ical://'.$schedulable['id'].'/REQUEST');
-        
-           $timezone = new DateTimeZone('UTC');
-           $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
-           $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
+                        $timezone = new DateTimeZone('UTC');
+                        $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
+                        $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
            
-           if(isset($schedulable['timezone']))
-           {
-               $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-               $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-           }
+                        if(isset($schedulable['timezone']))
+                        {
+                                $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
+                                $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
+                        }
             
-           $attList = '<UL> ';
-           foreach ($schedulable['participants'] as $i => $v)  
-           {   
-                if($part === false && $v['id'] == $partID)
-                   $part = $v;
-
-                $attList .= ' <LI> '. (isset($v['user']['name']) ? $v['user']['name'] : $v['user']['mail']) ;
-           }
-           $attList .= '</UL>';
-                            
-           $data = array(     'startDate' =>  date_format( $sTime , 'd/m/Y') ,
+                        $data = array(     'startDate' =>  date_format( $sTime , 'd/m/Y') ,
                               'startTime' =>  ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i') ,
                               'endDate' =>  date_format( $eTime , 'd/m/Y') ,
@@ -136 +295 @@
                               'eventTitle' =>  $schedulable['summary'],
                               'eventLocation' =>  $schedulable['location'],
-                              'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC' ,
-                              'participants' =>  $attList);
-            
-             $subject['notificationType'] = 'Convite de Calendario';
-             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-             $subject['startDate'] = date_format( $sTime , 'd/m/Y');
-             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
-             $subject['endDate'] = date_format( $eTime , 'd/m/Y');
-             $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
-             $subject['participant'] = Config::me('uid');
- 
-             self::sendMail($data, $ical , $part['user']['mail'] , $subject , 'notify_create_body');
+                              'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC');
+                        $temp = $part;
+                        $part = false;
+                        switch($temp){
+                                case 'attendees':
+                                        $attList = '<UL> ';
+                                        foreach ($schedulable['participants'] as $i => $v)  
+                                        {               
+                                                if($part === false && $v['id'] == $partID)
+                                                   $part = $v;
+
+                                                $attList .= ' <LI> '. (isset($v['user']['name']) ? $v['user']['name'] : $v['user']['mail']) ;
+                                        }
+                                        $attList .= '</UL>';
+                                        $data['participants'] = $attList;
+                                break;
+                                case 'me':
+                                        $part = self::_getAttendeeById($partID, $schedulable);
+                                        $data['participant'] = isset($part['user']['name']) ? $part['user']['name'] : $part['user']['mail'];
+                                break;
+                                case 'othersAttendees':
+                                        $data['participants'] = '<UL> ';
+                                        foreach ($schedulable['participants'] as $ii => $participant){
+                                                if(Config::me('mail') !== $participant['user']['mail'])
+                                                        $part[] = $participant['user']['mail'];
+                                        
+                                        $data['participants'] .= ' <LI> '. (isset($participant['user']['name']) ? $participant['user']['name'] : $participant['user']['mail']) ;
+                                        }
+                                break;
+                        }         
+                        $subject['notificationType'] = $notificationType;
+                        $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
+                        $subject['startDate'] = date_format( $sTime , 'd/m/Y');
+                        $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
+                        $subject['endDate'] = date_format( $eTime , 'd/m/Y');
+                        $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
+                        $subject['participant'] = Config::me('uid');
+        }
+        
+        
+    /**
+    * Monta o email de convite que sera enviado ao participant
+    *
+    * @license    http://www.gnu.org/copyleft/gpl.html GPL
+    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+    * @sponsor    Caixa Econômica Federal
+    * @author     Cristiano Corrêa Schmidt
+    * @return     void
+    * @access     public
+    */
+    public static function participantCreated( &$partID , &$schedulable, $type = false, $delegatedParams = false)
+    {   
+                $method = 'REQUEST';
+                $notificationType = 'Convite de Calendario'; 
+                $part = 'attendees';
+                self::mountStruture($partID, $schedulable, $type , $data,  $subject, $ical, $part, $method, $notificationType, true);
+        
+                if($delegatedParams)
+                        $data = array_merge($data, $delegatedParams);
+                                         
+                 self::sendMail($data, $ical , $part['user']['mail'] , $subject , !$delegatedParams  ? 'notify_create_body' : 'notify_create_delegated_body' );
        
     }
@@ -161 +369 @@
     * @access     public
     */
-    public static function participantStatusChange( &$partID , &$schedulable , &$organizer , $type )
-    {
-        $part = false;
-        
-        foreach ($schedulable['participants'] as $i => $v) //salva em $part as informações do participant a ser notificado     
-            if(($v['id'] == $partID) && ($part = $v) ) break;
-            
-        if( Config::regGet('ical://'.$schedulable['id'].'/REPLY') === false ) //Verifica se o ical ja não esta no reg
-        {
-                  $schedulable['URI']['concept'] = 'schedulable';
-                  $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => 'REPLY' , 'participant' => $partID) );  
-                  $ical['type'] = 'text/calendar';
-                  $ical['name'] = 'calendar.ics';
-                  Config::regSet('ical://'.$schedulable['id'].'/REPLY', $ical);
-         }
-         else
-            $ical = Config::regGet('ical://'.$schedulable['id'].'/REPLY');
-        
-        
-        $timezone = new DateTimeZone('UTC');
-        $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
-        $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
-        
-        if(isset($schedulable['timezone']))
-        {
-            $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-            $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-        }
-        
-        $data = array('startDate' =>  date_format( $sTime , 'd/m/Y') ,
-                          'startTime' =>  ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i') ,
-                          'endDate' =>  date_format( $eTime , 'd/m/Y') ,
-                          'endTime' =>  ($schedulable['allDay']) ? '' :  date_format( $eTime , 'H:i') ,
-                          'eventTitle' =>  $schedulable['summary'],
-                          'eventLocation' =>  $schedulable['location'],
-                          'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC' ,
-                          'participant' =>  (isset($part['user']['name']) ? $part['user']['name'] : $part['user']['mail']) );
-          
-        $subject['notificationType'] = 'Convite Aceito';
-        $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-        $subject['startDate'] = date_format( $sTime , 'd/m/Y');
-        $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
-        $subject['endDate'] = date_format( $eTime , 'd/m/Y');
-        $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
-        $subject['participant'] = Config::me('uid');
-          
+    public static function participantStatusChange( &$partID , &$schedulable , &$organizer , $type, $delegatedParams = false )
+    {   
+        $method = 'REPLY';
+                $notificationType = 'Convite Aceito';
+                $part = 'me';
+                
+                self::mountStruture($partID, $schedulable, $type , $data,  $subject, $ical, $part, $method, $notificationType, true );
+                       
+                if($delegatedParams){
+                        $data = array_merge($data, $delegatedParams);
+                        $tplDelegated = 'notify_delegated_status_body';
+                }
+
        switch($type)
        {
             case STATUS_ACCEPTED:
-                $tpl =   'notify_accept_body';
+                $tpl =   !$delegatedParams ? 'notify_accept_body' : $tplDelegated;
                 $subject['notificationType'] = 'Convite Aceito';
             break;
-            case STATUS_TENATIVE:
-                $tpl =   'notify_attempt_body';
+            case STATUS_TENTATIVE:
+                $tpl =   !$delegatedParams ? 'notify_attempt_body' : $tplDelegated;
                 $subject['notificationType'] = 'Convite  aceito provisoriamente';
             break;
             case STATUS_CANCELLED:
-                $tpl =   'notify_reject_body';
+                $tpl =   !$delegatedParams ? 'notify_reject_body' : $tplDelegated;
                 $subject['notificationType'] = 'Convite rejeitado';
+            break;
+                        case STATUS_DELEGATED:
+                                if($delegatedParams)
+                                        $data = array_merge($data, $delegatedParams);
+                $tpl =   'notify_delegated_body';
+                $subject['notificationType'] = 'Convite delegado';
             break;
 
@@ -264 +445 @@
        if((Config::regGet('noAlarm') === false) && (self::futureEvent( $schedulable['startTime'] , $schedulable['rangeEnd'])))
        {
-           $schedulable['URI']['concept'] = 'schedulable'; 
-           $timezone = new DateTimeZone('UTC');
-           $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
-           $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
-           
-           if(isset($schedulable['timezone']))
-           {
-               $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-               $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-           }
-           
-           $data =  array('startDate' =>  date_format( $sTime , 'd/m/Y') ,
-                              'startTime' =>  ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i') ,
-                              'endDate' =>  date_format( $eTime , 'd/m/Y') ,
-                              'endTime' =>  ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i') ,
-                              'eventTitle' =>  $schedulable['summary'],
-                              'eventLocation' =>  $schedulable['location'],
-                              'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC');
-                              
-           
-           $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => 'CANCEL'));  
-           $ical['type'] = 'text/calendar';
-           $ical['name'] = 'calendar.ics';
-           
-           foreach ($schedulable['participants'] as $ii => $participant)
-                if(Config::me('mail') !== $participant['user']['mail'])
-                    $to[] = $participant['user']['mail'];
-                    
-             $subject['notificationType'] = 'Cancelamento de Calendario';
-             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-             $subject['startDate'] = date_format( $sTime , 'd/m/Y');
-             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
-             $subject['endDate'] = date_format( $eTime , 'd/m/Y');
-             $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
-             $subject['participant'] = Config::me('uid');     
+                        $method = 'CANCEL';
+                        $notificationType = 'Cancelamento de Calendario';
+                        $part = 'othersAttendees';
+                        self::mountStruture($uri['id'], $schedulable, false , $data,  $subject, $ical, $part, $method, $notificationType );
                 
-           if(count($to) > 0)
-            self::sendMail($data, $ical , implode(',' , $to) ,$subject, 'notify_cancel_body');
+           if(count($part) > 0)
+            self::sendMail($data, $ical , implode(',' , $part) ,$subject, 'notify_cancel_body');
        }
     }
@@ -323 +473 @@
        if((Config::regGet('noAlarm') === false) && (self::futureEvent( $schedulable['startTime'] , $schedulable['rangeEnd'])))
        {  
-           $schedulable['URI']['concept'] = 'schedulable'; 
-           $timezone = new DateTimeZone('UTC');
-           $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
-           $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
-           
-           if(isset($schedulable['timezone']))
-           {
-               $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-               $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-           }
-           
-           $data =  array('startDate' =>  date_format( $sTime , 'd/m/Y') ,
-                              'startTime' => ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i') ,
-                              'endDate' =>  date_format( $eTime , 'd/m/Y') ,
-                              'endTime' => ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i') ,
-                              'eventTitle' =>  $schedulable['summary'],
-                              'eventLocation' =>  $schedulable['location'],
-                              'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC');
-
-           $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => 'CANCEL'));  
-           $ical['type'] = 'text/calendar';
-           $ical['name'] = 'calendar.ics';
-           
-             $subject['notificationType'] = 'Cancelamento de Calendario';
-             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-             $subject['startDate'] = date_format( $sTime , 'd/m/Y');
-             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
-             $subject['endDate'] = date_format( $eTime , 'd/m/Y');
-             $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
-             $subject['participant'] = Config::me('uid');
-                          
-           self::sendMail($data, $ical , $participant['user']['mail'] , $subject , 'notify_cancel_body');  
+                        $method = 'CANCEL';
+                        $notificationType = 'Cancelamento de Calendario';
+                        $part = 'others';
+                        self::mountStruture(false, $schedulable, false , $data,  $subject, $ical, $part, $method, $notificationType );
+                                            
+                        self::sendMail($data, $ical , $participant['user']['mail'] , $subject , 'notify_cancel_body');  
         }
     }
@@ -369 +493 @@
     */
     public function updateEvent( &$uri , &$params , &$criteria , $original  )
-    {
-       
-       $schedulableOld =  Controller::read( array( 'concept' => 'schedulable' , 'id' => $uri['id'] ) , null , array('deepness' => '2') ) ;      
+    {       
+       $schedulableOld =  Controller::find( array( 'concept' => 'schedulable' , 'id' => $uri['id'] ) , null , array('deepness' => '2') ) ;      
        $schedulable = $schedulableOld;
        $alt = false;
-       
-      
+
        foreach ($params as $i => $v) //Verifica se ouve alteração no evento
            if( isset( $schedulableOld[$i] ) && $schedulableOld[$i] != $v && $i != 'participants')
@@ -384 +506 @@
            
        if ( ($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'])) ) 
-       {
-            $schedulable['URI']['concept'] = 'schedulable';
-            $ical['source'] = Controller::format(array('service' => 'iCal'), array($schedulable), array('method' => 'REQUEST'));
-            $ical['type'] = 'text/calendar';
-            $ical['name'] = 'calendar.ics';
-
-            $timezone = new DateTimeZone('UTC');
-            $sTime = new DateTime('@' . (int) ($schedulable['startTime'] / 1000), $timezone);
-            $eTime = new DateTime('@' . (int) ($schedulable['endTime'] / 1000), $timezone);
-
-            if (isset($schedulable['timezone'])) {
-                $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-                $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-            }
-            ///Montando lista de participantes
-            $attList = '<UL> ';
-            foreach ($schedulable['participants'] as $ii => $participant)
-                $attList .= ' <LI> ' . (isset($participant['user']['name']) ? $participant['user']['name'] : $participant['user']['mail']);
-            $attList .= ' </UL>';
-            /////////////////////////
-
-            $data = array('startDate' => date_format($sTime, 'd/m/Y'),
-                'startTime' => ($schedulable['allDay']) ? '' : date_format($sTime, 'H:i'),
-                'endDate' => date_format($eTime, 'd/m/Y'),
-                'endTime' => ($schedulable['allDay']) ? '' : date_format($eTime, 'H:i'),
-                'eventTitle' => $schedulable['summary'],
-                'eventLocation' => $schedulable['location'],
-                'timezone' => ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC',
-                'participants' => $attList
-            );
-
-
-            foreach ($schedulable['participants'] as $ii => $participant)
-                if (Config::me('mail') !== $participant['user']['mail'])
-                    $to[] = $participant['user']['mail'];
-
-            $subject['notificationType'] = 'Modificação de Calendario';
-            $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-            $subject['startDate'] = date_format($sTime, 'd/m/Y');
-            $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format($sTime, 'H:i');
-            $subject['endDate'] = date_format($eTime, 'd/m/Y');
-            $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format($eTime, 'H:i');
-            $subject['participant'] = Config::me('uid');
-             
-            if ( isset($to) && count($to) > 0)
-                self::sendMail($data, $ical, implode(',', $to), $subject, 'notify_modify_body');
+       {                        
+                        $method = 'REQUEST';
+                        $notificationType = 'Modificação de Calendario'; 
+                        $part = 'othersAttendees';
+                        self::mountStruture($partID, $schedulable, $type , $data,  $subject, $ical, $part, $method, $notificationType);
+
+            if ( isset($part) && count($part) > 0)
+                self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_modify_body');
         }
     }

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

@@ -29 +29 @@
                 this.preferenceIds = pref.ids;
     }
+}
+
+constantsParticipant = {
+        'o' : 'organization',
+        'w' : 'write',
+        'p' : 'participationRequired',
+        'i' : 'inviteGuests',
+        'r' : 'read'
 }
 
@@ -333 +341 @@
 });
 
+DataLayer.codec( "suggestion", "duration", {
+
+    decoder: function( evtObj ){
+                if( notArray = $.type(evtObj) !== "array" )
+                        evtObj = [ evtObj ];
+
+
+
+                var meAttendee = function(attendees){
+                        for(var i = 0; i < attendees.length; i++)
+                                if(DataLayer.get('participant', attendees[i]).user == User.me.id)
+                                        return attendee;
+                };
+
+                var res = $.map(evtObj, function( form ){       
+                        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) ,
+                                allDay: ( !!form.allDay ? 1 : 0 ),
+                                schedulable: form.idEvent
+                        }
+                });     
+        
+
+        return notArray ? res[0] : res;
+        },
+        
+        encoder: function( evtObj ){}
+        
+});
+
+DataLayer.codec( "attachment", "detail", {
+  
+        decoder: function(evtObj){
+        
+                if( notArray = $.type(evtObj) !== "array" )
+                        evtObj = [ evtObj ];
+
+                var res = $.map(evtObj, function( form){
+                        return [$.map(form.files , function( files){
+                                        return { source: files };
+                                })];
+                });
+        return notArray ? res[0] : res;
+        },
+      
+        encoder: function(){}
+
+      
+});
+
 DataLayer.codec( "schedulable", "preview", {
 
@@ -348 +408 @@
                                 id: form.idEvent,
                                 calendar: form.calendar,
-                                participants : [{
-                                        user: User.me.id,
-                                        status: form.status,
-                                        id: form.meId,
-                                        isOrganizer: 0,
-                                        alarms: typeof(form.alarmTime) != 'undefined' ? 
-                                                $.map( form.alarmTime || [], function( alarmTime, i ){
-
-                                                        if( alarmTime === "" )
-                                                                return( null );
-
-                                                        return !!form.alarmId[i] ?
-                                                                { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] } : 
-                                                                { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
-                                                }) : []
-                                        }]
+                                participants : $.map(form.attendee, function( attendee, i ){
+                                        if(isNaN(attendee)){
+                                                return{
+                                                        id: attendee,
+                                                        acl: form.attendeeAcl[i],
+                                                        delegatedFrom: !!form.delegatedFrom[i] ? form.delegatedFrom[i] : 0,
+                                                        isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                                                        isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                                                        acl: form.attendeeAcl[i].replace('o', '')
+                                                };
+                                        }else{
+                                                if(DataLayer.get('participant', attendee).user == User.me.id){
+                                                        var me = {
+                                                                user: User.me.id,
+                                                                status: form.status,
+                                                                id: attendee,
+                                                                isOrganizer: 0,
+                                                                receiveNotification : (!!form.receiveNotification ? 1 : 0),
+                                                                alarms: typeof(form.alarmTime) != 'undefined' ? 
+                                                                        $.map( form.alarmTime || [], function( alarmTime, i ){
+
+                                                                                if( alarmTime === "" )
+                                                                                        return( null );
+
+                                                                                return !!form.alarmId[i] ?
+                                                                                        { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] } : 
+                                                                                        { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
+                                                                        }) : []
+                                                        };
+                                                        
+                                                        if(form.startDate){
+                                                                var tzId =  DataLayer.get('schedulable', form.idEvent).timezone || User.preferences.timezone,
+                                                                formatString = ( typeof form.allDay !== "undefined" && !!form.allDay )? pref.dateFormat+" HH:mm" : pref.dateFormat + " " + pref.hourFormat;
+                                                                
+                                                                DataLayer.put('notification', {
+                                                                        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) ,
+                                                                        allDay: ( !!form.allDay ? 1 : 0 ),
+                                                                        schedulable: form.idEvent
+                                                                });
+                                                        
+                                                        }
+                                                        return me;
+                                                }else return(null);
+                                        };
+                                })
                         }
                 });
-                
                 return notArray ? res[0] : res;
     },
@@ -381 +472 @@
         statusLabels = [ '', 'accepted', 'tentative', 'cancelled', 'unanswered', 'delegated' ];
         
+        var delegateAttendee = {};
+        
         for( var i = 0; i < statusLabels.length; i++ )
                 statusParticipants[ statusLabels[i] ] = 0;
-
-        var isOrganizer = 1;
         
         var res = $.map(evtObj, function( objEvent ){                   
                     
-                        var participantInfo = {}, me = DataLayer.copy(User.me);
+                        var participantInfo = {}, delegatedFrom = {}, me = DataLayer.copy(User.me);
+                        
+                        var constantAcl = function(acl){
+                                var returns = {};
+                                for (var i in constantsParticipant){
+                                        returns[constantsParticipant[i]] = acl.indexOf(i) >= 0 ? true : false
+                                }
+                                return returns;
+                        };
                                                 
                     return {
@@ -406 +505 @@
                             endHour: dateCalendar.formatDate(Timezone.setDateTimezone(new Date(parseInt(objEvent.endTime)), objEvent.timezone, objEvent.calendar), User.preferences.hourFormat),
                             allDay: !!parseInt( objEvent.allDay ),
-          //                            attachments: this.decode( "attachment:detail", form ),
+                                attachments: $.map(objEvent.attachments || [], function( attachment, i ){
+                                        var attach = DataLayer.get('schedulableToAttachment', attachment, false);
+                                        attach.name = attach.name.length < 10 ?  attach.name : ( attach.name.substr(0, 6) + attach.name.substr( attach.name.length-4, attach.name.length));
+                                        
+                                        return attach;
+                                }),                                             
                             attendee: $.map(objEvent.participants || [], function( participant, i ){                                            
+                                        
+                                        if(delegateAttendee[participant])
+                                                return(null);
                                         
                                         var attend = DataLayer.get('participant', participant);
@@ -416 +523 @@
                                         if( attend.user.id ===  me.id ){
                                             participantInfo.user = {
+                                                        id: attend.id,
                                                         status : attend.status,
+                                                        delegatedFrom: attend.delegatedFrom,
+                                                        acl: attend.acl,
+                                                        receiveNotification : attend.receiveNotification,
                                                         alarms : $.map(attend.alarms || [], function( alarm ){
                                                                 return DataLayer.get('alarm', alarm);
@@ -422 +533 @@
                                                 };
                                                 me.id = attend.id;
-                                                return(null);
+                                                return(null);
                                         };
                                         
@@ -429 +540 @@
                                                 name: attend.user.name != 'false' ? attend.user.name : '',
                                                 mail: attend.user.mail,
-                                                isExternal: attend.isExternal
+                                                status : attend.status,
+                                                isExternal: attend.isExternal,
+                                                acl: attend.acl,
+                                                delegatedFrom: attend.delegatedFrom
                                         };
                                         
+                                        if(!!parseInt(attend.delegatedFrom)){
+                                                delegatedFrom[attend.delegatedFrom] = DataLayer.copy(person);
+                                                return(null);
+                                        }
+                                        
                                         if( !!parseInt(attend.isOrganizer )){
-                                                isOrganizer = ((attend.user.id == User.me.id) || (!!!attend.user)) ? 1 : 0;
                                             participantInfo.organizer = DataLayer.copy(person);
                                                 return(null);
@@ -441 +559 @@
                                 }),
                             organizer: participantInfo.organizer || me,
-                            alarms: !!participantInfo.user ?  participantInfo.user.alarms : [],
-                            status: !!participantInfo.user ? participantInfo.user.status :  1,
-                            me: me,
-                                isOrganizer: isOrganizer,
+                            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}),
+                                delegatedFrom: delegatedFrom,
                                 statusParticipants: statusParticipants
                         };
-                });
-
+                });     
         return notArray ? res[0] : res;
     }
@@ -485 +603 @@
                               description: form.description,
                               timezone: tzId,
+                                  attachments: $.map(form.attachment || [], function( attachment, i ){
+                                                return {attachment: attachment}
+                                  }),
                               participants: $.map( form.attendee || [], function( attendee, i ){
 
@@ -495 +616 @@
                                                 if( participant.user === User.me.id ){
                                                         return DataLayer.merge({
-                                                                isOrganizer: ( !i ? 1 : 0 ),
+                                                                id: attendee,
+                                                                isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                                                                acl: form.attendee_organizer == attendee ? (form.attendeeAcl[i].indexOf('o') < 0 ? form.attendeeAcl[i]+'o' : form.attendeeAcl[i]) : form.attendeeAcl[i].replace('o', ''),
                                                                 alarms: participant.alarms = $.map( form.alarmTime || [], function( alarmTime, i ){
                                                                                 if( alarmTime === "" )
@@ -502 +625 @@
                                                                                                                                         { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
                                                                         }),
-                                                                status: form.status
-                                                        }, !!form.idEvent ? {id: attendee} : {user: participant.user});                                                 
+                                                                status: !!form.status ? form.status : 3
+                                                                }, form.delegatedFrom[i] != '0' ? {delegatedFrom: form.delegatedFrom[i]} : {});                                                 
                                                 }else{
-                                                        return {
+                                                        return DataLayer.merge({
                                                                 id: attendee,
-                                                                isOrganizer: ( !i ? 1 : 0 ),
-                                                                isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0
-                                                        };
+                                                                acl: form.attendeeAcl[i],
+                                                                isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                                                                isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                                                                acl: form.attendee_organizer == attendee ? (form.attendeeAcl[i].indexOf('o') < 0 ? form.attendeeAcl[i]+'o' : form.attendeeAcl[i]) : form.attendeeAcl[i].replace('o', '')
+                                                        }, form.delegatedFrom[i] != '0' ? {delegatedFrom: form.delegatedFrom[i]} : {}); 
                                                 };
                                           })
@@ -719 +844 @@
                         for(var i = 0; i < evt.participants.length; i++){
                                 attendee = DataLayer.get('participant', evt.participants[i]);
-                                if(!!parseInt(attendee.isOrganizer))
                                         if(attendee.user == User.me.id)
-                                                return true;
-                                        else
-                                                return false;
+                                                return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? true : false;
                         }
                 }

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

@@ -45 +45 @@
 }
 */
+
 function eventDetails( objEvent, decoded, path)
 {
@@ -69 +70 @@
          */
         zebraDiscardEventDialog = false;
+        
+        /**
+                ACLs do participant
+        */
+        acl_names = {
+                'w': 'acl-white',
+                'i': 'acl-invite-guests',
+                'p': 'acl-participation-required'
+        };
+        /**
+        * callback de participantes generico
+        */
+        var callbackAttendee = function(){
+                //Cria qtip de permissões pelo click do checkbox
+                var checked = false;
+                blkAddAtendee.find("li.not-attendee").addClass('hidden');
+        
+                blkAddAtendee.find("li .button").filter(".close.new").button({
+                        icons: {
+                                primary: "ui-icon-close"
+                        },
+                        text: false
+                }).click(function () {
+                        DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val());
+                        $(this).parents('li').remove();
+                        if(blkAddAtendee.find(".attendee-list li").length == 1)
+                                blkAddAtendee.find("li.not-attendee").removeClass('hidden');
+                })
+                .addClass('tiny disable ui-button-disabled ui-state-disabled')
+                .removeClass('new').end()
+        
+                .filter(".delegate.new").button({
+                        icons: {
+                                primary: "ui-icon-transferthick-e-w"
+                        },
+                        text: false
+                }).click(function () {
+                                                
+                        if($(this).hasClass('attendee-permissions-change-button')){
+                                $(this).removeClass('attendee-permissions-change-button')   
+                                .find('.ui-icon-transferthick-e-w').removeClass('attendee-permissions-change').end();               
+                                
+                                $(this).parents('li').find('input[name="delegatedFrom[]"]').val('');
+                                
+                                blkAddAtendee.find('.request-update').addClass('hidden');
+                                blkAddAtendee.find('.status option').toggleClass('hidden');
+                                
+                                
+                                blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');
+                                
+                        }else{
+                                blkAddAtendee.find('.delegate').removeClass('attendee-permissions-change-button');
+                                blkAddAtendee.find('.ui-icon-transferthick-e-w').removeClass('attendee-permissions-change');
+                        
+                                $(this).addClass('attendee-permissions-change-button')   
+                                .find('.ui-icon-transferthick-e-w').addClass('attendee-permissions-change').end();               
+                                $(this).parents('li').find('input[name="delegatedFrom[]"]').val(blkAddAtendee.find('.me input[name="attendee[]"]').val());
+                        
+                                blkAddAtendee.find('.request-update').removeClass('hidden');
+                                if(blkAddAtendee.find('.status option.hidden').length == 1)
+                                        blkAddAtendee.find('.status option').toggleClass('hidden');
+                        
+                                blkAddAtendee.find('option[value=5]').attr('selected','selected').trigger('change');
+                        }
+                })
+                .addClass('tiny disable ui-button-disabled ui-state-disabled')
+                .removeClass('new').end()
+                
+                .filter(".edit.new").button({
+                        icons: {
+                                primary: "ui-icon-key"
+                        },
+                        text: false
+                }).click(function() {
+                        
+                        if(!!!checked)
+                                $(this).parents('li').find('[type=checkbox]').attr('checked', (!$(this).parent().find('[type=checkbox]').is(':checked'))).end();
+                        
+                        var aclsParticipant =  $(this).parents('li').find('input[name="attendeeAcl[]"]').val();
+                        checked = false;
+                        
+                        if( $('.qtip.qtip-blue.qtip-active').val() !== ''){
+                                blkAddAtendee.find('dd.attendee-list').qtip({
+                                        show: {ready: true, solo: true, when: {event: 'click'}},
+                                        hide: false,
+                                        content: {
+                                                text: $('<div></div>').html( DataLayer.render( 'templates/attendee_permissions.ejs', {} ) ), 
+                                                title: {
+                                                        text:'Permissões', 
+                                                        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}
+                                        }
+                                })
+                                .qtip("api").onShow = function(arg0) {
+                                        $('.qtip-active .button.close').button({
+                                                icons: {primary: "ui-icon-close"},
+                                                text: false
+                                        })
+                                        .click(function(){
+                                                blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                                        });
+                                        
+                                        $('.qtip-active .button.save').button().click(function(){
+                                                
+                                                var acl = '';
+                                                $('.qtip-active').find('[type=checkbox]:checked').each(function(i, obj) {
+                                                        acl+= obj.value;
+                                                });
+
+                                                blkAddAtendee.find('dd.attendee-list [type=checkbox]:checked').siblings('input[name="attendeeAcl[]"]').each(function(i, obj) { 
+                                                        obj.value = 'r'+acl;
+                                                }).parents('li').find('.button.edit').addClass('attendee-permissions-change-button')   
+                                                .find('.ui-icon-key').addClass('attendee-permissions-change');               
+                                                
+                                                blkAddAtendee.find('dd.attendee-list [type=checkbox]').attr('checked', false);
+                                                
+                                                blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                                        
+                                        });
+                                        $('.qtip-active .button.cancel').button().click(function(){
+                                                blkAddAtendee.find('dd.attendee-list [type=checkbox]').attr('checked', false);
+                                                blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                                        });
+                                        
+                                        if(aclsParticipant)
+                                                for(var i = 1; i < aclsParticipant.length; i++){
+                                                        $('.qtip-active').find('input[name="'+acl_names[aclsParticipant.charAt(i)]+'"]').attr('checked', true);
+                                                }
+                                        
+                                        
+                                        $('.button').button();
+                                        
+                                };
+                        }else{
+                                if(!$('.new-event-win dd.attendee-list').find('[type=checkbox]:checked').length){
+                                        blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                                }else{
+                                        $('.qtip-active .button.save .ui-button-text').html('Aplicar a todos')
+                                }
+                        
+                        };                      
+                })
+                .addClass('tiny disable ui-button-disabled ui-state-disabled')
+                .removeClass('new').end()
+                
+                .filter(".open-delegate.new").click(function(){
+                        if($(this).hasClass('ui-icon-triangle-1-e')){
+                                $(this).removeClass('ui-icon-triangle-1-e').addClass('ui-icon-triangle-1-s');
+                                $(this).parents('li').find('.list-delegates').removeClass('hidden');
+                        }else{
+                                $(this).removeClass('ui-icon-triangle-1-s').addClass('ui-icon-triangle-1-e');
+                                $(this).parents('li').find('.list-delegates').addClass('hidden');
+                        }
+                
+                }).removeClass('new');
+        
+        
+                blkAddAtendee.find("li input[type=checkbox].new").click(function(){
+                        if(!$('.new-event-win dd.attendee-list').find('[type=checkbox]:checked').length){
+                                blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                        }else{
+                                checked = true;
+                                $(this).parents('li').find('.button.edit').click();
+                                //$('.qtip-active .button.save .ui-button-text').html('Aplicar a todos')
+                        }
+                        
+                        checked = true;
+                        $(this).parents('li').find('.button.edit').click();
+                }).removeClass('new');
+        
+                UI.dialogs.addEvent.find('.attendees-list li').hover(
+                        function () {
+                                $(this).addClass("hover-attendee");
+                                $(this).find('.button').removeClass('disable ui-button-disabled ui-state-disabled').end()
+                                .find('.attendee-options').addClass('hover-attendee');
+                        },
+                        function () {
+                                $(this).removeClass("hover-attendee");
+                                $(this).find('.button').addClass('disable ui-button-disabled ui-state-disabled').end()
+                                .find('.attendee-options').removeClass('hover-attendee');;
+                        }
+                );
+        
+                
+        }
         
         var html = DataLayer.render( path+'templates/event_add.ejs', {event:objEvent}); 
@@ -99 +293 @@
                                                                         if(clicked == 'Descartar alterações') {
                                                                                 canDiscardEventDialog = true;
+                                                                                /**
+                                                                                *Remoção dos anexos do eventos caso seja cancelado a edição
+                                                                                */
+                                                                                var ids = [];
+                                                                                $.each($('.attachment-list input'), function (i, input) { ids.push(input.value); });
+                                                                                if(ids.length > 0)
+                                                                                        DataLayer.remove('attachment', {filter: ['IN', 'id', ids]});
+                                                                                
                                                                                 UI.dialogs.addEvent.dialog('close');
                                                                         }else{
@@ -256 +458 @@
                         canDiscardEventDialog = true;
                         
-                        UI.dialogs.addEvent.children(".form-addevent").submit();
+                        UI.dialogs.addEvent.children().find('form.form-addevent').submit();
                         UI.dialogs.addEvent.dialog("close");
             }).end()
                 
                 .children(".export").click(function(){
-                        UI.dialogs.addEvent.children(".form-export").submit();
+                        UI.dialogs.addEvent.children().find(".form-export").submit();
             });
 
@@ -293 +495 @@
             });
             
-//          UI.dialogs.addEvent.find('.button-add-attachment').click(function(){
-//                  var li_attach = 
-//                          '<li class="input_label">' + 
-//                                  '<input type="file" name="attachments[]"" />' +
-//                          '</li>';
-//                  jQuery('.attachments-list').append(li_attach);
-//          });
-            
-                var attendeeHtml = DataLayer.render( path+'templates/attendee_add.ejs', {event:objEvent});
+                 
+                UI.dialogs.addEvent.find('.button.suggestion-hours').button({
+                        icons: {
+                                primary: "ui-icon-clock"
+                        },
+                        text: 'Sugerir horário'
+                }).click(function () {
+                        $(this).siblings('input').removeAttr('disabled')
+                        .end().parents().find('input[name="allDay"]').removeAttr('disabled');           
+                });
+
+                if(objEvent.me.id == User.me.id){
+                        objEvent.me.id = DataLayer.put('participant', {user: objEvent.me.id, mail: objEvent.me.mail });
+                        objEvent.organizer.id = objEvent.me.id;
+                }
+
+                var attendeeHtml = DataLayer.render( path+'templates/attendee_add.ejs', {event:objEvent});              
         
                         // load template of attendees
                         var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6').append(attendeeHtml);
-                        
-                        blkAddAtendee.find('li.attendee .button').addClass('small '+ (objEvent.isOrganizer == 1 ? '' : 'hidden')).button({text:false, icons: {primary:'ui-icon-close'}}).click(function () {
-                                DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
-                                $(this).parent().remove();
-                        });
+                        if(objEvent.attendee.length)
+                                callbackAttendee();
+                        /**
+                                Opções de delegação do participante/organizer
+                        */              
+                        blkAddAtendee.find(".button.participant-delegate").button({
+                                icons: {
+                                        primary: "ui-icon-transferthick-e-w"
+                                },
+                                text: false
+                        }).click(function () {
+                                if($(this).hasClass('attendee-permissions-change-button')){
+                                        if(!$(this).hasClass('disable')){
+                                                $(this).removeClass('attendee-permissions-change-button')   
+                                                .find('.ui-icon-transferthick-e-w').removeClass('attendee-permissions-change').end();               
+                                                blkAddAtendee.find('.block-add-attendee.search').addClass('hidden');
+                                                blkAddAtendee.find('.block-add-attendee.search dt').html('Adicionar outros contatos');
+                                        }
+                                }else{                                                                  
+                                        $(this).addClass('attendee-permissions-change-button')   
+                                        .find('.ui-icon-transferthick-e-w').addClass('attendee-permissions-change').end();               
+                                        blkAddAtendee.find('.block-add-attendee.search dt').html('Delegar participação para');
+                                        blkAddAtendee.find('.block-add-attendee.search').removeClass('hidden');
+                                        blkAddAtendee.find('.block-add-attendee.search input.search').focus();
+                                }
+                        })
+                        .addClass('tiny');              
+                        
                         //show or hidden permissions attendees
                         //blkAddAtendee.find('.block-attendee-list #attendees-users li').click(show_permissions_attendees); 
@@ -481 +714 @@
                                                         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)
+                                                                DataLayer.render(path+'templates/participants_add_itemlist.ejs', {user:user, acl: objEvent.acl})
                                                         )
-                                                        .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');
+                                                        callbackAttendee();
                                                 }
                                                 
@@ -503 +733 @@
                                                  
                                                 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');
-
+                                                        DataLayer.render(path+'templates/participants_add_itemlist.ejs', [{id:newAttendeeId, name: newAttendeeName, mail: newAttendeeEmail, isExternal: 1, acl: objEvent.acl}])
+                                                ).scrollTo('max');
+                                                callbackAttendee();
 
                                                 /** 
@@ -573 +799 @@
                                                         newAttendeeId = DataLayer.put('participant', {user: old_item.find('.id').html(), isExternal: 0});
                                                         blkAddAtendee.find('dd.attendee-list ul.attendee-list')
-                                                        .append(DataLayer.render(path+'templates/participants_add_itemlist.ejs', [{id: newAttendeeId, name: old_item.find('.name').html(), mail: old_item.find('.mail').html(), isExternal: 0}]))
-                                                        .find('.button').addClass('small').button({text:false, icons: {primary:'ui-icon-close'}}).click(function () {
-                                                                $(this).parent().remove();
-                                                        }).end()
+                                                        .append(DataLayer.render(path+'templates/participants_add_itemlist.ejs', [{id: newAttendeeId, name: old_item.find('.name').html(), mail: old_item.find('.mail').html(), isExternal: 0, acl: objEvent.acl}]))
                                                         .scrollTo('max');
-
-                                                        old_item.remove();
+                                                        /**
+                                                        * Delegação de participação de um participante com permissão apenas de leitura
+                                                        *
+                                                        */
+                                                        if(!objEvent.acl.organization && !objEvent.acl.write && !objEvent.acl.inviteGuests && objEvent.acl.read ){
+                                                                
+                                                                blkAddAtendee.find('.block-add-attendee.search').addClass('hidden');
+                                                                blkAddAtendee.find('.block-add-attendee.search dt').html('Adicionar outros contatos');
+                                                                
+                                                                blkAddAtendee.find('.status option').toggleClass('hidden');
+                                                                blkAddAtendee.find('option[value=5]').attr('selected','selected').trigger('change');
+                                                                blkAddAtendee.find('.request-update').removeClass('hidden');
+
+                                                                blkAddAtendee.find('dd.attendee-list ul.attendee-list li .button.close').parents('li').find('input[name="delegatedFrom[]"]').val(blkAddAtendee.find('.me input[name="attendee[]"]').val());
+                                                                
+                                                                blkAddAtendee.find('.me .participant-delegate').addClass('disable ui-button-disabled ui-state-disabled');
+                                                                blkAddAtendee.find(".button.close").button({
+                                                                        icons: {
+                                                                                primary: "ui-icon-close"
+                                                                        },
+                                                                        text: false
+                                                                }).click(function () {
+                                                                        
+                                                                        $(this).parents('li').find('input[name="delegatedFrom[]"]').val('');
+                                                                        blkAddAtendee.find('.request-update').addClass('hidden');
+                                                                        blkAddAtendee.find('.status option').toggleClass('hidden');
+                                                                        blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');                    
+                                                                        blkAddAtendee.find('.me .participant-delegate').removeClass('disable ui-button-disabled ui-state-disabled attendee-permissions-change-button')
+                                                                        .find('.ui-icon-person').removeClass('attendee-permissions-change').end();                      
+                                                                        
+                                                                        DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val());
+                                                                        $(this).parents('li').remove();
+                                                                })
+                                                                .addClass('tiny');
+                                                        }else{
+                                                                callbackAttendee();
+                                                                old_item.remove();
+                                                        }
                                                 }
                                         });
@@ -586 +845 @@
                                 }
                         });
-
-/*
-                        UI.dialogs.addEvent.find('.attendees-list li').hover(
-                                function () {
-                                        $(this).addClass("hover");
-                                },
-                                function () {
-                                        $(this).removeClass("hover");
+                        //$('.block-add-attendee .search-result-list').selectable();
+
+                UI.dialogs.addEvent.find('.row.fileupload-buttonbar .button').filter('.delete').button({
+                        icons: {
+                                primary: "ui-icon-close"
+                        },
+                                text: 'Excluir'
+                        }).click(function () {
+                                $('.row.fileupload-buttonbar .attachments-list p').remove();
+                                
+                                var ids = [];
+                                $.each($('.attachment-list input'), function (i, input) { ids.push(input.value); });
+                                if(ids.length > 0){
+                                        DataLayer.remove('attachment', {filter: ['IN', 'id', ids]});
+                                        $('.attachment-list input').remove();
                                 }
-                        );
-*/
-                        //$('.block-add-attendee .search-result-list').selectable();
-
-                        UI.dialogs.addEvent.find('.block-attendee-list select.status').change(function(){
-                                if ($(this).val() == 'another') {
-        //                              jQuery('.block-attendee-list .add-attendee-search').removeClass('hidden');
-                                        $(this).qtip({
-                                                show: {ready: true},
-                                                hide: false,
-                                                content: {
-                                                        text: $('.block-attendee-list .add-attendee-search').clone().removeClass('hidden'), 
-                                                        title: {
-                                                                text:'Indique o participante', 
-                                                                button: '<a class="button close" href="#">close</a>'
-                                                        }
-                                                },
-                                                style: {name: 'blue', tip: {corner: 'leftMiddle'}, border: {width: 4, radius: 8}, width: {min: 250, max:250}},
-                                                position: {
-                                                        corner: {
-                                                                target: 'rightMiddle',
-                                                                tooltip: 'leftMiddle'
-                                                        },
-                                                        adjust: {x:0, y:0}
-                                                }
-                                        })
-                                        $(this).qtip.onShow = function() {
-                                                $('.qtip .button.close').button({
-                                                        icons: {primary: "ui-icon-close"},
-                                                        text: false
-                                                });
-                                        }
-                                } else {
-        //                              jQuery('.block-attendee-list .add-attendee-search').addClass('hidden');
-                                }
-                        });
-                UI.dialogs.addEvent.find(':input').change(function(event){
-                        if (event.keyCode != '27' && event.keyCode != '13')
-                                canDiscardEventDialog = false;
-                }).keydown(function(event){
-                        if (event.keyCode != '27' && event.keyCode != '13')
-                                canDiscardEventDialog = false;
+                }).end()
+                .filter('.close').button({
+                        icons: {
+                                primary: "ui-icon-close"
+                        },
+                                text: false
+                        }).click(function () {
+                                DataLayer.remove('attachment', $(this).parents('p').find('input[name="fileId[]"]').val());
+                                $(this).parents('p').remove();
+                }).end()
+                .filter('.downlaod-archive').button({
+                        icons: {
+                                primary: "ui-icon-arrowthickstop-1-s"
+                        },
+                                text: false
                 });
+                
+        $('#fileupload').fileupload({
+                sequentialUploads: true,
+                add: function (e, data) {
+                        if(data.files[0].size < 30000000)
+                                data.submit();
+                },
+                change: function (e, data) {
+                        $.each(data.files, function (index, file) {
+                                var attach = {};
+                                attach.fileName = file.name;
+                                if(file.name.length > 10)
+                                        attach.fileName = file.name.substr(0, 6) + file.name.substr(file.name.length-4, file.name.length);
+                                attach.fileSize = file.size;
+                                if(file.size > 30000000)
+                                        attach.error = 'Tamanho de arquivo nao permitido!!'
+                                
+                                $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {file : attach}));
+                                
+                                if(file.size < 30000000){
+                                        $('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+                                        $('.attachments-list').find('[type=file]').addClass('hidden');
+                                        
+                                }else
+                                        $('.fileinput-button.new').removeClass('new');
+                                
+                                
+                                $('.attachments-list').find('.button.close').button({
+                                        icons: {
+                                                primary: "ui-icon-close"
+                                        },
+                                        text: false
+                                }).click(function(){
+                                        var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
+                                        $('.attachment-list').find('input[value="'+idAttach+'"]')
+                                        $(this).parent().remove();
+                                });     
+                                
+                })},
+                progress: function(e, data){
+                        var value = parseInt(data.loaded / data.total * 100, 10);
+                        $('.progress.in-progress:first').removeClass('hidden')
+                        $('.progress.in-progress:first').progressbar({
+                                value: value
+                        });
+                        
+                        if(value == 100){
+                                $('.progress.in-progress:first').removeClass('in-progress').addClass('on-complete').fadeOut('slow');
+                        }
+                                
+                },
+                done: function(e, data){
+                        if(!!data.result && data.result != "[]"){
+                                var newAttach = jQuery.parseJSON(data.result);
+                                $('.attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>');
+                                $('.progress.on-complete:first').removeClass('on-complete').parents('p')
+                                .append('<input type="hidden" name="fileId[]" value="'+newAttach['attachment'][0][0].id+'"/>')
+                                .find('.status-upload').addClass('ui-icon ui-icon-check');
+                        }else
+                                $('.progress.on-complete:first').removeClass('on-complete').parents('p').find('.status-upload').addClass('ui-icon ui-icon-cancel');
+                                
+                        console.log("oi doen");
+                }
+        });
+                $('.attachments-list .button').button();
+                
+                
+                
+        $('#fileupload').bind('fileuploadstart', function () {
+                var widget = $(this),
+        progressElement = $('#fileupload-progress').fadeIn(),
+        interval = 500,
+        total = 0,
+        loaded = 0,
+        loadedBefore = 0,
+        progressTimer,
+        progressHandler = function (e, data) {
+            loaded = data.loaded;
+            total = data.total;
+        },
+        stopHandler = function () {
+            widget
+                .unbind('fileuploadprogressall', progressHandler)
+                .unbind('fileuploadstop', stopHandler);
+            window.clearInterval(progressTimer);
+            progressElement.fadeOut(function () {
+                progressElement.html('');
+            });
+        },
+        formatTime = function (seconds) {
+            var date = new Date(seconds * 1000);
+            return ('0' + date.getUTCHours()).slice(-2) + ':' +
+                ('0' + date.getUTCMinutes()).slice(-2) + ':' +
+                ('0' + date.getUTCSeconds()).slice(-2);
+        },
+        formatBytes = function (bytes) {
+            if (bytes >= 1000000000) {
+                return (bytes / 1000000000).toFixed(2) + ' GB';
+            }
+            if (bytes >= 1000000) {
+                return (bytes / 1000000).toFixed(2) + ' MB';
+            }
+            if (bytes >= 1000) {
+                return (bytes / 1000).toFixed(2) + ' KB';
+            }
+            return bytes + ' B';
+        },
+        formatPercentage = function (floatValue) {
+            return (floatValue * 100).toFixed(2) + ' %';
+        },
+        updateProgressElement = function (loaded, total, bps) {
+            progressElement.html(
+                formatBytes(bps) + 'ps | ' +
+                    formatTime((total - loaded) / bps) + ' | ' +
+                    formatPercentage(loaded / total) + ' | ' +
+                    formatBytes(loaded) + ' / ' + formatBytes(total)
+            );
+        },
+        intervalHandler = function () {
+            var diff = loaded - loadedBefore;
+            if (!diff) {
+                return;
+            }
+            loadedBefore = loaded;
+            updateProgressElement(
+                loaded,
+                total,
+                diff * (1000 / interval)
+            );
+        };
+                widget
+                        .bind('fileuploadprogressall', progressHandler)
+                        .bind('fileuploadstop', stopHandler);
+                progressTimer = window.setInterval(intervalHandler, interval);
+        });
+                
+        UI.dialogs.addEvent.find(':input').change(function(event){
+                if (event.keyCode != '27' && event.keyCode != '13')
+                        canDiscardEventDialog = false;
+        }).keydown(function(event){
+                if (event.keyCode != '27' && event.keyCode != '13')
+                        canDiscardEventDialog = false;
+        });     
+                
                 
                 UI.dialogs.addEvent.dialog('open');

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

@@ -17 +17 @@
                         <input type="hidden" name="isDefaultAlarm[]" value="<%=data.alarm.useAlarmDefault ? 1 : 0%>" />
                         <label> antes de cada evento.</label>
-                        <a class="button remove small"></a>
+                        <a class="button remove tiny"></a>
                 </li>
         <%}
@@ -36 +36 @@
                 <input type="hidden" name="alarmId[]" value="" />
                 <label> antes de cada evento.</label>
-                <a class="button remove small"></a>
+                <a class="button remove tiny"></a>
         </li>
 <%}%>

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

@@ +1 @@
+        <%var iconStatus = ['','ui-icon-check', 'ui-icon-radio-off', 'ui-icon-close', 'ui-icon-help', 'ui-icon-transferthick-e-w', 'ui-icon-contact']
+          var legendStatus = ['','Confirmado','Tentativa','Cancelado','Sem Resposta','Delegado', 'Participante']
+        %>
         <dl class="block-attendee-list attendees-list">
                 <dt class="me"><%= data.event.me.name %></dt>
                 <dd class="me">
                         <select class="status" name="status">
-                                <option value="1" <%= data.event.status=='1' ? 'selected="selected"':'' %>>Eu vou</option>
-                                <option value="3" <%= data.event.status=='3' ? 'selected="selected"':'' %>>Eu não vou</option>
-                                <option value="2" <%= data.event.status=='2' ? 'selected="selected"':'' %>>Talvez</option>
-<!--                            <option value="another">Outra pessoa vai</option>-->
+                                <%if(!data.event.delegatedFrom[data.event.me.id]){%>
+                                        <option value="1" <%= data.event.status=='1' ? 'selected="selected"':'' %>>Eu vou</option>
+                                        <%if(!data.event.acl.participationRequired){%>
+                                                <option value="3" <%= data.event.status=='3' ? 'selected="selected"':'' %>>Eu não vou</option>
+                                                <option value="2" <%= data.event.status=='2' ? 'selected="selected"':'' %>>Talvez</option>
+                                                <option class="hidden" value="5">Delegado</option>
+                                        <%}%>
+                                <%}else{%>
+                                        <option value="5" 'selected="selected"'>Delegado</option>
+                                <%}%>
                         </select>
-                        <%if(data.event.organizer.id != data.event.me.id){%>
-                            <input type="hidden" name="meId" value="<%=data.event.me.id%>">
-                        <%}%>
-                        <fieldset class="add-attendee-search search-field ui-corner-all hidden">
-                                <span class="ui-icon ui-icon-search"></span>
-                                <input class="search" type="text" />
-                        </fieldset>
+                        <% if (!data.event.acl.organization && !data.event.acl.write && !data.event.acl.inviteGuests && !data.event.acl.participationRequired && !data.event.delegatedFrom[data.event.me.id] ) { %>
+                                <fieldset class="add-attendee-options-read">
+                                        <a href="#" class="button participant-delegate add-attendee-options-button">Delegar participação a um novo participante</a>
+                                </fieldset>
+                        <% } %>
+                        
+                        <p class="input-group request-update <%=data.event.delegatedFrom[data.event.me.id] ? '' : "hidden"%>">
+                                <input type="checkbox" name="receiveNotification" value="true" <%=data.event.me.receiveNotification=='1' ? 'checked="checked"' : ''%>/>
+                                <label for="request-update">Receber atualizações</label>
+                        </p>
+                        
+                        <input type="hidden" name="delegatedFrom[]" value="<%=data.event.me.delegatedFrom%>">
+                
+                        <input type="hidden" name="attendee[]" value="<%=data.event.me.id%>">
+                        <input type="hidden" name="attendeeType[]" value="0">
+                        <input type="hidden" name="attendeeAcl[]" value="<%=data.event.me.acl%>">                               
+                        
                 </dd>
 
@@ -20 +39 @@
                 <dd class="attendee-list">
                         <ul class="attendee-list">
-                                <li class="organizer <%= data.event.organizer.id == data.event.me.id ? "hidden" : ''%>"> 
+                                <li class="organizer <%= (data.event.acl.organization) ? "hidden" : "" %>"> 
                                         <div style="overflow:hidden; width:100%; display:table;">
-                                                <input type="checkbox" value="<%= data.event.organizer.id %>" disabled="disabled">
-                                                <input type="hidden" name="attendee[]" value="<%=data.event.organizer.id%>">
-                                                <input type="hidden" name="attendeeType[]" value="0">
-                                                <input type="hidden" name="attendee_organizer[]" value="<%=data.event.organizer.id%>">
-                                                <label for="attendee_organizer" title="<%= data.event.organizer.name ? data.event.organizer.name: '' %>" class="name"><%= data.event.organizer.name ? data.event.organizer.name : '' %></label>
-                                                <label for="attendee_organizer" title="<%= data.event.organizer.mail ? data.event.organizer.mail: '' %>" class="mail"><%= data.event.organizer.mail ? data.event.organizer.mail : '' %></label>
-                                                <% if (data.event.me.id == data.event.organizer.id && false) { %>
-                                                <span class="button small swap">Mudar organizador</span>
-                                                <% } %>
+                                                <span class="space-status ui-icon <%=iconStatus[data.event.organizer.status]%>" title="<%=legendStatus[data.event.organizer.status]%>"></span>
+                                                <span class="space-special ui-icon ui-icon-person" title="Organizador"></span>
+                                                <% if (!data.event.acl.organization && (data.event.organizer.id != data.event.me.id )) { %>
+                                                        <input type="checkbox" value="<%= data.event.organizer.id %>" disabled="disabled">
+                                                        <input type="hidden" name="attendee[]" value="<%=data.event.organizer.id%>">
+                                                        <input type="hidden" name="attendeeType[]" value="0">
+                                                        <input type="hidden" name="attendeeAcl[]" value="<%=data.event.organizer.acl%>">
+                                                        <input type="hidden" name="delegatedFrom[]" value="<%=data.event.organizer.delegatedFrom%>">
+                                                <%}%>
+                                                <input type="hidden" name="attendee_organizer" value="<%=data.event.organizer.id%>">
+                                                <label for="attendee_organizer" title="<%= data.event.organizer.name ? data.event.organizer.name: '' %>" class="name name-special"><%= data.event.organizer.name ? data.event.organizer.name : '' %></label>
+                                                <label for="attendee_organizer" title="<%= data.event.organizer.mail ? data.event.organizer.mail: '' %>" class="mail name-special"><%= data.event.organizer.mail ? data.event.organizer.mail : '' %></label>
                                         </div>
-                                </li>           
-                                
-                        <% if (data.event && data.event.attendee) {
-                                for (var i=0; i< data.event.attendee.length; i++) {
-                        %>
-                                <li class="attendee"> 
+                                </li>
+                        <%if(!!data.event.delegatedFrom[data.event.me.id]){
+                                var delegated_me = data.event.delegatedFrom[data.event.me.id]%>
+                                <li class="me-delegated">
                                         <div style="overflow:hidden; width:100%; display:table;">
-                                                <input type="checkbox" value="<%= data.event.attendee[i].id %>" disabled="disabled">
-                                                <input type="hidden" name="attendee[]" value="<%=data.event.attendee[i].id%>">
-                                                <input type="hidden" name="attendeeType[]" value="<%=data.event.attendee[i].isExternal%>">
-                                                <label title="<%= data.event.attendee[i].name ? data.event.attendee[i].name: '' %>" class="name"><%= data.event.attendee[i].name ? data.event.attendee[i].name : '' %></label>
-                                                <label title="<%= data.event.attendee[i].mail ? data.event.attendee[i].mail : '' %>" class="mail"><%= data.event.attendee[i].mail ? data.event.attendee[i].mail : '' %></label>
-                                                <span class="ui-icon ui-icon-close ui-corner-all ui-icon-float-right"></span>
-                                        </div> 
-                                        <a class="button close">X</a>
+                                                <span class="space-status ui-icon <%=iconStatus[delegated_me.status]%>" title="<%=legendStatus[delegated_me.status]%>"></span>
+                                                <span class="space-special ui-icon <%=iconStatus[5]%>" title="Delegado para"></span>
+                                                <input type="checkbox" value="<%= delegated_me.id%>" disabled="disabled">
+                                                <label for="me-delegated" title="<%= delegated_me.name ? delegated_me.name: '' %>" class="name name-special"><%= delegated_me.name ? delegated_me.name : '' %></label>
+                                                <label for="me-delegated" title="<%= delegated_me.mail ? delegated_me.mail: '' %>" class="mail name-special"><%= delegated_me.mail ? delegated_me.mail : '' %></label>
+                                        </div>
                                 </li>
-                                
-                                
-                                
-                        <%      
-                                } 
-                        } else { %>
-                                <li>Não há outros participantes.</li>
+                        <%}%>
+                        <% if (data.event && data.event.attendee.length > 0) {
+                                for (var i=0; i< data.event.attendee.length; i++) {%>
+                                        <li class="attendee"> 
+                                                <div style="overflow:hidden; width:100%; display:table;">
+                                                        <%if(data.event.delegatedFrom[data.event.attendee[i].id]){%>
+                                                                <span class="open-delegate new ui-icon ui-icon-triangle-1-e"></span>
+                                                        <%}else{%>
+                                                                <span class="space-status ui-icon <%=iconStatus[data.event.attendee[i].status]%>" title="<%=legendStatus[data.event.attendee[i].status]%>"></span>
+                                                        <%}%>
+                                                        <span class="space-special ui-icon <%= !!data.event.delegatedFrom[data.event.attendee[i].id] ? iconStatus[5] : iconStatus[6]%>" title="<%=!!data.event.delegatedFrom[data.event.attendee[i].id] ? legendStatus[5] : legendStatus[6]%>"></span>
+                                                        <%if(data.event.acl.organization || data.event.acl.write){%>
+                                                                <input type="checkbox" value="<%= data.event.attendee[i].id %>">
+                                                        <%}else{%>
+                                                                <input type="checkbox" value="<%= data.event.attendee[i].id%>" disabled="disabled">
+                                                        <%}%>
+                                                        <input type="hidden" name="attendee[]" value="<%=data.event.attendee[i].id%>">
+                                                        <input type="hidden" name="attendeeType[]" value="<%=data.event.attendee[i].isExternal%>">
+                                                        <input type="hidden" name="attendeeAcl[]" value="<%=data.event.attendee[i].acl%>">
+                                                        <input type="hidden" name="delegatedFrom[]" value="<%=data.event.attendee[i].delegatedFrom%>">
+                                                        <label title="<%= data.event.attendee[i].name ? data.event.attendee[i].name: '' %>" class="name <%= !!data.event.delegatedFrom[data.event.attendee[i].id] ? "name-special-delegated" : "name-special" %>"><%= data.event.attendee[i].name ? data.event.attendee[i].name : '' %></label>
+                                                        <label title="<%= data.event.attendee[i].mail ? data.event.attendee[i].mail : ''%>" class="mail <%= !!data.event.delegatedFrom[data.event.attendee[i].id] ? "name-special-delegated" : "name-special"%>"><%= data.event.attendee[i].mail ? data.event.attendee[i].mail : '' %></label>
+                                                        <span class="ui-icon ui-icon-close ui-corner-all ui-icon-float-right"></span>
+                                                </div> 
+                                                <div class="attendee-options">
+                                                        <%if(data.event.acl.organization || data.event.acl.write){%>
+                                                                <a class="button edit attendee-options-button-edit new">Editar permissões</a>
+                                                                <a class="button close new">Remover</a>
+                                                        <%}%>
+                                                </div>
+
+
+                                                <%if(!!data.event.delegatedFrom[data.event.attendee[i].id]){%>
+                                                        <%var attendee = data.event.delegatedFrom[data.event.attendee[i].id]%>
+                                                        <% while(attendee != 0){%>
+                                                                <div class="list-delegates hidden">
+                                                                        <div style="overflow:hidden; width:100%; display:table;">
+                                                                                <span class="status-delegate ui-icon <%=iconStatus[attendee.status]%>" title="<%=legendStatus[attendee.status]%>"></span>
+                                                                                <span class="space-special-delegated ui-icon <%= !!data.event.delegatedFrom[attendee.id] ? iconStatus[5] : iconStatus[6]%>" title="<%=!!data.event.delegatedFrom[attendee.id] ? legendStatus[5] : legendStatus[6]%>"></span>
+                                                                                <input type="hidden" name="attendee[]" value="<%=attendee.id%>">
+                                                                                <input type="hidden" name="attendeeType[]" value="<%=attendee.isExternal%>">
+                                                                                <input type="hidden" name="attendeeAcl[]" value="<%=attendee.acl%>">
+                                                                                <input type="hidden" name="delegatedFrom[]" value="<%=attendee.delegatedFrom%>">
+                                                                                <label title="<%= attendee.name ? attendee.name : '' %>" class="name <%=attendee.status == 5 ? "name-status-delegated-delegated" : "name-status-delegated-none"%>"><%= attendee.name ? attendee.name : '' %></label>
+                                                                                <label title="<%= attendee.mail ? attendee.mail : '' %>" class="mail <%=attendee.status == 5 ? "name-status-delegated-none" : "name-status-delegated-none"%>"><%= attendee.mail ? attendee.mail : '' %></label>
+                                                                                <span class="ui-icon ui-icon-close ui-corner-all ui-icon-float-right"></span>
+                                                                        </div> 
+                                                                </div>
+                                                                <%attendee = !!data.event.delegatedFrom[attendee.id] ? data.event.delegatedFrom[attendee.id] : 0%>
+                                                        <%}%>
+                                                <%}%>
+                                                
+
+                                        </li>   
+                                <%} 
+                        } else if(data.event.me.id == data.event.organizer.id && !(data.event.attendee.length > 0) ) { %>
+                                <li class="not-attendee">Não há outros participantes.</li>
                         <% } %>
                         </ul>
@@ -86 +154 @@
                 
         </dl>
-<% if (data.event.isOrganizer == 1) { %>
-        <dl class="block-add-attendee">
-                <dt class="add-attendee">Adicionar convidados</dt>
-                <dd class="add-attendee">
-                        <fieldset class="block-add-attendee" title="Participantes">
-                                <fieldset class="add-attendee-search search-field ui-corner-all">
-                                        <span class="ui-icon ui-icon-search"></span>
-                                        <input class="search" type="text" />
-                                </fieldset>
-                                <ul class="search-result-list ui-corner-all">
+<% var isSearch = (data.event.acl.organization || data.event.acl.write || data.event.acl.inviteGuests) ? '' : 'hidden' %>
+<dl class="block-add-attendee search <%=isSearch%>">
+        <dt class="add-attendee search">Adicionar outros convidados</dt>
+        <dd class="add-attendee">
+                <fieldset class="block-add-attendee" title="Participantes">
+                        <fieldset class="add-attendee-search search-field ui-corner-all">
+                                <span class="ui-icon ui-icon-search"></span>
+                                <input class="search" type="text" />
+                        </fieldset>
+                        <ul class="search-result-list ui-corner-all">
 
-                                </ul>
+                        </ul>
 
-                        </fieldset>
+                </fieldset>
+        </dd>
+</dl>
 
-                        <fieldset class="block-add-attendee-permissions ui-corner-all hidden">
-                                <legend>Convidados podem:</legend>
-                                <ul class="add-attendee-permissions-list">
-                                        <li><input type="checkbox" name="attendee-mod-event"><label for="attendee-mod-event">Modificar evento </label></li>
-                                        <li><input type="checkbox" name="attendee-invite-others"><label for="attendee-invite-others">Convidar outros</label></li>
-                                        <li><input type="checkbox" name="attendee-view-list-invited"><label for="attendee-view-list-invited">Ver lista de convidados</label></li>
-                                        <li><input type="checkbox" name="attendee-optional"><label for="attendee-optional">Participação opcional</label></li>
-                                </ul>
-                        </fieldset>
-                </dd>
-        </dl>
-<% } %>

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

@@ -1 @@
-<!--<div title="Criar Evento" class="new-event-win active"> -->
-    <form method="POST" action="<%=((data.event.isOrganizer == 0) && (data.event.id)) ? "schedulable:preview" : "schedulable:detail"%>" class="form-addevent content">
+<div title="Criar Evento" class="div-addevent content">
+    <form method="POST" action="<%=(data.event.acl.organization || data.event.acl.write) ?  "schedulable:detail" : "schedulable:preview"%>" class="form-addevent content">
 
         <fieldset id="calendar_addevent_details1">
                 <legend class="hidden">Detalhes do evento</legend>
                 <p class="input-group">
-                        <input type="text" class="h1" name="summary" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> value="<%= (data.event.summary) ? data.event.summary : '' %>"/>
+                        <input type="text" class="h1" name="summary" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> value="<%= (data.event.summary) ? data.event.summary : '' %>"/>
                         <% if( data.event.id ){ %>
                                 <input type="hidden" class="id-event" name="idEvent" value="<%= data.event.id %>"/>
@@ -11 +11 @@
                 </p>
                 <p class="input-group date-info">
-                        <input type="text" class="date start-date" value="<%= (data.event.startDate) ? data.event.startDate : '' %>" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> name="startDate" />
-                        <input type="text" class="time start-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.startHour) ? data.event.startHour : '' %>" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> name="startHour" /> 
+                        <input type="text" class="date start-date" value="<%= (data.event.startDate) ? data.event.startDate : '' %>" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="startDate" />
+                        <input type="text" class="time start-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.startHour) ? data.event.startHour : '' %>" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="startHour" /> 
                         <span>até</span>
-                        <input type="text" class="date end-date" value="<%= (data.event.endDate) ? data.event.endDate : '' %>" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> name="endDate" />
-                        <input type="text" class="time end-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.endHour) ? data.event.endHour : '' %>" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> name="endHour" />
-
-                        <a href="#" class="calendar_addevent_details_lnk_timezone">Fuso horário</a>
+                        <input type="text" class="date end-date" value="<%= (data.event.endDate) ? data.event.endDate : '' %>" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="endDate" />
+                        <input type="text" class="time end-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.endHour) ? data.event.endHour : '' %>" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="endHour" />
+
+                        <a href="#" class="calendar_addevent_details_lnk_timezone <%=((!data.event.acl.organization || !data.event.acl.write) && (data.event.id)) ? "hidden" : '' %>">Fuso horário</a>
 <!--                    <input type="text" name="timezone" style="display: none;" />-->
                         <select name="timezone" class="hidden calendar-addevent-details-txt-timezone">
@@ -25 +25 @@
                                 <% } %>
                         </select>
-                </p>
-                
+                        
+                        <a class="button suggestion-hours small <%=(data.event.acl.organization || data.event.acl.write) ? "hidden" : '' %>" href="#">Sugerir horário</a>
+                        
+                </p>
+                                
                 <div class="ui-widget messages-validation hidden">
                         <div style="padding: 0.2em 0.7em;" class="ui-state-error ui-corner-all"> 
@@ -37 +40 @@
                 
                 <p class="input-group event-type">
-                        <input type="checkbox" name="allDay" value="true" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> <%= (data.event.allDay) ? 'checked="checked"' : '' %>/>
+                        <input type="checkbox" name="allDay" value="true" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> <%= (data.event.allDay) ? 'checked="checked"' : '' %>/>
                         <label for="allDay">Dia inteiro</label>
 <!--
@@ -48 +51 @@
 <!--            <li><a href="#calendar_addevent_details3">Repetir</a></li>-->
                 <li><a href="#calendar_addevent_details4">Lembretes</a></li>
-<!--            <li><a href="#calendar_addevent_details4" style="color:#BBB;">Anexos</a></li>-->
+                <li><a href="#calendar_addevent_details5">Anexos</a></li>
                 <li><a href="#calendar_addevent_details6">Participantes</a></li>
         </ul>
@@ -55 +58 @@
                 <p class="input-group event-info">
                         <label for="calendar_addevent_details_txt_local">Onde</label>
-                        <input type="text" name="location" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> value="<%= (data.event) ? data.event.location : '' %>"/>
+                        <input type="text" name="location" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> value="<%= (data.event) ? data.event.location : '' %>"/>
                 </p>
 
                 <p class="input-group">
                         <label for="calendar_addevent_details_txtarea_description" class="for-textarea" >Descrição</label>
-                        <textarea name="description" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> ><%=(data.event) ? data.event.description : '' %></textarea>
+                        <textarea name="description" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> ><%=(data.event) ? data.event.description : '' %></textarea>
                 </p>
 
@@ -144 +147 @@
         <fieldset id="calendar_addevent_details6" class="tab-level2" title="Participantes">
         </fieldset>
+        
+        
+        <fieldset class="attachment-list hidden">
+        </fieldset>
     </form>
-    <form action="../../../../upload.php" method="POST">        
-<!--
+    
+
         <fieldset id="calendar_addevent_details5" class="tab-level2">
-                <span class="input_label">Anexos</span> 
-                  <ul class="attachments-list">
-                        <% if (data.event && data.event.attachments) {
-                                for (var i=0; i< data.event.attachments.length; i++) {
-                        %>
-                                <li>
-                                        <a href="<%= data.event.attachments[i].src %>" >
-                                                <input type="checkbox" name="attachments['<%= data.event.attachments[i].name %>']" checked="checked" />
-                                                <label for="calendar_addevent_details_attach_<%=i%>"><%= data.event.attachments[i].name %></label>
-                                        </a>
-                                </li>
-                        <%      }
-                           }
-                        %>
-
-                  </ul>
-                <span class="button add button-add-attachment">Adicionar anexo</span>
-        
-                <div id="fileupload">
-                        <div title="form:upload.php">
-                                <div class="fileupload-buttonbar">
-                                        <label class="fileinput-button">
-                                                <span>Add files...</span>
-                                                <input type="file" name="files[]" multiple>
-                                        </label>
-                                        <button type="submit" class="start">Start upload</button>
-                                        <button type="reset"  class="cancel">Cancel upload</button>
-                                        <button type="button" class="delete">Delete files</button>
-                                </div>
-                        </div>
-                        <div class="fileupload-content">
-                                <table class="files"></table>
-                                <div class="fileupload-progressbar"></div>
-                        </div>
-                </div>
+                <form id="fileupload" action="attachment:detail" method="POST">
+        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+        <div class="row fileupload-buttonbar">
+            <div class="button-files-upload">
+                <!-- The fileinput-button span is used to style the file input field as button -->
+                <span class="button btn-success fileinput-button">
+                    <span><i class="icon-plus icon-white"></i> Adicionar</span>
+                    <input type="file" name="files[]" multiple>
+                </span>
+                                <%if(data.event.acl.organization || data.event.acl.write){%>
+                                        <button type="button" class="button btn-danger delete">
+                                                <i class="icon-trash icon-white"></i> Remover Todos
+                                        </button>
+                                <%}%>
+            </div>
+                        <div id="fileupload-progress"></div>
+            <div class="files-list">
+               <ul class="attachments-list">
+                           <%if(data.event && data.event.attachments){
+                                        for (var i=0; i< data.event.attachments.length; i++) {
+                                        %>
+                                                <p class="input-group arquive-info">
+                                                        <label class="lbl-archive-nome">Nome:</label>
+                                                        <span class="archive-nome"><%=data.event.attachments[i].name%></span>
+                                                        
+                                                        <label class="lbl-archive-size">Tamanho:</label>
+                                                        <span class="archive-size"><%=data.event.attachments[i].size%> kb</span>
+                                                        <a href="../prototype/getArchive.php?attachment=<%=data.event.attachments[i].id%>" class="button tiny upload downlaod-archive">Download</a>
+                                                        <%if(data.event.acl.organization || data.event.acl.write){%>
+                                                                <span class="button close tiny upload delete-upload" title="Deletar">Deletar</span>
+                                                        <%}%>
+                                                        <input type="hidden" name="fileId[]" value="<%=data.event.attachments[i].id%>"/>
+                                                </p>
+                                        <%}
+                                }%>
+                           
+                           
+                           </ul>
+            </div>
+        </div>
+        <br>
+        
+    </form>
+
+        </fieldset>
 
         </fieldset>
@@ -194 +211 @@
     <div class="menu-container footer-container menu-addevent">
             <% if (data.event.id) { %>
-                <a class="button export" href="#">Exportar</a>
-            <a class="button delete" href="#">Excluir</a>
+                        <a class="button export" href="#">Exportar</a>
+                        <a class="button delete" href="#">Excluir</a>
             <% } %>
                 <a class="button cancel" href="#">Cancelar</a>
             <a class="button save" href="#">Salvar</a>
     </div>
-<!--</div>-->
+</div>
 <!--<script src="application.js"></script>-->
+<!--<script src="application.js"></script>-->

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

@@ -40 +40 @@
 <script type='text/javascript' src='<?= PLUGINSURL ?>/store/jquery.store.js'></script>
 <script type='text/javascript' src='<?= PLUGINSURL ?>/fileupload/jquery.fileupload.js'></script>
-<script type='text/javascript' src='<?= PLUGINSURL ?>/fileupload/jquery.fileupload-ui.js'></script>
+<!--<script type='text/javascript' src='<?= PLUGINSURL ?>/fileupload/jquery.fileupload-ui.js'></script>-->
 <script type='text/javascript' src='<?= PLUGINSURL ?>/fileupload/jquery.iframe-transport.js'></script>
 <script type='text/javascript' src='<?= PLUGINSURL ?>/store/jquery.store.js'></script>

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

@@ -1 +1 @@
 <li class="attendee"> 
         <div style="overflow:hidden; width:100%; display:table;">
-                <input type="checkbox" value="<%= data[0].id %>" disabled="disabled">
+                <div class="attendee-options">
+                        <%if(data[0].acl.organization || data[0].acl.write || data[0].acl.inviteGuests){%>
+                                <a href="#" class="button delegate attendee-options-button-delegate new">Delegar participação a este participante</a>
+                        <%}%>
+                        <%if(data[0].acl.organization || data[0].acl.write){%>
+                                <a class="button edit attendee-options-button-edit new">Editar permissões</a>
+                        <%}%>
+                        <a class="button close new">Close</a>
+                </div>
+                
+                <input class="new" type="checkbox" value="<%= data[0].id %>">
                 <input type="hidden" name="attendee[]" value="<%= data[0].id %>">
                 <input type="hidden" name="attendeeType[]" value="<%=data[0].isExternal%>">
+                <input type="hidden" name="attendeeAcl[]" value="r">
+                <input type="hidden" name="delegatedFrom[]" value="0">
                 <label title="<%= data[0].name ? data[0].name : '' %>" class="name"><%= data[0].name ? data[0].name : '' %></label>
-                <label title="<%= data[0].mail ? data[0].mail : '' %>" class="mail"><%= data[0].mail ? data[0].mail : '' %></label>
-        </div> 
-        <a class="button close">Close</a>
+                <label title="<%= data[0].mail ? data[0].mail : '' %>" class="mail <%= data[0].name ? 'hidden' : ''%>"><%= data[0].mail ? data[0].mail : '' %></label>
+
+        </div>
+        
 </li>

trunk/prototype/post.php

@@ -1 +1 @@
 <?php
-
-if( !isset($_REQUEST['data']) ) return;
-
-$data = $_REQUEST['data']; unset( $_REQUEST['data'] );
+/* Upload de arquivos e encaminhado para seu respectivo conceito
+ * com o source em base64 melhoria na performace.
+ */
+$data = $_POST;
+if( count($_FILES) )
+{
+        $files = array();
+        foreach( $_FILES as $name => $file )
+        {
+                if( is_array( $file['name'] ) )
+                {
+                        foreach( $file['name'] as $key => $value ){
+                                $counter = count($files);
+                                $files[$name.$counter] = array('name' => $file['name'][$counter], 
+                                                                                                'type' => $file['type'][$counter],
+                                                                                                'source' => base64_encode(file_get_contents( $file['tmp_name'][$counter], $file['size'][$counter])),
+                                                                                                'size' => $file['size'][$counter]);
+                        }
+                }else
+                        $files[$name] = $file;
+        } 
+        
+        $_FILES = $files;
+}
 
 require_once "api/controller.php";
 
-echo json_encode( Controller::put( $_REQUEST, $data ) );
+$result = array();
+foreach( $data as $concept => &$content )
+{
+        if(!is_array($content))
+                $content = array($content);
+                
+        foreach($content as $key => $value)
+                $result[$concept][] = Controller::put( array( 'concept' => $concept ), $value, isset($data['criteria']) ? $data['criteria'] : false );
+}       
+echo json_encode( $result );

trunk/prototype/services/PostgreSQL.php

@@ -210 +210 @@
             if( isset($criteria["order"]) )
             {
-                    $result .= ' ORDER BY '.( is_array($criteria["order"]) ? implode(', ', $criteria["order"]) : $criteria["order"] ).' ';
+                    $result .= ' ORDER BY '.self::parseOrder( $criteria["order"], $map ).' ';
             }
             if( isset($criteria["limit"]) )
@@ -300 +300 @@
         return $return;  
     }
-   
+
+   private static function parseOrder($order , &$map)
+    {
+                  
+        if($notArray = !is_array($order)) //Caso seja um full select pegar todas as keys
+            $order = array( $order );
+
+        $return = array();
+
+        foreach ($order as &$value) 
+        {
+            if(!isset($map[$value])) continue; //Escapa itens não existentes no mapa
+
+            $value = $map[$value];
+        }
+
+        return ( $notArray ?  $order[0] : implode(', ', $order) );
+    }
 }
 

trunk/prototype/services/iCal.php

@@ -14 +14 @@
 
     public function format ($data , $params = false)
-    {
+    {           
         $timezones = array_flip(self::$timezonesMap);
            
@@ -63 +63 @@
                            $vevent->setProperty( 'X-MICROSOFT-CDO-ALLDAYEVENT', 'FALSE' );
                        }
-                       
-                       if(isset($v['participants']) && is_array($v['participants']) && count($v['participants']) > 0 )
-                           foreach ($v['participants'] as $pi => $pv)
-                           {
-                                if($pv['isOrganizer'] == 1)
-                                   $vevent->setProperty( 'organizer' , $pv['user']['mail'], array( 'CN' => $pv['user']['name'] ));  
-                                else
-                                {
-                                    $pParams = array();
-                                    $pParams['CN'] = $pv['user']['name'];
-                                    $pParams['PARTSTAT'] = self::_getStatus( $pv['status'] );
-                                    $pParams['RSVP'] = 'TRUE';
-
-
-                                    //TODO: Implementar o delegated
-                                    $vevent->setProperty( 'attendee' , $pv['user']['mail'], $pParams);  
-                                }
-
-                           }
-
+
+                                                if(isset($v['participants']) && is_array($v['participants']) && count($v['participants']) > 0 )
+                                                        $this->createAttendee($v['participants'], $vevent);
+
+                                                if(isset($v['attachments']) && is_array($v['attachments']) && count($v['attachments']) > 0 )
+                                                        $this->createAttachment($v['attachments'], $vevent);
+                                                        
                         $vevent->setProperty( 'uid' , $v['uid'] );
-                       
+
                        //Todo: Implementar Repetição
                                            
@@ -91 +78 @@
                 default:
                     break;
-            } 
-            
-          
+            }           
         }
                         
@@ -99 +84 @@
     
     }
+        //Trata a criacao de anexos do ics
+        public function createAttachment($attachments, &$vevent){
+                foreach($attachments as $key => $attachment){
+                        $pParams = array("ENCODING" => "BASE64", "VALUE" => "BINARY",
+                                                        "X-FILENAME"  => $attachment['name']);
+                
+                        $vevent->setProperty( "attach", $attachment['source'], $pParams );
+                }
+        }
+        
+        //Trata a criacao de attendees com tratamento de delegate
+        public function createAttendee($attendees, &$vevent){
+                $delegate = array();
+                foreach ($attendees as $di => $dv){
+                        if($dv['delegatedFrom'] != 0){
+                                $delegate[$dv['delegatedFrom']] = $dv;
+                        }
+                }
+
+                foreach ($attendees as $pi => $pv){
+                        $isResponseDelegated = false;
+                        if($pv['delegatedFrom'] == 0){
+                                if($pv['isOrganizer'] == 1)
+                                   $vevent->setProperty( 'organizer' , $pv['user']['mail'], array( 'CN' => $pv['user']['name'] ));  
+                                else
+                                {
+                                        $pParams = array();
+                                        $pParams['CN'] = $pv['user']['name'];
+                                        $pParams['PARTSTAT'] = self::_getStatus( $pv['status'] );
+                                        
+                                        if(isset($delegate[$pv['id']])){
+                                                        $pParams['PARTSTAT'] = self::_getStatus( $delegate[$pv['id']]['status']);
+                                                        $pParams['DELEGATED-TO'] = $delegate[$pv['id']]['user']['mail'];
+                                                        $pParams['CN'] = $pv['user']['name'];
+                                                        
+                                                        $vevent->setProperty( 'attendee' , $pv['user']['mail'], $pParams);  
+                                                        
+                                                        if($delegate[$pv['id']]['status'] == STATUS_UNANSWERED){
+                                                                $pParams['RSVP'] = $pv['receiveNotification'] == 1 ? 'TRUE' : 'FALSE';
+                                                                unset($pParams['PARTSTAT']);
+                                                        }else
+                                                                $pParams['PARTSTAT'] = self::_getStatus( $delegate[$pv['id']]['status']);
+                                                        
+                                                        unset($pParams['DELEGATED-TO']);
+                                                        $pParams['DELEGATED-FROM'] = $pv['user']['mail'];
+                                                        
+                                                        $vevent->setProperty( 'attendee' , $delegate[$pv['id']]['user']['mail'], $pParams);  
+                                                        continue;
+                                        }
+                                        $pParams['RSVP'] = 'TRUE';
+                                                
+                                        $vevent->setProperty( 'attendee' , $pv['user']['mail'], $pParams);  
+                                }                       
+                        }
+                }       
+        }
       
-     public function parse ( $data , $params = false)
+    public function parse ( $data , $params = false)
     {
         Config::regSet('noAlarm', TRUE); //Evita o envio de notificação
@@ -110 +151 @@
         $method = $vcalendar->getProperty('method',FALSE , FALSE);
         $params['prodid'] =  $vcalendar->getProperty( 'prodid' , false , false );
-        
+                
         while ($component = $vcalendar->getComponent())
         {     
@@ -183 +224 @@
                          
                          case 'COUNTER':
+                                                        if($params['acceptedSuggestion'] !== 'false' ){
+                                                        
+                                                                $schedulable = self::_getSchedulable($uid);
+                                                                $params['calendar'] = self::_existInMyCalendars($schedulable['id']);
+                                                                
+                                $interation = self::_makeCOUNTER($schedulable , $component , $params);  
+                                                                Config::regSet('noAlarm', FALSE);                                       
+                                                        }else{
+                                                                $response = array();
+                                                                $response['from'] = $params['from'];
+                                                                $response['type'] = 'suggestionResponse';
+                                                                $response['status'] = 'DECLINECOUNTER';
+                                                                $response['schedulable'] = self::_getSchedulable($uid);
+                                                                
+                                                                Controller::create( array( 'concept' => 'notification' ) , $response); 
+                                                        }
                                break;
                          
-                         case 'DECLINE-COUNTER':
+                         case 'DECLINECOUNTER':
                                break;
                            
@@ -194 +251 @@
                                 $interation = self::_makeVEVENT($schedulable , $component , $params);
                              else // Importar evento
-                                 $interation = self::_makeVEVENT( array() , $component , $params);
+                                $interation = self::_makeVEVENT( array() , $component , $params);
 
                              break;
@@ -214 +271 @@
         public function analize ( $data , $params = false)
         {
-            $vcalendar = new icalCreator( ); 
+                        $vcalendar = new icalCreator( ); 
             $vcalendar->parse(trim($data)); 
             $vcalendar->sort();         
@@ -223 +280 @@
             while ($component = $vcalendar->getComponent())
             {     
-                $interation = array();
+                $interation = array();
                 $uid = $component->getProperty( 'uid' , false , false ); //Resgata o uid do componente
 
@@ -269 +326 @@
 
                              case 'COUNTER':
+                                                                        $interation = ICAL_ACTION_SUGGESTION;
                                    break;
 
-                             case 'DECLINE-COUNTER':
-                                   break;
+                             case 'DECLINECOUNTER':
+                                   $interation = ICAL_ACTION_NONE;
+                                                                   break;
 
                              default:
@@ -322 +381 @@
                         STATUS_CONFIRMED =>  'CONFIRMED',
                         STATUS_CANCELLED =>  'CANCELLED',
-                        STATUS_TENATIVE =>   'TENATIVE',
+                        STATUS_TENTATIVE =>   'TENTATIVE',
                         STATUS_UNANSWERED => 'NEEDS-ACTION',
                         STATUS_DELEGATED =>  'DELEGATED'
@@ -367 +426 @@
         }
 
-        static private function _makeVEVENT( $schedulable , $component ,$params)
-        {
-            $interation = array();                  
+                static private function _makeCOUNTER( $schedulable , $component ,$params)
+        {
+                        $interation = array();                  
             $eventID = isset($schedulable['id']) ? $schedulable['id'] : mt_rand().'(Formatter)';
             
             /* Data de Inicio*/
                 $startTime = $component->getProperty( 'dtstart', false , true );
-         
-                   
+                                
             /* Tiem zone do evento*/    
                if(isset($startTime['params']['TZID']))
@@ -389 +447 @@
                     $schedulable['startTime'] = self::date2timestamp($startTime['value']) - self::_getTzOffset('UTC',$schedulable['timezone']) . '000';
                 }
-                elseif(isset($startTime['params']['TZID']) && !isset($startTime['value']['tz']))/* Caso não tenha um tz na data mais exista um parametro TZID deve ser aplicado o timezone do TZID a data */
+                elseif(isset($startTime['params']['TZID']) && !isset($startTime['value']['tz'])){/* Caso não tenha um tz na data mais exista um parametro TZID deve ser aplicado o timezone do TZID a data */
                     $schedulable['startTime'] = self::date2timestamp($startTime['value']) - self::_getTzOffset('UTC',$startTime['params']['TZID']) . '000';      
+                                        $schedulable['allDay'] = 0;
+                                }
+                                else
+                {
+                    $schedulable['startTime'] = self::date2timestamp($startTime['value']) . '000';
+                     if( strpos($params['prodid'], 'Outlook') !== false )
+                    {
+                        //Se o ics veio em utc não aplicar horario de verão
+                        $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , new DateTimeZone('UTC') ); 
+                        $sTime->setTimezone($objTimezone);
+                        if($sTime->format('I')) //Se o ics veio em utc não aplicar horario de verão
+                         $schedulable['startTime'] = $schedulable['startTime'] - 3600000;
+                    }
+                }
+                
+
+             /* Data de Termino*/
+                $endTime = $component->getProperty( 'dtend', false , true ); 
+
+                if($endTime['params']['VALUE'] === 'DATE')
+                    $schedulable['endTime'] = self::date2timestamp($endTime['value']) - self::_getTzOffset('UTC',$schedulable['timezone']) . '000';
+                else if(isset($endTime['params']['TZID']) && !isset($endTime['value']['tz'])) /* Caso não tenha um tz na data mais exista um parametro TZID deve ser aplicado o timezone do TZID a data */
+                    $schedulable['endTime'] = self::date2timestamp($endTime['value']) - self::_getTzOffset('UTC',$endTime['params']['TZID']) . '000';
                 else
+                {
+                    $schedulable['endTime'] = self::date2timestamp($endTime['value']) . '000';
+                    if( strpos($params['prodid'], 'Outlook') !== false )
+                    {
+                    //Se o ics veio em utc não aplicar horario de verão
+                        $eTime = new DateTime( '@'.(int)($schedulable['endTime'] / 1000)  ,new DateTimeZone('UTC')); 
+                        $eTime->setTimezone($objTimezone);
+                        if($eTime->format('I')) 
+                            $schedulable['endTime'] = $schedulable['endTime'] - 3600000;
+                   
+                                        }
+                                }
+                        unset($schedulable['participants']);                    
+                        $interation['schedulable://'.$eventID] = $schedulable;
+                         
+            return $interation;
+                }
+                
+        static private function _makeVEVENT( $schedulable , $component ,$params)
+        {
+                        
+            $interation = array();                  
+            $eventID = isset($schedulable['id']) ? $schedulable['id'] : mt_rand().'(Formatter)';
+            
+            /* Data de Inicio*/
+                $startTime = $component->getProperty( 'dtstart', false , true );
+                                
+            /* Tiem zone do evento*/    
+               if(isset($startTime['params']['TZID']))
+                  $schedulable['timezone'] = self::nomalizeTZID ($startTime['params']['TZID']); 
+               else
+                  $schedulable['timezone'] = isset($params['calendar_timezone']) ? $params['calendar_timezone'] : 'America/Sao_Paulo'; 
+               
+                $objTimezone =  new DateTimeZone($schedulable['timezone']);  
+                
+                if($startTime['params']['VALUE'] === 'DATE' && isset($params['calendar_timezone']) )
+                {
+                    $schedulable['allDay'] = 1;
+                    $schedulable['startTime'] = self::date2timestamp($startTime['value']) - self::_getTzOffset('UTC',$schedulable['timezone']) . '000';
+                }
+                elseif(isset($startTime['params']['TZID']) && !isset($startTime['value']['tz'])){/* Caso não tenha um tz na data mais exista um parametro TZID deve ser aplicado o timezone do TZID a data */
+                    $schedulable['startTime'] = self::date2timestamp($startTime['value']) - self::_getTzOffset('UTC',$startTime['params']['TZID']) . '000';      
+                                        $schedulable['allDay'] = 0;
+                                }
+                                else
                 {
                     $schedulable['startTime'] = self::date2timestamp($startTime['value']) . '000';
@@ -519 +645 @@
                 $participant['status'] = (isset($property['params']['PARTSTAT']) && constant('STATUS_'.$property['params']['PARTSTAT']) !== null ) ? constant('STATUS_'.$property['params']['PARTSTAT']) : STATUS_UNANSWERED;
                 $participant['isOrganizer'] = '1';
+                                $participant['acl'] = 'rowi';
 
                 /* Verifica se este usuario é um usuario interno do ldap */     
@@ -558 +685 @@
                     $participant['status'] = STATUS_CONFIRMED;
                     $participant['isOrganizer'] = '1';
+                    $participant['acl'] = 'rowi';
                     $participant['isExternal']  = 0;
                     $participant['user'] =  $params['owner'];
@@ -583 +711 @@
             if($uid = $component->getProperty( 'uid' , false , false ));
                   $schedulable['uid'] = $uid;
-                
-             $interation['schedulable://'.$eventID] = $schedulable;
-                         
-             return $interation;
+
+                         while($attach = $component->getProperty('ATTACH',FALSE , TRUE)){
+
+                                $attachCurrent = array( 'name' => $attach['params']['X-FILENAME'],
+                                                                'size' => strlen($attach['value']),
+                                                                'type' => self::_getContentType($attach['params']['X-FILENAME'])
+                                                        );
+
+                                $ids = Controller::find( array( 'concept' => 'attachment' ) , array('id') ,array( 'filter' => array('AND' , array( '=' , 'name' ,  $attachCurrent['name'] ), array( '=' , 'size' , $attachCurrent['size'] ), array( '=' , 'type' , $attachCurrent['type'] )))); 
+
+                                if(!is_array($ids)){
+                                        $attachCurrent['source'] = $attach['value'];
+                                        //insere o anexo no banco e pega id para colcar no relacionamento                               
+                                        $idAttachment =  Controller::create( array('concept' => 'attachment') , $attachCurrent );
+                                }else
+                                        $idAttachment = array('id' => $ids[0]['id']);
+                                
+                                $calendarToAttachmentId = mt_rand().'2(Formatter)';
+                                $calendarToAttachment['attachment'] = $idAttachment['id'] ;
+                                $calendarToAttachment['schedulable'] = $eventID ;
+                                $interation['schedulableToAttachment://'.$calendarToAttachmentId] = $calendarToAttachment;
+                                
+                                $schedulable['attachments'][] = $calendarToAttachmentId;
+
+                        }
+
+                        $interation['schedulable://'.$eventID] = $schedulable;
+
+            return $interation;
         }
         
@@ -603 +756 @@
            
            $return =  Controller::find( array( 'concept' => 'calendarToSchedulable' ) , null , array ( 'filter' => array('AND' , array( 'IN' , 'calendar' , $calendars ),array( '=' , 'schedulable' , $id ))));
-           
-           return (isset($return[0])) ? true : false;
+
+           return (isset($return[0])) ? $return[0]['calendar'] : false;
         }
         
@@ -614 +767 @@
            return false;
         }
+                
+                
+                 static private function _getContentType( $fileName )
+        {
+            $strFileType = strtolower(substr ( $fileName , strrpos($fileName, '.') ));
+                         
+                        switch( $strFileType )
+                        {
+                                case ".asf": return "video/x-ms-asf";
+                                case ".avi": return "video/avi";
+                                case ".doc": return "application/msword";
+                                case ".zip": return "application/zip";
+                                case ".xls": return "application/vnd.ms-excel";
+                                case ".gif": return "image/gif";
+                                case ".bmp": return "image/bmp";
+                                case ".jpeg":
+                                case ".jpg": return "image/jpeg";
+                                case ".wav": return "audio/wav";
+                                case ".mp3": return "audio/mpeg3";
+                                case ".mpeg":
+                                case ".mpg": return "video/mpeg";
+                                case ".rtf": return "application/rtf";
+                                case ".html":
+                                case ".htm": return "text/html";
+                                case ".xml": return "text/xml";
+                                case ".xsl": return "text/xsl";
+                                case ".css": return "text/css";
+                                case ".php": return "text/php";
+                                case ".asp": return "text/asp";
+                                case ".pdf": return "application/pdf";
+                                case ".png": return "image/png";
+                                case ".txt": return "text/plain";
+                                case ".log": return "text/plain";
+                                case ".wmv": return "video/x-ms-wmv";
+                                case ".sxc": return "application/vnd.sun.xml.calc";
+                                case ".odt": return "application/vnd.oasis.opendocument.text";
+                                case ".stc": return "application/vnd.sun.xml.calc.template";
+                                case ".sxd": return "application/vnd.sun.xml.draw";
+                                case ".std": return "application/vnd.sun.xml.draw.template";
+                                case ".sxi": return "application/vnd.sun.xml.impress";
+                                case ".sti": return "application/vnd.sun.xml.impress.template";
+                                case ".sxm": return "application/vnd.sun.xml.math";
+                                case ".sxw": return "application/vnd.sun.xml.writer";
+                                case ".sxq": return "application/vnd.sun.xml.writer.global";
+                                case ".stw": return "application/vnd.sun.xml.writer.template";
+                                case ".pps": return "application/vnd.ms-powerpoint";
+                                case ".odt": return "application/vnd.oasis.opendocument.text";
+                                case ".ott": return "application/vnd.oasis.opendocument.text-template";
+                                case ".oth": return "application/vnd.oasis.opendocument.text-web";
+                                case ".odm": return "application/vnd.oasis.opendocument.text-master";
+                                case ".odg": return "application/vnd.oasis.opendocument.graphics";
+                                case ".otg": return "application/vnd.oasis.opendocument.graphics-template";
+                                case ".odp": return "application/vnd.oasis.opendocument.presentation";
+                                case ".otp": return "application/vnd.oasis.opendocument.presentation-template";
+                                case ".ods": return "application/vnd.oasis.opendocument.spreadsheet";
+                                case ".ots": return "application/vnd.oasis.opendocument.spreadsheet-template";
+                                case ".odc": return "application/vnd.oasis.opendocument.chart";
+                                case ".odf": return "application/vnd.oasis.opendocument.formula";
+                                case ".odi": return "application/vnd.oasis.opendocument.image";
+                                case ".ndl": return "application/vnd.lotus-notes";
+                                case ".eml": return "text/plain";
+                                case ".ps" : return "application/postscript";
+                                default    : return "application/octet-stream";
+                        }
+        }               
 }
 ?>