X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=9ed2a31c67c6c05d6b911de09c9af400dcd02bbf;hp=547eaba544297c8ea7d49947558e9c90ee8a2b5d;hb=a122bb9b5954e4384b8f1c3f52bcdda74b421f25;hpb=0a329295bb764112812177386b525ed3aa2b8c6d

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 547eaba..9ed2a31 100644
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -28,13 +28,16 @@ sub _generate{
 
 	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 && $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 ? $open->time : $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);
+			my $factor = $job->result ? 0 : 1;
+			$factor = $1 / 100 if $job->result_text =~ /^(\d+ )/;
+			$scores{$job->owner->id}{$job->problem->id} = int ($factor * calc_score ($value, $time, $tries{$job->owner->id}{$job->problem->id}, $ct->stop - $ct->start));
 			$tries{$job->owner->id}{$job->problem->id}++;
 		} else {
 			no warnings 'numeric';