Pass private argument to job log from pb_entry

[plack-app-gruntmaster.git] / lib / Plack / App / Gruntmaster / HTML.pm

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index b1f8dce71eac1678c38d0058e1a41873de53987c..f2ce142269abbc94f5b1f46951cde1b193c9da18 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -79,6 +79,7 @@ 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}};
 
@@ -93,7 +94,7 @@ sub process_us_entry {
 
        my $ctiter = sub {
                my ($data, $td) = @_;
-               $td->fclass('contest')->namedlink($data->{contest});
+               $td->fclass('contest')->namedlink($data->{contest}, $data->{contest_name});
                $td->fclass('score')->replace_content($data->{score});
                $td->fclass('rank')->replace_content($data->{rank});
        };
@@ -102,13 +103,12 @@ sub process_us_entry {
 
 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 {
@@ -138,6 +138,7 @@ 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},
                author    =>         $args{author},
@@ -157,6 +158,7 @@ sub process_pb_entry {
                $_->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');
@@ -192,6 +194,17 @@ sub process_pb {
 
 sub process_log_entry {
        my ($tree, %args) = @_;
+       $tree->fid('problem')->namedlink(@args{qw/problem problem_name/});
+       $tree->fid('owner')->namedlink(@args{qw/owner owner_name/});
+       $tree->fid('source')->namedlink("$args{id}.$args{extension}", sprintf '%.2fKB', $args{size}/1024);
+       if ($args{contest}) {
+               $tree->fid('contest')->namedlink(@args{qw/contest contest_name/});
+               $tree->fid('problem')->find('a')->edit_href(sub {$_.="?contest=$args{contest}"});
+       } else {
+               $tree->fid('contest')->left->detach;
+               $tree->fid('contest')->detach;
+       }
+
        $args{errors} ? $tree->fid('errors')->find('pre')->replace_content($args{errors}) : $tree->fid('errors')->detach;
        my $iter = sub {
                my ($data, $tr) = @_;
@@ -199,7 +212,7 @@ sub process_log_entry {
                $tr->defmap(class => $data);
                $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;
+       $args{results} ? $tree->fid('results')->find('tbody')->find('tr')->iter3($args{results}, $iter) : $tree->fid('results')->detach;
 }
 
 sub process_log {
@@ -217,8 +230,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}");
 }