From c4b0e3e4fbef182e3ef1411c91cbb72c2ced70e2 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Sat, 27 Jan 2007 12:12:49 +0000 Subject: [PATCH] changed so score is red and size is green as in other graphs --- ND/Web/Pages/Graph.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm index c0b49ca..68ff440 100644 --- 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; -- 2.39.2