Adds handling for more than one meeting per month. Adds day and month…

… to getMeetings
zrrrzzt · Sep 8, 2016 · f1f9922 · f1f9922
1 parent 619ce2d
commit f1f9922
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -62,7 +62,8 @@ const ogm = require('opengov-meetings')
 const opts = {
   host: 'http://opengov.cloudapp.net',
   path: '/Meetings/tfk',
-  boardId: '200151'
+  boardId: '200151',
+  year: 2015
 }
 
 function cb (err, data) {

diff --git a/lib/parse-meetings.js b/lib/parse-meetings.js
@@ -2,6 +2,10 @@
 
 const cheerio = require('cheerio')
 
+function fixMonth (elem) {
+  return elem > 11 ? elem - 12 : elem
+}
+
 module.exports = page => {
   var $ = cheerio.load(page)
   var data = {}
@@ -16,15 +20,20 @@ module.exports = page => {
 
   Object.keys(dates).forEach(function (elem) {
     if (typeof parseInt(elem, 10) === 'number') {
+      const month = fixMonth(elem)
       cell = dates[elem]
       if (cell.hasOwnProperty('type') && cell.children.length > 0) {
         item = {}
         if (cell.attribs.title) {
-          item.date = cell.children[0].data + '. ' + headers[elem].attribs.title
+          item.date = cell.children[0].data + '. ' + headers[month].attribs.title
+          item.day = cell.children[0].data
+          item.month = parseInt(month, 10) + 1
           item.status = cell.attribs.title
           item.id = ''
         } else {
-          item.date = cell.children[0].children[0].data + '. ' + headers[elem].attribs.title
+          item.date = cell.children[0].children[0].data + '. ' + headers[month].attribs.title
+          item.day = cell.children[0].children[0].data
+          item.month = parseInt(month, 10) + 1
           item.status = cell.children[0].attribs.title
           item.id = cell.children[0].attribs.href.split('/').pop()
         }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "opengov-meetings",
   "description": "Connect to 360 OpenGov Meetings",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "license": "MIT",
   "author": {
     "name": "Geir Gåsodden",

diff --git a/test/data/get-meetings-data-full.json b/test/data/get-meetings-data-full.json
@@ -3,18 +3,24 @@
   "meetings": [
     {
       "date": "19. mars",
+      "day": "19",
+      "month": 3,
       "status": "Offentlig",
       "id": "212860",
       "year": "2015"
     },
     {
       "date": "8. juni",
+      "day": "8",
+      "month": 6,
       "status": "Offentlig",
       "id": "212864",
       "year": "2015"
     },
     {
       "date": "21. september",
+      "day": "21",
+      "month": 9,
       "status": "Avlyst",
       "id": "",
       "year": "2015"

diff --git a/test/data/get-meetings-data.json b/test/data/get-meetings-data.json
@@ -3,16 +3,22 @@
   "meetings": [
     {
       "date": "19. mars",
+      "day": "19",
+      "month": 3,
       "status": "Offentlig",
       "id": "212860"
     },
     {
       "date": "8. juni",
+      "day": "8",
+      "month": 6,
       "status": "Offentlig",
       "id": "212864"
     },
     {
       "date": "21. september",
+      "day": "21",
+      "month": 9,
       "status": "Avlyst",
       "id": ""
     }