show graphs for galaxies and proper ranking axis

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index 7b20efe97ebf34bd9a5564d72d9c1931a1cfb1ef..605c60774cbfc4ef707c2740aa4f3221164963de 100644 (file)
--- a/ND/Web/Pages/Graph.pm
+++ b/ND/Web/Pages/Graph.pm
@@ -72,20 +72,21 @@ sub render {
                        if ($type eq 'stats'){
                                $query = $DBH->prepare(q{SELECT tick,score,size,value,xp*60 AS "xp*60" FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
                        }elsif($type eq 'ranks'){
-                               $query = $DBH->prepare(q{SELECT tick,scorerank,sizerank,valuerank,xprank FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
+                               $query = $DBH->prepare(q{SELECT tick,-scorerank AS score,-sizerank AS size,-valuerank AS value,-xprank AS xp FROM planets natural join planet_stats WHERE id = planetid($1,$2,$3,$4) ORDER BY tick ASC});
                        }
                        $query->execute($x,$y,$z,$ND::TICK) or die $DBH->errstr;
                }else{
                        if ($type eq 'stats'){
                                $query = $DBH->prepare(q{SELECT tick,score,size,value,xp*60 AS "xp*60" FROM galaxies WHERE x = $1 AND y = $2 ORDER BY tick ASC});
                        }elsif($type eq 'ranks'){
-                               $query = $DBH->prepare(q{SELECT tick,scorerank,sizerank,valuerank,xprank FROM galaxies WHERE x = $1 AND y = $2  ORDER BY tick ASC});
+                               $query = $DBH->prepare(q{SELECT tick,-scorerank AS score,-sizerank AS size,-valuerank AS value,-xprank AS xp FROM galaxies WHERE x = $1 AND y = $2  ORDER BY tick ASC});
                        }
                        $query->execute($x,$y) or die $DBH->errstr;
                }
                
                $graph_settings{two_axes} = 1;
                $graph_settings{use_axis} = [2,1,2,2];
+               $graph_settings{y_max_value} = 0 if $type eq 'ranks';
                $img = graphFromQuery 500,300,\%graph_settings,$query;
        }
 

diff --git a/templates/check.tmpl b/templates/check.tmpl
index 18774acd20e243f26ab92b5f24212323d59cd56e..6c6e8fad22f56b925caba5e1df5ece37381d0a0b 100644 (file)
--- a/templates/check.tmpl
+++ b/templates/check.tmpl
@@ -14,6 +14,10 @@
 
        </TMPL_LOOP>
 </table>
+<div class="leftinfo">
+<img class="graph" src="graph/stats/<TMPL_VAR NAME=Coords>" alt="stats" height="300" width="500"/>
+<img class="graph" src="graph/ranks/<TMPL_VAR NAME=Coords>" alt="ranks" height="300" width="500"/>
+</div>
 <TMPL_IF OnePlanet>
 <table border="1">
        <tr><th>Target</th><th>Mission</th><th>Landing tick</th><th>ETA</th><th>Amount</th></tr>
@@ -24,10 +28,6 @@
        </tr>
        </TMPL_LOOP>
 </table>
-<div class="leftinfo">
-<img class="graph" src="graph/stats/<TMPL_VAR NAME=Coords>" alt="stats" height="300" width="500"/>
-<img class="graph" src="graph/ranks/<TMPL_VAR NAME=Coords>" alt="ranks" height="300" width="500"/>
-</div>
 <TMPL_LOOP Scans>
 <div class="leftinfo">
 <TMPL_VAR NAME=Scan>