Changeset 7221 for trunk/expressoMail1_2

Timestamp:

09/14/12 14:48:28 (12 years ago)

Author:

acoutinho

Message:

Ticket #3104 - Unificar recursos de listagem dos contatos pessoais

Location:

trunk/expressoMail1_2/js

Files:

• doiMenuData.js (modified) (1 diff)
• draw_api.js (modified) (8 diffs)
• main.js (modified) (2 diffs)

trunk/expressoMail1_2/js/doiMenuData.js

@@ -304 +304 @@
 
 function loadExtraLDAPBox(data, element){
+
+    if(!!data[0]){
+        var decoded = {};
+
+        $.each(data, function(i, e){
+            decoded[e.name] = e.value;
+        });
+
+        data = decoded;
+
+        console.log('Entrei nao encodado');
+        console.log(data);
+    }
+
         menuItensLabel = {};
-        menuItensLabel["Name"] = {name: "<b>"+data[0].value+"</b>", disabled: true};            
-        menuItensLabel["Email"] = {name: data[1].value, disabled: true};        
-        if(data[2].value){
+        menuItensLabel["Name"] = {name: "<b>"+data.name+"</b>", disabled: true};
+        menuItensLabel["Email"] = {name: data.email, disabled: true};
+        if(!!data.telephone){
                 menuItensLabel["TelefoneLabel"] = {name: "<b>"+get_lang("Telephone")+"</b>", disabled: true};
-                menuItensLabel["TelefoneValue"] = {name: data[2].value, disabled: true};
-        }
-        if(data[3]){
-                if(data[3].value == "TRUE"){
+                menuItensLabel["TelefoneValue"] = {name: data.telephone, disabled: true};
+        }
+        if(data.vacationActive){
+                if(data.vacationActive == "TRUE"){
                         menuItensLabel["outOffice"] = {name: "<b>"+get_lang("Out of office")+"</b>", disabled: true};
-                        menuItensLabel["outOfficeValue"] = {name: data[4].value.substring(0, 20), disabled: true};
+                        menuItensLabel["outOfficeValue"] = {name: data.vacationInfo.substring(0, 20), disabled: true};
                 }
         }

trunk/expressoMail1_2/js/draw_api.js

@@ -4132 +4132 @@
                                         box.find(".box-loading").remove();
                                 else{
-                                        box.find(".box-loading").removeClass("box-loading").addClass("box-info");
+                    box.find(".box-loading").removeClass("box-loading").addClass("box-info");
                                         box.addClass("box-"+value).removeClass("invalid-email-box");
                                         loadGroupBox(data.collection, ".box-"+value);
@@ -4153 +4153 @@
         
         if(personal){
-                REST.get("/"+ (shared ? "shared" : "") +"contact/"+value, {}, function(data){
+                REST.get("/"+ (shared ? "shared" : "") +"personalContact/"+value, {}, function(data){
                         if(!data.error){
                                 if(data.collection.error)
                                         box.find(".box-loading").remove();
                                 else{
+                    var item = normalizeContact(data.collection.itens[0].data);
                                         box.find(".box-loading").removeClass("box-loading").addClass("box-info");
                                         box.addClass("box-"+value).removeClass("invalid-email-box");
-                                        loadExtraLDAPBox(data.collection.data, ".box-"+value);
+                                        loadExtraLDAPBox(item, ".box-"+value);
                                         box.unbind("dblclick").bind("dblclick", function(e){
                                                 new $.Zebra_Dialog(get_lang("Impossible editing this contact, but it's possible to remove it"), {
@@ -4168 +4169 @@
                                                         'auto_close': 3000
                                                 });
-                                        }).find(".box-input").val("\""+data.collection.data[0].value+"\" <"+data.collection.data[1].value+">");
-                                        var emailBoxValue = data.collection.data[0].value.length > 18 ? data.collection.data[0].value.substring(0, 15)+"...": data.collection.data[0].value;
-                                        emailBoxValue = emailBoxValue.length > 2 ? emailBoxValue : data.collection.data[1].value.substr(0,data.collection.data[1].value.indexOf('@'));
-                                        emailBoxValue = emailBoxValue > 18 ? emailBoxValue.substr(0,15) + "..." : emailBoxValue;
-                                        box.find(".email-box-value").html(emailBoxValue);
+                                        }).find(".box-input").val("\""+item.name+"\" <"+item.email+">");
+
+                                        box.find(".email-box-value").html(normalizeBoxName(item.name, item.value));
                                 }
                         }else{
@@ -4186 +4185 @@
                                 box.find(".box-loading").remove();
                         else{
+                var item = normalizeContact(data.collection.itens[0].data);
                                 box.find(".box-loading").removeClass("box-loading").addClass("box-info");
                                 box.addClass("box-"+value).removeClass("invalid-email-box");
-                                loadExtraLDAPBox(data.collection.itens[0].data, ".box-"+value);
+                                loadExtraLDAPBox(item, ".box-"+value);
                                 box.unbind("dblclick").bind("dblclick", function(e){
                                         new $.Zebra_Dialog(get_lang("Impossible editing this contact, but it's possible to remove it"), {
@@ -4196 +4196 @@
                                                 'auto_close': 3000
                                         });
-                                }).find(".box-input").val("\""+data.collection.itens[0].data[0].value+"\" <"+data.collection.itens[0].data[1].value+">");
-                                var emailBoxValue = data.collection.itens[0].data[0].value.length > 18 ? data.collection.itens[0].data[0].value.substring(0, 15)+"...": data.collection.itens[0].data[0].value;
-                                emailBoxValue = emailBoxValue.length > 2 ? emailBoxValue : data.collection.itens[0].data[1].value.substr(0,data.collection.itens[0].data[1].indexOf('@'));
-                                emailBoxValue = emailBoxValue > 18 ? emailBoxValue.substr(0,15) + "..." : emailBoxValue;
-                                box.find(".email-box-value").html(emailBoxValue);
-                                if(data.collection.itens[0].data[3].value == "TRUE"){
-                                        box.removeClass("invalid-email-box").addClass("out-office-box");
+                                }).find(".box-input").val("\""+item.name+"\" <"+item.email+">");
+
+                box.find(".email-box-value").html(normalizeBoxName(item.name, item.value));
+                                if(item.vacationActive == "TRUE"){
+                                        box.addClass("out-office-box");
                                 }
                         }
@@ -4210 +4208 @@
         });
 }
+
+function normalizeBoxName(name, mail){
+    var emailBoxValue = name.length > 18 ? name.substring(0, 15)+"...": name;
+    emailBoxValue = emailBoxValue.length > 2 ? emailBoxValue : email.substr(0,email.indexOf('@'));
+    emailBoxValue = emailBoxValue > 18 ? emailBoxValue.substr(0,15) + "..." : emailBoxValue;
+
+    return emailBoxValue;
+}
+
+function normalizeContact(data){
+    var item = {};
+    $.each(data, function(j, e){
+       item[e.name] = e.value;
+    });
+
+    return item;
+}
+
+function normalizeContacts(data){
+    var decoded = [];
+
+    if(!$.isArray(data)){data = [data];}
+
+    for(var i = 0; i < data.length; i++){
+        var item = {};
+        $.each(data[i].data, function(j, e){
+            item[e.name] = e.value;
+        });
+        decoded.push(item);
+    }
+    return decoded;
+}
+
 
 //FUNÇÃO QUE "SETA" OS BINDS DOS CAMPOS PARA - CC - CCO
@@ -4265 +4296 @@
                                                 if(item.typel == "/groups" && $(ul).find(".dynamic-recent").length)
                                                         self._renderItem( ul, {name:"", value:"", type:"linha"} );
-                                                if(item.typel == "/contacts" && ($(ul).find(".dynamic-group").length || $(ul).find(".dynamic-recent").length))
+                                                if(item.typel == "/personalContact" && ($(ul).find(".dynamic-group").length || $(ul).find(".dynamic-recent").length))
                                                         self._renderItem( ul, {name:"", value:"", type:"linha"} );      
                                                 currentType = item.typel;
@@ -4325 +4356 @@
                                 event.preventDefault();
                                 $(this).val("");
-                                if(ui.item.typel == "/contacts")
+                                if(ui.item.typel == "/personalContact")
                                         draw_email_box(""+ui.item.id, $(this), true, (ui.item.type.substring(0,7) == "/shared" ? true : false));
                                 else if(ui.item.typel == "/groups")

trunk/expressoMail1_2/js/main.js

@@ -55 +55 @@
 function updateDynamicPersonalContacts(){
         dynamicPersonalContacts = new Array();
-        var contactsData = REST.get("/contacts").collection.itens;
+        var contactsData = normalizeContacts(REST.get("/personalContact").collection.itens);
         if(contactsData){
                 $.each(contactsData, function(index, value){
                         var contact = {
-                                id : parseInt(value.data[0].value),
-                                name : value.data[1].value,
-                                email : value.data[2].value,
-                                value: value.data[1].value + " - " + value.data[2].value,
+                id : parseInt(value.id),
+                name : value.name,
+                email: value.email,
+                                value: value.name+ " - " + value.email,
                                 type: "P"
                         };
@@ -73 +73 @@
 function updateDynamicPersonalGroups(){
         dynamicPersonalGroups = new Array();
-        var contactsData = REST.get("/groups").collection.itens;
+        var contactsData = normalizeContacts(REST.get("/groups").collection.itens);
         if(contactsData){
                 $.each(contactsData, function(index, value){
                         var contact = {
-                                id : parseInt(value.data[0].value),
-                                owner : value.data[1].value,
-                                name : value.data[2].value,
-                                email: value.data[3].value,
+                                id : parseInt(value.id),
+                                owner : value.owner,
+                                name : value.name,
+                                email: value.email,
                                 type: "G"
                         };