From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 15 Feb 2014 20:17:06 +0000 (+0200)
Subject: Merge branch 'master' into mindcoding
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;ds=inline;h=d120694ae6ae41c26882f58aded9ee1bcdc4bd6e;hp=-c;p=plack-app-gruntmaster.git

Merge branch 'master' into mindcoding
---

d120694ae6ae41c26882f58aded9ee1bcdc4bd6e
diff --combined lib/Gruntmaster/Page/St.pm
index 901dc9a,02e377d..b25b5dc
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@@ -10,7 -10,7 +10,7 @@@ our $VERSION = '0.001'
  use constant LEVEL_VALUES => {
  	beginner => 100,
  	easy => 250,
 -	medium => 500,
 +	medium => 600,
  	hard => 1000,
  };
  
@@@ -43,14 -43,15 +43,15 @@@ sub _generate
  	@problems = sort @problems;
  	my (%scores, %tries);
  	for (1 .. jobcard) {
+ 		next unless defined job_user && defined job_problem && defined job_result;
+ 		next if $Gruntmaster::Data::contest && job_date() < $start;
+ 
  		if ($Gruntmaster::Data::contest) {
- 			$scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}++, $totaltime) if job_date() > $start;
- 		} elsif (defined job_user && defined job_problem && defined job_result) {
- 			if (defined job_result_text && job_result_text =~ m/^(\scores+)/) {
- 				$scores{job_user()}{job_problem()} = $ct;
- 			} else {
- 				$scores{job_user()}{job_problem()} = job_result() ? 0 : 100;
- 			}
+ 			$scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}, $totaltime);
+ 			$tries{job_user()}{job_problem()}++;
+ 		} else {
+ 			no warnings 'numeric';
+ 			$scores{job_user()}{job_problem()} = 0 + job_result_text() || (job_result() ? 0 : 100)
  		}
  	}