Converted editRaid page

[ndwebbie.git] / NDWeb / Pages / Check.pm

diff --git a/NDWeb/Pages/Check.pm b/NDWeb/Pages/Check.pm
index cac7f92bef68c450de688c470ac052bf5d7df931..a0062ab3568b7a67327e171ecdf68d2cff7b67ea 100644 (file)
--- a/NDWeb/Pages/Check.pm
+++ b/NDWeb/Pages/Check.pm
@@ -78,7 +78,7 @@ sub render_body {
                $extra_columns = ", planet_status,hit_us, alliance,relationship";
        }
 
-       my $query = $DBH->prepare(qq{Select p.id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race,
+       my $query = $DBH->prepare(qq{Select p.id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race,gov,
                size, size_gain, size_gain_day,
                score,score_gain,score_gain_day,
                value,value_gain,value_gain_day,
@@ -147,7 +147,9 @@ sub render_body {
                        ORDER BY i.tick,x,y,z
                });
                $query->execute($planet_id);
-               my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships WHERE id = ?});
+               my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+                       WHERE id = ? ORDER BY num
+               });
                my @missions;
                while (my $mission = $query->fetchrow_hashref){
                        $mission->{CLASS} = $mission->{mission};