X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=fe7e4964ebe02507e0f86b4d281667bb0636c593;hb=20777d844ac7adb5887ea4e50885cd9702b7ee6a;hp=117d1b4be5ac7f2567394ca8d9d4522621f0cc1b;hpb=caafa703ea07c02254cc23227dc89c4c1e7b91ed;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 117d1b4..fe7e496 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -115,9 +115,12 @@ sub process_ct_entry {
 	my ($tree, %args) = @_;
 	$_->edit_href (sub {s/contest_id/$args{id}/}) for $tree->find('a');
 	$tree->fid('links')->detach unless $args{started};
+	my $status = ($args{time} < $args{start} ? 'starts' : 'ends');
+	$tree->fclass('timer')->attr('data-stop', $status eq 'ends' ? $args{stop} : $args{start});
 	$tree->content_handler(
 		start       => ftime   $args{start},
 		stop        => ftime   $args{stop},
+		status      => $status,
 		description => literal $args{description});
 }
 
@@ -147,14 +150,11 @@ sub process_pb_entry {
 	if ($args{contest_stop}) {
 		$tree->fid('solution')->detach;
 		$tree->fid('solution_modal')->detach;
-		my $countdown = $tree->fid('countdown');
-		$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::Result::Contest::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
+		my $score = $tree->fid('score');
+		$score->attr('data-start' => $args{open_time});
+		$score->attr('data-stop'  => $args{contest_stop});
+		$score->attr('data-value'  => $args{value});
+		$tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
 	} else {
 		$tree->fid('solution')->detach unless $args{solution};
 		$_->detach for $tree->fclass('rc'); # requires contest
@@ -183,6 +183,7 @@ sub process_pb {
 		$tr->fclass('name')->namedlink($data->{id}, $data->{name});
 		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest};
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
+		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private};
 	};
 	my $iter = sub {
 		my ($data, $div) = @_;
@@ -235,6 +236,7 @@ sub process_log {
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
 		$tr->fclass('result_text')->replace_content($data->{result_text});
 		$tr->fclass('result_text')->attr(class => "r$data->{result}");
+		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private};
 	};
 	$tree->find('table')->find('tbody')->find('tr')->iter3($args{log}, $iter);
 	$args{next_page} ? $tree->fclass('next')->namedlink($args{next_page}, 'Next') : $tree->fclass('next')->detach;