Merge branch 'master' into mindcoding

[plack-app-gruntmaster.git] / lib / Gruntmaster / Page / St.pm

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 562e4678cc2ab085ad24e247e8e635dd2cba06f0..22d6e30ca323697feabf8ee7e8d769a9994a7566 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -1,11 +1,6 @@
 package Gruntmaster::Page::St;
 
-use 5.014000;
-use strict;
-use warnings;
 use Gruntmaster::Page::Base st => 'Standings';
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
 
 use constant LEVEL_VALUES => {
        beginner => 100,
@@ -27,14 +22,6 @@ sub calc_score{
        int $score + 0.5
 }
 
-sub usname ($) {
-       local $Gruntmaster::Data::contest;
-       my $user = shift;
-       my $name = user_name $user;
-       "$name ($user)"
-}
-
-
 sub _generate{
        my ($self, $htc, $lang, $env, $ct) = @_;
        debug $env => "language is '$lang' and contest is '$ct'";
@@ -66,7 +53,8 @@ sub _generate{
        my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user}} map {
                my $user = $_;
                +{
-                       user => usname $user,
+                       user => $user,
+                       name => do {local $Gruntmaster::Data::contest; user_name $user},
                        score => sum (values $scores{$user}),
                        scores => [map { $scores{$user}{$_} // '-'} @problems],
                        problems => $Gruntmaster::Data::contest,