From 8066c990cc9bbb0e8033116792ae9cfaf0f0c864 Mon Sep 17 00:00:00 2001 From: didier amyot Date: Mon, 9 Jul 2018 20:19:38 -0400 Subject: [PATCH] new article --- data/articles/reprisesaison2018.toml.md | 22 +++++++ data/resultats.yaml | 78 ++++++++++++------------- script/articles/articles.js | 3 +- 3 files changed, 63 insertions(+), 40 deletions(-) create mode 100644 data/articles/reprisesaison2018.toml.md diff --git a/data/articles/reprisesaison2018.toml.md b/data/articles/reprisesaison2018.toml.md new file mode 100644 index 0000000..6b9fba1 --- /dev/null +++ b/data/articles/reprisesaison2018.toml.md @@ -0,0 +1,22 @@ +[title] +innerMarkdown = """ +## Reprise saison 2018 +""" + +[meta] +innerMarkdown = """ +Lundi 9 juillet 2018 +""" + +[body] +innerMarkdown = """ + +Bonjour a toutes et a tous! + +Finalement, les travaux au parc walter-stewart sont finis et nous pouvons +reprendre nos activites. Nous devrions finir la saison plus tard pour +reprendre nos parties. + +On se voit jeudi! + +""" diff --git a/data/resultats.yaml b/data/resultats.yaml index 7b91291..5678f02 100644 --- a/data/resultats.yaml +++ b/data/resultats.yaml @@ -73,41 +73,41 @@ away_points: 8 rain: false -# ## Semaine 5 -# - -# date: 2018/6/14 # year/month/day -# time: "18:45" -# away: jaune -# home: rouge -# home_points: ~ -# away_points: ~ -# rain: false -# - -# date: 2018/6/14 # year/month/day -# time: "20:15" -# away: vert -# home: gris -# home_points: ~ -# away_points: ~ -# rain: false -# -# ## Semaine 6 -# - -# date: 2018/6/21 # year/month/day -# time: "18:45" -# away: gris -# home: rouge -# home_points: ~ -# away_points: ~ -# rain: false -# - -# date: 2018/6/21 # year/month/day -# time: "20:15" -# away: jaune -# home: vert -# home_points: ~ -# away_points: ~ -# rain: false +## Semaine 5 +- + date: 2018/6/14 # year/month/day + time: "18:45" + away: jaune + home: rouge + home_points: ~ + away_points: ~ + rain: yes +- + date: 2018/6/14 # year/month/day + time: "20:15" + away: vert + home: gris + home_points: ~ + away_points: ~ + rain: yes + +## Semaine 6 +- + date: 2018/6/21 # year/month/day + time: "18:45" + away: gris + home: rouge + home_points: ~ + away_points: ~ + rain: yes +- + date: 2018/6/21 # year/month/day + time: "20:15" + away: jaune + home: vert + home_points: ~ + away_points: ~ + rain: yes ## Semaine 7 - @@ -117,7 +117,7 @@ home: rouge home_points: ~ away_points: ~ - rain: false + rain: true - date: 2018/6/28 # year/month/day time: "20:15" @@ -125,7 +125,7 @@ home: jaune home_points: ~ away_points: ~ - rain: false + rain: true ## Semaine 8 - @@ -135,7 +135,7 @@ home: rouge home_points: ~ away_points: ~ - rain: false + rain: true - date: 2018/7/5 # year/month/day time: "20:15" @@ -143,7 +143,7 @@ home: vert home_points: ~ away_points: ~ - rain: false + rain: true ## Semaine 9 - diff --git a/script/articles/articles.js b/script/articles/articles.js index 2eb07f7..9f0d6f6 100644 --- a/script/articles/articles.js +++ b/script/articles/articles.js @@ -1,4 +1,4 @@ -define(['m', 'articles/evaluation_2018', 'articles/inscription_2018', 'articles/aga_2017', 'articles/party_2017', 'articles/retour_walter_stewart', 'articles/saison2017', 'articles/saison_retardee', 'articles/inscription_2017', 'articles/inscription', 'articles/inscription_rappel', 'articles/walter_stewart', 'articles/changement_de_parc'], function (m, evaluation_2018, inscription_2018, aga_2017, party_2017, retour_walter_stewart,saison2017, saison_retardee, inscription_2017, inscription, inscription_rappel, walter_stewart, changement_de_parc) { +define(['m', 'articles/reprisesaison2018', 'articles/evaluation_2018', 'articles/inscription_2018', 'articles/aga_2017', 'articles/party_2017', 'articles/retour_walter_stewart', 'articles/saison2017', 'articles/saison_retardee', 'articles/inscription_2017', 'articles/inscription', 'articles/inscription_rappel', 'articles/walter_stewart', 'articles/changement_de_parc'], function (m, reprisesaison2018, evaluation_2018, inscription_2018, aga_2017, party_2017, retour_walter_stewart,saison2017, saison_retardee, inscription_2017, inscription, inscription_rappel, walter_stewart, changement_de_parc) { var simplifyArticleStructure = function(article){ var ret = {}; _.each(article, function(section, sectionName){ @@ -8,6 +8,7 @@ define(['m', 'articles/evaluation_2018', 'articles/inscription_2018', 'articles/ }; var articles = [ + reprisesaison2018, evaluation_2018, inscription_2018, aga_2017,