nicer table in check

[ndwebbie.git] / calls.pl

diff --git a/calls.pl b/calls.pl
index ad7e13c449c20ed2cc8506a9e0b5831d33691c28..5fa57dff1ae9809ab5055664b5d511812379263f 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -130,11 +130,12 @@ if ($call){
                $BODY->param(Ignore => 'Open');
        }
        my $fleets = $DBH->prepare(q{
-SELECT id,mission,landing_tick,eta, (landing_tick+eta-1) AS back FROM fleets WHERE uid = ? AND (fleet = 0 OR (landing_tick + eta > ? AND landing_tick - eta - 11 < ? ))
+SELECT id,mission,landing_tick,eta, back FROM fleets WHERE uid = ? AND (fleet = 0 OR (back >= ? AND landing_tick - eta - 11 < ? ))
 ORDER BY fleet ASC});
        my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE fleet = ?');
        $fleets->execute($call->{member},$call->{landing_tick},$call->{landing_tick});
        my @fleets;
+       my $i = 0;
        while (my $fleet = $fleets->fetchrow_hashref){
                if ($fleet->{back} == $call->{landing_tick}){
                        $fleet->{Fleetcatch} = 1;
@@ -142,6 +143,8 @@ ORDER BY fleet ASC});
                $ships->execute($fleet->{id});
                my @ships;
                while (my $ship = $ships->fetchrow_hashref){
+                       $i++;
+                       $ship->{ODD} = $i % 2;
                        push @ships,$ship;
                }
                $fleet->{Ships} = \@ships;
@@ -157,7 +160,10 @@ WHERE i.call = ?
 ORDER BY p.x,p.y,p.z});
        $attackers->execute($call->{id});
        my @attackers;
+       my $i = 0;
        while(my $attacker = $attackers->fetchrow_hashref){
+               $i++;
+               $attacker->{ODD} = $i % 2;
                push @attackers,$attacker;
        }
        $BODY->param(Attackers => \@attackers);
@@ -170,6 +176,10 @@ ORDER BY p.x,p.y,p.z});
        }elsif (param('show') eq 'uncovered'){
                $where = 'not covered';
        }
+       my $pointlimits = $DBH->prepare(q{SELECT value :: int FROM misc WHERE id = ?});
+       my ($minpoints) = $DBH->selectrow_array($pointlimits,undef,'DEFMIN');
+       my ($maxpoints) = $DBH->selectrow_array($pointlimits,undef,'DEFMAX');
+
        my $query = $DBH->prepare(qq{
 SELECT c.id, coords(p.x,p.y,p.z), u.defense_points, c.landing_tick, 
        TRIM('/' FROM concat(p2.race||' /')) AS race, TRIM('/' FROM concat(i.amount||' /')) AS amount,
@@ -189,11 +199,24 @@ ORDER BY c.landing_tick DESC
        $query->execute or $error .= $DBH->errstr;
        my @calls;
        my $i = 0;
+       my $tick = $ND::TICK;
        while (my $call = $query->fetchrow_hashref){
+               if ($call->{defense_points} < $minpoints){
+                       $call->{DefPrio} = 'LowestPrio';
+               }elsif ($call->{defense_points} < $maxpoints){
+                       $call->{DefPrio} = 'MediumPrio';
+               }else{
+                       $call->{DefPrio} = 'HighestPrio';
+               }
+               while ($tick - 24 > $call->{landing_tick}){
+                       $tick -= 24;
+                       push @calls,{};
+                       $i = 0;
+               }
+               $i++;
                $call->{ODD} = $i % 2;
                $call->{shiptype} = escapeHTML($call->{shiptype});
                push @calls, $call;
-               $i++;
        }
        $BODY->param(Calls => \@calls);
 }