From a0ae5e89b7f5ed9236781b385fc07b6afdde72d8 Mon Sep 17 00:00:00 2001 From: didier amyot Date: Wed, 1 Jun 2016 19:15:21 -0400 Subject: [PATCH] re-added new schedule --- data/resultats.yaml | 455 ++++++++++++++++++++------------------- script/views/mainPage.js | 15 +- 2 files changed, 239 insertions(+), 231 deletions(-) diff --git a/data/resultats.yaml b/data/resultats.yaml index 3d57e48..27369e4 100644 --- a/data/resultats.yaml +++ b/data/resultats.yaml @@ -1,227 +1,230 @@ --- -[] -# - -# date: 2016/5/12 # year/month/day -# time: "18:45" -# away: jaune -# home: rouge -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/5/12 # year/month/day -# time: "20:20" -# away: gris -# home: bleu -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/5/19 # year/month/day -# time: "18:45" -# away: rouge -# home: gris -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/5/19 # year/month/day -# time: "20:20" -# away: bleu -# home: jaune -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/5/26 # year/month/day -# time: "18:45" -# away: gris -# home: jaune -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/5/26 # year/month/day -# time: "20:20" -# away: rouge -# home: bleu -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/2 # year/month/day -# time: "18:45" -# away: bleu -# home: gris -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/2 # year/month/day -# time: "20:20" -# away: rouge -# home: jaune -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/9 # year/month/day -# time: "18:45" -# away: jaune -# home: bleu -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/9 # year/month/day -# time: "20:20" -# away: gris -# home: rouge -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/16 # year/month/day -# time: "18:45" -# away: bleu -# home: rouge -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/16 # year/month/day -# time: "20:20" -# away: jaune -# home: gris -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/23 # year/month/day -# time: "18:45" -# away: jaune -# home: rouge -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/23 # year/month/day -# time: "20:20" -# away: gris -# home: bleu -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/30 # year/month/day -# time: "18:45" -# away: rouge -# home: gris -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/6/30 # year/month/day -# time: "20:20" -# away: bleu -# home: jaune -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/7/7 # year/month/day -# time: "18:45" -# away: gris -# home: jaune -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/7/7 # year/month/day -# time: "20:20" -# away: rouge -# home: bleu -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/7/14 # year/month/day -# time: "18:45" -# away: bleu -# home: gris -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/7/14 # year/month/day -# time: "20:20" -# away: rouge -# home: jaune -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/7/21 # year/month/day -# time: "18:45" -# away: jaune -# home: bleu -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/7/21 # year/month/day -# time: "20:20" -# away: gris -# home: rouge -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/7/28 # year/month/day -# time: "18:45" -# away: bleu -# home: rouge -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/7/28 # year/month/day -# time: "20:20" -# away: jaune -# home: gris -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/8/4 # year/month/day -# time: "18:45" -# away: jaune -# home: rouge -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/8/4 # year/month/day -# time: "20:20" -# away: gris -# home: bleu -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/8/11 # year/month/day -# time: "18:45" -# away: rouge -# home: gris -# home_points: ~ -# away_points: ~ -# -# - -# date: 2016/8/11 # year/month/day -# time: "20:20" -# away: bleu -# home: jaune -# home_points: ~ -# away_points: ~ -# -# +- + date: 2016/5/12 # year/month/day + time: "18:45" + away: jaune + home: rouge + home_points: ~ + away_points: ~ + rain: true + +- + date: 2016/5/12 # year/month/day + time: "20:20" + away: gris + home: bleu + home_points: ~ + away_points: ~ + rain: true + +- + date: 2016/5/19 # year/month/day + time: "18:45" + away: rouge + home: gris + home_points: ~ + away_points: ~ + rain: true + +- + date: 2016/5/19 # year/month/day + time: "20:20" + away: bleu + home: jaune + home_points: ~ + away_points: ~ + rain: true + +- + date: 2016/5/26 # year/month/day + time: "18:45" + away: gris + home: jaune + home_points: ~ + away_points: ~ + rain: true + +- + date: 2016/5/26 # year/month/day + time: "20:20" + away: rouge + home: bleu + home_points: ~ + away_points: ~ + rain: true + +- + date: 2016/6/2 # year/month/day + time: "18:45" + away: bleu + home: gris + home_points: ~ + away_points: ~ + +- + date: 2016/6/2 # year/month/day + time: "20:20" + away: rouge + home: jaune + home_points: ~ + away_points: ~ + +- + date: 2016/6/9 # year/month/day + time: "18:45" + away: jaune + home: bleu + home_points: ~ + away_points: ~ + +- + date: 2016/6/9 # year/month/day + time: "20:20" + away: gris + home: rouge + home_points: ~ + away_points: + +- + date: 2016/6/16 # year/month/day + time: "18:45" + away: bleu + home: rouge + home_points: ~ + away_points: ~ + +- + date: 2016/6/16 # year/month/day + time: "20:20" + away: jaune + home: gris + home_points: ~ + away_points: ~ + +- + date: 2016/6/23 # year/month/day + time: "18:45" + away: jaune + home: rouge + home_points: ~ + away_points: ~ + +- + date: 2016/6/23 # year/month/day + time: "20:20" + away: gris + home: bleu + home_points: ~ + away_points: ~ + +- + date: 2016/6/30 # year/month/day + time: "18:45" + away: rouge + home: gris + home_points: ~ + away_points: ~ + +- + date: 2016/6/30 # year/month/day + time: "20:20" + away: bleu + home: jaune + home_points: ~ + away_points: ~ + +- + date: 2016/7/7 # year/month/day + time: "18:45" + away: gris + home: jaune + home_points: ~ + away_points: ~ + +- + date: 2016/7/7 # year/month/day + time: "20:20" + away: rouge + home: bleu + home_points: ~ + away_points: ~ + +- + date: 2016/7/14 # year/month/day + time: "18:45" + away: bleu + home: gris + home_points: ~ + away_points: ~ + +- + date: 2016/7/14 # year/month/day + time: "20:20" + away: rouge + home: jaune + home_points: ~ + away_points: ~ + +- + date: 2016/7/21 # year/month/day + time: "18:45" + away: jaune + home: bleu + home_points: ~ + away_points: ~ + +- + date: 2016/7/21 # year/month/day + time: "20:20" + away: gris + home: rouge + home_points: ~ + away_points: ~ + +- + date: 2016/7/28 # year/month/day + time: "18:45" + away: bleu + home: rouge + home_points: ~ + away_points: ~ + +- + date: 2016/7/28 # year/month/day + time: "20:20" + away: jaune + home: gris + home_points: ~ + away_points: ~ + +- + date: 2016/8/4 # year/month/day + time: "18:45" + away: jaune + home: rouge + home_points: ~ + away_points: ~ + +- + date: 2016/8/4 # year/month/day + time: "20:20" + away: gris + home: bleu + home_points: ~ + away_points: ~ + +- + date: 2016/8/11 # year/month/day + time: "18:45" + away: rouge + home: gris + home_points: ~ + away_points: ~ + +- + date: 2016/8/11 # year/month/day + time: "20:20" + away: bleu + home: jaune + home_points: ~ + away_points: ~ diff --git a/script/views/mainPage.js b/script/views/mainPage.js index ec032cb..4c04558 100644 --- a/script/views/mainPage.js +++ b/script/views/mainPage.js @@ -30,10 +30,16 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer', 'ar .then(games) .then(resultParser.getNightGames) .then(function(nightGames){ - return nightGames[0].games; + return nextGameDaySchedule._getNextNightGame(nightGames, _.now()).games; }); }; + nextGameDaySchedule._getNextNightGame = function(games, date){ + return _.first(_.filter(games, function(game){ + return game.jsDate.getTime() > date; + })); + }; + nextGameDaySchedule._getTableHead = function(){ return m('thead', m('tr', [ m('td', 'Date'), @@ -83,12 +89,11 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer', 'ar var mainMap = {}; mainMap.getMap = function(){ - var iframeUrl = "//www.openstreetmap.org/export/embed.html?bbox=-73.55889558792114%2C45.53089890181621%2C-73.55181455612183%2C45.53426212742867&layer=mapnik"; - var externalLink = "http://www.openstreetmap.org/#map=18/45.53258/-73.55536"; + var iframeUrl = "//www.openstreetmap.org/export/embed.html?bbox=-73.63646507263184%2C45.56388364174337%2C-73.60814094543457%2C45.57732744542051&layer=mapnik&marker=45.570605945819395%2C-73.6223030090332"; + var externalLink = "http://www.openstreetmap.org/#map=18/45.56830/-73.61476"; var iframeParams = { style: {border: '1px solid black', 'min-height': '300px'}, width: '100%', - // height: '100%', frameborder: 0, scrolling: 'no', marginheight: 0, @@ -106,7 +111,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer', 'ar m('div.uk-panel-badge.uk-badge', [ m('i.fa.fa-map-o', {style: {'font-size': '1.7em'}}) ]), - m('h3.uk-panel-title', 'Parc Walter-Stewart'), + m('h3.uk-panel-title', 'Parc George-Vernot'), mainMap.getMap() ]); };