X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=39d7b84358f1320f4a39af8184b1cfb18dd59250;hb=17080e2d464cf6c131c34e6e87bcf5970de815cc;hp=f1a42c11fb278ac952a73b232d5724a775cb1d55;hpb=d0d5bac626e81b789a6325771697da68c1fd559b;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index f1a42c1..39d7b84 100644
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -31,10 +31,13 @@ sub _generate{
 	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}{$job->problem}, $ct->stop - $ct->start));
 			$tries{$job->owner->id}{$job->problem->id}++;
 		} else {
 			no warnings 'numeric';