X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=ce87c254c9b85027fa1d1c7dbeceaa6bd030e8e7;hb=347ea1e4cea0a3bb98bbcb978b6c8d3296e7707f;hp=608ca50d9350b5fc0b8860c168f81e6f8d8cc98f;hpb=4779105915c19046793a5fc2e3c920d3e9deef29;p=gruntmaster-data.git

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 608ca50..ce87c25 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -15,11 +15,12 @@ __PACKAGE__->load_namespaces;
 # Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-03-05 13:11:39
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dAEmtAexvUaNXLgYz2rNEg
 
-our $VERSION = '5999.000_008';
+our $VERSION = '5999.000_011';
 
 use Lingua::EN::Inflect qw/PL_N/;
-use JSON qw/decode_json/;
+use JSON::MaybeXS qw/decode_json/;
 use List::Util qw/sum/;
+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/];
@@ -28,26 +29,19 @@ use constant JOBS_PER_PAGE => 10;
 
 sub dynsub{
 	our ($name, $sub) = @_;
-	no strict 'refs';
+	no strict 'refs'; ## no critic (Strict)
 	*$name = subname $name => $sub
 }
 
 BEGIN {
 	for my $rs (qw/contest contest_problem job open problem user/) {
 		my $rsname = ucfirst $rs;
-		$rsname =~ s/_([a-z])/\u$1/g;
+		$rsname =~ s/_([a-z])/\u$1/gs;
 		dynsub PL_N($rs) => sub { $_[0]->resultset($rsname)              };
 		dynsub      $rs  => sub { $_[0]->resultset($rsname)->find($_[1]) };
 	}
 }
 
-use constant LEVEL_VALUES => {
-	beginner => 100,
-	easy => 250,
-	medium => 500,
-	hard => 1000,
-};
-
 sub calc_score{
 	my ($mxscore, $time, $tries, $totaltime) = @_;
 	my $score = $mxscore;
@@ -70,21 +64,21 @@ sub standings {
 			my $open = $self->opens->find($ct->id, $job->problem->id, $job->owner->id);
 			my $time = $job->date - ($open ? $open->time : $ct->start);
 			next if $time < 0;
-			my $value = $job->problem->value // LEVEL_VALUES->{$job->problem->level};
+			my $value = $job->problem->value;
 			my $factor = $job->result ? 0 : 1;
-			$factor = $1 / 100 if $job->result_text =~ /^(\d+ )/;
+			$factor = $1 / 100 if $job->result_text =~ /^(\d+ )/s;
 			$scores{$job->owner->id}{$job->problem->id} = int ($factor * calc_score ($value, $time, $tries{$job->owner->id}{$job->problem->id}++, $ct->stop - $ct->start));
 		} else {
-			no warnings 'numeric';
+			no warnings 'numeric'; ## no critic (ProhibitNoWarnings)
 			$scores{$job->owner->id}{$job->problem->id} = 0 + $job->result_text || ($job->result ? 0 : 100)
 		}
 	}
 
-	my @st = sort { $b->{score} <=> $a->{score} or $a->{user}->id cmp $b->{user}->id} map {
+	my @st = sort { $b->{score} <=> $a->{score} or $a->{user}->id cmp $b->{user}->id} map { ## no critic (ProhibitReverseSortBlock)
 		my $user = $_;
 		+{
 			user => $self->user($user),
-			score => sum (values $scores{$user}),
+			score => sum (values %{$scores{$user}}),
 			scores => [map { $scores{$user}{$_->id} // '-'} @problems],
 			problems => $ct,
 		}
@@ -97,7 +91,7 @@ sub standings {
 
 sub user_list {
 	my $rs = $_[0]->users->search(undef, {order_by => 'name', columns => USER_PUBLIC_COLUMNS});
-	[ map +{ $_->get_columns }, $rs->all ]
+	[ map { { $_->get_columns } } $rs->all ]
 }
 
 sub user_entry {
@@ -115,7 +109,7 @@ sub problem_list {
 	$params{contest} = $args{contest} if $args{contest};
 	for ($rs->all) {
 		$params{$_->level} //= [];
-		push $params{$_->level}, {$_->get_columns, owner_name => $_->owner->name} ;
+		push @{$params{$_->level}}, {$_->get_columns, owner_name => $_->owner->name} ;
 	}
 	\%params
 }
@@ -124,7 +118,7 @@ sub problem_entry {
 	my ($self, $id, $contest, $user) = @_;
 	my $pb = $self->problems->find($id, {columns => PROBLEM_PUBLIC_COLUMNS, prefetch => 'owner'});
 	my $running = $contest && $self->contest($contest)->is_running;
-	eval {
+	eval { ## no critic (RequireCheckingReturnValueOfEval)
 		$self->opens->create({
 			contest => $contest,
 			problem => $id,
@@ -132,7 +126,8 @@ sub problem_entry {
 			time => time,
 		})
 	} if $running;
-	+{ $pb->get_columns, owner_name => $pb->owner->name, cansubmit => $contest ? $running : 1 }
+	$contest &&= $self->contest($contest);
+	+{ $pb->get_columns, owner_name => $pb->owner->name, cansubmit => $contest ? $running : 1, $running ? (contest_start => $contest->start, contest_stop => $contest->stop) : () }
 }
 
 sub contest_list {
@@ -143,7 +138,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, started => !$_->is_pending, owner_name => $_->owner->name };
 	}
 	\%params
 }
@@ -157,19 +152,25 @@ sub contest_entry {
 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, offset => ($args{page} - 1) * JOBS_PER_PAGE});
+	my $rs = $self->jobs->search(undef, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, page => $args{page}});
 	$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};
-	[map {
-		my %params = $_->get_columns;
-		$params{owner_name}   = $_->owner->name;
-		$params{problem_name} = $_->problem->name;
-		$params{results} &&= decode_json $params{results};
-		$params{size}      = length $params{source};
-		delete $params{source};
-		\%params
-	} $rs->all]
+	return {
+		log => [map {
+			my %params = $_->get_columns;
+			$params{owner_name}   = $_->owner->name;
+			$params{problem_name} = $_->problem->name;
+			$params{results} &&= decode_json $params{results};
+			$params{size}      = length $params{source};
+			delete $params{source};
+			\%params
+		} $rs->all],
+		current_page => $rs->pager->current_page,
+		maybe previous_page => $rs->pager->previous_page,
+		maybe next_page => $rs->pager->next_page,
+		maybe last_page => $rs->pager->last_page,
+	}
 }
 
 sub job_entry {