From a189765a37d1fcc4a4dfa732a8177dd55844060e Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Tue, 11 Sep 2007 19:40:16 +0200
Subject: [PATCH] Fetch and present def missions too

---
 NDWeb/Pages/MemberIntel.pm | 36 ++++++++++++++++++++++++++++++++----
 templates/memberIntel.tmpl | 15 +++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index 0974b5a..ae5cb2d 100644
--- a/NDWeb/Pages/MemberIntel.pm
+++ b/NDWeb/Pages/MemberIntel.pm
@@ -19,7 +19,7 @@
 
 package NDWeb::Pages::MemberIntel;
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 use CGI qw/:standard/;
 use NDWeb::Include;
 
@@ -73,7 +73,7 @@ sub render_body {
 		$query->execute($user->{uid}) or $error .= $DBH->errstr;
 		my @nd_attacks;
 		my @retals;
-		my @other;
+		my @other_attacks;
 		while (my $intel = $query->fetchrow_hashref){
 			my $attack = {target => $intel->{coords}, tick => $intel->{tick}};
 			if ($intel->{ndtarget}){
@@ -84,14 +84,42 @@ sub render_body {
 				}
 				push @nd_attacks, $attack;
 			}else{
-				push @other, $attack;
+				push @other_attacks, $attack;
 			}
 		}
 		my @attacks;
 		push @attacks, {name => 'ND Attacks', list => \@nd_attacks};
-		push @attacks, {name => 'Other', list => \@other};
+		push @attacks, {name => 'Other', list => \@other_attacks};
 		$BODY->param(Attacks => \@attacks);
 
+		$query = $DBH->prepare(q{
+			SELECT coords(t.x,t.y,t.z),t.alliance_id, t.alliance, i.eta, i.tick, i.ingal
+			FROM users u
+			JOIN (SELECT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+			LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
+			WHERE u.uid = $1 AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
+			ORDER BY (i.tick - i.eta)
+			});
+		$query->execute($user->{uid}) or $error .= $DBH->errstr;
+		my @nd_def;
+		my @ingal_def;
+		my @other_def;
+		while (my $intel = $query->fetchrow_hashref){
+			my $def = {target => $intel->{coords}.(defined $intel->{alliance} ? " ($intel->{alliance})" : ''), tick => $intel->{tick}};
+			if (defined $intel->{alliance_id} && $intel->{alliance_id} == 1){
+				push @nd_def, $def;
+			}elsif($intel->{ingal}){
+				push @ingal_def, $def;
+			}else{
+				push @other_def, $def;
+			}
+		}
+		my @defenses;
+		push @defenses, {name => 'ND Def', list => \@nd_def};
+		push @defenses, {name => 'Ingal Def', list => \@ingal_def};
+		push @defenses, {name => 'Other', list => \@other_def};
+		$BODY->param(Defenses => \@defenses);
+
 	}else{
 		my $query = $DBH->prepare(q{SELECT u.uid,u.username,u.attack_points, u.defense_points, n.tick
 			,count(CASE WHEN i.mission = 'Attack' THEN 1 ELSE NULL END) AS attacks
diff --git a/templates/memberIntel.tmpl b/templates/memberIntel.tmpl
index 95a7d56..13e6967 100644
--- a/templates/memberIntel.tmpl
+++ b/templates/memberIntel.tmpl
@@ -16,6 +16,21 @@
 		</TMPL_LOOP>
 	</TMPL_LOOP>
 </table>
+<table>
+	<tr>
+		<th>Defense</th><th>Pt</th><th></th>
+	</tr>
+	<TMPL_LOOP Defenses>
+		<tr><td><TMPL_VAR NAME=NAME></td></tr>
+		<TMPL_LOOP LIST>
+	<tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+		<td><TMPL_VAR NAME=Target></td>
+		<td><TMPL_VAR NAME=tick></td>
+		<td><TMPL_VAR NAME=Other></td>
+	</tr>
+		</TMPL_LOOP>
+	</TMPL_LOOP>
+</table>
 <TMPL_ELSE>
 <table>
 	<tr>
-- 
2.39.2