Sort problem lists by value instead of level

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

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 7df9ef3c5f422fc47b388120bcfdd37b86841f1d..7a980737a7fd4eb5fe6da2a7bcf075d0e1845956 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -8,13 +8,15 @@ use HTML::Element::Library;
 use HTML::TreeBuilder;
 use POSIX qw//;
 use Data::Dumper qw/Dumper/;
+use Sort::ByExample
+  sorter => {-as => 'ct_sort', example => [qw/Running Pending Finished/], xform => sub {$_->{status}}};
 
 my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th => 1};
 
 sub ftime ($)   { POSIX::strftime '%c', localtime shift }
 sub literal ($) {
        my ($html) = @_;
-       return unless $html;
+       return '' unless $html;
        my $b = HTML::TreeBuilder->new;
        $b->ignore_unknown(0);
        $b->parse($html);
@@ -46,7 +48,7 @@ sub HTML::Element::fclass { shift->look_down(class => qr/\b$_[0]\b/) }
 
 sub HTML::Element::namedlink {
        my ($self, $id, $name) = @_;
-       $name = $id unless $name =~ /[[:graph:]]/;
+       $name = $id unless $name && $name =~ /[[:graph:]]/;
        $self = $self->find('a');
        $self->edit_href(sub {s/id/$id/});
        $self->replace_content($name);
@@ -64,7 +66,15 @@ sub render {
        my ($tmpl, $lang, %args) = @_;
        $lang //= 'en';
        my $meat = _render($tmpl, $lang, %args);
-       _render('skel', $lang, %args, meat => $meat)
+       my $html = _render('skel', $lang, %args, meat => $meat);
+       if ($tmpl eq 'pb_entry') { # Move sidebar to correct position
+               my $builder = HTML::TreeBuilder->new;
+               $builder->ignore_unknown(0);
+               my $tree = $builder->parse_content($html);
+               $tree->fid('content')->postinsert($tree->fid('sidebar'));
+               $html = $tree->as_HTML(undef, undef, $optional_end_tags)
+       }
+       $html
 }
 
 sub render_article {
@@ -83,8 +93,6 @@ sub _render {
        $tree->defmap(smap => \%args);
        my $process = __PACKAGE__->can("process_$tmpl");
        $process->($tree, %args) if $process;
-       $_->detach for $tree->look_down(static => $args{static} ? 'no' : 'yes');
-       $_->attr('static', undef) for $tree->look_down(sub {$_[0]->attr('static')});
        $_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')});
        $tree->as_HTML(undef, undef, $optional_end_tags);
 }
@@ -155,7 +163,8 @@ sub process_ct {
                $tr->fclass('name')->namedlink($data->{id}, $data->{name});
                $tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
        };
-       $args{$_} ? $tree->fid($_)->find('tbody')->find('tr')->iter3($args{$_}, $iter) : $tree->fid($_)->detach for qw/running pending finished/;
+       $_->{status} = $_->{finished} ? 'Finished' : $_->{started} ? 'Running' : 'Pending' for @{$args{ct}};
+       $tree->find('tbody')->find('tr')->iter3([ct_sort @{$args{ct}}], $iter);
 }
 
 sub process_pb_entry {
@@ -187,16 +196,11 @@ sub process_pb_entry {
                $_->detach for $tree->fclass('rc'); # requires contest
                $tree->fid('solution_modal')->replace_content(literal $args{solution});
        }
-       if ($args{cansubmit}) {
-               $tree->fid('nosubmit')->detach;
-               $tree->look_down(name => 'problem')->attr(value => $args{id});
-               my $contest = $tree->look_down(name => 'contest');
-               $contest->attr(value => $args{args}{contest}) if $args{args}{contest};
-               $contest->detach unless $args{args}{contest}
-       } else {
-               $tree->fid('nosubmit')->find('a')->edit_href(sub{s/id/$args{id}/});
-               $tree->fid('submit')->detach
-       }
+
+       $tree->look_down(name => 'problem')->attr(value => $args{id});
+       my $contest = $tree->look_down(name => 'contest');
+       $contest->attr(value => $args{args}{contest}) if $args{args}{contest};
+       $contest->detach unless $args{args}{contest}
 }
 
 sub process_sol {
@@ -206,22 +210,18 @@ sub process_sol {
 
 sub process_pb {
        my ($tree, %args) = @_;
-       my $titer = sub {
+       my $iter = sub {
                my ($data, $tr) = @_;
                $tr->set_child_content(class => 'author', $data->{author});
+               $tr->set_child_content(class => 'level', ucfirst $data->{level});
                $tr->fclass('name')->namedlink($data->{id}, $data->{name});
-               $tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest};
+               $tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{args}{contest}"}) if $args{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} && !$args{contest};
+               $tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{args}{contest};
        };
-       my $iter = sub {
-               my ($data, $div) = @_;
-               $div->attr(id => $data);
-               $div->find('h2')->replace_content(ucfirst $data);
-               $div->find('tbody')->find('tr')->iter3($args{$data}, $titer);
-       };
-       $tree->fid('beginner')->iter3([grep {$args{$_}} qw/beginner easy medium hard/], $iter);
-       $tree->fid('open-alert')->detach unless $args{contest};
+
+       $tree->find('tbody')->find('tr')->iter3([sort { $a->{value} <=> $b->{value} } @{$args{pb}}], $iter);
+       $tree->fid('open-alert')->detach unless $args{args}{contest};
 }
 
 sub process_log_entry {
@@ -256,7 +256,7 @@ sub process_log {
                my ($data, $tr) = @_;
                $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{args}{contest}"}) if $args{args}{contest};
+               $tr->fclass('problem')->find('a')->edit_href(sub{$_ .= '?contest='.$data->{contest}}) if $data->{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});
@@ -277,10 +277,6 @@ sub process_log {
                $elem->find('a')->edit_href(sub{s/$/&$str/}) if $str;
        }
        $tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
-
-       my @detach;
-       push @detach, $args{args}{$_} ? $tree->fclass($_) : () for qw/problem contest owner/;
-       $_->detach for @detach;
 }
 
 sub process_st {
@@ -313,7 +309,7 @@ sub process_ed {
                $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/;
+       my @pb = sort { $a->{value} <=> $b->{value} } @{$args{pb}};
        $tree->fclass('well')->iter3(\@pb, $iter);
 }