Add a finished key to contest_entry

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

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 741061bfc99409a1c6b47d67aac59ec6be9140ed..40751bed17ca6c02cd05b04e8beb3c3f16880630 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -132,7 +132,7 @@ sub contest_list {
 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 {
@@ -174,12 +174,15 @@ sub job_entry {
 
 sub update_status {
        my ($self) = @_;
-       my @jobs = $self->jobs->search({private => 0}, {cache => 1, prefetch => 'problem'})->all;
+       my @jobs = $self->jobs->search({'me.private' => 0}, {cache => 1, prefetch => 'problem'})->all;
 
+       my %private;
        my %hash;
        for (@jobs) {
-               next if !$_->problem->is_in_archive;
-               $hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] 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] for @jobs;
        }
 
        my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;