changed so score is red and size is green as in other graphs

[ndwebbie.git] / ND / Web / Pages / Graph.pm

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index c0b49cafddbdea55920abfcecc1a2813b9c51d3b..68ff44000526bfef2e2d94384d955e084e1a4143 100644 (file)
--- a/ND/Web/Pages/Graph.pm
+++ b/ND/Web/Pages/Graph.pm
@@ -119,16 +119,16 @@ sub render_body {
 
                $graph_settings{title} = 'Alliance vs known members';
                $graph_settings{two_axes} = 1;
-               $graph_settings{use_axis} = [1,2,1,2];
+               $graph_settings{use_axis} = [2,1,1,2];
                $graph_settings{y2_label} = 'score';
 
                my $query;
                if ($type eq 'alliance'){
-                       $query = $DBH->prepare(q{SELECT a.tick,a.size,a.score,memsize, memscore FROM (SELECT tick,SUM(size) AS memsize,SUM(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
+                       $query = $DBH->prepare(q{SELECT a.tick,a.score,a.size,memsize, memscore FROM (SELECT tick,SUM(size) AS memsize,SUM(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
 WHERE a.id = $1 ORDER BY tick});
                }else{
                        $graph_settings{title} = 'Average alliance vs known members';
-                       $query = $DBH->prepare(q{SELECT a.tick,a.size/members AS size,a.score/members AS score,memsize, memscore FROM (SELECT tick,AVG(size) AS memsize,AVG(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
+                       $query = $DBH->prepare(q{SELECT a.tick,a.score/members AS score,a.size/members AS size,memsize, memscore FROM (SELECT tick,AVG(size) AS memsize,AVG(score) AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.alliance_id = $1 GROUP BY tick) p JOIN alliance_stats a ON a.tick = p.tick
 WHERE a.id = $1 ORDER BY tick});
                }
                $query->execute($2) or die $DBH->errstr;