Explicit ordering of fleets, so they're shown as normal unit scans

diff --git a/NDWeb/Pages/Calls.pm b/NDWeb/Pages/Calls.pm
index e8cdd2abaaae51ae9839c656ba5a408f814ad33b..6e51754b11ae6867a1e0a89ac32536d7f653d9f5 100644 (file)
--- a/NDWeb/Pages/Calls.pm
+++ b/NDWeb/Pages/Calls.pm
@@ -159,7 +159,7 @@ sub render_body {
                                AND (i.tick > $2 - 14 OR i.mission = 'Full fleet')
                        ORDER BY i.tick,x,y,z
                });
-               my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE id = ?');
+               my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE id = ? ORDER BY num');
                $outgoings->execute($call->{planet},$call->{landing_tick});
                my @fleets;
                while (my $fleet = $outgoings->fetchrow_hashref){

diff --git a/NDWeb/Pages/Check.pm b/NDWeb/Pages/Check.pm
index cac7f92bef68c450de688c470ac052bf5d7df931..88e37e6dc5d98034613a53d7a85d12bb237f75e7 100644 (file)
--- a/NDWeb/Pages/Check.pm
+++ b/NDWeb/Pages/Check.pm
@@ -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};

diff --git a/NDWeb/Pages/Main.pm b/NDWeb/Pages/Main.pm
index b4c793b600dab86e6a769b176d456f30f00d4bd2..8a3233c85b770ceef16bd6d31ab17387d678704a 100644 (file)
--- a/NDWeb/Pages/Main.pm
+++ b/NDWeb/Pages/Main.pm
@@ -208,7 +208,6 @@ sub render_body {
        $query = $DBH->prepare(q{SELECT f.id, coords(x,y,z) AS target, mission
                , f.amount, tick, back
 FROM fleets f 
-JOIN fleet_ships fs USING (id)
 LEFT OUTER JOIN current_planet_stats p ON f.target = p.id
 WHERE f.uid = ? AND f.sender = ? AND 
        (back >= ? OR (tick >= tick() -  24 AND name = 'Main'))
@@ -216,7 +215,9 @@ GROUP BY f.id, x,y,z, mission, tick,back,f.amount
 ORDER BY x,y,z,mission,tick
                });
 
-       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
+       });
 
        $query->execute($self->{UID},$self->{PLANET},$self->{TICK}) or warn $DBH->errstr;
        my @fleets;

diff --git a/NDWeb/Pages/Raids.pm b/NDWeb/Pages/Raids.pm
index 0b342fa42022547358865b52e8d680c91cd0f222..4b454589af81e11a6bebc19e4bba811a72d39a49 100644 (file)
--- a/NDWeb/Pages/Raids.pm
+++ b/NDWeb/Pages/Raids.pm
@@ -245,7 +245,9 @@ sub render_body {
                                ORDER BY name,i.tick DESC
                        });
                        $unitscans->execute($target->{planet}) or warn $DBH->errstr;
-                       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 = $unitscans->fetchrow_hashref){
                                my @ships;