Merge branch 'master' into gruntmaster

diff --git a/lib/Gruntmaster/Page/Ct.pm b/lib/Gruntmaster/Page/Ct.pm
index b62b9751fd82972dd8d6aee59c1962d24e1a82ae..a21bf77809d352a78ef06c358833c3467945cda9 100644 (file)
--- a/lib/Gruntmaster/Page/Ct.pm
+++ b/lib/Gruntmaster/Page/Ct.pm
@@ -12,7 +12,7 @@ sub _generate{
        debug $env => "language is '$lang'";
 
        my (@running, @pending, @finished);
-       for (contests) {
+       for (sort {contest_start $a <=> contest_start $b}contests) {
                my $ct = { id => $_,
                                   name => contest_name,
                                   start => strftime ('%c', localtime contest_start),

diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index 8b770efe3a24bcc5f193675171a685e364480227..4cf007edcd1760d3eaf7dea49298ad942d52265f 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -13,7 +13,7 @@ sub _generate{
        my ($self, $htc, $lang, $env, $contest, $id) = @_;
        debug $env => "language is '$lang', contest is '$contest', id is '$id'";
        my $user = $env->{REMOTE_USER};
-       if ($contest && $user) {
+       if ($contest && $user && time >= contest_start $contest) {
                local $Gruntmaster::Data::contest = $contest;
                mark_open $id, $user;
                debug $env => "Marking problem $id of contest $contest open by $user";

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 2186fea570647822782d3fb32f6a3492f0750c2c..6486136cb09d362b6c0cd2f14294ba748c18217d 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -44,8 +44,7 @@ sub _generate{
        my (%scores, %tries);
        for (1 .. jobcard) {
                if ($Gruntmaster::Data::contest) {
-                       $tries{job_user()}{job_problem()}++;
-                       $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;
+                       $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;