Changeset 5086 for branches/2.2
- Timestamp:
- 09/13/11 10:21:50 (13 years ago)
- Location:
- branches/2.2/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/js/local_messages.js
r4857 r5086 913 913 } 914 914 915 local_messages.prototype.search = function(folders,sFilter ) {915 local_messages.prototype.search = function(folders,sFilter,sortType) { 916 916 this.init_local_messages(); 917 917 this.setFilter(sFilter); … … 958 958 } 959 959 } 960 var sql = "select mail.header,folder.folder,mail.rowid,size from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario="+account_id + " and folder.folder in ("; 960 var sql = "select mail.header,folder.folder,mail.rowid,size"; 961 var order; 962 if(sortType) { 963 var sort_splited = sortType.split("_"); 964 965 //Preparando o select caso tenha order from 966 if(sort_splited[0]=="SORTWHO") { 967 sql+=',case when ltrim(ltrim(substr(UPPER(ffrom),21,length(mail.ffrom)),\':\'),\'"\') like \'5:%\' then ' + 968 'substr(ltrim(ltrim(substr(UPPER(mail.ffrom),21,length(mail.ffrom)),\':\'),\'"\'),17) ' + 969 'else ' + 970 'ltrim(ltrim(substr(UPPER(mail.ffrom),21,length(mail.ffrom)),\':\'),\'"\') ' + 971 'end as order_from'; 972 } 973 974 order=" order by "; 975 switch (sort_splited[0]) { 976 case "SORTBOX": 977 order+= "folder.folder "; 978 break; 979 case "SORTWHO": 980 order+="order_from "; 981 break; 982 case "SORTSUBJECT": 983 order+="UPPER(mail.subject) "; 984 break; 985 case "SORTDATE": 986 order+="mail.timestamp "; 987 break; 988 case "SORTSIZE": 989 order+="mail.size "; 990 break; 991 } 992 if(sort_splited[1]=='REVERSE') 993 order+="desc"; 994 995 996 997 } 998 else { 999 order = " "; 1000 } 1001 sql+=" from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario="+account_id + " and folder.folder in ("; 961 1002 for(var fnum in folders) { 962 1003 sql+="'"+folders[fnum]+"'"; … … 990 1031 } 991 1032 sql += ")"; 1033 sql += order; 1034 1035 992 1036 var rs = this.dbGears.execute(sql); 993 1037 var retorno = []; -
branches/2.2/expressoMail1_2/js/search.js
r5067 r5086 331 331 } 332 332 333 searchE.prototype.viewLocalMessage = function( )333 searchE.prototype.viewLocalMessage = function(borderID, sortType) 334 334 { 335 335 var data = [2]; … … 349 349 if ( local_folders.length > 0 ){ 350 350 if (this.folders.length >0) 351 gears = expresso_local_messages.search( this.folders, expresso_local_messages.getFilter() );351 gears = expresso_local_messages.search( this.folders, expresso_local_messages.getFilter(),sortType ); 352 352 else 353 gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter() );353 gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter(), sortType ); 354 354 } 355 355 data['data_gears'] = gears; … … 358 358 write_msg( data['num_msgs'] + " " + get_lang("results found") ); 359 359 360 EsearchE.mount_result( data ); 360 delete_border( borderID, false ); 361 362 EsearchE.mount_result( data, sortType ); 361 363 } 362 364 } … … 638 640 if( Data['data'] ) 639 641 { 640 td_element1.onclick = function(){ EsearchE.searchFor(border_id, 'SORTBOX_REVERSE'); }; 641 td_element1.innerHTML = "<b>"+get_lang("Folder")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 642 td_element1.onclick = function(){ EsearchE.searchFor(border_id, 'SORTBOX_REVERSE'); }; 642 643 } 643 644 else 644 645 { 645 td_element1.innerHTML = "<b>"+get_lang("Folder")+"</b>"; 646 } 646 td_element1.onclick = function(){ EsearchE.viewLocalMessage(border_id,'SORTBOX_REVERSE'); }; 647 } 648 td_element1.innerHTML = "<b>"+get_lang("Folder")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 647 649 } 648 650 else … … 654 656 else 655 657 { 658 td_element1.onclick = function(){ EsearchE.viewLocalMessage(border_id,'SORTBOX'); }; 656 659 //alert('Ordenando localMessage'); 657 660 } … … 669 672 { 670 673 td_element2.onclick = function(){ EsearchE.searchFor(border_id, 'SORTWHO_REVERSE'); }; 671 td_element2.innerHTML = "<b>"+get_lang("who")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";672 674 } 673 675 else 674 676 { 675 td_element2.innerHTML = "<b>"+get_lang("who")+"</b>"; 676 } 677 td_element2.onclick = function(){ EsearchE.viewLocalMessage(border_id,'SORTWHO_REVERSE'); }; 678 } 679 td_element2.innerHTML = "<b>"+get_lang("who")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 677 680 } 678 681 else … … 684 687 else 685 688 { 686 //alert('Ordenando localMessage');689 td_element2.onclick = function(){ EsearchE.viewLocalMessage(border_id, 'SORTWHO'); }; 687 690 } 688 691 td_element2.innerHTML = ( sort_type == 'SORTWHO_REVERSE' ) ? arrow_ascendant(get_lang("who")) : get_lang("who"); … … 699 702 { 700 703 td_element3.onclick = function(){ EsearchE.searchFor(border_id, 'SORTSUBJECT_REVERSE'); }; 701 td_element3.innerHTML = "<b>"+get_lang("subject")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";704 702 705 } 703 706 else 704 707 { 705 td_element3.innerHTML = "<b>"+get_lang("subject")+"</b>"; 706 } 708 td_element3.onclick = function(){ EsearchE.viewLocalMessage(border_id, 'SORTSUBJECT_REVERSE'); }; 709 } 710 td_element3.innerHTML = "<b>"+get_lang("subject")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 707 711 } 708 712 else … … 714 718 else 715 719 { 716 //alert('Ordenando localMessage');720 td_element3.onclick = function(){ EsearchE.viewLocalMessage( border_id, 'SORTSUBJECT'); }; 717 721 } 718 722 td_element3.innerHTML = ( sort_type == 'SORTSUBJECT_REVERSE' ) ? arrow_ascendant(get_lang("subject")) : get_lang("subject"); … … 729 733 { 730 734 td_element4.onclick = function(){ EsearchE.searchFor(border_id, 'SORTDATE_REVERSE'); }; 731 td_element4.innerHTML = "<b>"+get_lang("Date")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";732 735 } 733 736 else 734 737 { 735 td_element4.innerHTML = "<b>"+get_lang("Date")+"</b>"; 736 } 738 td_element4.onclick = function(){ EsearchE.viewLocalMessage(border_id, 'SORTDATE_REVERSE'); }; 739 } 740 td_element4.innerHTML = "<b>"+get_lang("Date")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 737 741 } 738 742 else … … 744 748 else 745 749 { 746 //alert('Ordenando localMessage');750 td_element4.onclick = function(){ EsearchE.viewLocalMessage(border_id, 'SORTDATE'); }; 747 751 } 748 752 td_element4.innerHTML = ( sort_type == 'SORTDATE_REVERSE' ) ? arrow_ascendant(get_lang("Date")) : get_lang("Date"); … … 759 763 { 760 764 td_element5.onclick = function(){ EsearchE.searchFor(border_id, 'SORTSIZE_REVERSE'); }; 761 td_element5.innerHTML = "<b>"+get_lang("size")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";765 762 766 } 763 767 else 764 768 { 765 td_element5.innerHTML = "<b>"+get_lang("size")+"</b>"; 766 } 769 td_element5.onclick = function(){ EsearchE.viewLocalMessage(border_id, 'SORTSIZE_REVERSE'); }; 770 } 771 td_element5.innerHTML = "<b>"+get_lang("size")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>"; 767 772 } 768 773 else … … 774 779 else 775 780 { 776 //alert('Ordenando localMessage');781 td_element5.onclick = function(){ EsearchE.viewLocalMessage(border_id, 'SORTSIZE'); }; 777 782 } 778 783 td_element5.innerHTML = ( sort_type == 'SORTSIZE_REVERSE' ) ? arrow_ascendant(get_lang("size")) : get_lang("size"); … … 813 818 814 819 resizeWindow(); 815 816 EsearchE.show_paging( Data['num_msgs'] );820 if( Data['data'] ) 821 EsearchE.show_paging( Data['num_msgs'] ); 817 822 } 818 823 … … 1103 1108 if( (tmp.length > 0) && (!data['num_msgs']) ) 1104 1109 { 1105 EsearchE.folders = local_folders; 1106 EsearchE.viewLocalMessage(); 1110 //EsearchE.folders = local_folders; 1111 var data_local = [2]; 1112 data_local['data_gears'] = tmp; 1113 data_local['num_msgs'] = tmp.length; 1114 EsearchE.mount_result(data_local); 1115 // EsearchE.viewLocalMessage(); 1107 1116 } 1108 1117 else
Note: See TracChangeset
for help on using the changeset viewer.