Merge pull request #127 from nodeschool/eventsort

Sort Events before Mapping, fixes #125
nodeschool · Oct 29, 2014 · 5d85aad · 5d85aad
2 parents 2ef3faf + cc21a75
commit 5d85aad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/index.html b/index.html
@@ -55,7 +55,6 @@ <h1>Workshops</h1>
 
       <div class="third upcoming-workshoppers">
         <h2>Upcoming Workshops</h2>
-        <br>
         <div id="upcoming-workshops">
           <div class="loading">
             Loading...
@@ -65,7 +64,7 @@ <h2>Upcoming Workshops</h2>
           </div>
           <div class="success">
             <ul></ul>
-            <a href="events.html" class="all-events">See all events</a>
+            <p><a href="events.html" class="all-events">See all events</a>.</p>
           </div>
           <div class="error">
             Could not load events, sorry!

diff --git a/js/index.js b/js/index.js
@@ -13,7 +13,7 @@ function loadEvents() {
 function showNearEvents(data) {
   writeCount(data.length)
   makeMap(data)
-  var list = sortDates(data)
+  var list = upcomingEvents(data)
   if (list.length == 0) {
     $('#upcoming-workshops').addClass("empty")
   } else {

diff --git a/js/main.js b/js/main.js
@@ -79,6 +79,13 @@ function sortDates(data) {
     return a.startUTC - b.startUTC
   })
 
+  return sorted
+}
+
+function upcomingEvents(data) {
+  var today = new Date()
+  var sorted = sortDates(data)
+
   // only upcoming events
   var freshies = []
   var todayBuffer = new Date()
@@ -93,12 +100,14 @@ function sortDates(data) {
 }
 
 function makeMap(data) {
-  data = addHexcolor(data, "#F7DA03", "#A09C9C")
+  var sorted = sortDates(data)
+  sorted = addHexcolor(sorted.reverse(), "#F7DA03", "#A09C9C")
+
   // make map
   var optionsJSON = ["name", "tickets", "startdate", "state"]
   var template = "<p class='event'>{{startdate}} <a class='{{state}}' href='{{tickets}}'"
     + " target='_blank'>{{name}}</a><p>"
-  var geoJSON = Sheetsee.createGeoJSON(data, optionsJSON)
+  var geoJSON = Sheetsee.createGeoJSON(sorted.reverse(), optionsJSON)
   var map = Sheetsee.loadMap("map")
   Sheetsee.addTileLayer(map, 'examples.map-20v6611k')
   var markerLayer = Sheetsee.addMarkerLayer(geoJSON, map, template)