]> git.sesse.net Git - wloh/commitdiff
Convert index.pl to templates.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 10 Jun 2012 00:00:02 +0000 (02:00 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 10 Jun 2012 00:00:02 +0000 (02:00 +0200)
templates/index.xml [new file with mode: 0644]
www/index.pl

diff --git a/templates/index.xml b/templates/index.xml
new file mode 100644 (file)
index 0000000..c3c00cb
--- /dev/null
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE
+  html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="no" xmlns:t="http://template.sesse.net/">
+  <head>
+    <title>WLoH-plasseringsannsynlighetsberegning</title>
+    <link rel="stylesheet" href="style" type="text/css" />
+    <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(false);
+    obj.data = url;
+    parent.appendChild(obj);
+}
+    //-->
+    </script>
+  </head>
+  <body>
+    <p style="font-size: smaller;" t:id="navbar">
+      <t:languages>
+        <t:separator>::</t:separator>
+        <t:lang-with-link><a /></t:lang-with-link>
+        <t:lang-no-link />
+      </t:languages>
+    </p>
+
+    <h1>WLoH-plasseringsannsynlighetsberegning</h1>
+
+    <p><em>Dette er et hobbyprosjekt fra tredjepart, og ikke en offisiell del av
+      <a href="http://wordfeud.aasmul.net/">Wordfeud Leage of Honour</a>.</em></p>
+
+    <p>Beregningen tar ikke hensyn til ujevn spillestyrke, ting som er sagt i forumet e.l.;
+      den antar at samtlige uspilte kamper trekkes fra en normalfordeling med standardavvik
+      <t:match-stddev /> poeng. Sannsynlighetene kan summere til andre tall enn 100% pga. avrunding.
+      Tallene vil variere litt fra gang til gang fordi utregningen skjer ved randomisering.
+      For scenarioeksempel, klikk i en rute.</p>
+
+    <p>Spillerne er sortert etter nick.</p>
+
+    <form method="get" t:id="division-selector">
+      <p>Divisjon:
+        <select name="divisjon" onchange="form.submit();" t:id="division">
+          <option />
+        </select>
+        Avdeling:
+        <select name="avdeling" onchange="form.submit();" t:id="subdivision">
+          <option />
+        </select>
+        <input type="submit" value="Vis" />
+      </p>
+    </form>
+
+    <table class="probmatrix" t:id="basic-probabilities">
+      <thead>
+        <tr>
+          <th></th>
+          <t:ranks>
+            <th />
+          </t:ranks>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <th><t:player /></th>
+          <t:player-ranks>
+            <td class="num"><t:link><a class="unmarkedlink" /></t:link><t:no-link /></td>
+          </t:player-ranks>
+        </tr>
+      </tbody>
+    </table>
+    
+    <p class="scenario"><object id="scenario1" data="" type="text/html"> </object></p>
+
+    <p style="clear: both; padding-top: 1em;">Under er en variant som tar relativ spillestyrke med i beregningen;
+      se <a href="rating">ratingsiden</a>.</p>
+
+    <table class="probmatrix" t:id="adjusted-probabilities">
+      <thead>
+        <tr>
+          <th></th>
+          <t:ranks>
+            <th />
+          </t:ranks>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <th><t:player /></th>
+          <t:player-ranks>
+            <td class="num"><t:link><a class="unmarkedlink" /></t:link><t:no-link /></td>
+          </t:player-ranks>
+        </tr>
+      </tbody>
+    </table>
+    
+    <p class="scenario"><object id="scenario2" data="" type="text/html"> </object></p>
+
+    <t:cov-table>
+      <p style="clear: both; padding-top: 1em;">Kovarianstabell:</p>
+
+      <table>
+        <thead>
+          <tr>
+            <th />
+            <t:player-list><th /></t:player-list>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th t:id="player" />
+            <t:elements><td class="num" /></t:elements>
+          </tr>
+        </tbody>
+      </table>
+    </t:cov-table>
+
+    <p style="clear: both; padding-top: 1em;">Gjennomsnittlig rating i denne avdelingen er <strong t:id="average-rating" />.</p>
+    <p class="lastsync">Databasen ble sist synkronisert <t:last-sync />.</p>
+  </body>
+</html>
index 966f5c77b7fdadd39f9230914048b20b3a9c352d..0bf35594f8e385c7878badb0b6678c4b012e1124 100755 (executable)
@@ -70,48 +70,19 @@ sub get_subdivisions {
        return @subdivisions;
 }
 
-sub print_division_selector {
-       my ($dbh, $locale, $divisions, $subdivisions, $division, $subdivision) = @_;
-
-       print <<"EOF";
-    <form method="get" action="/$locale/">
-EOF
-
-       my $max_division = $divisions->[(scalar @$divisions) - 1];
-
-       print <<"EOF";
-     <p>Divisjon:
-        <select name="divisjon" onchange="form.submit();">
-EOF
+sub get_division_selector {
+       my ($divisions, $division) = @_;
 
+       my @ret = ();
        for my $d (@$divisions) {
-               if ($d == $division) {
-                       print "        <option value=\"$d\" selected=\"selected\">$d</option>\n";
-               } else {
-                       print "        <option value=\"$d\">$d</option>\n";
-               }
-       }
-
-       print <<"EOF";
-        </select>
-        Avdeling:
-        <select name="avdeling" onchange="form.submit();">
-EOF
-
-       for my $sd (@$subdivisions) {
-               if ($sd == $subdivision) {
-                       print "        <option value=\"$sd\" selected=\"selected\">$sd</option>\n";
-               } else {
-                       print "        <option value=\"$sd\">$sd</option>\n";
-               }
+               my $parms = {
+                       'option' => $d,
+                       'option/value' => $d,
+               };
+               $parms->{'option/selected'} = 'selected' if ($d == $division);
+               push @ret, $parms;
        }
-
-       print <<"EOF";
-        </select>
-        <input type="submit" value="Vis" />
-      </p>
-    </form>
-EOF
+       return \@ret;
 }
 
 sub get_players_and_ratings {
@@ -213,29 +184,8 @@ sub write_parms_to_file {
        return $tmpnam;
 }
 
-my $num_tables = 0;
-
 sub make_table {
-       my ($locale, $aux_parms, $match_stddev, $lowest_division, $used_ratings, $used_cov, $division, $subdivision) = @_;
-       ++$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(false);
-    obj.data = url;
-    parent.appendChild(obj);
-}
-    //-->
-    </script>
-    <table class="probmatrix">
-      <tr>
-        <th></th>
-EOF
+       my ($locale, $aux_parms, $match_stddev, $lowest_division, $used_ratings, $used_cov, $division, $subdivision, $table_id) = @_;
 
        my $tmpnam = write_parms_to_file($aux_parms, $match_stddev, $used_ratings, $used_cov);
        my %prob = ();
@@ -253,17 +203,21 @@ EOF
        unlink $tmpnam;
 
        my $num_games = scalar keys %prob;
+
+       # Make list of ranks.
+       my @ranks = ();
        for my $i (1..$num_games) {
-               print "        <th>$i.</th>\n";
+               push @ranks, { 'th' => "$i." };
        }
-       print "        <th>NEDRYKK</th>\n" unless ($lowest_division);
-       print "      </tr>\n";
+       push @ranks, { 'th' => 'NEDRYKK' } unless ($lowest_division);
+
+       my @players = ();
 
        my $pnum = 0;
        for my $player (sort { $a cmp $b } keys %prob) {
                ++$pnum;
-               print "      <tr>\n";
-               print "        <th>$player</th>\n";
+
+               my @player_ranks = ();
 
                for my $i (1..$num_games) {
                        my $pn = $prob{$player}->[$i - 1] / $trials;
@@ -280,9 +234,17 @@ EOF
 
                        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;
+                               push @player_ranks, {
+                                       'td/style' => "background-color: rgb($r, $g, $b)",
+                                       'td' => sprintf("%.1f%%", $pn * 100.0),
+                                       'link' => ''
+                               };
                        } else {
-                               printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\"><a class=\"unmarkedlink\" href=\"javascript:showScenario('scenario$num_tables', '/$locale/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i');\">%.1f%%</a></td>\n", $pn * 100.0;
+                               push @player_ranks, {
+                                       'td/style' => "background-color: rgb($r, $g, $b)",
+                                       'a' => sprintf("%.1f%%", $pn * 100.0),
+                                       'a/href' => "javascript:showScenario('$table_id', '/$locale/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i"
+                               };
                        }
                }
 
@@ -292,46 +254,50 @@ EOF
                        my $r = color(1.0);
                        my $g = color(1.0 - $pn / 3);
                        my $b = color(1.0 - $pn / 3);
-                       printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\">%.1f%%</td>\n", $pn * 100.0;
+                       push @player_ranks, {
+                               'td/style' => "background-color: rgb($r, $g, $b)",
+                               'td' => sprintf("%.1f%%", $pn * 100.0),
+                               'link' => ''
+                       };
                }
-               print "      </tr>\n";
+               push @players, {
+                       'player' => $player,
+                       'player-ranks' => \@player_ranks
+               };
        }
 
-       print << "EOF";
-    </table>
-    
-    <p class="scenario"><object id="scenario$num_tables" data="" type="text/html"></object></p>
-EOF
+       return {
+               'ranks' => \@ranks,
+               'tbody' => \@players,
+       };
 }
 
 sub make_cov_table {
        my ($cov) = @_;
        my @players = (sort { $players{$a} cmp $players{$b} } keys %players);
 
-       print <<"EOF";
-    <table class="probmatrix">
-      <tr>
-        <th></th>
-EOF
-
+       my @player_list = ();
        for my $player (@players) {
-               printf "        <th>%s</th>\n", $players{$player};
+               push @player_list, { 'th' => $players{$player} };
        }
-       print "      </tr>\n";
 
-       my $pnum = 0;
+       my @player_rows = ();
        for my $player (@players) {
-               ++$pnum;
-               print "      <tr>\n";
-               printf "        <th>%s</th>\n", $players{$player};
-
+               my @elements = ();
                for my $player2 (@players) {
-                       printf "        <td class=\"num\">%.3f</td>\n", $cov->{$player}{$player2};
+                       my $c = sprintf("%.2f", $cov->{$player}{$player2});
+                       push @elements, { 'td' => $c };
                }
-               print "      </tr>\n";
+               push @player_rows, {
+                       '#player' => $players{$player},
+                       'elements' => \@elements
+               };
        }
 
-       print "    </table>\n";
+       return {
+               'player-list' => \@player_list,
+               'tbody' => \@player_rows
+       };
 }
 
 sub find_avg_rating {
@@ -389,9 +355,8 @@ get_players_and_ratings($dbh, $locale, $season, $division, $subdivision);
 @matches = get_matches($dbh, $locale, $season, $division, $subdivision);
 my $cov = get_covariance_matrix($dbh, keys %players);
 
-print_header($cgi, 'WLoH-plasseringsannsynlighetsberegning');
-
 if (defined($match_player) && defined($match_position)) {
+       print_header($cgi, 'WLoH-plasseringsannsynlighetsberegning');
        my $tmpnam = write_parms_to_file($aux_parms, $match_stddev, \%ratings, $cov);
 
        --$match_player;
@@ -423,45 +388,30 @@ if (defined($match_player) && defined($match_position)) {
                }
                print "    </ul>\n";
        }
+       print_footer();
 } else {
        POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
-       wloh_common::print_navbar($cgi, $dbh, $locale);
-       printf <<"EOF", $match_stddev;
-    <h1>WLoH-plasseringsannsynlighetsberegning</h1>
-
-    <p><em>Dette er et hobbyprosjekt fra tredjepart, og ikke en offisiell del av
-      <a href="http://wordfeud.aasmul.net/">Wordfeud Leage of Honour</a>.</em></p>
-
-    <p>Beregningen tar ikke hensyn til ujevn spillestyrke, ting som er sagt i forumet e.l.;
-      den antar at samtlige uspilte kamper trekkes fra en normalfordeling med standardavvik
-      %.1f poeng. Sannsynlighetene kan summere til andre tall enn 100%% pga. avrunding.
-      Tallene vil variere litt fra gang til gang fordi utregningen skjer ved randomisering.
-      For scenarioeksempel, klikk i en rute.</p>
-
-    <p>Spillerne er sortert etter nick.</p>
-EOF
-
-       print_division_selector($dbh, $locale, \@divisions, \@subdivisions, $division, $subdivision);
 
        my $max_division = $divisions[$#divisions];
        my $lowest_division = ($division == $max_division);
-       make_table($locale, $aux_parms, $match_stddev, $lowest_division, {}, {}, $division, $subdivision);
-
-       print <<"EOF";
-    <p style="clear: both; padding-top: 1em;">Under er en variant som tar relativ spillestyrke med i beregningen;
-      se <a href="rating">ratingsiden</a>.</p>
-EOF
-
-       make_table($locale, $aux_parms, $match_stddev, $lowest_division, \%ratings, $cov, $division, $subdivision);
+       my $basic_table = make_table($locale, $aux_parms, $match_stddev, $lowest_division, {}, {}, $division, $subdivision, 'scenario1');
+       my $adjusted_table = make_table($locale, $aux_parms, $match_stddev, $lowest_division, \%ratings, $cov, $division, $subdivision, 'scenario2');
+       my $cov_table = (defined($cgi->param('showcov'))) ? make_cov_table($cov) : '';
 
        my $avg_rating = find_avg_rating(\%ratings);
-       printf "    <p style=\"clear: both; padding-top: 1em;\">Gjennomsnittlig rating i denne avdelingen er <strong>%.1f</strong>.</p>\n", $avg_rating;
-
-       if (defined($cgi->param('showcov'))) {
-               make_cov_table($cov);
-       }
 
-       wloh_common::output_last_sync($dbh);
+       print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+5m');
+       wloh_common::process_template('index.xml', {
+               '#navbar' => wloh_common::get_navbar($cgi, $dbh, $locale),
+               '#division-selector/action' => "/$locale/",
+               '#division' => get_division_selector(\@divisions, $division),
+               '#subdivision' => get_division_selector(\@subdivisions, $subdivision),
+               '#basic-probabilities' => $basic_table,
+               '#adjusted-probabilities' => $adjusted_table,
+               'cov-table' => $cov_table,
+               'match-stddev' => sprintf("%.1f", $match_stddev),
+               '#average-rating' => sprintf("%.1f", $avg_rating),
+               'last-sync' => wloh_common::get_last_sync($dbh),
+       });
 }
 
-print_footer();