X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=8f47616eaf4e9446ee550c774b62e60972e49e2b;hb=8d690af588170f90b957507454123e3e9070f7a6;hp=91f1fc4baf091583245eb1ca3c5379cb470ff509;hpb=2dfeee941a31f31400e8e4b4f0f2de5ff5456b0c;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 91f1fc4..8f47616 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -138,26 +138,28 @@ sub process_pb_entry {
 	$tree->fid('owner')->edit_href(sub{s/owner_id/$args{owner}/});
 	$tree->fid('job_log')->edit_href(sub{s/problem_id/$args{id}/});
 	$tree->fid('solution')->edit_href(sub{s/problem_id/$args{id}/});
+	$tree->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private};
 	$tree->content_handler(
 		statement => literal $args{statement},
+		level     => ucfirst $args{level},
 		author    =>         $args{author},
 		owner     =>         $args{owner_name} || $args{owner});
 	if ($args{contest_stop}) {
 		$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');
@@ -211,7 +213,10 @@ sub process_log_entry {
 		$tr->defmap(class => $data);
 		$tr->fclass('result_text')->attr(class => "r$data->{result}")
 	};
+	$tree->fclass('result_text')->replace_content($args{result_text});
+	$tree->fclass('result_text')->attr(class => "r$args{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 {
@@ -221,7 +226,10 @@ sub process_log {
 		$tr->fclass('id')->namedlink($data->{id});
 		$tr->fclass('problem')->namedlink($data->{problem}, $data->{problem_name});
 		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{contest}"}) if $args{contest};
+		$tr->fclass('contest')->namedlink($data->{contest}, $data->{contest_name}) if $data->{contest};
+		$tr->fclass('contest')->replace_content('None') unless $data->{contest};
 		$tr->fclass('date')->replace_content(ftime $data->{date});
+		$tr->fclass('format')->replace_content($data->{format});
 		$tr->fclass('size')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB", $data->{size}/1024);
 		$tr->fclass('size')->attr('data-private', '') if $data->{private};
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
@@ -231,6 +239,13 @@ sub process_log {
 	$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;
 	$args{previous_page} ? $tree->fclass('previous')->namedlink($args{previous_page}, 'Previous') : $tree->fclass('previous')->detach;
+	for my $cls (qw/next previous/) {
+		my $elem = $tree->fclass($cls);
+		next unless $elem;
+		delete $args{args}{page};
+		my $str = join '&', map { $_ . '=' . $args{args}{$_} } keys %{$args{args}};
+		$elem->find('a')->edit_href(sub{s/$/&$str/});
+	}
 	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
 }
 
@@ -240,7 +255,8 @@ sub process_st {
 	my $pbiter = sub {
 		my ($data, $th) = @_;
 		$th->attr(class => undef);
-		$th->namedlink($data->id, $data->name);
+		$th->namedlink(@$data);
+		$th->find('a')->edit_href(sub{s/$/?contest=$args{args}{contest}/});
 	};
 	$tree->fclass('problem')->iter3($args{problems}, $pbiter);
 	my $iter = sub {
@@ -253,3 +269,15 @@ sub process_st {
 	};
 	$tree->find('tbody')->find('tr')->iter3($args{st}, $iter);
 }
+
+sub process_ed {
+	my ($tree, %args) = @_;
+	my $iter = sub {
+		my ($data, $div) = @_;
+		$div->set_child_content(class => 'value', $data->{value});
+		$div->set_child_content(class => 'solution', literal $data->{solution});
+		$div->fclass('problem')->namedlink($data->{id}, $data->{name});
+	};
+	my @pb = map { @{$args{$_}} } qw/beginner easy medium hard/;
+	$tree->fclass('well')->iter3(\@pb, $iter);
+}