Changeset 5548 for trunk/expressoMail1_2/js/search.js

Timestamp:

02/24/12 15:37:35 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Resolvida logica para sinalizar/marcar e exibir sinalizadores e marcadores na busca de mensagens.

File:

• trunk/expressoMail1_2/js/search.js (modified) (6 diffs)

trunk/expressoMail1_2/js/search.js

@@ -442 +442 @@
         
         searchE.prototype.make_tr_message = function(aux,border_id,i) {
-        console.log(aux);
         /**
          * Preenche a estrutura de cache de mensagens para posterior consulta de 
@@ -460 +459 @@
                 var uid_msg = aux.uid;
                 var subject = aux.subject;
+                var labels = aux.labels;
+                var followupflagged = aux.followupflagged;
 
                 tr.id = uid_msg+"_s"+numBox;
@@ -555 +556 @@
                                                         followupflag: DataLayer.get('followupflag', '1')
                                                 };
-                                                $(this).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);
+                                                $('#td_message_followup_' + messageClickedId + ', ' + 
+                                                '#td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);                                         
+                                                //$(this).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);
                                                 aux.followupflagged.id = DataLayer.put('followupflagged', aux.followupflagged);
                                                 
@@ -567 +570 @@
                                                 DataLayer.remove('followupflagged', flagged[0].id);
                                                 $('#td_message_followup_' + messageClickedId + ', ' + 
-                                                '#td_message_followup_search_' + messageClickedId).find(".flag-edited")
-                                                .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
+                                                  '#td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", '#CCC');
+                                                $('#td_message_followup_' + messageClickedId + ', ' + 
+                                                        '#td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                                        .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
                                         } else {
                                                 //TODO - open dialog
@@ -717 +722 @@
                                 }
                                 
+
                                 tr.appendChild(td);
                         }
@@ -792 +798 @@
                 if ( data == undefined )
                         return;
+
+                //////////////////////////////////////////////////////////////////////
+                /**
+                 * Get the labels aplyed to the messages and saves the information 
+                 * into message array 
+                 */
+
+                var msg_folder = get_current_folder(); 
+                var messageNumbers = new Array();
+                var messageFolders = new Array();
+                for (var i=0; i<data.length; i++) {
+                        messageNumbers.push(data[i].uid);
+                        messageFolders.push(data[i].boxname);
+                }
+                
+
+                // var labeleds = DataLayer.get('labeled', {
+                                // filter: ['AND', ['IN', 'messageNumber', messageNumbers], ['=', 'folderName', messageFolders]],
+                                // criteria: {deepness: 2}
+                // });
+
+                // if(labeleds) {
+                        // for (var i=0; i<data.length; i++) {
+                                // for (var j=0; j<labeleds.length; j++) {
+                                        // if (labeleds[j].messageNumber == data[i].uid) {
+                                                // if (!data[i].labels)
+                                                        // data[i].labels = {};
+                                                // data[i].labels[labeleds[j].label.id] = labeleds[j].label;
+                                        // }
+                                // }
+                        // }
+                // }
+
+                /**
+                 * Get the followupflags aplyed to the messages and saves the information 
+                 * into message array 
+                 */
+                 
+                // var followupflaggeds = DataLayer.get('followupflagged', {
+                                // filter: ['AND', ['IN', 'messageNumber', messageNumbers], ['=', 'folderName', messageFolders]],
+                                // criteria: {deepness: 2}
+                        // });
+
+                // if(followupflaggeds) {
+                        // for (var i=0; i<data.length; i++) {
+                                // for (var j=0; j<followupflaggeds.length; j++) {
+                                        // if (followupflaggeds[j].messageNumber == data[i].uid) {
+                                                // if (!data[i].followupflagged)
+                                                        // data[i].followupflagged = {};
+                                                // data[i].followupflagged = followupflaggeds[j];
+                                        // }
+                                // }
+                        // }
+                // }
+                /////////////////////////////////////////////////////////////////////////
         
                 var cont = parseInt(0);