Show available ships

[ndwebbie.git] / lib / NDWeb / Controller / Members.pm

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index f69e82d19b986fa901aa3ac371d867d115db20f7..440c51f47021a778f690c3e5a1400b6c23fc83e8 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -527,7 +527,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 +535,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);