Change the calls and incomings structure

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

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index ae1e8e6f927c675d64847b9655d3ad32c4d5eeff..fc440a343313e0d9efaa5b163a5abc21fabf4e82 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -61,6 +61,7 @@ sub index : Path : Args(0) {
        my $calls = $dbh->prepare(q{
 SELECT * FROM defcalls
 WHERE uid = $1 AND landing_tick >= tick()
+ORDER BY landing_tick DESC
                });
        $calls->execute($c->user->id);
        $c->stash(calls => $calls->fetchall_arrayref({}) );
@@ -268,6 +269,44 @@ ORDER BY } . "$order $limit"
        $c->stash(members => $query->fetchall_arrayref({}));
 }
 
+sub stats : Local {
+       my ( $self, $c, $order ) = @_;
+       my $dbh = $c->model;
+
+       if ($order ~~ /^(scre|value|xp|size|race)$/){
+               $order = "$1rank";
+       }else{
+               $order = 'scorerank';
+       }
+       $order .= ',race' if $order eq 'racerank';
+
+       my $limit = 'LIMIT 10';
+       $limit = '' if $c->check_user_roles(qw/members_points_nolimit/);
+
+       my ($races) = $dbh->selectrow_array(q{SELECT enum_range(null::race)::text[]});
+       $c->stash(races => $races);
+       my $query = $dbh->prepare(q{
+SELECT nick
+       ,rank() OVER(ORDER BY score DESC) AS scorerank
+       ,rank() OVER(ORDER BY value DESC) AS valuerank
+       ,rank() OVER(ORDER BY xp DESC) AS xprank
+       ,rank() OVER(ORDER BY size DESC) AS sizerank
+       ,rank() OVER(PARTITION BY race ORDER BY score DESC) AS racerank
+       ,race
+FROM current_planet_stats
+WHERE alliance = 'NewDawn'
+       AND race = ANY($1)
+ORDER BY } . "$order $limit");
+       my @race = $c->req->param('race');
+       my %race = map { $_ => 1 } @race;
+       $c->stash(race => \%race);
+       unless (@race){
+               @race = @$races;
+       }
+       $query->execute(\@race);
+       $c->stash(members => $query->fetchall_arrayref({}));
+}
+
 sub addintel : Local {
        my ( $self, $c, $order ) = @_;
 
@@ -385,8 +424,8 @@ sub postconfirmation : Local {
                        WHERE c.uid = ? AND r.tick+c.wave-1 = ? AND t.pid = ?
                                AND r.open AND not r.removed
                        });
-               my $finddefensetarget = $dbh->prepare(q{SELECT c.id FROM calls c
-                               JOIN users u ON c.member = u.uid
+               my $finddefensetarget = $dbh->prepare(q{SELECT call FROM calls c
+                               JOIN users u USING (uid)
                        WHERE u.pid = $1 AND c.landing_tick = $2
                });
                my $informDefChannel = $dbh->prepare(q{INSERT INTO defense_missions
@@ -486,7 +525,7 @@ sub postconfirmation : Local {
                                }
                        }elsif ($mission eq 'Defend'){
                                my $call = $findtarget->fetchrow_hashref;
-                               $informDefChannel->execute($fleet,$call->{id});
+                               $informDefChannel->execute($fleet,$call->{call});
                        }
 
                        $log->execute($c->user->id,"Pasted confirmation for $mission mission to $x:$y:$z, landing tick $tick");