Changeset 764


Ignore:
Timestamp:
03/28/13 12:12:23 (8 years ago)
Author:
ramonb
Message:
  • fixed image map
Location:
branches/0.4/web/addons/job_monarch
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/web/addons/job_monarch/libtoga.php

    r759 r764  
    13941394        $this->output    = 0;
    13951395    }
    1396     function setJobs($jobs )
    1397     {
    1398         $this->jobs     = &$jobs;
    1399     }
    14001396    function getJobs()
    14011397    {
     
    14081404
    14091405        return $this->jobs;
     1406    }
     1407    function setJobs($jobs)
     1408    {
     1409        $this->jobs   = &$jobs;
    14101410    }
    14111411    function getNodes()
     
    20432043        $clusterimage_map    = "";
    20442044
    2045         foreach( $this->nodes as $hostname => $node )
    2046         {
    2047             $node_map        = $node->getImagemapArea();
    2048             $clusterimage_map    .= $node_map;
     2045        $nodes = &$this->getNodes();
     2046
     2047        foreach( $nodes as $node )
     2048        {
     2049            $node_map          = $node->getImagemapArea();
     2050            $clusterimage_map .= $node_map;
    20492051        }
    20502052
  • branches/0.4/web/addons/job_monarch/overview.php

    r763 r764  
    4545$myxml_data = $ds->getData();
    4646
     47//print_r( $myxml_data );
     48
    4749$data_gatherer = new DataGatherer( $clustername );
    4850$data_gatherer->parseXML( $myxml_data );
     
    5961{
    6062
    61     global $tpl_data, $filter, $clustername, $piefilter, $data_gatherer, $myxml_data, $filterorder, $_SESSION;
     63    global $tpl_data, $filter, $clustername, $piefilter, $data_gatherer, $myxml_data, $filterorder, $_SESSION, $data_gatherer;
     64    global $jobs, $gnodes;
    6265
    6366    $filter_image_url = "";
     
    7780    $ic = new ClusterImage( $myxml_data, $clustername );
    7881
    79     $ic->setJobs( $data_gatherer->getJobs() );
    80     $ic->setNodes( $data_gatherer->getNodes() );
     82    $ic->setJobs( $jobs );
     83    $ic->setNodes( $gnodes );
    8184    $ic->setBig();
    8285    $ic->setNoimage();
     
    513516    global $start, $end, $reports, $gnodes, $default_showhosts;
    514517    global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $COLUMN_NODES, $hostname;
    515     global $cluster, $use_fqdn;
     518    global $cluster, $use_fqdn, $myxml_data, $data_gatherer;
    516519
    517520    $metricname        = $m;
  • branches/0.4/web/addons/job_monarch/templates/overview.tpl

    r758 r764  
    141141    </div>
    142142    <MAP NAME="MONARCH_CLUSTER_BIG">
    143 {if "$nodes_clustermap" == "yes"}
    144 {$node_area_map}
    145 {/if}
     143    {$node_area_map}
    146144    </MAP>
    147145    <BR>
Note: See TracChangeset for help on using the changeset viewer.