Changeset 5394

Timestamp:

01/18/12 13:23:58 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Melhoria e correcao de bugs na importacao de eventos pelo expressoMail

Location:

trunk

Files:

• expressoMail1_2/inc/class.db_functions.inc.php (modified) (3 diffs)
• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/main.js (modified) (1 diff)
• prototype/app/datalayer.js (modified) (1 diff)

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

@@ -394 +394 @@
             $uiicalendar = CreateObject("calendar.uiicalendar");
                         if($params['selected'] || $params['readable']){
+                                $user = $params['id_user'];
+                                
                                 $_REQUEST['data'] = $fileContent;
                                 $_REQUEST['type'] = 'iCal';
@@ -404 +406 @@
                                 $output = ob_get_clean();                       
                                 $valid = json_decode($output, true);
-
-
                                 if($_REQUEST['readable']){      
                                         if(!$valid)
@@ -411 +411 @@
                                                 $return = false;
                                                 $output = unserialize($output);
-                                                foreach($output[0] as $key => $value){
-                                                        if(array_key_exists("id",$output[0][$key]))
-                                                                $return = true;
+                                        
+                                                ob_start();
+                                                var_dump($output[0]);                                           
+                                                $l = ob_get_clean();
+                                                file_put_contents( "/tmp/acoutinho.log",  $l , FILE_APPEND);
+
+                                                
+                                                
+                                                foreach($output[0] as $key => &$value){
+                                                
+                                                        if(isset($value['user'])){                                                      
+                                                                if($user == $value['user'])
+                                                                        return  $value['schedulable'];
+                                                        }
                                                 }
-                                                return $return;
                                         }
                                         return false;

trunk/expressoMail1_2/index.php

@@ -91 +91 @@
         ';
 
+        /**
+        * Importacao de plugins e dados do nova agenda
+        *
+        *
+        */
+        
+        echo"
+                
+                <script type='text/javascript' src='../prototype/app/plugins/datejs/date-pt-BR.js'></script>
+                <script type='text/javascript' src='../prototype/app/plugins/datejs/sugarpak.js'></script>
+                <script type='text/javascript' src='../prototype/app/plugins/datejs/parser.js'></script>
+                <script type='text/javascript' src='../prototype/app/plugins/dateFormat/dateFormat.js'></script>
+                
+                <script src='../prototype/app/plugins/ejs/ejs.js' language='javascript'></script>
+                <script src='../prototype/app/plugins/store/jquery.store.js' language='javascript'></script>
+                <script src='../prototype/app/datalayer.js' language='javascript'></script>
+                <script type='text/javascript' src='../prototype/app/plugins/scrollto/jquery.scrollTo.js'></script>
+                <script language='javascript'>DataLayer.dispatchPath = '../prototype/';</script>
+        
+                <script>
+                $.ajax({
+                                url: '../prototype/modules/calendar/index.php',
+                                async: false,
+                                success: function(){
+                                }
+                });
+                </script>
+                <script type='text/javascript' src='../prototype/modules/calendar/js/calendar.codecs.js'></script>
+                <script type='text/javascript' src='../prototype/modules/calendar/js/helpers.js'></script>
+                <script language='javascript'>var CalendarBkp = Calendar;</script>
+
+        
+        
+        ";
+        
+         echo "<script language='javascript'>Calendar = $.extend(CalendarBkp, Calendar);</script>";
+        
+        
         /*
          * TODO: implementar o controle como preferência do usuário 

trunk/expressoMail1_2/js/main.js

@@ -3407 +3407 @@
                         success: function(){
                                 $.ajax({
-                                        url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&readable=true',
+                                        url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&readable=true&cirus_delimiter='+cyrus_delimiter,
                                         async: false,
                                         success: function(data){
                                                 data = connector.unserialize(data);
-                                                if(data){
-                                                        up = true;
-                                                        $("#select-agenda").css("display", "none");
-                                                        $("#import-dialog" ).children("p:first-child").css("display", "none");
-                                                        $("#import-dialog" ).dialog({
-                                                                height: 160,
-                                                                title: 'Atualizar Evento'
-                                                        });
-                                                        $(".ui-dialog-buttonpane").find(".ui-button:last").children().html("Atualizar");
+                                                
+                                                        
+                                                var createDialog = function(isCorrentEvent){
+                                                        
+                                                        if(!(!!isCorrentEvent)){
+                                                                $("#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);
+                                                                };                                      
+                                                        
+                                                        }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'
+                                                                });
+                                                                $(".ui-dialog-buttonpane").find(".ui-button:last").children().html("Atualizar");                
+                                                        };
+                                                        $( "#import-dialog" ).dialog( "open" ); 
+                                                };
+                                                
+                                                
+                                                
+                                                if(!!data){
+                                                        var isCorrentEvent = false;
+                                                        var count = 0;
+                                                        
+                                                        $.getJSON("../prototype/request.php",
+                                                        {
+                                                                concept : "calendarToSchedulable",
+                                                                filter : ['AND', ['IN', 'calendar', Calendar.calendarIds], ['=', 'schedulable', data]]
+                                                        }, createDialog);
+                                                }else{
+                                                        createDialog(false);
                                                 }
-                                                else{
-                                                        $.getJSON("../prototype/me.php", function(user){
-                                                                logUser = user;
-                                                                up = false;
-                                                                $("#select-agenda").css("display", "");
-                                                                $("#import-dialog" ).children("p:first-child").css("display", "");
-                                                                $.getJSON("../prototype/request.php",
-                                                                {
-                                                                        concept : "calendarSignature",
-                                                                        criteria : {'deepness' : 2},
-                                                                        filter : ["=", "user", logUser.id]
-                                                                }, function(calendarSignatures){
-                                                                        $("#select-agenda").html('');
-                                                                        for(var calendario in calendarSignatures){
-                                                                                var doc = document .createElement("OPTION");
-                                                                                doc.value = calendarSignatures[parseInt(calendario)].calendar.id;
-                                                                                doc.innerHTML = calendarSignatures[parseInt(calendario)].calendar.name;
-                                                                                $("#select-agenda").append(doc);
-                                                                        }
-                                                                });
-                                                        });
-                                                }
-                                        }
-                                });
-                        }
-                });
-        }
-        else
-        {                       
-                if(confirm(get_lang("Do you confirm this import to your Calendar?"))){
-                        cExecute( import_url +'&from_ajax=true',handler_import_calendar);
-                }
-        }
-        $( "#import-dialog" ).dialog( "open" );
+                                }});
+                        }});
+                }
 }
 function open_msg_part(data){

trunk/prototype/app/datalayer.js

@@ -1013 +1013 @@
             result = this.request( concept, id || filter.filter, filter.criteria );
 
-            if( result && bothSides && !filter.criteria.format )
+            if( result && bothSides && (!filter || 
+                                                                        !filter.criteria || 
+                                                                        !filter.criteria.format) )
             {
               var newResult = [];