Changeset 763 for branches/0.4/web/addons/job_monarch
- Timestamp:
- 03/27/13 21:42:47 (11 years ago)
- Location:
- branches/0.4/web/addons/job_monarch
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.4/web/addons/job_monarch/graph.php
r761 r763 425 425 426 426 } 427 if( $series != '' ) 428 { 429 if ($job_start) 430 $series .= "VRULE:${job_start}#${jobstart_color} "; 431 if ($job_stop) 432 $series .= "VRULE:${job_stop}#${jobstart_color} "; 427 } 428 if( $series != '' ) 429 { 430 if ($job_start) 431 { 432 $series .= "VRULE:${job_start}#${jobstart_color} "; 433 } 434 if ($job_stop) 435 { 436 $series .= "VRULE:${job_stop}#${jobstart_color} "; 433 437 } 434 438 } -
branches/0.4/web/addons/job_monarch/overview.php
r761 r763 819 819 if( $jobs[$jobid]['status'] == 'R' ) 820 820 { 821 $job_runningtime = $heartbeat - $start_time; 821 822 if( $rjqj_start == null ) 822 823 { 823 $rjqj_start = $start_time;824 $rjqj_start = intval( $start_time - (intval( $job_runningtime * 0.10 ) ) ); 824 825 } 825 826 else if( $start_time < $rjqj_start ) 826 827 { 827 $rjqj_start = $start_time;828 $rjqj_start = intval( $start_time - (intval( $job_runningtime * 0.10 ) ) ); 828 829 } 829 830 … … 886 887 } 887 888 } 889 if( intval($view_jobs) == 1 and $start_time ) 890 { 891 if( $last_displayed_job != null ) 892 { 893 $filter['id'] = $last_displayed_job; 894 } 895 } 888 896 // Running / queued amount jobs graph 889 897 // … … 900 908 { 901 909 $rjqj_graphargs .= "&st=$cluster[LOCALTIME]"; 910 } 911 if( intval($view_jobs) == 1 and $start_time ) 912 { 913 $job_start = $jobs[$last_displayed_job]['start_timestamp']; 914 $rjqj_graphargs .= "&job_start=$start_time"; 902 915 } 903 916 … … 964 977 $tpl_data->assign( "report_time", makeDate( $heartbeat) ); 965 978 966 if( intval($view_jobs) == 1 and $start_time )967 {968 if( $last_displayed_job != null )969 {970 $filter['id'] = $last_displayed_job;971 }972 }973 979 974 980 global $longtitle, $title;
Note: See TracChangeset
for help on using the changeset viewer.