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 b280783a4091846cfb643a7389d578ecedc1537e..c0b49cafddbdea55920abfcecc1a2813b9c51d3b 100644 (file)
--- a/ND/Web/Pages/Graph.pm
+++ b/ND/Web/Pages/Graph.pm
@@ -89,28 +89,30 @@ sub render_body {
                my $query;
                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});
+                       $graph_settings{y_min_value} = 0;
                }elsif($type eq 'ranks'){
                        $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});
+                       $graph_settings{y_max_value} = 0;
                }
                $query->execute($x,$y,$z,$ND::TICK) or die $DBH->errstr;
                $graph_settings{title} = $type;
                $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;
        }elsif ($type eq 'galstats' || $type eq 'galranks'){
                my $query;
                my ($x,$y) = ($req{x},$req{y});
                if ($type eq 'galstats'){
                        $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});
+                       $graph_settings{y_min_value} = 0;
                }elsif($type eq 'galranks'){
                        $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});
+                       $graph_settings{y_max_value} = 0;
                }
                $query->execute($x,$y) or die $DBH->errstr;
                $graph_settings{title} = $type;
                $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;
        }elsif ($type eq 'alliance' || $type eq 'allianceavg'){
 
@@ -121,7 +123,7 @@ sub render_body {
                $graph_settings{y2_label} = 'score';
 
                my $query;
-               unless (defined $1){
+               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
 WHERE a.id = $1 ORDER BY tick});
                }else{
@@ -135,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;