- Timestamp:
- 02/10/09 17:13:54 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web2/addons/job_monarch/js/monarch.js
r595 r597 6 6 var SearchField; 7 7 var filterButton; 8 9 // Extra header to prevent browser caching 10 // 11 Ext.Ajax.defaultHeaders = 12 { 13 'If-Modified-Since': 'Sat, 1 Jan 2005 00:00:00 GMT' 14 }; 8 15 9 16 // associative filter array … … 359 366 load: function() 360 367 { 361 var url 362 var image 363 var loadEvent 368 var url = this.url; 369 var image = this.image; 370 var loadEvent = this.loadEvent; 364 371 addListener( this.image, 'load', 365 372 function(e) … … 445 452 function reloadClusterImage() 446 453 { 447 ClusterImageArgs['view'] 448 449 filt_url 450 imag_url 451 img_url 452 453 var newClusterImage 454 newClusterImage.loadEvent 454 ClusterImageArgs['view'] = 'big-clusterimage'; 455 456 filt_url = makeArrayURL( myfilters ); 457 imag_url = makeArrayURL( ClusterImageArgs ); 458 img_url = './image.php?' + filt_url + '&' + imag_url; 459 460 var newClusterImage = new ImageLoader( 'clusterimage', img_url ); 461 newClusterImage.loadEvent = function( url, image ) 455 462 { 456 463 ClusterImageWindow.getBottomToolbar().clearStatus( { useDefaults:true } ); … … 470 477 function resizeClusterImage() 471 478 { 472 var ci_height 473 var ci_width 479 var ci_height = document.getElementById( "clusterimage" ).height + ClusterImageWindow.getFrameHeight(); 480 var ci_width = document.getElementById( "clusterimage" ).width + ClusterImageWindow.getFrameWidth(); 474 481 475 482 ClusterImageWindow.setSize( ci_width, ci_height ); … … 531 538 if( fieldName == 'nodes' ) 532 539 { 533 filterName 534 fil_dis 535 fil_ena 540 filterName = 'host'; 541 fil_dis = 'nodesfilter'; 542 fil_ena = 'nodesfilterenabled'; 536 543 } 537 544 if( inMyArrayKeys( myfilters, filterName ) ) … … 567 574 } 568 575 JobListingWindow.setTitle( filter_str ); 569 filter_title = true; 570 filter_str = myparams.c + ' Jobs Overview' + makeFilterString(); 576 577 filter_title = true; 578 filter_str = myparams.c + ' Jobs Overview' + makeFilterString(); 571 579 } 572 580 } … … 574 582 function jobCellRender( value, metadata, record, rowindex, colindex, store ) 575 583 { 576 var fieldName 577 var fil_dis 578 var fil_ena 579 var filterName 584 var fieldName = JobsColumnModel.getColumnById( colindex ).dataIndex; 585 var fil_dis = 'filter'; 586 var fil_ena = 'filterenabled'; 587 var filterName = fieldName; 580 588 581 589 if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' || fieldName == 'nodes' ) … … 583 591 if( fieldName == 'nodes' ) 584 592 { 585 fil_dis 586 fil_ena 587 filterName 593 fil_dis = 'nodesfilter'; 594 fil_ena = 'nodesfilterenabled'; 595 filterName = 'host'; 588 596 } 589 597 if( myfilters[filterName] != null ) 590 598 { 591 metadata.css 599 metadata.css = fil_ena; 592 600 } 593 601 else 594 602 { 595 metadata.css 603 metadata.css = fil_dis; 596 604 } 597 605 } … … 599 607 } 600 608 601 JobProxy = new Ext.data.HttpProxy(602 { 603 url: 'jobstore.php',604 method: 'POST'609 var JobProxy = new Ext.data.HttpProxy( 610 { 611 url: 'jobstore.php', 612 method: 'POST' 605 613 }); 606 614 … … 613 621 new Ext.data.JsonReader( 614 622 { 615 root: 616 totalProperty: 617 id: 623 root: 'results', 624 totalProperty: 'total', 625 id: 'id' 618 626 }, 619 627 [ … … 634 642 sortInfo: 635 643 { 636 field: 637 direction: 644 field: 'jid', 645 direction: "DESC" 638 646 }, 639 647 remoteSort: true, … … 645 653 fn: 646 654 647 function() 648 { 655 function( myStore, myOptions ) 656 { 657 // Add a (bogus) timestamp, to create a unique url and prevent browser caching 658 // 659 myStore.proxy.url = 'jobstore.php?timestamp=' + new Date().getTime(); 660 649 661 if( SearchField ) 650 662 { … … 826 838 { 827 839 //id: 'NodesDataStore', 828 proxy: JobProxy, 829 autoLoad: false, 840 proxy: new Ext.data.HttpProxy( 841 { 842 url: 'jobstore.php', 843 method: 'POST' 844 }), 845 autoLoad: true, 830 846 baseParams: 831 847 { 832 'task': "GETNODES",833 'c': cluster,834 'jid': jid848 'task': "GETNODES", 849 'c': cluster, 850 'jid': jid 835 851 }, 836 852 reader: new Ext.data.JsonReader( … … 847 863 {name: 'jr', type: 'string', mapping: 'jr'}, 848 864 {name: 'js', type: 'string', mapping: 'js'} 849 ]) 865 ]), 866 listeners: 867 { 868 'beforeload': 869 { 870 scope: this, 871 fn: 872 873 function( myStore, myOptions ) 874 { 875 // Add a (bogus) timestamp, to create a unique url and prevent browser caching 876 // 877 myStore.proxy.url = 'jobstore.php?timestamp=' + new Date().getTime(); 878 //alert( myStore.proxy.url ); 879 } 880 } 881 } 882 850 883 }); 851 884 … … 866 899 //autoHeight: true, 867 900 autoShow: true, 901 loadMask: true, 868 902 store: store, 869 903 layout: 'fit', … … 897 931 tabWidth: 135, 898 932 enableTabScroll:true, 899 defaults: {autoScroll:true} 933 defaults: {autoScroll:true}, 934 view: view, 935 listeners: 936 { 937 'tabchange': 938 { 939 scope: this, 940 fn: function( myTabPanel, tab ) 941 { 942 //myTabPanel.items[0].refresh(); 943 //this.view.refresh(); 944 } 945 } 946 } 900 947 }); 901 948 … … 1008 1055 nodeDatastore = createNodesDataStore( myparams.c, graphJids[w][t] ); 1009 1056 graphView = createGraphView( nodeDatastore, graphJids[w][t] ); 1057 1058 nodeDatastore.removeAll(); 1059 1010 1060 lastView = myPanel.add( graphView ); 1011 1061 1012 nodeDatastore.load();1062 //nodeDatastore.load(); 1013 1063 myPanel.setActiveTab( lastView ); 1014 1064 } … … 1049 1099 new Ext.PagingToolbar( 1050 1100 { 1051 pageSize: 1052 store: 1053 displayInfo: 1054 displayMsg: 1055 emptyMsg: 1056 plugins: [new Ext.ux.PageSizePlugin()]1101 pageSize: 15, 1102 store: JobsDataStore, 1103 displayInfo: true, 1104 displayMsg: 'Displaying jobs {0} - {1} out of {2} jobs total found.', 1105 emptyMsg: 'No jobs found to display', 1106 plugins: [ new Ext.ux.PageSizePlugin() ] 1057 1107 }), 1058 1108 … … 1086 1136 new Ext.StatusBar( 1087 1137 { 1088 defaultText: 1089 id: 1090 defaultIconCls: 1138 defaultText: 'Ready.', 1139 id: 'basic-statusbar', 1140 defaultIconCls: '' 1091 1141 }) 1092 1142 });
Note: See TracChangeset
for help on using the changeset viewer.