Commit 5ee85ae6 authored by Sascha Herzinger's avatar Sascha Herzinger
Browse files

Fixing bug that displayed points with null value

parent 6eddca48
......@@ -881,12 +881,6 @@
"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
"dev": true
},
"catharsis": {
"version": "0.8.8",
"resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.8.tgz",
"integrity": "sha1-aTR59DqsVJ2Aa9c+kkzQ2USVGgY=",
"dev": true
},
"center-align": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
......@@ -1347,20 +1341,57 @@
"dev": true
},
"d3": {
"version": "4.9.1",
"resolved": "https://registry.npmjs.org/d3/-/d3-4.9.1.tgz",
"integrity": "sha1-+GC+klImGjwU7qZLHSWQ0U9NuDg="
"version": "4.10.0",
"resolved": "https://registry.npmjs.org/d3/-/d3-4.10.0.tgz",
"integrity": "sha512-PXnXfSEgrYOspAIU4ujlsJuIVHvVbT/AidBMedq6XRPXbbUwPI2rqe9kbuQofCaAW/IipdT5gSbTKw/5Xjbb5Q==",
"dependencies": {
"d3-axis": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.8.tgz",
"integrity": "sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo="
},
"d3-collection": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.4.tgz",
"integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI="
},
"d3-drag": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.1.1.tgz",
"integrity": "sha512-51aazbUuZZhPZzXv9xxwPOJTeDSVv8cXNd8oFxqJyR8ZBD9yLd09CFGSDSm3ArViHg2D5Wo1qCaKl7Efj/qchg=="
},
"d3-hierarchy": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz",
"integrity": "sha1-ochFxC+Eoga88cAcAQmOpN2qeiY="
},
"d3-shape": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz",
"integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c="
},
"d3-time": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.7.tgz",
"integrity": "sha1-lMr27bt4ebuAnQ0fdXK8SEgvcnA="
},
"d3-timer": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.6.tgz",
"integrity": "sha1-QES/FdcCXAbOfRFJ9zzQe1Tb14Q="
},
"d3-zoom": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.5.0.tgz",
"integrity": "sha512-tc/ONeSUVuwHczjjK4jQPd0T1iZ+lfsz8TbguAAceY5qs057hp4WLglkPWValkuVjCyeGpqiA2iTm8S++NJ84w=="
}
}
},
"d3-array": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.0.tgz",
"integrity": "sha1-FH0mlyDhdMQFen9CvosPPyulMQg="
},
"d3-axis": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.7.tgz",
"integrity": "sha1-BIQz0wcGH2LR0kjikwwB17ZzjNg="
},
"d3-brush": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz",
......@@ -1416,11 +1447,6 @@
"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.6.4.tgz",
"integrity": "sha1-8g4eRhyxhF9ai+Vatvh2VCp+MZk="
},
"d3-hierarchy": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.4.tgz",
"integrity": "sha1-lsOULz8hz5l6EbTt8A3eKne0xtA="
},
"d3-interpolate": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.5.tgz",
......@@ -1466,11 +1492,6 @@
"resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.1.0.tgz",
"integrity": "sha1-GZhoSJZIj4OcoDchI9o08dMYgJw="
},
"d3-shape": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.1.1.tgz",
"integrity": "sha1-UKEDfkinn1uP2dWM3lJ5musfdyM="
},
"d3-time": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.6.tgz",
......@@ -1496,11 +1517,6 @@
"resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.2.tgz",
"integrity": "sha1-Fodmfo8TotFYyAwUgMWinLDYlzw="
},
"d3-zoom": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.2.0.tgz",
"integrity": "sha1-syMfT5OGJBR13v4cVXv9P94QZfs="
},
"dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
......@@ -1791,12 +1807,6 @@
"integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
"dev": true
},
"enhanced-resolve": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz",
"integrity": "sha1-n0tib1dyRe3PSyrYPYbhf09CHew=",
"dev": true
},
"ent": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
......@@ -3581,6 +3591,12 @@
"integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
"dev": true
},
"js2xmlparser": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
"integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
"dev": true
},
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
......@@ -3589,9 +3605,9 @@
"optional": true
},
"jsdoc": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.0.tgz",
"integrity": "sha512-AkXuBHsvZ7D81lV2BRiZhvcWPAaNNfWssEoDqKte07mhE+/6FUgeTQxMhbQPx1gaeWNtd4K60fo/ecD9FPIpjA==",
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.3.tgz",
"integrity": "sha512-K9mjBmCm2P62kqJ5UU6Zj7zZnJoLxZBzgLm2yVv98tqLHYSpIvxUkM+dGBua+yUsvOhXsAh232a/joE+86D4CQ==",
"dev": true,
"dependencies": {
"babylon": {
......@@ -3606,10 +3622,10 @@
"integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
"dev": true
},
"js2xmlparser": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
"integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
"catharsis": {
"version": "0.8.9",
"resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz",
"integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=",
"dev": true
},
"klaw": {
......@@ -5810,9 +5826,9 @@
"dev": true
},
"tippy.js": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-1.1.0.tgz",
"integrity": "sha512-uVW+WCxWlwc7uqykreNBpFyVOPDOnk3bVR36+sjThK20aq2LQLPJ1PYA5MBWIoFFy5CNcVVwgV+Hh0wrgoILyg=="
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-1.1.3.tgz",
"integrity": "sha512-p4tm1Q87PhRHJirw2FomXATYRclnd42NFzucVTpr7ibFpLW+IO4RAWebdtxPGiC9ysO3gspSvJu2nZbK6o/LYQ=="
},
"tmp": {
"version": "0.0.31",
......@@ -5947,8 +5963,7 @@
"underscore": {
"version": "1.8.3",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
"dev": true
"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
},
"underscore-contrib": {
"version": "0.3.0",
......@@ -6087,8 +6102,7 @@
"uuid": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
"dev": true
"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
},
"validate-npm-package-license": {
"version": "3.0.1",
......@@ -6127,9 +6141,9 @@
"dev": true
},
"vue": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.3.4.tgz",
"integrity": "sha512-oLCxuVcVQ2inwSbS7B+zfjB6CSjgQ0yyCOzPcg7S5CXeOCbtkaiN5frR6MtwvrveqbG86OsGd9jWf6JsGyQkLw=="
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.4.1.tgz",
"integrity": "sha512-V/3mbqPeXJf+AEdm2Qdrho8ADjN2/Th+q7abrDqQrGaERgtlGPLe8SRLDzJ2eNEV4Gh+L8T/vfbxb2sLUfwYbA=="
},
"vue-hot-reload-api": {
"version": "2.1.0",
......@@ -6138,9 +6152,9 @@
"dev": true
},
"vue-loader": {
"version": "12.2.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-12.2.1.tgz",
"integrity": "sha1-U/J8CXPThnaPWnUVb0Epte/GulU=",
"version": "12.2.2",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-12.2.2.tgz",
"integrity": "sha512-DD+sYaWQ1esYL/tEwJpoEGE/PFUu32fp7iOuMf4Sra3dgxqr4haTOkVam2VY0/5D4LG8eAcB94ruXKeQW2/ikw==",
"dev": true,
"dependencies": {
"lru-cache": {
......@@ -6158,9 +6172,9 @@
"dev": true
},
"vue-template-compiler": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.3.4.tgz",
"integrity": "sha512-GezvHn6bw053zIo0TQIjimRpyELjCEOrc5hGHtHUeadbVSdKB9yqY6By9WiYvbFwOZiuMmFpSfjD8VzVibWGtQ=="
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.1.tgz",
"integrity": "sha512-DE7D9qpgT8ExbWwnzDeakZjmi2tEP1auxq4sD1R2L10A6PFTvo+R0r3bpxPAReGJBqxS4qrjw3kGFzT6Jvb3YQ=="
},
"vue-template-es2015-compiler": {
"version": "1.5.3",
......@@ -6194,9 +6208,9 @@
"dev": true
},
"webpack": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz",
"integrity": "sha1-LgRX8KuxrF3zqxBsacZy8jZ4Xwc=",
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-2.7.0.tgz",
"integrity": "sha512-MjAA0ZqO1ba7ZQJRnoCdbM56mmFpipOPUv/vQpwwfSI42p5PVDdoiuK2AL2FwFUVgT859Jr43bFZXRg/LNsqvg==",
"dev": true,
"dependencies": {
"async": {
......@@ -6211,18 +6225,36 @@
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
"dev": true
},
"enhanced-resolve": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz",
"integrity": "sha512-2qbxE7ek3YxPJ1ML6V+satHkzHpJQKWkRHmRx6mfAoW59yP8YH8BFplbegSP+u2hBd6B6KCOpvJQ3dZAP+hkpg==",
"dev": true
},
"loader-utils": {
"version": "0.2.17",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
"integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
"dev": true
},
"source-list-map": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
"integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
"dev": true
},
"supports-color": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true
},
"webpack-sources": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
"integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
"dev": true
},
"yargs": {
"version": "6.6.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
......@@ -6301,20 +6333,6 @@
}
}
},
"webpack-sources": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz",
"integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=",
"dev": true,
"dependencies": {
"source-list-map": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz",
"integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=",
"dev": true
}
}
},
"websocket-driver": {
"version": "0.6.5",
"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
......
......@@ -20,14 +20,14 @@
"main": "lib/fractal.min.js",
"dependencies": {
"axios": "^0.16.1",
"d3": "^4.7.4",
"d3": "^4.10.0",
"deep-freeze-strict": "^1.1.1",
"gsap": "^1.20.2",
"jquery": "^3.2.1",
"tippy.js": "^1.1.0",
"tippy.js": "^1.1.3",
"uuid": "^3.1.0",
"vue": "^2.3.3",
"vue-template-compiler": "^2.3.3",
"vue": "^2.4.1",
"vue-template-compiler": "^2.4.1",
"vuex": "^2.3.1"
},
"devDependencies": {
......@@ -43,7 +43,7 @@
"eslint-plugin-standard": "^2.1.1",
"file-loader": "^0.11.1",
"jasmine-core": "^2.6.4",
"jsdoc": "^3.5.0",
"jsdoc": "^3.5.3",
"karma": "^1.5.0",
"karma-chrome-launcher": "^2.2.0",
"karma-jasmine": "^1.1.0",
......@@ -54,8 +54,8 @@
"sass-loader": "^6.0.6",
"style-loader": "^0.17.0",
"url-loader": "^0.5.8",
"vue-loader": "^12.2.1",
"webpack": "^2.6.1",
"vue-loader": "^12.2.2",
"webpack": "^2.7.0",
"webpack-dev-server": "^2.5.1",
"yargs": "^7.0.2"
}
......
......@@ -179,7 +179,7 @@
let [variable, category, subset] = label.split('//')
subset = parseInt(subset.substring(1)) - 1 // revert subset string formatting
points[label] = this.results.data
.filter(d => d.subset === subset && d.category === category)
.filter(d => d.subset === subset && d.category === category && typeof d[variable] === 'number')
.map(d => {
return {
id: d.id,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment