X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=50dcfd57d1a407e8da7611515b3691fe66ae0b4f;hb=e1250e203047d108bef4640e19d1384a503826e0;hp=fa81e76b926301d25eaf33e7963d2fa6b02b8f45;hpb=6dda1f23dd233eaca23859432922dfdceb68358f;p=gruntmaster-data.git

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index fa81e76..50dcfd5 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -28,7 +28,7 @@ use Sub::Name qw/subname/;
 use constant CONTEST_PUBLIC_COLUMNS => [qw/id name description start stop owner/];
 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;
+use constant JOBS_PER_PAGE => 50;
 
 sub dynsub{
 	our ($name, $sub) = @_;
@@ -56,14 +56,16 @@ sub user_list {
 	}
 	$contests{$_->rawowner}++ for $self->contest_statuses->all;
 
-	[ sort { $b->{solved} <=> $a->{solved} or $b->{attempted} <=> $a->{attempted} } ## no critic (ProhibitReverseSort)
-		grep { $_->{solved} || $_->{attempted} } map {
+	my @users = sort { $b->{solved} <=> $a->{solved} or $b->{attempted} <=> $a->{attempted} } ## no critic (ProhibitReverseSort)
+		map {
 			my $id = $_->id;
 			+{ $_->get_columns,
 			   solved => ($solved{$id} // 0),
 			   attempted => ($attempted{$id} // 0),
 			   contests => ($contests{$id} // 0) }
-		} $rs->all ]
+		} $rs->all;
+	@users = @users[0 .. 199] if @users > 200;
+	\@users
 }
 
 sub user_entry {
@@ -98,6 +100,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 +114,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 ? (