Include limit overrides in problem_entry

[gruntmaster-data.git] / lib / Gruntmaster / Data.pm

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 60ab3e53e4e1a94b6e042e7816cc93e8e1135ee9..fbfabcff39fc6a7d67f325f0662d0d90fba83f12 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -37,7 +37,7 @@ sub dynsub{
 }
 
 BEGIN {
-       for my $rs (qw/contest contest_problem job open problem user problem_status contest_status/) {
+       for my $rs (qw/contest contest_problem job open limit problem user problem_status contest_status/) {
                my $rsname = ucfirst $rs;
                $rsname =~ s/_([a-z])/\u$1/gs;
                dynsub PL_N($rs) => sub { $_[0]->resultset($rsname)              };
@@ -98,6 +98,10 @@ sub problem_entry {
        push @columns, 'statement';
        push @columns, 'solution' unless $running;
        my $pb = $self->problems->find($id, {columns => \@columns, prefetch => 'owner'});
+       my @limits = map { +{
+               format  => $_->format,
+               timeout => $_->timeout,
+       } } $self->limits->search({problem => $id});
        my $open;
        $open = $self->opens->find_or_create({
                contest => $contest,
@@ -108,6 +112,7 @@ sub problem_entry {
        $contest &&= $self->contest($contest);
        +{
                $pb->get_columns,
+               @limits ? (limits => \@limits) : (),
                owner_name => $pb->owner->name,
                cansubmit => !$contest || !$contest->is_finished,
                $running ? (
@@ -145,6 +150,7 @@ sub job_list {
        $rs = $rs->search({'me.private'=> 0})          unless $args{private};
        $rs = $rs->search({'me.owner'  => $args{owner}})   if $args{owner};
        $rs = $rs->search({problem     => $args{problem}}) if $args{problem};
+       $rs = $rs->search({result      => $args{result}})  if defined $args{result};
        return {
                log => [map {
                        my %params = $_->get_columns;
@@ -184,7 +190,7 @@ sub update_status {
        my %hash;
        for (@jobs) {
                my $pb = $_->get_column('problem');
-               $private{$pb} //= $_->problem->is_private;
+               $private{$pb} //= $_->problem->private;
                next if $private{$pb};
                $hash{$pb, $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1];
        }