X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=2186fea570647822782d3fb32f6a3492f0750c2c;hb=7ffb6a3686e644a2cb9a6d39f3d60a646a1e2de6;hp=97d0d065d48e3990aff57b514a553cf58020defa;hpb=7dc3247307f2e86af154dc449224f22ba8923c79;p=plack-app-gruntmaster.git
diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 97d0d06..2186fea 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,
@@ -45,8 +28,8 @@ sub calc_score{
}
sub _generate{
- my ($self, $htc, $lang, $logger, $ct) = @_;
- debug $logger => "language is '$lang' and contest is '$ct'";
+ my ($self, $htc, $lang, $env, $ct) = @_;
+ debug $env => "language is '$lang' and contest is '$ct'";
my ($totaltime, $start);
local $Gruntmaster::Data::contest;
@@ -63,8 +46,8 @@ sub _generate{
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+)/) {
+ } 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 +55,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 +64,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);
}