Changeset 7912 for sandbox/2.5.1-expresso1/prototype/modules/attach_message/attach_message.js

Timestamp:

02/26/13 12:01:41 (11 years ago)

Author:

gustavo

Message:

Ticket #3349 - Finalizada implementacao da melhoria com a busca no anexo de mensagens

File:

• sandbox/2.5.1-expresso1/prototype/modules/attach_message/attach_message.js (modified) (6 diffs)

sandbox/2.5.1-expresso1/prototype/modules/attach_message/attach_message.js

@@ -728 +728 @@
                     message['id'] = id;
                     msgs.push( message );
-
                 });
                 return msgs;
@@ -734 +733 @@
         }
         var search_imap_messages = function(param, folder){
-            var filters = [
-                        [
-                                'from',
-                                '*',
-                                param
-                        ],              
-                        [
-                        'OR',
-                        'to',
-                        '*',
-                        param
-                ],
-                        [
-                        'OR',
-                        'subject',
-                        '*',
-                        param
-                ]
-            ];
-
+                var grid = $("#message_attacher_grid");
+
+                DataLayer.storage.cache = {};
+                if( $(".attach-message-search-checkbox:checked").length > 0 ){
+                    var filters = [
+                                [
+                                        'from',
+                                        '*',
+                                        param
+                                ],              
+                                [
+                                'OR',
+                                'to',
+                                '*',
+                                param
+                        ],
+                                [
+                                'OR',
+                                'subject',
+                                '*',
+                                param
+                        ],
+                        [
+                                'OR',
+                                'folder',
+                                '*',
+                                folder
+                        ],
+                        [
+                                'OR',
+                                'body',
+                                '*',
+                                param
+                        ]
+                    ];
+                }else{
+                        var filters = [
+                                [
+                                        'from',
+                                        '*',
+                                        param
+                                ],              
+                                [
+                                'OR',
+                                'to',
+                                '*',
+                                param
+                        ],
+                                [
+                                'OR',
+                                'subject',
+                                '*',
+                                param
+                        ],
+                        [
+                                'OR',
+                                'folder',
+                                '*',
+                                folder
+                        ]
+                    ];
+                }
+                        
             var data = DataLayer.get( 'message', { filter: filters, criteria: { properties: { context: { folder: folder } } } }, true );
             var tmp = [DataLayer.get( 'message', {filter: [ "msgNumber", "IN", data ], criteria: { properties: { context: { folder: folder } } } })];
@@ -759 +801 @@
             msgs = [];
 
-            $.each(tmp, function(i, msg){
-                flag = msg['flag'];
-                id = msg['msg_number'];
-                var message = {};
-              
-                message['msg_number'] = id;
-                message['flags'] = flag;
-                message['from.name'] = msg['from'];
-                message['subject'] = msg['subject'];
-                message['timestamp'] = msg['timestamp'];
-                message['size'] = msg['size'];
-                message['id'] = id;
-                msgs.push( message );
-
-            });
-
+            if(tmp[0].rows){
+                $.each(tmp[0].rows, function(i, msg){                   
+                        flag = msg['flags'];
+                        id = msg['msg_number'];
+                        var message = {};
+                      
+                        message['msg_number'] = id;
+                        message['flags'] = flag;
+                        message['to'] = {
+                                name: msg['toaddress2'],
+                                email: msg['toaddress2']
+                        };
+
+                        if(msg['from'] != undefined &&  msg['header']['from'] != undefined){
+                                message['from'] = {
+                                        'email' : msg['from']['email'],
+                                        'name' : msg['header']['from']['name']
+                                }
+                            }else{
+                                message['from'] = {
+                                        'email' : '',
+                                        'name' : 'Rascunho'
+                                }
+                            }
+                        //message['from']['name'] = msg['from']['name'];
+                        message['subject'] = msg['subject'] ? msg['subject'] : "(sem assunto)";
+                        message['timestamp'] = parseInt(msg['timestamp']);
+                        message['size'] = msg['size'];
+                        message['id'] = id;
+                        msgs.push( message );
+                        });
+            }else{
+                grid.jqGrid("clearGridData", true);
+            }
             return msgs;
         }
@@ -781 +841 @@
             var grid = $("#message_attacher_grid");
             var folder = $("#foldertree li span.selected").parent().attr("id");
+            
+            if(param == ""){
+                $('#foldertree [id="'+folder+'"]').trigger("click");
+                return;
+            }
 
             if(folder.indexOf("local_messages_") == 0){
                 // Pesquisa pelas mensagens locais...
-                if(param == ""){
-                    $("#foldertree #"+folder).trigger("click");
-                    return;
-                }
                 msgs = search_local_messsages(param, folder);
             } else {
@@ -797 +858 @@
             grid.jqGrid("clearGridData", true);
             grid.jqGrid('setGridParam',{datatype: "local",data: msgs})
-            .trigger("reloadGrid")
-            .jqGrid('setCaption', '<span class="'+child.attr('class')+'">'+child.attr('title')+'</span>');
+            .trigger("reloadGrid");
+            //.jqGrid('setCaption', '<span class="'+child.attr('class')+'">'+child.attr('title')+'</span>');
                 }
 
@@ -807 +868 @@
                 $("#last_message_attacher_grid_pager").attr("title",title[3]);
                 $("#mailgrid-container .ui-jqgrid-titlebar")
-                .append( DataLayer.render("../prototype/modules/mail/templates/attachment_search.ejs") ).find(".ui-jqgrid-titlebar-close").hide()
+                .append( DataLayer.render("../prototype/modules/attach_message/attachment_search.ejs") ).find(".ui-jqgrid-titlebar-close").hide()
                 .end().find(".attach-message-search-input").Watermark("Pesquisa...").keydown(function(e){
                         if($.ui.keyCode.ENTER == e.keyCode){
                                 search_messages($(this).val());
                         }
+                });
+                $("#attach-message-search").button({
+                        text: false,
+                        icons: {
+                                primary: "ui-icon-search"
+                        }
+                }).next().button({
+                        text: false,
+                        icons: {
+                                primary: "ui-icon-script"
+                        }
+                });
+                $("#attach-message-search").parent().buttonset();
+
+                $("#attach-message-search").click(function(){
+                        search_messages($(this).parents(".attach-message-search-div:first").find(".attach-message-search-input").val());
                 });
         }