Changeset 7271 for trunk/expressoMail1_2/js/main.js

Timestamp:

09/21/12 12:29:04 (12 years ago)

Author:

acoutinho

Message:

Ticket #3104 - Unificar recursos de listagem dos contatos, melhorias nos processos e validacoes

File:

• trunk/expressoMail1_2/js/main.js (modified) (3 diffs)

trunk/expressoMail1_2/js/main.js

@@ -33 +33 @@
 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);
@@ -55 +59 @@
 function updateDynamicPersonalContacts(){
         dynamicPersonalContacts = new Array();
-        var contactsData = normalizeContacts(REST.get("/personalContact").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);
-                });
-        }
+
+    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);
+            });
+        }
+    }
 }
 
@@ -73 +82 @@
 function updateDynamicPersonalGroups(){
         dynamicPersonalGroups = new Array();
-        var contactsData = normalizeContacts(REST.get("/groups").collection.itens);
-        if(contactsData){
-                $.each(contactsData, function(index, value){
-                        var contact = {
-                                id : parseInt(value.id),
-                                owner : value.owner,
-                                name : value.name,
-                                email: value.email,
-                                type: "G"
-                        };
-                        dynamicPersonalGroups.push(contact);
-                });
-        }
+
+    var groups = REST.get("/groups");
+
+    if(groups.collection && !groups.collection.error){
+        var contactsData = normalizeContacts(groups.collection.itens);
+        if(contactsData.collecion && !contactsData.collecion.error){
+            $.each(contactsData, function(index, value){
+                var contact = {
+                    id : parseInt(value.id),
+                    owner : value.owner,
+                    name : value.name,
+                    email: value.email,
+                    type: "G"
+                };
+                dynamicPersonalGroups.push(contact);
+            });
+        }
+    }
 }