Organize tournaments by season.

diff --git a/html/templates/tournaments.tmpl b/html/templates/tournaments.tmpl
index 492434e3ead78099065794ba9e947c841e972aed..f0a59066968c6e9031a6bc9fec10705602eaa811 100644 (file)
--- a/html/templates/tournaments.tmpl
+++ b/html/templates/tournaments.tmpl
@@ -1,8 +1,20 @@
 [%# vim:set filetype=html: %]
-<div>
-  <ul>
+[% SET last_season = 0 %]
 [% FOR t = tournaments %]
-    <li><a href="show-tournament.pl?id=[% t.tournament %]">[% t.tournamentname %]</a></li>
+
+[% IF t.season != last_season %]
+[% IF last_season != 0 %]
+    </ul>
+  </div>
 [% END %]
-  </ul>
-</div>
+[% SET last_season = t.season %]
+
+  <h2>[% t.seasonname %]</h2>
+  
+  <div>
+    <ul>
+[% END %]
+      <li><a href="show-tournament.pl?id=[% t.tournament %]">[% t.tournamentname %]</a></li>
+[% END %]
+    </ul>
+  </div>

diff --git a/html/tournaments.pl b/html/tournaments.pl
index 1f00a958d3776223baff795fe9555cafecd08972..169d84d1b1c1b0c253b0558433ee05d39a71bc68 100755 (executable)
--- a/html/tournaments.pl
+++ b/html/tournaments.pl
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 
 my $dbh = ccbs::db_connect();
-my $tournaments = ccbs::db_fetch_all($dbh, 'SELECT * FROM tournaments');
+my $tournaments = ccbs::db_fetch_all($dbh, 'SELECT * FROM tournaments NATURAL JOIN seasons ORDER BY season, date');
 
 ccbs::print_header();
 ccbs::process_template('tournaments.tmpl', 'Turneringer', { tournaments => $tournaments });