Sort problems in standings by value and fix standings JSON

[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 0ac0c88b6fe17667139cd11983aaf8c751a84985..e84f6003d70a54f7972a24dfc61911a23e185d20 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -154,12 +154,12 @@ sub process_pb_entry {
                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::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
+               $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}));
        } else {
+               $tree->fid('solution')->detach unless $args{solution};
                $_->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');
@@ -243,7 +243,7 @@ sub process_st {
        my $pbiter = sub {
                my ($data, $th) = @_;
                $th->attr(class => undef);
-               $th->namedlink($data->id, $data->name);
+               $th->namedlink(@$data);
        };
        $tree->fclass('problem')->iter3($args{problems}, $pbiter);
        my $iter = sub {