Fix and update standings

[gruntmaster-page.git] / lib / Gruntmaster / Page / St.pm

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index e5b418d26a7844767e06c053b8d5ac05175720dd..b91137e883f2f45cfea0933b3ed58db83970994a 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -3,19 +3,11 @@ package Gruntmaster::Page::St;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate/;
+use Gruntmaster::Page::Base st => 'Standings';
+our @ISA = qw/Gruntmaster::Page::Base/;
 our $VERSION = '0.001';
 
-use constant TITLE => 'Standings';
-
-use HTML::Template::Compiled;
-use List::Util qw/sum/;
-use POSIX qw/strftime/;
-use Gruntmaster::Page::Common qw/header footer/;
-use Gruntmaster::Data qw/problems jobcard job_result_text job_result job_problem job_user/;
-
-my %templates = (
+use constant TEMPLATES => {
        en => <<'HTML',
 <table border>
 <thead>
@@ -27,16 +19,16 @@ my %templates = (
 </tmpl_loop>
 </table>
 HTML
-);
+};
 
-$templates{$_}  = header($_, TITLE) . $templates{$_} for keys %templates;
-$templates{$_} .= footer $_ for keys %templates;
+sub _generate{
+       my ($self, $htc, $path, $lang) = @_;
 
-sub generate{
-       local $Gruntmaster::Data::contest = ($_[0] =~ m,^ct/([^/]+)/,)[0];
-       my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$_[1]});
+       $path =~ m,^(?:ct/([^/]+)/)?,;
+       local $Gruntmaster::Data::contest = $1;
 
-       my @problems = sort problems;
+       my @problems = problems;
+       @problems = sort @problems;
        my %scores;
        for (1 .. jobcard) {
                if (job_result_text =~ m/^(\d+)/) {
@@ -54,9 +46,8 @@ sub generate{
                        scores => [map { $scores{$user}{$_} // '-'} @problems],
                }
        } keys %scores;
-       $htc->param(problems => \@problems);
+       $htc->param(problems => [map { problem_name } @problems ]);
        $htc->param(st => \@st);
-       $htc->output
 }
 
 1