Improve HTML::Element::fclass

[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 8f47616eaf4e9446ee550c774b62e60972e49e2b..81a33c0dc59a12e0d4822ea95f12989ecca76dcd 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -32,7 +32,7 @@ sub HTML::Element::iter3 {
 }
 
 sub HTML::Element::fid    { shift->look_down(id    => shift) }
-sub HTML::Element::fclass { shift->look_down(class => shift) }
+sub HTML::Element::fclass { shift->look_down(class => qr/\b$_[0]\b/) }
 
 sub HTML::Element::namedlink {
        my ($self, $id, $name) = @_;
@@ -115,9 +115,12 @@ sub process_ct_entry {
        my ($tree, %args) = @_;
        $_->edit_href (sub {s/contest_id/$args{id}/}) for $tree->find('a');
        $tree->fid('links')->detach unless $args{started};
+       my $status = ($args{time} < $args{start} ? 'starts' : 'ends');
+       $tree->fclass('timer')->attr('data-stop', $status eq 'ends' ? $args{stop} : $args{start});
        $tree->content_handler(
                start       => ftime   $args{start},
                stop        => ftime   $args{stop},
+               status      => $status,
                description => literal $args{description});
 }
 
@@ -147,14 +150,11 @@ sub process_pb_entry {
        if ($args{contest_stop}) {
                $tree->fid('solution')->detach;
                $tree->fid('solution_modal')->detach;
-               my $countdown = $tree->fid('countdown');
-               $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::Result::Contest::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
+               my $score = $tree->fid('score');
+               $score->attr('data-start' => $args{open_time});
+               $score->attr('data-stop'  => $args{contest_stop});
+               $score->attr('data-value'  => $args{value});
+               $tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
        } else {
                $tree->fid('solution')->detach unless $args{solution};
                $_->detach for $tree->fclass('rc'); # requires contest
@@ -183,12 +183,13 @@ sub process_pb {
                $tr->fclass('name')->namedlink($data->{id}, $data->{name});
                $tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $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};
        };
        my $iter = sub {
                my ($data, $div) = @_;
                $div->attr(id => $data);
                $div->find('h2')->replace_content(ucfirst $data);
-               $div->find('tbody')->iter3($args{$data}, $titer);
+               $div->find('tbody')->find('tr')->iter3($args{$data}, $titer);
        };
        $tree->fid('beginner')->iter3([grep {$args{$_}} qw/beginner easy medium hard/], $iter);
 }
@@ -235,6 +236,7 @@ sub process_log {
                $tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
                $tr->fclass('result_text')->replace_content($data->{result_text});
                $tr->fclass('result_text')->attr(class => "r$data->{result}");
+               $tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private};
        };
        $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;