Minor JavaScript refactoring.

[wloh] / www / index.pl

diff --git a/www/index.pl b/www/index.pl
index fd3228b7a3894676b1247e19024c9fe2350af079..697470cdd75a6002c92ed6b2919bef3b15258007 100755 (executable)
--- a/www/index.pl
+++ b/www/index.pl
@@ -177,6 +177,10 @@ sub get_covariance_matrix {
 sub write_parms_to_file {
        my ($aux_parms, $match_stddev, $used_ratings, $used_cov) = @_;
 
+       POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
+
+       my @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players;
+
        POSIX::setlocale(&POSIX::LC_ALL, 'C');
 
        my $tmpnam = POSIX::tmpnam();
@@ -186,7 +190,7 @@ sub write_parms_to_file {
        printf MCCALC "%f\n", $match_stddev;
        printf MCCALC "%d\n", scalar keys %players;
 
-       for my $id (keys %players) {
+       for my $id (@sorted_players) {
                my $rating = $used_ratings->{$id} // 500.0;
                printf MCCALC "%s %f\n", $id, $rating;
        }
@@ -220,7 +224,18 @@ sub make_table {
        ++$num_tables;
 
        print <<"EOF";
-
+    <script type="text/javascript">
+    <!--
+function showScenario(element_id, url) {
+    var obj = document.getElementById(element_id);
+    var parent = obj.parentElement;
+    parent.removeChild(obj);
+    obj = obj.cloneNode();
+    obj.data = url;
+    parent.appendChild(obj);
+}
+    //-->
+    </script>
     <table class="probmatrix">
       <tr>
         <th></th>
@@ -267,7 +282,12 @@ EOF
                                ($r, $b) = ($b, $r);
                        }
 
-                       printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\"><a class=\"unmarkedlink\" href=\"javascript:var obj=document.getElementById('scenario$num_tables');var parent=obj.parentElement;parent.removeChild(obj);obj=obj.cloneNode();obj.data = '/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i';parent.appendChild(obj);\">%.1f%%</a></td>\n", $pn * 100.0;
+                       my $num_total_games = ($num_games * ($num_games - 1)) / 2;
+                       if (scalar @matches == $num_total_games || $prob{$player}->[$i - 1] == $trials) {
+                               printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\">%.1f%%</td>\n", $pn * 100.0;
+                       } else {
+                               printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\"><a class=\"unmarkedlink\" href=\"javascript:showScenario('scenario$num_tables', '/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i');\">%.1f%%</a></td>\n", $pn * 100.0;
+                       }
                }
 
                unless ($lowest_division) {
@@ -370,10 +390,15 @@ if (defined($match_player) && defined($match_position)) {
        close MCCALC;
        #unlink $tmpnam;
 
+       my @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players;
+       my $player_name = $players{$sorted_players[$match_player]};
+
        if (scalar @scenario == 0) {
-               # FIXME: distinguish between "all played" and "none found"
-               print "    <p>Fant ingen m&aring;te dette kunne skje p&aring.</p>\n";
+               printf "    <p>Fant ingen m&aring;te <strong>%s</strong> kan ende p&aring; <strong>%d.</strong> plass p&aring;.</p>\n",
+                       $player_name, ($match_position + 1);
        } else {
+               printf "    <p>Scenario der <strong>%s</strong> ender p&aring; <strong>%d.</strong> plass:</p>\n",
+                       $player_name, ($match_position + 1);
                print "    <ul>\n";
                for my $m (@scenario) {
                        printf "    <li>%s &ndash; %s: %+d</li>\n", $players{$m->[0]}, $players{$m->[1]}, $m->[2];