Show full names and usernames in standings

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

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 316a92b46f5c1f5ea555e0fbf43cf64fdf0b7c3c..562e4678cc2ab085ad24e247e8e635dd2cba06f0 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -10,7 +10,7 @@ our $VERSION = '0.001';
 use constant LEVEL_VALUES => {
        beginner => 100,
        easy => 250,
-       medium => 600,
+       medium => 500,
        hard => 1000,
 };
 
@@ -24,9 +24,17 @@ 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 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'";
@@ -43,22 +51,22 @@ sub _generate{
        @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) {
+                       $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()}++;
-                       $scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}, $totaltime) if job_date() > $start;
-               } elsif (defined job_user && defined job_problem && defined job_result) {
-                       if (defined job_result_text && job_result_text =~ m/^(\scores+)/) {
-                               $scores{job_user()}{job_problem()} = $ct;
-                       } else {
-                               $scores{job_user()}{job_problem()} = job_result() ? 0 : 100;
-                       }
+               } else {
+                       no warnings 'numeric';
+                       $scores{job_user()}{job_problem()} = 0 + job_result_text() || (job_result() ? 0 : 100)
                }
        }
 
        my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user}} map {
                my $user = $_;
                +{
-                       user => $user,
+                       user => usname $user,
                        score => sum (values $scores{$user}),
                        scores => [map { $scores{$user}{$_} // '-'} @problems],
                        problems => $Gruntmaster::Data::contest,