Changeset 763


Ignore:
Timestamp:
03/27/13 21:42:47 (10 years ago)
Author:
ramonb
Message:
  • give rjqj graph also red job start line
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  
    425425
    426426    }
    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}
     428if( $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} ";
    433437    }
    434438}
  • branches/0.4/web/addons/job_monarch/overview.php

    r761 r763  
    819819                if( $jobs[$jobid]['status'] == 'R' )
    820820                {
     821                    $job_runningtime    = $heartbeat - $start_time;
    821822                    if( $rjqj_start == null )
    822823                    {
    823                         $rjqj_start = $start_time;
     824                        $rjqj_start = intval( $start_time - (intval( $job_runningtime * 0.10 ) ) );
    824825                    }
    825826                    else if( $start_time < $rjqj_start )
    826827                    {
    827                         $rjqj_start = $start_time;
     828                        $rjqj_start = intval( $start_time - (intval( $job_runningtime * 0.10 ) ) );
    828829                    }
    829830
     
    886887        }
    887888    }
     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    }
    888896    // Running / queued amount jobs graph
    889897    //
     
    900908        {
    901909            $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";
    902915        }
    903916
     
    964977    $tpl_data->assign( "report_time", makeDate( $heartbeat) );
    965978
    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     }
    973979
    974980    global $longtitle, $title;
Note: See TracChangeset for help on using the changeset viewer.