Changeset 7336 for trunk/calendar/templates/default/js/edit_exmail.js

Timestamp:

10/02/12 15:05:11 (12 years ago)

Author:

angelo

Message:

Ticket #3137 - Compatibilizar normalizacao de dados dos contatos dinamicos com o calendar

File:

• trunk/calendar/templates/default/js/edit_exmail.js (modified) (2 diffs)

trunk/calendar/templates/default/js/edit_exmail.js

@@ -359 +359 @@
 function extractLast( term ) {
         return split( term ).pop();
-}               
+}
 
 function updateDynamicContact(){
         dynamicContacts = new Array();
-        var dynamicData = REST.get("/dynamiccontacts").collection.itens;
-        if(dynamicData){
-                $.each(dynamicData, function(index, value){
+    var dynamicUsers = REST.get("/dynamiccontacts");
+    if(dynamicUsers.collection && !dynamicUsers.collection.error){
+        var dynamicData = normalizeContacts(dynamicUsers.collection.itens)
+
+        $.each(dynamicData, function(index, value){
                         if(index ==0){
-                                topContact = parseInt(value.data[2].value);
+                                topContact = parseInt(value['number_of_messages']);
                         }
                         var dynamic = {
-                                name : value.data[0].value,
-                                mail : value.data[1].value,
-                                value: value.data[0].value + " - " + value.data[1].value,
+                                name : value.name,
+                                mail : value.mail,
+                                value: value.name + " - " + value.mail,
                                 type: "",
-                                id: parseInt(value.data[3].value),
-                                qtd : parseInt(value.data[2].value)
+                                id: value.id,
+                                qtd : value['number_of_messages']
                         };
                         dynamicContacts.push(dynamic);
@@ -382 +384 @@
 }
 
-
 function updateDynamicPersonalContacts(){
         dynamicPersonalContacts = new Array();
-        var contactsData = REST.get("/contacts").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,
-                                type: "P"
-                        };
-                        dynamicPersonalContacts.push(contact);
-                });
-        }
+
+    var personalContacts = REST.get("/personalContact");
+
+    if(personalContacts.collection && !personalContacts.collection.error){
+        var contactsData = normalizeContacts(personalContacts.collection.itens);
+        if(contactsData){
+            $.each(contactsData, function(index, value){
+                var contact = {
+                    id : parseInt(value.id),
+                    name : value.name,
+                    email: value.email,
+                    value: value.name+ " - " + value.email,
+                    type: "P"
+                };
+                dynamicPersonalContacts.push(contact);
+            });
+        }
+    }
+}
+
+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;
 }