X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=ed40c3744ca5582ee3fb6001a31512548bf7c3ff;hb=4aa919c4abdc11770c25a8cb078857ac2e2bff08;hp=4cb6512965869fe4adcb56561bcb44823040cc68;hpb=17d4928116ac07ae3a5cabd5790130de5f244228;p=gruntmaster-data.git

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 4cb6512..ed40c37 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -25,8 +25,8 @@ use HTTP::Tiny;
 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{
@@ -74,7 +74,9 @@ sub user_entry {
 
 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};
@@ -90,9 +92,10 @@ sub problem_list {
 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,
@@ -121,7 +124,7 @@ sub contest_list {
 	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
 }
@@ -171,10 +174,17 @@ sub job_entry {
 
 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] for @jobs;
+	}
+
 	my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
 
 	my @contest_statuses = map {