Registration now supports countries and clubs.

diff --git a/html/do-add-player.pl b/html/do-add-player.pl
index 2ed4b6c18b78aab0eab9872041cf2f7f09290574..39b46f70d3c3c163bf9abc0d2edb0dcfd47a9728 100755 (executable)
--- a/html/do-add-player.pl
+++ b/html/do-add-player.pl
@@ -11,8 +11,12 @@ my $cgi = new CGI;
 
 my $tournament = $cgi->param('tournament');
 my $nick = $cgi->param('nick');
+my $country = $cgi->param('country');
+my $club = $cgi->param('club');
 
-$dbh->do('INSERT INTO players (nick) VALUES (?)', undef, $nick);
+$club = undef if ($club == -1);
+
+$dbh->do('INSERT INTO players (nick, country, club) VALUES (?, ?, ?)', undef, $nick, $country, $club);
 my $ref = $dbh->selectrow_hashref('SELECT player FROM players WHERE nick=?',
        undef, $nick);
 

diff --git a/html/registration.pl b/html/registration.pl
index a2da719fee68dfcf837221730d58bc07c4222ce6..84d19fc4966b87a54c33365a633997daa04ba09b 100755 (executable)
--- a/html/registration.pl
+++ b/html/registration.pl
@@ -13,12 +13,16 @@ my $dbh = ccbs::db_connect();
 my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN seasons NATURAL JOIN countries NATURAL JOIN machines NATURAL JOIN scoringsystems WHERE tournament=?', undef, $id);
 my $registered = ccbs::db_fetch_all($dbh, 'SELECT * FROM tournamentparticipation NATURAL JOIN players WHERE tournament=? ORDER BY LOWER(nick)', $id);
 my $available = ccbs::db_fetch_all($dbh, 'SELECT * FROM players WHERE player NOT IN ( SELECT player FROM tournamentparticipation WHERE tournament=? ) ORDER BY LOWER(nick)', $id);
+my $countries = ccbs::db_fetch_all($dbh, 'SELECT * FROM countries ORDER BY countrycode');
+my $clubs = ccbs::db_fetch_all($dbh, 'SELECT * FROM clubs ORDER BY clubcode');
 
 ccbs::print_header();
 ccbs::process_template('registration.tmpl', $tournament->{'tournamentname'}, {
        tournament => $tournament,
        registered => $registered,
        available => $available,
-       selected_player => $selected_player
+       selected_player => $selected_player,
+       countries => $countries,
+       clubs => $clubs
 });
 $dbh->disconnect;

diff --git a/html/templates/registration.tmpl b/html/templates/registration.tmpl
index a51778fd15c81c8caaf9685038f29d58fce71975..dca65b0d48322b0890ec75ed3b831f068374339b 100644 (file)
--- a/html/templates/registration.tmpl
+++ b/html/templates/registration.tmpl
@@ -46,6 +46,31 @@
       <th>Nick</th>
       <td><input name="nick" /></td>
     </tr>
+    <tr>
+      <th>Land</th>
+      <td>
+        <select name="country">
+[% FOR c = countries %]
+[% IF c.countrycode == "NOR" %]
+          <option value="[% c.country %]" selected="selected">[% c.countrycode %] - [% c.countryname %]</option>
+[% ELSE %]
+          <option value="[% c.country %]">[% c.countrycode %] - [% c.countryname %]</option>
+[% END %]        
+[% END %]        
+       </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Klubb</th>
+      <td>
+        <select name="club">
+         <option value="-1" selected="selected"></option>
+[% FOR c = clubs %]
+          <option value="[% c.club %]">[% c.clubcode %] - [% c.clubname %]</option>
+[% END %]        
+       </select>
+      </td>
+    </tr>
     <tr>
       <th colspan="2">
         <input type="hidden" name="tournament" value="[% tournament.tournament %]" />