Support having stream times from other weekdays.

[ultimatescore] / carousel.js

diff --git a/carousel.js b/carousel.js
index b24c575539e0de6e5f913790b520ae93190d2fcd..0d5ec25783f9a6a392ec8743d448c16f4244192e 100644 (file)
--- a/carousel.js
+++ b/carousel.js
@@ -241,6 +241,7 @@ parse_teams_from_spreadsheet = function(response) {
                        "name": response.values[i][0],
                        "mediumname": response.values[i][1],
                        "shortname": response.values[i][2],
+                       "tags": response.values[i][3],
                        "nplayed": 0,
                        "gd": 0,
                        "pts": 0,
@@ -262,7 +263,7 @@ parse_games_from_spreadsheet = function(response, group_name, include_unplayed)
 
        for ( ; response.values[i] !== undefined && response.values[i].length >= 1; ++i) {
                if ((response.values[i][2] && response.values[i][3]) || include_unplayed) {
-                       var real_group_name = response.values[i][8];
+                       var real_group_name = response.values[i][9];
                        if (real_group_name === undefined) {
                                real_group_name = group_name;
                        }
@@ -271,7 +272,8 @@ parse_games_from_spreadsheet = function(response, group_name, include_unplayed)
                                "name2": response.values[i][1],
                                "score1": parseInt(response.values[i][2]),
                                "score2": parseInt(response.values[i][3]),
-                               "streamtime": response.values[i][7],
+                               "streamday": response.values[i][7],
+                               "streamtime": response.values[i][8],
                                "group_name": real_group_name
                        });
                }
@@ -411,6 +413,10 @@ var display_stream_schedule_parsed = function(teams, games) {
        var teams_to_idx = make_teams_to_idx(teams);
        games = games.filter(function(game) { return game.streamtime !== undefined && game.streamtime.match(/[0-9]+:[0-9]+/) != null; });
        games.sort(function(a, b) {
+               if (a.streamday !== b.streamday) {
+                       return a.streamday - b.streamday;
+               }
+
                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]);
@@ -431,10 +437,15 @@ var display_stream_schedule_parsed = function(teams, games) {
        if (games.length >= max_list_len) {
                start_idx = Math.min(start_idx, games.length - max_list_len);
        }
+
+       var days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
+       var shortdays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+       var today = days[(new Date).getDay()];
+       var short_today = shortdays[(new Date).getDay()];
        
        var carousel = document.getElementById('carousel');
        clear_carousel(carousel);
-       addheading(carousel, 3, "Stream schedule, Trøndisk 2017<br />Saturday");
+       addheading(carousel, 3, "Stream schedule, Trøndisk 2017<br />" + today);
 
        var row_num = 0;
        for (i = start_idx; i < games.length && row_num < max_list_len; ++i) {
@@ -450,7 +461,12 @@ var display_stream_schedule_parsed = function(teams, games) {
                    games[i].score1 !== games[i].score2) {
                        addtd(tr, "streamtime", games[i].score1 + "–" + games[i].score2);
                } else {
-                       addth(tr, "streamtime", games[i].streamtime);
+                       var streamtime = games[i].streamtime;
+                       var streamday = days[games[i].streamday];
+                       if (streamday !== today) {
+                               streamtime = shortdays[games[i].streamday] + " " + streamtime;
+                       }
+                       addth(tr, "streamtime", streamtime);
                }
 
                row_num++;