X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=02e377da57baad96bdaf98932da3f3501c007c55;hb=fdbf59e5def9cbb4e1c0749f819ba8d946c37725;hp=099c1936a6f6646c747fdd8a44ff0bb5530f3e81;hpb=9da2f4958089ae517865b808be61bb12d43b61de;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 099c193..02e377d 100644
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -43,19 +43,19 @@ 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,
@@ -64,6 +64,9 @@ sub _generate{
 			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);
 }