From: Michael Andreen <harv@ruin.nu>
Date: Sat, 20 Jan 2007 16:50:07 +0000 (+0000)
Subject: show which targets are in cluster
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=b9159022387023d73c9a6369a0dadcb20760988e;p=ndwebbie.git

show which targets are in cluster
---

diff --git a/ND/Web/Pages/Raids.pm b/ND/Web/Pages/Raids.pm
index f7b1373..4af8631 100644
--- a/ND/Web/Pages/Raids.pm
+++ b/ND/Web/Pages/Raids.pm
@@ -196,7 +196,7 @@ sub render_body {
 		}
 		$BODY->param(Message => parseMarkup($raid->{message}));
 		$BODY->param(LandingTick => parseMarkup($raid->{tick}));
-		my $targetquery = $DBH->prepare(qq{SELECT r.id, r.planet, size, score, value, coords(p.x,p.y,p.z), race, p.value - p.size*200 -coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue, comment
+		my $targetquery = $DBH->prepare(qq{SELECT r.id, r.planet, size, score, value, p.x,p.y,p.z, race, p.value - p.size*200 -coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue, comment
 			FROM current_planet_stats p 
 			JOIN raid_targets r ON p.id = r.planet 
 			LEFT OUTER JOIN covop_targets c ON p.id = c.planet
@@ -247,6 +247,12 @@ sub render_body {
 			}
 			$target{Scans} = \@scans;
 
+			if ($planet){
+				if ($planet->{x} == $target->{x}){
+					$target{style} = 'incluster';
+				}
+			}
+
 			my @roids;
 			my @claims;
 			my $size = $target{Size};
@@ -270,6 +276,8 @@ sub render_body {
 
 			push @targets,\%target;
 		}
+		@targets = sort {$b->{Roids}[0]{XP} <=> $a->{Roids}[0]{XP} or $b->{Size} <=> $a->{Size}} @targets;
+
 		$BODY->param(Targets => \@targets);
 	}else{#list raids if we haven't chosen one yet
 		my $query = $DBH->prepare(q{SELECT id,released_coords FROM raids WHERE open AND not removed AND
diff --git a/default.css b/default.css
index 4e948f5..05fcc5a 100644
--- a/default.css
+++ b/default.css
@@ -201,3 +201,9 @@ div.bbcode-quote,div.bbcode-code {
 div.bbcode-quote-head,div.bbcode-code-head {
 	font-weight: bold;
 }
+
+fieldset.incluster {
+	border: solid;
+	border-width: 2px;
+	border-color: red;
+}
diff --git a/templates/raids.tmpl b/templates/raids.tmpl
index bdbd4d8..069bfce 100644
--- a/templates/raids.tmpl
+++ b/templates/raids.tmpl
@@ -41,8 +41,8 @@
 </form>
 </TMPL_IF>
 <TMPL_LOOP Targets>
-<fieldset> <legend>Target: #<TMPL_VAR NAME=Id></legend>
-<a name="target<TMPL_VAR NAME=Id>"/>
+<fieldset class="<TMPL_VAR Name=Style>"> <legend><a name="target<TMPL_VAR NAME=Id>">Target: #<TMPL_VAR NAME=Id></a></legend>
+
 	<div class="leftinfo"><ul>
 		<li>Size: <TMPL_VAR NAME=Size></li>
 		<li class="<TMPL_VAR NAME=ScoreBash>">Score: <TMPL_VAR NAME=Score></li>