Add full names to standings

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

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index fafded1c601dda5d63eda51851a07f568e3844ca..22d6e30ca323697feabf8ee7e8d769a9994a7566 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -1,28 +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 TEMPLATES => {
-       en => <<'HTML',
-<table border>
-<thead>
-<tmpl_if problems><tr><th>Username<tmpl_loop problems><th><tmpl_var _></tmpl_loop><th>Total
-<tmpl_else><tr><th>Username<th>Score
-</tmpl_if>
-
-<tbody>
-<tmpl_loop st><tr><td><tmpl_var user>
-<tmpl_if problems><tmpl_loop scores><td><tmpl_var _>
-</tmpl_loop></tmpl_if><td><tmpl_var score>
-</tmpl_loop>
-</table>
-HTML
-};
 
 use constant LEVEL_VALUES => {
        beginner => 100,
@@ -41,45 +19,50 @@ sub calc_score{
        $score = ($totaltime - $timetaken) / $totaltime * $score;
        $score -= $tries / 10 * $mxscore;
        $score = $mxscore * 3 / 10 if $score < $mxscore * 3 / 10;
-       int $score
+       int $score + 0.5
 }
 
 sub _generate{
-       my ($self, $htc, $path, $lang) = @_;
-       my $totaltime;
+       my ($self, $htc, $lang, $env, $ct) = @_;
+       debug $env => "language is '$lang' and contest is '$ct'";
+       my ($totaltime, $start);
 
-       $path =~ m,^(?:ct/([^/]+)/)?,;
        local $Gruntmaster::Data::contest;
-       if ($1) {
-               $totaltime = contest_end ($1) - contest_start ($1);
-               $Gruntmaster::Data::contest = $1;
+       if ($ct) {
+               $start = contest_start ($ct);
+               $totaltime = contest_end ($ct) - $start;
+               $Gruntmaster::Data::contest = $ct;
        }
 
        my @problems = problems;
        @problems = sort @problems;
        my (%scores, %tries);
        for (1 .. jobcard) {
+               next unless defined job_user && defined job_problem && defined job_result;
+               next if $Gruntmaster::Data::contest && job_date() < $start;
+
                if ($Gruntmaster::Data::contest) {
-                       $tries{job_user()}{job_problem()}++;
                        $scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}, $totaltime);
+                       $tries{job_user()}{job_problem()}++;
                } else {
-                       if (job_result_text =~ m/^(\d+)/) {
-                               $scores{job_user()}{job_problem()} = $1;
-                       } else {
-                               $scores{job_user()}{job_problem()} = job_result() ? 0 : 100;
-                       }
+                       no warnings 'numeric';
+                       $scores{job_user()}{job_problem()} = 0 + job_result_text() || (job_result() ? 0 : 100)
                }
        }
 
-       my @st = sort { $b->{score} <=> $a->{score} } map {
+       my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user}} map {
                my $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,
                }
        } keys %scores;
+
+       $st[0]->{rank} = 1;
+       $st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
        $htc->param(problems => [map { problem_name } @problems ]) if $Gruntmaster::Data::contest;
        $htc->param(st => \@st);
 }