X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FGraph.pm;h=68ff44000526bfef2e2d94384d955e084e1a4143;hb=c4b0e3e4fbef182e3ef1411c91cbb72c2ced70e2;hp=93308f9edf1553416b99bbbf83ad37ce282f14ad;hpb=bc5fe76561eec517ebefad912f82aa5c6e4d84cd;p=ndwebbie.git

diff --git a/ND/Web/Pages/Graph.pm b/ND/Web/Pages/Graph.pm
index 93308f9..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;
@@ -137,10 +137,10 @@ WHERE a.id = $1 ORDER BY tick});
 	}elsif ($type eq 'planetvsnd'){
 		$graph_settings{title} = 'You vs ND AVG';
 		$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 = $DBH->prepare(q{SELECT a.tick,a.size/members as NDsize,a.score/members AS NDscore,memsize, memscore FROM (SELECT tick,size AS memsize,score AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.id = $1) p JOIN alliance_stats a ON a.tick = p.tick
+		my $query = $DBH->prepare(q{SELECT a.tick,a.score/members AS NDscore,a.size/members as NDsize,memsize, memscore FROM (SELECT tick,size AS memsize,score AS memscore FROM planets p JOIN planet_stats ps USING (id) WHERE p.id = $1) p JOIN alliance_stats a ON a.tick = p.tick
 			WHERE a.id = 1 ORDER BY tick});
 		$query->execute($req{id}) or die $DBH->errstr;