list your own def calls

diff --git a/ND/Web/Pages/Main.pm b/ND/Web/Pages/Main.pm
index 0a795d0db6eab04086113e769af41109427162ad..f6a6696407e5ff41ecb07a5b434f122f37ae92f5 100644 (file)
--- a/ND/Web/Pages/Main.pm
+++ b/ND/Web/Pages/Main.pm
@@ -131,6 +131,41 @@ sub render_body {
 
        $BODY->param(Planet => $planet);
 
+       $query = $DBH->prepare(qq{
+               SELECT c.id, c.landing_tick, dc.username,c.covered,
+               TRIM('/' FROM concat(p2.race||' /')) AS race, TRIM('/' FROM concat(i.amount||' /')) AS amount,
+               TRIM('/' FROM concat(i.eta||' /')) AS eta, TRIM('/' FROM concat(i.shiptype||' /')) AS shiptype,
+               (c.landing_tick - tick()) AS curreta,
+               TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||' /')) AS attackers
+               FROM calls c 
+               JOIN incomings i ON i.call = c.id
+               JOIN current_planet_stats p2 ON i.sender = p2.id
+               LEFT OUTER JOIN users dc ON c.dc = dc.uid
+               WHERE c.member = ? AND (c.landing_tick - tick())  > 0
+               GROUP BY c.id, c.landing_tick,dc.username,c.covered
+               ORDER BY c.landing_tick DESC
+               })or $error .= $DBH->errstr;
+       $query->execute($ND::UIN) or $error .= $DBH->errstr;
+
+       my $i = 0;
+       my @calls;
+       while (my $call = $query->fetchrow_hashref){
+               $call->{attackers} =~ s{(\d+:\d+:\d+)}{<a href="/check?coords=$1">$1</a>}g;
+               unless(defined $call->{username}){
+                       $call->{dc} = 'Hostile';
+                       $call->{username} = 'none';
+               }
+               if($call->{covered}){
+                       $call->{covered} = 'Friendly';
+               }else{
+                       $call->{covered} = 'Hostile';
+               }
+               $i++;
+               $call->{ODD} = $i % 2;
+               $call->{shiptype} = escapeHTML($call->{shiptype});
+               push @calls, $call;
+       }
+       $BODY->param(Calls => \@calls);
 
        my $planetstats= $DBH->selectrow_hashref(q{SELECT x,y,z, ((ruler || ' OF ') || p.planet) as planet,race,
                size, size_gain, size_gain_day,
@@ -173,7 +208,7 @@ ORDER BY f.fleet
 
        $query->execute($ND::UID,$self->{TICK}) or $error .= '<p>'.$DBH->errstr.'</p>';
        my @fleets;
-       my $i = 0;
+       $i = 0;
        while (my $fleet = $query->fetchrow_hashref){
                $i++;
                $fleet->{ODD} = $i % 2;

diff --git a/templates/main.tmpl b/templates/main.tmpl
index cfcaee0a28b1fec340e3747803705879c524e381..a60b3b70369d7146527ee428aff5e64326326b5c 100644 (file)
--- a/templates/main.tmpl
+++ b/templates/main.tmpl
@@ -39,6 +39,22 @@
        </table>
 </TMPL_IF>
 <div class="leftinfo">
+<table>
+       <tr><th>Call</th><th>DC</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>Current eta</th><th>Inital eta</th><th>Attackers</th></tr>
+<TMPL_LOOP Calls>
+       <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+               <td class="<TMPL_VAR NAME=Covered>"><a href="/calls?call=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Id></a></td>
+               <td class="<TMPL_VAR NAME=DC>"><TMPL_VAR NAME=Username></td>
+               <td><TMPL_VAR NAME=Landing_tick></td>
+               <td><TMPL_VAR NAME=Race></td>
+               <td><TMPL_VAR NAME=Amount></td>
+               <td><TMPL_VAR NAME=Shiptype></td>
+               <td><TMPL_VAR NAME=Curreta></td>
+               <td><TMPL_VAR NAME=Eta></td>
+               <td><TMPL_VAR NAME=Attackers></td>
+       </tr>
+</TMPL_LOOP>
+</table>
 <fieldset class="forum-post"> <legend>Account details</legend>
        <ul>
        <TMPL_IF isMEMBER>