X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=22d6e30ca323697feabf8ee7e8d769a9994a7566;hb=e40d63cddada5e7792c582ff6f52766946bb485e;hp=5803183be0fc49994a93bc641f969582e6d02e65;hpb=191f4979def520b8be01554eb954c80ee42df38b;p=gruntmaster-page.git

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 5803183..22d6e30 100644
--- 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,7 +19,7 @@ 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{
@@ -60,27 +38,31 @@ 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;
 		} else {
-			if (job_result_text =~ m/^(\scores+)/) {
-				$scores{job_user()}{job_problem()} = $ct;
-			} 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);
 }