use PerlX::Maybe qw/maybe/;
use Sub::Name qw/subname/;
-use constant PROBLEM_PUBLIC_COLUMNS => [qw/id author writer level name owner private statement timeout olimit value/];
-use constant USER_PUBLIC_COLUMNS => [qw/id admin name town university level/];
+use constant PROBLEM_PUBLIC_COLUMNS => [qw/id author writer level name owner private timeout olimit value/];
+use constant USER_PUBLIC_COLUMNS => [qw/id admin name town university country level/];
use constant JOBS_PER_PAGE => 10;
sub dynsub{
sub problem_list {
my ($self, %args) = @_;
- my $rs = $self->problems->search(undef, {order_by => 'me.name', columns => PROBLEM_PUBLIC_COLUMNS, prefetch => 'owner'});
+ my @columns = @{PROBLEM_PUBLIC_COLUMNS()};
+ push @columns, 'solution' if $args{solution} && $args{contest} && !$self->contest($args{contest})->is_running;
+ my $rs = $self->problems->search(undef, {order_by => 'me.name', columns => \@columns, prefetch => 'owner'});
$rs = $rs->search({-or => ['contest_problems.contest' => undef, 'contest.stop' => {'<=', time}], 'me.private' => 0}, {join => {'contest_problems' => 'contest'}, distinct => 1}) unless $args{contest} || $args{private};
$rs = $rs->search({'contest_problems.contest' => $args{contest}}, {join => 'contest_problems'}) if $args{contest};
$rs = $rs->search({'me.owner' => $args{owner}}) if $args{owner};
sub problem_entry {
my ($self, $id, $contest, $user) = @_;
my $running = $contest && $self->contest($contest)->is_running;
- my $columns = PROBLEM_PUBLIC_COLUMNS;
- push @$columns, 'solution' unless $running;
- my $pb = $self->problems->find($id, {columns => $columns, prefetch => 'owner'});
+ my @columns = @{PROBLEM_PUBLIC_COLUMNS()};
+ push @columns, 'statement';
+ push @columns, 'solution' unless $running;
+ my $pb = $self->problems->find($id, {columns => \@columns, prefetch => 'owner'});
my $open;
$open = $self->opens->find_or_create({
contest => $contest,
for ($rs->all) {
my $state = $_->is_pending ? 'pending' : $_->is_running ? 'running' : 'finished';
$params{$state} //= [];
- push @{$params{$state}}, { $_->get_columns, started => !$_->is_pending, owner_name => $_->owner->name };
+ push @{$params{$state}}, { $_->get_columns, owner_name => $_->owner->name };
}
\%params
}
sub contest_entry {
my ($self, $id) = @_;
my $ct = $self->contest($id);
- +{ $ct->get_columns, started => !$ct->is_pending, owner_name => $ct->owner->name }
+ +{ $ct->get_columns, started => !$ct->is_pending, finished => $ct->is_finished, owner_name => $ct->owner->name }
}
sub job_list {
my ($self, %args) = @_;
$args{page} //= 1;
- my $rs = $self->jobs->search(undef, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, page => $args{page}});
+ my $rs = $self->jobs->search({contest => $args{contest}}, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, page => $args{page}});
$rs = $rs->search({'me.private'=> 0}) unless $args{private};
$rs = $rs->search({'me.owner' => $args{owner}}) if $args{owner};
- $rs = $rs->search({contest => $args{contest}}) if $args{contest};
$rs = $rs->search({problem => $args{problem}}) if $args{problem};
return {
log => [map {
sub update_status {
my ($self) = @_;
- my @jobs = $self->jobs->search(undef, {cache => 1})->all;
+ my @jobs = $self->jobs->search({'me.private' => 0}, {cache => 1, prefetch => 'problem'})->all;
+ my %private;
my %hash;
- $hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] for @jobs;
+ for (@jobs) {
+ my $pb = $_->get_column('problem');
+ $private{$pb} //= $_->problem->is_private;
+ next if $private{$pb};
+ $hash{$pb, $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1];
+ }
+
my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
my @contest_statuses = map {