X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=f0952cf6228cc468aa77155a9a30a28581853591;hb=f1c090e7ae6e91f4fcaa690466524adb94afdf08;hp=04127828de03ee7704f2deb2887d0eba9142a2ee;hpb=9a4806b3c49eef940ac5d2d2b38f9d47b346d544;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 0412782..f0952cf 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -79,17 +79,36 @@ sub process_skel {
 sub process_us_entry {
 	my ($tree, %args) = @_;
 	$tree->fid($_)->attr('href', "/$_/?owner=$args{id}") for qw/log pb/;
+	$tree->fid('track_user')->attr('data-user', $args{id});
+	my @solved = map { $_->{solved} ? ($_->{problem}) : () } @{$args{problems}};
+	my @attempted = map { !$_->{solved} ? ($_->{problem}) : () } @{$args{problems}};
+
+	my $pbiter = sub {
+		my ($data, $li) = @_;
+		$li->find('a')->namedlink($data);
+	};
+	$tree->fid('solved')->find('li')->iter3(\@solved, $pbiter);
+	$tree->fid('attempted')->find('li')->iter3(\@attempted, $pbiter);
+	$tree->fid('solved_count')->replace_content(scalar @solved);
+	$tree->fid('attempted_count')->replace_content(scalar @attempted);
+
+	my $ctiter = sub {
+		my ($data, $td) = @_;
+		$td->fclass('contest')->namedlink($data->{contest}, $data->{contest_name});
+		$td->fclass('score')->replace_content($data->{score});
+		$td->fclass('rank')->replace_content($data->{rank});
+	};
+	$tree->find('table')->find('tbody')->find('tr')->iter3($args{contests}, $ctiter);
 }
 
 sub process_us {
 	my ($tree, %args) = @_;
-	my $item = $tree->fclass('list-group-item');
-	$item->replace_with(map {
-		my $new = $item->clone;
-		$new->attr(href => $_->{id});
-		$new->replace_content($_->{name} || $_->{id});
-		$new
-	} @{$args{us}});
+	my $iter = sub {
+		my ($data, $tr) = @_;
+		$tr->fclass('user')->namedlink($data->{id}, $data->{name});
+		$tr->fclass($_)->replace_content($data->{$_}) for qw/solved attempted contests/;
+	};
+	$tree->find('tbody')->find('tr')->iter3($args{us}, $iter);
 }
 
 sub process_ct_entry {
@@ -118,11 +137,14 @@ sub process_pb_entry {
 	my ($tree, %args) = @_;
 	$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->content_handler(
 		statement => literal $args{statement},
 		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-stop' => $args{contest_stop});
@@ -133,6 +155,7 @@ sub process_pb_entry {
 		$tree->fid('score')->replace_content(Gruntmaster::Data::calc_score($args{value}, $args{time} - $args{contest_start}, 0, $args{contest_stop} - $args{contest_start}));
 	} else {
 		$_->detach for $tree->fclass('rc'); # requires contest
+		$tree->fid('solution_modal')->fclass('modal-body')->replace_content(literal $args{solution});
 	}
 	if ($args{cansubmit}) {
 		$tree->look_down(name => 'problem')->attr(value => $args{id});
@@ -144,6 +167,11 @@ sub process_pb_entry {
 	}
 }
 
+sub process_sol {
+	my ($tree, %args) = @_;
+	$tree->content_handler(solution => literal $args{solution});
+}
+
 sub process_pb {
 	my ($tree, %args) = @_;
 	my $titer = sub {
@@ -189,8 +217,8 @@ sub process_log {
 		$tr->fclass('result_text')->attr(class => "r$data->{result}");
 	};
 	$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')->attr(class => 'next disabled');
-	$args{previous_page} ? $tree->fclass('previous')->namedlink($args{previous_page}, 'Previous') : $tree->fclass('previous')->attr(class => 'previous disabled');
+	$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;
 	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
 }
 
@@ -207,9 +235,8 @@ sub process_st {
 		my ($st, $tr) = @_;
 		$tr->set_child_content(class => 'rank', $st->{rank});
 		$tr->set_child_content(class => 'score', $st->{score});
-		$tr->fclass('user')->namedlink($st->{user}->id, $st->{user}->name);
+		$tr->fclass('user')->namedlink($st->{user}, $st->{user_name});
 		my $pbscore = $tr->fclass('pbscore');
-		$pbscore->detach unless $st->{problems};
 		$pbscore->iter($pbscore => @{$st->{scores}});
 	};
 	$tree->find('tbody')->find('tr')->iter3($args{st}, $iter);