X-Git-Url: http://git.ieval.ro/?p=plack-app-gruntmaster.git;a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=5c108d1a7a035618c3cafd23828f581276a215c6;hp=b67ef296cf544a0164e7ecadb175a33485680d6c;hb=25ed3a342819b81afaf9d04c8c6f8db372a22392;hpb=1f64ef28e31c592b91d5d75850229e01e7f89b84

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index b67ef29..5c108d1 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -14,7 +14,7 @@ my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th =>
 sub ftime ($)   { POSIX::strftime '%c', localtime shift }
 sub literal ($) {
 	my ($html) = @_;
-	return unless $html;
+	return '' unless $html;
 	my $b = HTML::TreeBuilder->new;
 	$b->ignore_unknown(0);
 	$b->parse($html);
@@ -161,6 +161,10 @@ sub process_ct {
 		$tr->fclass('name')->namedlink($data->{id}, $data->{name});
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
 	};
+	for (@{$args{ct}}) {
+		my $state = $_->{finished} ? 'finished' : $_->{started} ? 'running' : 'pending';
+		push @{$args{$state} //= []}, $_;
+	}
 	$args{$_} ? $tree->fid($_)->find('tbody')->find('tr')->iter3($args{$_}, $iter) : $tree->fid($_)->detach for qw/running pending finished/;
 }
 
@@ -221,6 +225,7 @@ sub process_pb {
 		$div->find('h2')->replace_content(ucfirst $data);
 		$div->find('tbody')->find('tr')->iter3($args{$data}, $titer);
 	};
+	push @{$args{$_->{level}} //= []}, $_ for @{$args{pb}};
 	$tree->fid('beginner')->iter3([grep {$args{$_}} qw/beginner easy medium hard/], $iter);
 	$tree->fid('open-alert')->detach unless $args{contest};
 }
@@ -310,7 +315,7 @@ sub process_ed {
 		$div->set_child_content(class => 'solution', literal $data->{solution});
 		$div->fclass('problem')->namedlink($data->{id}, $data->{name});
 	};
-	my @pb = map { @{$args{$_} // []} } qw/beginner easy medium hard/;
+	my @pb = sort { $a->{value} <=> $b->{value} } @{$args{pb}};
 	$tree->fclass('well')->iter3(\@pb, $iter);
 }