X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=f6cbefdd91473476487c054d9290f2d4456782e2;hb=5de3274bb521067ae091a9848f9f762eb3e1680f;hp=f69e82d19b986fa901aa3ac371d867d115db20f7;hpb=83195c3c8034fff520fa90d1d0fb8b7995f925d3;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index f69e82d..f6cbefd 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -29,7 +29,6 @@ sub index : Path : Args(0) {
 
 	$c->stash(error => $c->flash->{error});
 
-	$c->stash(comma => \&comma_value);
 	$c->stash(u => $dbh->selectrow_hashref(q{SELECT planet,defense_points
 			,attack_points,scan_points,humor_points
 			, (attack_points+defense_points+scan_points/20)::NUMERIC(5,1) as total_points
@@ -527,7 +526,7 @@ sub defenders : Local {
 
 	my $defenders = $dbh->prepare(q{
 SELECT uid,u.planet,username, to_char(NOW() AT TIME ZONE timezone,'HH24:MI') AS time
-	,sms_note, call_if_needed, race
+	,sms_note, call_if_needed, race, timezone
 FROM users u
 	JOIN current_planet_stats p ON p.id = u.planet
 WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
@@ -535,10 +534,19 @@ ORDER BY call_if_needed DESC, LOWER(username)
 		});
 	$defenders->execute;
 
+	my $available = $dbh->prepare(q{
+SELECT ship,amount FROM available_ships WHERE planet = $1
+		});
+
 	my @members;
 	while (my $member = $defenders->fetchrow_hashref){
 
 		$member->{fleets} = member_fleets($dbh, $member->{uid}, $member->{planet});
+		$available->execute($member->{planet});
+		my $fleet = {fid => $member->{username}, mission => 'Available', name => 'At home'
+			, ships => $available->fetchall_arrayref({})
+		};
+		push @{$member->{fleets}}, $fleet;
 		push @members,$member;
 	}
 	$c->stash(members => \@members);