only list scans, don't show them

diff --git a/NDWeb/Pages/EditRaid.pm b/NDWeb/Pages/EditRaid.pm
index b0f4f99c7ca2a12e88448cc8087ccbfa20f93f3b..61a58143fa79ed93158f615ab00a428903f67faa 100644 (file)
--- a/NDWeb/Pages/EditRaid.pm
+++ b/NDWeb/Pages/EditRaid.pm
@@ -223,28 +223,17 @@ sub render_body {
                        }
                        $target->{waves} = \@waves;
 
-                       my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans 
-                               WHERE planet = ? AND type ~ 'Unit|Planet|Advanced Unit|.* Analysis' AND tick + 24 > tick() AND scan is not null
-                               GROUP BY type, tick, scan ORDER BY type ,tick DESC});
+                       my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) scan_id,type, tick FROM scans 
+                               WHERE planet = ? AND type ~ 'Unit|Planet|Advanced Unit|.* Analysis' AND tick + 24 > tick()
+                               ORDER BY type ,tick DESC});
                        $scans->execute($target->{planet});
                        delete $target->{planet};
-                       my %scans;
-                       while (my $scan = $scans->fetchrow_hashref){
-                               $scans{$scan->{type}} = $scan;
-                       }
 
                        my @scans;
-                       for my $type ('Planet','Unit','Advanced Unit','Surface Analysis','Technology Analysis'){
-                               next unless exists $scans{$type};
-                               my $scan = $scans{$type};
-                               if ($self->{TICK} - $scan->{tick} > 5){
-                                       $scan->{scan} =~ s{<table( cellpadding="\d+")?>}{<table class="old">};
-                               }
-                               if ($type eq 'Planet'){
-                                       $target->{PlanetScan} = $scan->{scan};
-                                       next;
-                               }
-                               push @scans,{Scan => $scan->{scan}};
+                       my $i = 0;
+                       while (my $scan = $scans->fetchrow_hashref){
+                               $scan->{ODD} = $i++ % 2;
+                               push @scans,$scan;
                        }
                        $target->{Scans} = \@scans;
                        push @targets,$target;

diff --git a/templates/editRaid.tmpl b/templates/editRaid.tmpl
index 6c9f277e9cd4eea89d6df56eff1eed6ab0146c08..0b176c31bb5b14a3288808c667775b103b944238 100644 (file)
--- a/templates/editRaid.tmpl
+++ b/templates/editRaid.tmpl
@@ -98,11 +98,15 @@
        </p>
        <TMPL_VAR NAME=PlanetScan>
        </div>
+       <table>
+       <tr><th>Tick</th><th>Scan</th></tr>
        <TMPL_LOOP Scans>
-               <div class="leftinfo">
-               <TMPL_VAR NAME=Scan>
-               </div>
+       <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+               <td><TMPL_VAR NAME=Tick></td>
+               <td><a href="http://game.planetarion.com/showscan.pl?scan_id=<TMPL_VAR NAME=Scan_id>"><TMPL_VAR NAME=Type></a></td>
+       </tr>
        </TMPL_LOOP>
+       </table>
        </fieldset>
 </TMPL_LOOP>
 <br/><input type="submit" value="Submit target changes"/>