From bb3ed008868592ef478d8432b86a39c293efae2d Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Wed, 27 Dec 2006 13:02:02 +0000 Subject: [PATCH] odd/even rows for fleets and attackers on defcalls --- calls.pl | 8 +++++++- templates/calls.tmpl | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/calls.pl b/calls.pl index ef75664..1092d39 100644 --- 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, 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); diff --git a/templates/calls.tmpl b/templates/calls.tmpl index 3946024..43a759c 100644 --- a/templates/calls.tmpl +++ b/templates/calls.tmpl @@ -17,7 +17,9 @@ - + + +
ShipAmount
@@ -49,7 +51,7 @@ Change/remove? - + () -- 2.39.2