Add preliminary edit boxes (no backend) for columns missing data.

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 5a98ff85436e520a8bea7dc7744375edc7009e3c..b02033d3ac925525fe0da1637791246e5b43a417 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -11,11 +11,12 @@ 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 $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 $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN seasons NATURAL JOIN countries NATURAL JOIN machines NATURAL JOIN scoringsystems WHERE tournament=?', undef, $id);
 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'});

 
 # 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,
 
 # 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,

-       'SELECT round,parallel,position,nick,title,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs WHERE tournament=? ORDER BY round,parallel,position,songnumber',
+       'SELECT round,parallel,position,songnumber,nick,song,title,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs WHERE tournament=? ORDER BY round,parallel,position,songnumber',

        $id);
 
 my @rounds = ();
        $id);
 
 my @rounds = ();


@@ -49,16 +50,15 @@ for my $score (@$scores) {
        my $pl = $p->[$#$p]->{'players'};
        if ($score->{'nick'} ne $player) {
                $player = $score->{'nick'};
        my $pl = $p->[$#$p]->{'players'};
        if ($score->{'nick'} ne $player) {
                $player = $score->{'nick'};

-               push @$pl, { nick => $player, songs => [], total => 0 };
+               push @$pl, { nick => $player, songs => [], total => 0, locked => 1 };

        }
        
        }
        

-       push @{$pl->[$#$pl]->{'songs'}}, {
-               title => $score->{'title'},
-               chosen => $score->{'chosen'},
-               score => $score->{'score'}
-       };
+       push @{$pl->[$#$pl]->{'songs'}}, $score;
+

        if (defined($score->{'score'})) {
                $pl->[$#$pl]->{'total'} += $score->{'score'};
        if (defined($score->{'score'})) {
                $pl->[$#$pl]->{'total'} += $score->{'score'};

+       } else {
+               $pl->[$#$pl]->{'locked'} = 0;

        }
 }
 
        }
 }
 


@@ -83,6 +83,7 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'},
        num_rankings => $num_rankings,
        rounds => \@rounds,
        num_rounds => $num_rounds,
        num_rankings => $num_rankings,
        rounds => \@rounds,
        num_rounds => $num_rounds,

-       num_qualified => $num_qualified
+       num_qualified => $num_qualified,
+       songs => $songs

 });
 $dbh->disconnect;
 });
 $dbh->disconnect;

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index c7566430271a6c0bec6bdeeb2172541e2fa0b05b..9d867e7960a55a4ab9f656866923e5e04e10e8d9 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -91,9 +91,11 @@
 [% IF p.num_songs > 1 %]
       <th>Total</th>
 [% END %]      
 [% IF p.num_songs > 1 %]
       <th>Total</th>
 [% END %]      

+      <th></th>

     </tr>
     
 [% FOR pl = p.players %]
     </tr>
     
 [% FOR pl = p.players %]

+[% IF pl.locked %]

     <tr>
       <th>[% pl.nick %]</th>
 [% FOR s = pl.songs %]
     <tr>
       <th>[% pl.nick %]</th>
 [% FOR s = pl.songs %]


@@ -106,6 +108,33 @@
      <td>[% pl.total %]</td>
 [% END %]      
     </tr>
      <td>[% pl.total %]</td>
 [% END %]      
     </tr>

+[% ELSE %]
+    <tr>
+      <th>[% pl.nick %]</th>
+[% FOR s = pl.songs %]
+      <td><input name="score[% s.songnumber %]" value="[% s.score %]" size="5" /></td>
+[% IF s.chosen %]
+      <td>
+        <select name="song[% s.songnumber %]">
+          <option value=""> </option>
+[% FOR ss = songs %]
+[% IF s.song == ss.song %]
+          <option value="[% ss.song %]" selected="selected">[% ss.title %]</option>
+[% ELSE %]       
+          <option value="[% ss.song %]">[% ss.title %]</option>
+[% END %]        
+[% END %]
+        </select>
+      </td>
+[% END %]
+[% END %]
+[% IF p.num_songs > 1 %]
+     <td>[% pl.total %]</td>
+[% END %]
+     <td><input type="submit" value="Oppdater" /></td>
+    </tr>
+
+[% END %]

 [% END %]
   </table>
 [% END %]
 [% END %]
   </table>
 [% END %]