X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=26669c7da1c520d5b88d6b7b4b7aec55d9917f05;hb=c5ff0b0939c991eadcd5c9026268bcd0f12c8a45;hp=ff998b96a4e654b999a5cebb5d60618506c63182;hpb=e4d5bdf52a921932551c051df63ea8087d2037da;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index ff998b9..26669c7 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -79,17 +79,35 @@ sub process_skel {
 sub process_us_entry {
 	my ($tree, %args) = @_;
 	$tree->fid($_)->attr('href', "/$_/?owner=$args{id}") for qw/log pb/;
+	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 {
@@ -216,9 +234,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);