Changeset 5394 for trunk/expressoMail1_2/js

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

File:

• trunk/expressoMail1_2/js/main.js (modified) (1 diff)

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