Prune away past events and trainings.

Both at the Jekyll level and at the JavaScript level.

Author: sjrd

events/_posts/2013-02-15-OutdatedEvent.md

@@ -0,0 +1,10 @@
+---
+isevent: true
+title: Outdated event
+logo: http://photos.osmek.com/95149
+location: Lausanne, Switzerland
+description: This event is outdated and should not appear in the JavaScript code
+start: 15 February 2013
+end: 19 February 2013
+url: http://www.epfl.ch/
+---

resources/js/main.js

@@ -69,19 +69,24 @@ $(document).ready(function(){
   }
 
   var scalaLangEvents = [
-  {% for event in site.categories.events limit:5 %}
+  {% for event in site.categories.events %}
+  {% if event.date >= site.time %}{% comment %} No point in including outdated events {% endcomment %}
     {
       "title": "{{ event.title }}",
       "logo": "{{ event.logo }}",
       "location": "{{ event.location }}",
       "start": "{{ event.start }}",
       "end": "{{ event.end }}",
       "url": "{{ event.url }}",
-    }{% unless forloop.last %},{% endunless %}
+    },
+  {% endif %}
   {% endfor%}
   ];
 
   function doPopulateEventsPane(allEvents) {
+    allEvents = allEvents.filter(function (event) {
+      return (event.end ? new Date(event.end) : new Date(event.start)) >= new Date();
+    });
     allEvents.sort(compareEventsByDate);
     var content = "";
     for (i = 0; i < allEvents.length && i < MAX_EVENTS; i++) {
@@ -123,7 +128,8 @@ $(document).ready(function(){
   }
 
   var scalaLangTrainings = [
-  {% for training in site.categories.training limit:5 %}
+  {% for training in site.categories.training %}
+  {% if training.date >= site.time %}{% comment %} No point in including outdated training sessions {% endcomment %}
     {
       title: "{{ training.title }}",
       description: "{{ training.description }}",
@@ -137,7 +143,8 @@ $(document).ready(function(){
           status: "{{ training.status }}"
         }
       ]
-    }{% unless forloop.last %},{% endunless %}
+    },
+  {% endif %}
   {% endfor%}
   ];
 
@@ -162,6 +169,9 @@ $(document).ready(function(){
 
   function doPopulateTrainingsPane(allTrainings0) {
     var allTrainings = keepOnlyOneSession(allTrainings0);
+    allTrainings = allTrainings.filter(function (training) {
+      return new Date(training.when) >= new Date();
+    });
     allTrainings.sort(compareTrainingsByDate);
     var content = "";
     for (i = 0; i < allTrainings.length; i++) {

training/_posts/2013-02-18-OutdatedTraining.md

@@ -0,0 +1,11 @@
+---
+istraining: true
+title: Outdated training
+description: This outdated training should not appear in the JavaScript
+url: http://www.epfl.ch/
+where: Lausanne, Switzerland
+when: 18 February 2013
+trainers: Sébastien Doeraene
+organizer: EPFL
+status: unknown
+---

training/_posts/2013-02-23-testtraining.md renamed to training/_posts/2013-03-23-testtraining.md

@@ -4,7 +4,7 @@ title: Test training
 description: This a cool test training
 url: http://www.epfl.ch/
 where: Lausanne, Switzerland
-when: 23 February 2013
+when: 23 March 2013
 trainers: Sébastien Doeraene
 organizer: EPFL
 status: unknown