Add a stream schedule to the carousel.

diff --git a/carousel.js b/carousel.js
index fc8a4ecdb0231eaf68a07d2aaa4d7b7a96ebda5d..285947eb3cc264dcea645729445ad0d9e197d55c 100644 (file)
--- a/carousel.js
+++ b/carousel.js
@@ -1,4 +1,15 @@
 
+addheading = function(carousel, colspan, content)
+{
+       var thead = document.createElement("thead");
+       var tr = document.createElement("tr");
+       var th = document.createElement("th");
+       th.innerHTML = content;
+       th.setAttribute("colspan", colspan);
+       tr.appendChild(th);
+       thead.appendChild(tr);
+       carousel.appendChild(thead);
+};
 addtd = function(tr, className, content) {
        var td = document.createElement("td");
        td.appendChild(document.createTextNode(content));
@@ -223,33 +234,43 @@ rank = function(games, teams, start_rank, tiebreakers) {
        return result; 
 }; 
 
-var req = new XMLHttpRequest();
-req.onload = function(e) {
-       var response = JSON.parse(req.responseText);
-       console.log(response.values);
-       var carousel = document.getElementById('carousel');
+parse_teams_from_spreadsheet = function(response) {
        var teams = [];
        for (var i = 2; response.values[i].length >= 1; ++i) {
                teams.push({
                        "name": response.values[i][0],
-                       "shortname": response.values[i][1],
+                       "mediumname": response.values[i][1],
+                       "shortname": response.values[i][2],
                        "nplayed": 0,
                        "gd": 0,
                        "pts": 0,
                        "goals": 0
                });
        }
+       return teams;
+};
+
+parse_games_from_spreadsheet = function(response, include_unplayed) {
        var games = [];
        for (var i = 12; response.values[i] !== undefined && response.values[i].length >= 1; ++i) {
-               if (response.values[i][2] && response.values[i][3]) {
+               if ((response.values[i][2] && response.values[i][3]) || include_unplayed) {
                        games.push({
                                "name1": response.values[i][0],
                                "name2": response.values[i][1],
                                "score1": parseInt(response.values[i][2]),
-                               "score2": parseInt(response.values[i][3])
+                               "score2": parseInt(response.values[i][3]),
+                               "streamtime": response.values[i][7]
                        });
                }
        }
+       return games;
+};
+
+var req = new XMLHttpRequest();
+req.onload = function(e) {
+       var response = JSON.parse(req.responseText);
+       var teams = parse_teams_from_spreadsheet(response);
+       var games = parse_games_from_spreadsheet(response, false);
 
        var teams_to_idx = make_teams_to_idx(teams);
        for (i = 0; i < games.length; ++i) {
@@ -278,6 +299,18 @@ req.onload = function(e) {
        tiebreakers = [];
        teams = rank(games, teams, 1, tiebreakers);
 
+       var carousel = document.getElementById('carousel');
+
+       addheading(carousel, 5, "Current standings, TrønDisk 2017<br />Group A");
+       var tr = document.createElement("tr");
+       tr.className = "subfooter";
+       addth(tr, "rank", "");
+       addth(tr, "team", "");
+       addth(tr, "nplayed", "P");
+       addth(tr, "gd", "GD");
+       addth(tr, "pts", "Pts");
+       carousel.appendChild(tr);
+
        var row_num = 2;
        for (i = 0; i < teams.length; ++i) {
                var tr = document.createElement("tr");
@@ -313,8 +346,67 @@ req.onload = function(e) {
        carousel.appendChild(footer_tr);
 
        carousel.style.display = 'table';
-}
-req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/1CwRHQtpokVMGTPJu2FYYG-6rnG7OfISIcEHwBfXh-Y4/values/A1:E22?key=AIzaSyAuP9yQn8g0bSay6r_RpGtpFeIbwprH1TU');
+};
+req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/1CwRHQtpokVMGTPJu2FYYG-6rnG7OfISIcEHwBfXh-Y4/values/A1:H25?key=AIzaSyAuP9yQn8g0bSay6r_RpGtpFeIbwprH1TU');
 if (false) {
        req.send();
 }
+
+// Stream schedule
+var req2 = new XMLHttpRequest();
+req2.onload = function(e) {
+       var response = JSON.parse(req.responseText);
+       var teams = parse_teams_from_spreadsheet(response);
+       var teams_to_idx = make_teams_to_idx(teams);
+       var games = parse_games_from_spreadsheet(response, true);
+       games = games.filter(function(game) { return game.streamtime !== undefined && game.streamtime.match(/[0-9]+:[0-9]+/) != null; });
+       games.sort(function(a, b) {
+               var m1 = a.streamtime.match(/([0-9]+):([0-9]+)/);
+               var m2 = b.streamtime.match(/([0-9]+):([0-9]+)/);
+               return (m1[1] * 60 + m1[2]) - (m2[1] * 60 + m2[2]);
+       });
+
+       // Pick out a reasonable place to start the list. We'll show the last
+       // completed match and start from there.
+       var max_list_len = 7;
+       var start_idx = games.length - 1;
+       for (var i = 0; i < games.length; ++i) {
+               if (isNaN(games[i].score1) || isNaN(games[i].score2) &&
+                   games[i].score1 === games[i].score2) {
+                       start_idx = i;
+                       break;
+               }
+       }
+       if (start_idx > 0) start_idx--;
+       if (games.length >= max_list_len) {
+               start_idx = Math.min(start_idx, games.length - max_list_len);
+       }
+       
+       var carousel = document.getElementById('carousel');
+       addheading(carousel, 3, "Stream schedule, TrønDisk 2017<br />Saturday");
+
+       var row_num = 0;
+       for (i = start_idx; i < games.length && row_num < max_list_len; ++i) {
+               var tr = document.createElement("tr");
+
+               var name1 = teams[teams_to_idx[games[i].name1]].mediumname;
+               var name2 = teams[teams_to_idx[games[i].name2]].mediumname;
+
+               addtd(tr, "matchup", name1 + "–" + name2);
+               addtd(tr, "group", "Group A");
+
+               if (!isNaN(games[i].score1) && !isNaN(games[i].score2) &&
+                   games[i].score1 !== games[i].score2) {
+                       addtd(tr, "streamtime", games[i].score1 + "–" + games[i].score2);
+               } else {
+                       addth(tr, "streamtime", games[i].streamtime);
+               }
+
+               tr.style = "-webkit-animation: fade-in 1.0s ease; -webkit-animation-delay: " + 0.25 * (row_num++) + "s; -webkit-animation-fill-mode: both;";
+               carousel.appendChild(tr);
+       }
+};
+req2.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/1CwRHQtpokVMGTPJu2FYYG-6rnG7OfISIcEHwBfXh-Y4/values/A1:H25?key=AIzaSyAuP9yQn8g0bSay6r_RpGtpFeIbwprH1TU');
+if (false) {
+       req2.send();
+}

diff --git a/score.css b/score.css
index 5e353eeba9f8d1a5dac06a6542a620638993e6a8..14551173b2a4c1d90589eeea51ee6836d6b43ec6 100644 (file)
--- a/score.css
+++ b/score.css
@@ -266,6 +266,19 @@ body {
 #carousel td.team {
   width: auto;
 }
+
+/* schedule */
+#carousel td.matchup {
+  padding-left: 0.7em;
+  width: auto;
+}
+#carousel td.group {
+  text-transform: none;
+}
+#carousel .streamtime {
+  text-align: center;
+}
+
 .nplayed, .gd, .pts {
   text-align: center;
 }

diff --git a/score.html b/score.html
index 106690d61dc5cda039784adb19b2043805545170..61eb13394e55137fb6e8812b61f67251bcdbfb12 100644 (file)
--- a/score.html
+++ b/score.html
@@ -35,18 +35,6 @@
       Commentators, Trøndisk 2016
     </div></div>
     <table id="carousel">
-      <thead>
-        <tr>
-          <th colspan="5">Current standings, TrønDisk 2017<br />Group A</th>
-        </tr> 
-      </thead>
-      <tr class="subfooter">
-        <th class="rank"></th>
-        <th class="team"></th>
-        <th class="nplayed">P</th>
-        <th class="gd">GD</th>
-        <th class="pts">Pts</th>
-      </tr>
     </table>
     <div id="manualcontrols">
       <p>