From: Steinar H. Gunderson <sesse@samfundet.no>
Date: Wed, 16 Feb 2005 15:32:17 +0000 (+0000)
Subject: Don't show the "start next round" form until we can actually do so.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=b0b74d8d081b73ba0716ae4edd25dde9c63a3aef

Don't show the "start next round" form until we can actually do so.
---

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 6604529..01c301e 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -13,6 +13,16 @@ my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN
 my $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players WHERE tournament=? ORDER BY ranking', $id);
 my $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURAL JOIN songs WHERE machine=? ORDER BY LOWER(title)', $tournament->{'machine'});
 
+# Check if the last round is valid for closing (by checking if all scores
+# entered are valid)
+my $ref = $dbh->selectrow_hashref('SELECT COUNT(*) AS num_incomplete FROM scores WHERE tournament=? AND (song IS NULL OR playmode IS NULL OR difficulty IS NULL OR chosen IS NULL or score IS NULL)', undef, $tournament->{'tournament'});
+my $closing_valid;
+if ($ref->{'num_incomplete'} == 0) {
+	$closing_valid = 1;
+} else {
+	$closing_valid = 0;
+}
+
 # Swoop all the data in in a big join, then order it over to quasi-sane Perl objects.
 # (round -> parallel -> player -> songs -> title,chosen,score)
 my $scores = ccbs::db_fetch_all($dbh,
@@ -87,6 +97,7 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'},
 	rounds => \@rounds,
 	num_rounds => $num_rounds,
 	num_qualified => $num_qualified,
-	songs => $songs
+	songs => $songs,
+	closing_valid => $closing_valid
 });
 $dbh->disconnect;
diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 56027a5..d66aa20 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -12,6 +12,7 @@
     </ul>
   </div>
 
+[% IF closing_valid %]
   <h2>Start ny runde</h2>
 
   <div>
@@ -51,6 +52,7 @@
       </table>
     </form>
   </div>
+[% END %]
 
 [% IF num_rankings > 0 %]
   <h2>Rankingliste</h2>