display all information

diff --git a/calls.pl b/calls.pl
index 11c4ed7b747ae3454cceed78a95bf8c78e3cf85c..063c40f45c742004aff3e5b92419311a7c4f5d41 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -30,11 +30,65 @@ die "You don't have access" unless isBC();
 
 my $call;
 if (param('call') =~ /^(\d+)$/){
-       my $query = $DBH->prepare(q{});
+       my $query = $DBH->prepare(q{
+SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered, open, dc.username AS dc, u.defense_points,c.member
+FROM calls c 
+       JOIN users u ON c.member = u.uid
+       LEFT OUTER JOIN users dc ON c.dc = dc.uid
+       JOIN current_planet_stats p ON u.planet = p.id
+WHERE c.id = ?});
        $call = $DBH->selectrow_hashref($query,undef,$1);
 }
 
 if ($call){
+       $BODY->param(Call => $call->{id});
+       $BODY->param(Coords => $call->{coords});
+       $BODY->param(DefensePoints => $call->{defense_points});
+       $BODY->param(LandingTick => $call->{landing_tick});
+       $BODY->param(ETA => $call->{landing_tick}-$ND::TICK);
+       $BODY->param(Info => $call->{info});
+       if ($call->{covered}){
+               $BODY->param(Cover => 'Uncover');
+       }else{
+               $BODY->param(Cover => 'Cover');
+       }
+       if ($call->{open} && !$call->{covered}){
+               $BODY->param(Cover => 'Ignore');
+       }else{
+               $BODY->param(Cover => '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 < ? ))
+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;
+       while (my $fleet = $fleets->fetchrow_hashref){
+               if ($fleet->{back} == $call->{landing_tick}){
+                       $fleet->{Fleetcatch} = 1;
+               }
+               $ships->execute($fleet->{id});
+               my @ships;
+               while (my $ship = $ships->fetchrow_hashref){
+                       push @ships,$ship;
+               }
+               $fleet->{Ships} = \@ships;
+               push @fleets, $fleet;
+       }
+       $BODY->param(Fleets => \@fleets);
+       
+       my $attackers = $DBH->prepare(q{
+SELECT coords(p.x,p.y,p.z), p.planet_status, p.race,i.eta,i.amount,i.fleet,i.shiptype,p.relationship,p.alliance,i.id
+FROM incomings i
+       JOIN current_planet_stats p ON i.sender = p.id
+WHERE i.call = ?
+ORDER BY p.x,p.y,p.z});
+       $attackers->execute($call->{id});
+       my @attackers;
+       while(my $attacker = $attackers->fetchrow_hashref){
+               push @attackers,$attacker;
+       }
+       $BODY->param(Attackers => \@attackers);
 }else{
        my $where = 'open AND c.landing_tick-6 > tick()';
        if (param('show') eq 'covered'){

diff --git a/templates/calls.tmpl b/templates/calls.tmpl
index b08723d340f521f8cd4a437a5af36699d2e68acc..5e721a1be1940df00f1c0898d04a130e31012471 100644 (file)
--- a/templates/calls.tmpl
+++ b/templates/calls.tmpl
@@ -1,4 +1,71 @@
 <TMPL_IF Call>
+<form action="/index.pl" method="post"><fieldset> <legend>Call details, call# <TMPL_VAR NAME=Call></legend>
+       <input type="hidden" name="page" value="calls"/>
+       <input type="hidden" name="call" value="<TMPL_VAR NAME=Call>"/>
+       <p>Current DC: <TMPL_VAR NAME=DC></p>
+       <p>Member: <a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></p>
+       <p>Defense points: <TMPL_VAR NAME=DefensePoints></p>
+       <p>Landing at tick: <input type="text" name="tick" value="<TMPL_VAR NAME=LandingTick>"/>
+               <input type="checkbox" name="ctick"/></p>
+       <p>ETA: <TMPL_VAR NAME=ETA></p>
+       <fieldset><legend>Member fleet</legend>
+       <TMPL_LOOP Fleets><TMPL_IF NAME=Id></TMPL_IF>
+       <div class="leftinfo">
+               <TMPL_IF Fleetcatch><p><b>FLEETCATCH</b></p></TMPL_IF>
+               <p>Fleet mission: <TMPL_VAR NAME=Mission>, Landing tick: <TMPL_VAR NAME=Landing_Tick>, Initial eta: <TMPL_VAR NAME=ETA>, Back: <TMPL_VAR NAME=Back></p>
+               <table>
+                       <tr><th>Ship</th><th>Amount</th></tr>
+                       <TMPL_LOOP Ships>
+                               <tr><td><TMPL_VAR NAME=Ship></td><td><TMPL_VAR NAME=Amount></td></tr>
+                       </TMPL_LOOP>
+               </table>
+       </div>
+       </TMPL_LOOP Fleets>
+       </fieldset>
+       <p>Userful information:</p>
+       <textarea rows="15" cols="80" name="info"><TMPL_VAR NAME=Info></textarea>
+       <p>
+               <input type="submit" name="cmd" value="Submit"/>
+               <input type="submit" name="cmd" value="Take call"/>
+               <input type="submit" name="cmd" value="<TMPL_VAR NAME=Cover> call"/>
+               <input type="submit" name="cmd" value="<TMPL_VAR NAME=Ignore> call"/>
+       </p>
+</fieldset></form>
+<p>Attackers:</p>
+<form action="index.pl" method="post">
+       <input type="hidden" name="page" value="calls"/>
+       <input type="hidden" name="call" value="<TMPL_VAR NAME=Call>"/>
+       <table>
+       <tr>
+       <th>Coords</th>
+       <th>Planet status</th>
+       <th>Alliance</th>
+       <th>Race</th>
+       <th>Initial ETA</th>
+       <th>Amount</th>
+       <th>Shiptypes</th>
+       <th>Fleet</th>
+       <th>Change/remove?</th>
+       </tr>
+       <TMPL_LOOP Attackers>
+       <tr>
+               <td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td class="<TMPL_VAR NAME=Planet_status>"><TMPL_VAR NAME=Planet_status></td>
+               <td class="<TMPL_VAR NAME=Relationship>"><TMPL_VAR NAME=Alliance> (<TMPL_VAR NAME=Relationship>)</td>
+               <td><TMPL_VAR NAME=Race></td>
+               <td><TMPL_VAR NAME=ETA></td>
+               <td><TMPL_VAR NAME=Amount></td>
+               <td><input class="coord" type="text" name="shiptype:<TMPL_VAR NAME=Id>" value="<TMPL_VAR NAME=Shiptype>"/></td>
+               <td><TMPL_VAR NAME=Fleet></td>
+               <td><input type="checkbox" name="change:<TMPL_VAR NAME=Id>"/></td>
+       </tr>
+       </TMPL_LOOP>
+       </table>
+       <p>
+       <input type="submit" name="cmd" value="Change"/>
+       <input type="submit" name="cmd" value="Remove"/>
+       </p>
+       </form>
 <TMPL_ELSE>
 <table>
        <tr><th>Call</th><th>Member (def points)</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>Current eta</th><th>Inital eta</th><th>Alliance</th><th>Attackers</th></tr>