X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=4625138831f74c7b0c4ca2ef40710282910d9033;hb=9484fd0b6fc494111e72a65133b4850bc6e852e2;hp=2d7b23831f29cb08420ae5d04f90dc1b9d07279c;hpb=d3200993969efcd4d9c0ce6a5666a012815ad2d5;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 2d7b238..4625138 100644
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -21,17 +21,18 @@ sub calc_score{
 }
 
 sub _generate{
-	my ($self, $htc, $lang, $env, $ct) = @_;
-	debug $env => "language is '$lang' and contest is '$ct'";
+	my ($self, $htc, $lang, $env) = @_;
+	#debug $env => "language is '$lang'";
 
-	$ct &&= db($env)->contest($ct);
+	my $ct = $env->{'gruntmaster.contest'} && db($env)->contest($env->{'gruntmaster.contest'});
 
-	my @problems = map { $_->problem } db($env)->contest_problems->search({contest => $ct->id}, {qw/join problem order_by problem.level/});
+	my @problems = map { $_->problem } db($env)->contest_problems->search({contest => $ct && $ct->id}, {qw/join problem order_by problem.level/});
 	my (%scores, %tries);
-	for my $job (db($env)->jobs->search({contest => $ct->id})) {
+	for my $job (db($env)->jobs->search({contest => $ct && $ct->id}, {order_by => 'id'})) {
 
 		if ($ct) {
-			my $time = $job->date - $ct->start;
+			my $open = db($env)->opens->find($ct->id, $job->problem->id, $job->owner->id);
+			my $time = $job->date - ($open || $ct->start);
 			next if $time < 0;
 			my $value = $job->problem->value // LEVEL_VALUES->{$job->problem->level};
 			$scores{$job->owner->id}{$job->problem->id} = $job->result ? 0 : calc_score ($value, $time, $tries{$job->owner}{$job->problem}, $ct->stop - $ct->start);
@@ -42,7 +43,7 @@ sub _generate{
 		}
 	}
 
-	my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user}} map {
+	my @st = sort { $b->{score} <=> $a->{score} or $a->{user}->id cmp $b->{user}->id} map {
 		my $user = $_;
 		+{
 			user => db($env)->user($user),