X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=e84f6003d70a54f7972a24dfc61911a23e185d20;hb=39e2d01af11ba6679478c9d2b265e76929a67191;hp=5ea06265ec9d3b11980ba9147a6e5b431d97ed25;hpb=6eb88ef91eba8f3db0098fe211bc8ecd63172f11;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 5ea0626..e84f600 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -148,18 +148,18 @@ sub process_pb_entry {
 		$tree->fid('solution')->detach;
 		$tree->fid('solution_modal')->detach;
 		my $countdown = $tree->fid('countdown');
-		$countdown->attr('data-start' => $args{contest_start});
+		$countdown->attr('data-start' => $args{open_time});
 		$countdown->attr('data-stop' => $args{contest_stop});
 		$countdown->attr('data-time' => $args{time});
 		my $left = $args{contest_stop} - $args{time};
 		$countdown->replace_content(sprintf '%02d:%02d:%02d', $left/60/60, $left/60%60, $left%60);
 		$tree->fid('score')->attr('data-value' => $args{value});
-		$tree->fid('score')->replace_content(Gruntmaster::Data::calc_score($args{value}, $args{time} - $args{contest_start}, 0, $args{contest_stop} - $args{contest_start}));
+		$tree->fid('score')->replace_content(Gruntmaster::Data::Result::Contest::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
 	} else {
+		$tree->fid('solution')->detach unless $args{solution};
 		$_->detach for $tree->fclass('rc'); # requires contest
 		$tree->fid('solution_modal')->fclass('modal-body')->replace_content(literal $args{solution});
 	}
-	$tree->fid('solution')->detach unless $args{solution};
 	if ($args{cansubmit}) {
 		$tree->look_down(name => 'problem')->attr(value => $args{id});
 		my $contest = $tree->look_down(name => 'contest');
@@ -214,6 +214,7 @@ sub process_log_entry {
 		$tr->fclass('result_text')->attr(class => "r$data->{result}")
 	};
 	$args{results} ? $tree->fid('results')->find('tbody')->find('tr')->iter3($args{results}, $iter) : $tree->fid('results')->detach;
+	$tree->fid('no_results')->detach if $tree->fid('results') || $tree->fid('errors');
 }
 
 sub process_log {
@@ -242,7 +243,7 @@ sub process_st {
 	my $pbiter = sub {
 		my ($data, $th) = @_;
 		$th->attr(class => undef);
-		$th->namedlink($data->id, $data->name);
+		$th->namedlink(@$data);
 	};
 	$tree->fclass('problem')->iter3($args{problems}, $pbiter);
 	my $iter = sub {