X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;ds=sidebyside;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=6486136cb09d362b6c0cd2f14294ba748c18217d;hb=6cfb28a02398f3759d43998206ab86bc6adfb1f6;hp=a812cfa0124b89bee6481e8a6b94cafed6cfd4e3;hpb=8e1eb2c1fbf99436083b0854235142f766c5167f;p=plack-app-gruntmaster.git
diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index a812cfa..6486136 100644
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -7,23 +7,6 @@ use Gruntmaster::Page::Base st => 'Standings';
our @ISA = qw/Gruntmaster::Page::Base/;
our $VERSION = '0.001';
-use constant TEMPLATES => {
- en => <<'HTML',
-
-
-UsernameTotal
-Username | Score
-
-
- |
-
-
-
-
- | | | | | |
---|
-HTML
-};
-
use constant LEVEL_VALUES => {
beginner => 100,
easy => 250,
@@ -61,10 +44,9 @@ 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;
- } else {
- if (job_result_text =~ m/^(\scores+)/) {
+ $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;
@@ -72,7 +54,7 @@ sub _generate{
}
}
- my @st = sort { $b->{score} <=> $a->{score} } map {
+ my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user}} map {
my $user = $_;
+{
user => $user,
@@ -81,6 +63,9 @@ sub _generate{
problems => $Gruntmaster::Data::contest,
}
} keys %scores;
+
+ $st[0]->{rank} = 1;
+ $st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
$htc->param(problems => [map { problem_name } @problems ]) if $Gruntmaster::Data::contest;
$htc->param(st => \@st);
}