Changeset 5732

Timestamp:

03/15/12 14:10:55 (11 years ago)

Author:

marcieli

Message:

Ticket #2494 - Resolvido: exibir no. de msgs nao lidas das filhas na pasta raiz.

Location:

trunk/prototype/modules

Files:

• filters/filters.js (modified) (1 diff)
• mail/js/foldertree.js (modified) (3 diffs)
• mail/templates/detailedfoldertree.ejs (modified) (1 diff)

trunk/prototype/modules/filters/filters.js

@@ -93 +93 @@
                 return '<span class="datable">' + c + '</span>';
         }
-};
-
-unorphanize = function(root, element) {
-        var ok = false;
-        for (var i=0; i<root.length; i++) {
-                if (root[i].id == element.parentFolder) {
-                        element.children = []; 
-                        root[i].children.push(element);
-                        return true;
-                } else if (ok = unorphanize(root[i].children, element)) {
-                        break;
-                }
-        }
-
-        return ok;
 };
 

trunk/prototype/modules/mail/js/foldertree.js

@@ -5 +5 @@
 function unorphanize(root, element) {
         var ok = false;
+        var f = 0;
         for (var i=0; i<root.length; i++) {
                 if (root[i].id == element.parentFolder) {
                         element.children = new Array(); 
                         root[i].children.push(element);
+/*                      root[i]['children_unseen'] = (root[i]['children_unseen']? root[i]['children_unseen'] : 0)+ parseInt(element.messageCount.unseen);
+                        console.log("=== INI ===");
+                        console.log(root[i].id);
+                        console.log(root[i].children.length);
+                        console.log("=== END ===");
+                        for(var k=0; k<root[i].children.length; k++){
+                                root[i]['children_unseen'] += (root[i].children[k]['children_unseen'] ? root[i].children[k]['children_unseen'] : 0);
+                        } */
                         return true;
                 } else if (ok = unorphanize(root[i].children, element)) {
@@ -15 +24 @@
         }
         return ok;
+}
+
+function count_unseen_children(folder){
+        if(folder.children.length){
+                for(var i=0; i< folder.children.length; i++){
+                        if(folder.children[i].children.length)
+                                folder.children[i]['children_unseen'] = (folder.children[i]['children_unseen'] ? folder.children[i]['children_unseen'] : 0) + count_unseen_children(folder.children[i]);
+                        
+                        folder['children_unseen'] = (folder['children_unseen'] ? folder['children_unseen'] : 0)+ (folder.children[i]['children_unseen'] ? folder.children[i]['children_unseen'] : 0) + parseInt(folder.children[i].messageCount.unseen);                        
+                }
+                return folder['children_unseen'];
+        }else{
+                return parseInt(folder.messageCount.unseen);
+        }
 }
 
@@ -71 +94 @@
                 }
         }
+        
+        for(var i =0; i<tree1.length; i++){
+                count_unseen_children(tree1[i]);
+        }
+        for(var i =0; i<tree2.length; i++){
+                count_unseen_children(tree2[i]);
+        }
+        for(var i =0; i<tree3.length; i++){
+                count_unseen_children(tree3[i]);
+        }
+        
         $("#content_folders").removeClass("menu-degrade").parent().removeClass("image-menu");
         var html = DataLayer.render('../prototype/modules/mail/templates/detailedfoldertree.ejs', {folders: [tree1, tree2, tree3]});

trunk/prototype/modules/mail/templates/detailedfoldertree.ejs

@@ -26 +26 @@
                   <% if(array_trees[i].messageCount.unseen > 0){        %>
                         <span style="text-align : left;">[<label id="dftree_<%= array_trees[i].id%>_unseen" class="folder_unseen" style="color : red; text-align : left;"><%= array_trees[i].messageCount.unseen %></label>]</span>
+                  <% }  %>
+                  <% if(array_trees[i].children_unseen > 0){    %>
+                        <span style="text-align : left;">[<label id="dftree_<%= array_trees[i].id%>_children_unseen" class="folder_unseen" style="color : blue; text-align : left;"><%= array_trees[i].children_unseen %></label>]</span>
                   <% }  %>
                   </span>