X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=7a980737a7fd4eb5fe6da2a7bcf075d0e1845956;hp=5c108d1a7a035618c3cafd23828f581276a215c6;hb=8eab1109352c846c1f5dcba55317c690812e4208;hpb=25ed3a342819b81afaf9d04c8c6f8db372a22392

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 5c108d1..7a98073 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -8,6 +8,8 @@ use HTML::Element::Library;
 use HTML::TreeBuilder;
 use POSIX qw//;
 use Data::Dumper qw/Dumper/;
+use Sort::ByExample
+  sorter => {-as => 'ct_sort', example => [qw/Running Pending Finished/], xform => sub {$_->{status}}};
 
 my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th => 1};
 
@@ -46,7 +48,7 @@ sub HTML::Element::fclass { shift->look_down(class => qr/\b$_[0]\b/) }
 
 sub HTML::Element::namedlink {
 	my ($self, $id, $name) = @_;
-	$name = $id unless $name =~ /[[:graph:]]/;
+	$name = $id unless $name && $name =~ /[[:graph:]]/;
 	$self = $self->find('a');
 	$self->edit_href(sub {s/id/$id/});
 	$self->replace_content($name);
@@ -161,11 +163,8 @@ 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/;
+	$_->{status} = $_->{finished} ? 'Finished' : $_->{started} ? 'Running' : 'Pending' for @{$args{ct}};
+	$tree->find('tbody')->find('tr')->iter3([ct_sort @{$args{ct}}], $iter);
 }
 
 sub process_pb_entry {
@@ -211,23 +210,18 @@ sub process_sol {
 
 sub process_pb {
 	my ($tree, %args) = @_;
-	my $titer = sub {
+	my $iter = sub {
 		my ($data, $tr) = @_;
 		$tr->set_child_content(class => 'author', $data->{author});
+		$tr->set_child_content(class => 'level', ucfirst $data->{level});
 		$tr->fclass('name')->namedlink($data->{id}, $data->{name});
-		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest};
+		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
-		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{contest};
-	};
-	my $iter = sub {
-		my ($data, $div) = @_;
-		$div->attr(id => $data);
-		$div->find('h2')->replace_content(ucfirst $data);
-		$div->find('tbody')->find('tr')->iter3($args{$data}, $titer);
+		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{args}{contest};
 	};
-	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};
+
+	$tree->find('tbody')->find('tr')->iter3([sort { $a->{value} <=> $b->{value} } @{$args{pb}}], $iter);
+	$tree->fid('open-alert')->detach unless $args{args}{contest};
 }
 
 sub process_log_entry {
@@ -262,7 +256,7 @@ sub process_log {
 		my ($data, $tr) = @_;
 		$tr->fclass('id')->namedlink($data->{id});
 		$tr->fclass('problem')->namedlink($data->{problem}, $data->{problem_name});
-		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
+		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= '?contest='.$data->{contest}}) if $data->{contest};
 		$tr->fclass('contest')->namedlink($data->{contest}, $data->{contest_name}) if $data->{contest};
 		$tr->fclass('contest')->replace_content('None') unless $data->{contest};
 		$tr->fclass('date')->replace_content(ftime $data->{date});