back field for fleets

diff --git a/calls.pl b/calls.pl
index 0b843dfdb09dd910ad4e3481cced2294f39a4914..ef7566441687efe8482095829c280b1b3fb760d4 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -130,7 +130,7 @@ 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 (landing_tick + eta > ? 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});

diff --git a/launchConfirmation.pl b/launchConfirmation.pl
index aacb1038dddf18af091b7213dfc175fea6f9573a..1d8caafda450ce178a05d66ba213ad6d2f42a2ce 100644 (file)
--- a/launchConfirmation.pl
+++ b/launchConfirmation.pl
@@ -24,6 +24,7 @@ $ND::TEMPLATE->param(TITLE => 'Launch Confirmation');
 our $BODY;
 our $DBH;
 our $LOG;
+my $error;
 
 
 
@@ -40,13 +41,13 @@ if (param('cmd') eq 'submit'){
        my $finddefensetarget = $DBH->prepare(q{SELECT NULL});
        my $addattackpoint = $DBH->prepare('UPDATE users SET attack_points = attack_points + 1 WHERE uid = ?');
        my $launchedtarget = $DBH->prepare('UPDATE raid_claims SET launched = True WHERE uid = ? AND target = ? AND wave = ?');
-       my $addfleet = $DBH->prepare(qq{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta) VALUES (?,?,?,?,(SELECT max(fleet)+1 from fleets WHERE uid = ?),?)});
+       my $addfleet = $DBH->prepare(qq{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta,back) VALUES (?,?,?,?,(SELECT max(fleet)+1 from fleets WHERE uid = ?),?,?)});
        my $addships = $DBH->prepare('INSERT INTO fleet_ships (fleet,ship,amount) VALUES (?,?,?)');
 
        my $fleet = $DBH->prepare("SELECT id FROM fleets WHERE uid = ? AND fleet = 0");
        my ($basefleet) = $DBH->selectrow_array($fleet,undef,$ND::UID);
        unless ($basefleet){
-               my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta) VALUES (?,?,'Base',0,0,0)});
+               my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta,back) VALUES (?,?,'Full fleet',0,0,0,0)});
                $insert->execute($ND::UID,$ND::PLANET);
        }
        my @missions;
@@ -94,9 +95,10 @@ if (param('cmd') eq 'submit'){
                        }
                }
 
-               $addfleet->execute($ND::UID,$planet_id,$mission,$tick,$ND::UID,$eta);
+               $addfleet->execute($ND::UID,$planet_id,$mission,$tick,$ND::UID,$eta,$tick+$eta-1) or $error .= '<p>'.$DBH->errstr.'</p>';
                my $fleet = $DBH->last_insert_id(undef,undef,undef,undef,"fleets_id_seq");
                $mission{Fleet} = $fleet;
+               $mission{Back} = $tick+$eta-1;
                my $ships = $10;
                my @ships;
                while ($ships =~ m/((?:\w+ )*\w+)\s+\w+\s+\w+\s+(?:Steal|Normal|Emp|Normal\s+Cloaked|Pod|Struc)\s+(\d+)/g){
@@ -107,9 +109,10 @@ if (param('cmd') eq 'submit'){
                $LOG->execute($ND::UID,"Pasted confirmation for $mission mission to $x:$y:$z, landing tick $tick");
                push @missions,\%mission;
        }
-       $DBH->commit;
+       $DBH->commit or $error .= '<p>'.$DBH->errstr.'</p>';
        $BODY->param(Missions => \@missions);
 }
+$BODY->param(Error => $error);
 
 
 1;

diff --git a/main.pl b/main.pl
index 81d7c8f12e8b56687477834b003181cfd8413ffc..0853243f37c24d2733a89f0f6c7118ae0d149446 100644 (file)
--- a/main.pl
+++ b/main.pl
@@ -30,7 +30,7 @@ if (param('cmd') eq 'fleet'){
        my $fleet = $DBH->prepare("SELECT id FROM fleets WHERE uid = ? AND fleet = 0");
        my ($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
        unless ($id){
-               my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta) VALUES (?,?,'Base',0,0,0)});
+               my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta,back) VALUES (?,?,'Full fleet',0,0,0,0)});
                $insert->execute($ND::UID,$ND::PLANET);
                ($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
        }

diff --git a/templates/launchConfirmation.tmpl b/templates/launchConfirmation.tmpl
index 1d5a4a2830bba3eb76fa650e78c392840bd5c12b..2edfa8da9152e23b9094a283b2bf716db216ec5d 100644 (file)
--- a/templates/launchConfirmation.tmpl
+++ b/templates/launchConfirmation.tmpl
@@ -1,9 +1,11 @@
+<TMPL_VAR NAME=Error>
 <TMPL_LOOP Missions>
 <TMPL_IF Warning><p><b><TMPL_VAR NAME=Warning></b></p></TMPL_IF>
 <p>Adding the following fleet: <TMPL_VAR NAME=Fleet>
 <br/>Target: <TMPL_VAR NAME=Target>
 <br/>Mission: <TMPL_VAR NAME=Mission>
 <br/>Landing tick: <TMPL_VAR NAME=Tick>
+<br/>Back: <TMPL_VAR NAME=Back>
 </p>
 <table>
 <TMPL_LOOP Ships>

diff --git a/templates/main.tmpl b/templates/main.tmpl
index 36eaaae74403e9c947a5bc58feee29795b5a6cc7..e1570e732570e8836eb2dd190d82b7b6a1bb563e 100644 (file)
--- a/templates/main.tmpl
+++ b/templates/main.tmpl
@@ -34,10 +34,11 @@
 </fieldset>
 <fieldset> <legend>Fleets</legend>
        <table>
-       <tr><th>Target</th><th>Mission</th><th>Amount</th><th>Landing Tick</th></tr>
+       <tr><th>Target</th><th>Mission</th><th>Amount</th><th>Landing Tick</th><th>Back home</th></tr>
        <TMPL_LOOP Fleets>
        <tr><td><TMPL_VAR NAME=Target></td><td><TMPL_VAR NAME=Mission></td>
                <td><TMPL_VAR NAME=Amount></td><td><TMPL_VAR NAME=LandingTick></td>
+               <td><TMPL_VAR NAME=Amount></td><td><TMPL_VAR NAME=Back></td>
        </tr>
        </TMPL_LOOP>
        </table>