Merge pull request #568 from OpenEnergyDashboard/huss

Changes to move OED to version 0.6.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Open-Energy-Dashboard",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "private": false,
   "license": "MPL-2.0",
   "repository": "https://github.com/OpenEnergyDashboard/OED",

src/client/app/containers/BarChartContainer.ts

@@ -35,7 +35,7 @@ function mapStateToProps(state: State) {
 						`${moment(barReading.startTimestamp).utc().format('MMM DD, YYYY')} - ${moment(barReading.endTimestamp).utc().format('MMM DD, YYYY')}`;
 					xData.push(timeReading);
 					yData.push(barReading.reading);
-					hoverText.push(`<b> ${timeReading} </b> <br> ${label}: ${barReading.reading} kW`);
+					hoverText.push(`<b> ${timeReading} </b> <br> ${label}: ${barReading.reading} kWh`);
 				});
 
 				// This variable contains all the elements (x and y values, bar type, etc.) assigned to the data parameter of the Plotly object
@@ -72,7 +72,7 @@ function mapStateToProps(state: State) {
 						`${moment(barReading.startTimestamp).utc().format('MMM DD, YYYY')} - ${moment(barReading.endTimestamp).utc().format('MMM DD, YYYY')}`;
 					xData.push(timeReading);
 					yData.push(barReading.reading);
-					hoverText.push(`<b> ${timeReading} </b> <br> ${label}: ${barReading.reading} kW`);
+					hoverText.push(`<b> ${timeReading} </b> <br> ${label}: ${barReading.reading} kWh`);
 				});
 
 				// This variable contains all the elements (x and y values, bar chart, etc.) assigned to the data parameter of the Plotly object
@@ -103,7 +103,7 @@ function mapStateToProps(state: State) {
 			orientation: 'h'
 		},
 		yaxis: {
-			title: 'kW',
+			title: 'kWh',
 			showgrid: true,
 			gridcolor: '#ddd'
 		},

src/client/app/containers/CompareChartContainer.ts

@@ -43,13 +43,13 @@ function mapStateToProps(state: State, ownProps: CompareChartContainerProps): IP
 			x: [periodLabels.prev, periodLabels.current],
 			y: [previousPeriod, currentPeriod],
 			hovertext: [
-				`<b>${previousPeriod} KW</b> ${translate('used.this.time')}<br>${periodLabels.prev.toLowerCase()}`,
-				`<b>${currentPeriod} KW</b> ${translate('used.so.far')}<br>${periodLabels.current.toLowerCase()}`
+				`<b>${previousPeriod} KWh</b> ${translate('used.this.time')}<br>${periodLabels.prev.toLowerCase()}`,
+				`<b>${currentPeriod} KWh</b> ${translate('used.so.far')}<br>${periodLabels.current.toLowerCase()}`
 			],
 			hoverinfo: 'text',
 			type: 'bar',
 			marker: {color: barColor},
-			text: [ `<b>${previousPeriod} kW</b>`, `<b>${currentPeriod} kW</b>`],
+			text: [ `<b>${previousPeriod} kWh</b>`, `<b>${currentPeriod} kWh</b>`],
 			textposition: 'auto',
 			textfont: {
 				color: 'rgba(0,0,0,1)'
@@ -71,7 +71,7 @@ function mapStateToProps(state: State, ownProps: CompareChartContainerProps): IP
 		legend: {
 		},
 		yaxis: {
-			title: 'kW',
+			title: 'kWh',
 			showgrid: true,
 			gridcolor: '#ddd'
 		},

src/client/app/containers/MapChartContainer.ts

@@ -63,7 +63,7 @@ function mapStateToProps(state: State) {
 								`${moment(mapReading.startTimestamp).utc().format('MMM DD, YYYY')} - ${moment(mapReading.endTimestamp).utc().format('MMM DD, YYYY')}`;
 							const averagedReading = mapReading.reading / barDuration.asDays(); // average total reading by days of duration
 							size.push(averagedReading);
-							texts.push(`<b> ${timeReading} </b> <br> ${label}: ${averagedReading} kW/day`);
+							texts.push(`<b> ${timeReading} </b> <br> ${label}: ${averagedReading} kWh/day`);
 						}
 					}
 				}

src/server/migrations/0.5.0-0.6.0/sql/meter/add_idenifier_column.sql

@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ALTER TABLE meters
+	ADD COLUMN IF NOT EXISTS identifier TEXT;
+
+UPDATE meters SET identifier=name WHERE identifier IS NULL or identifier='';

src/server/migrations/registerMigration.js

@@ -8,7 +8,8 @@
 const migrations = [
 	/* eslint-disable global-require */
 	//require('./0.2.0-0.3.0-Template/indexTemplate'),
-	require('./0.3.0-0.5.0')
+	require('./0.3.0-0.5.0'),
+	require('./0.5.0-0.6.0')
 	/* eslint-disable global-require */
 ];
 

src/server/routes/meters.js

@@ -109,18 +109,23 @@ router.post('/edit', async (req, res) => {
 			id: { type: 'integer' },
 			enabled: { type: 'bool' },
 			displayable: { type: 'bool' },
-			timeZone: { type: 'string' },
+			timeZone: {
+				oneOf: [
+					{ type: 'string' },
+					{ type: 'null' }
+				]
+			},
 			gps: {
 				oneOf: [
 					{
 						type: 'object',
 						required: ['latitude', 'longitude'],
 						properties: {
 							latitude: { type: 'number', minimum: '-90', maximum: '90' },
-							longitude: { type: 'number', minimum: '-180', maximum: '180'}
+							longitude: { type: 'number', minimum: '-180', maximum: '180' }
 						}
 					},
-					{type: 'null'}
+					{ type: 'null' }
 				]
 			}
 		}
@@ -137,7 +142,7 @@ router.post('/edit', async (req, res) => {
 			meter.enabled = req.body.enabled;
 			meter.displayable = req.body.displayable;
 			meter.meterTimezone = req.body.timeZone;
-			meter.gps = (req.body.gps)? new Point(req.body.gps.longitude, req.body.gps.latitude): null;
+			meter.gps = (req.body.gps) ? new Point(req.body.gps.longitude, req.body.gps.latitude) : null;
 			await meter.update(conn);
 		} catch (err) {
 			log.error('Failed to edit meter', err);

src/server/routes/preferences.js

@@ -50,7 +50,10 @@ router.post('/', async (req, res) => {
 					type: 'string'
 				},
 				defaultTimezone: {
-					type: 'string'
+					oneOf: [
+						{ type: 'string' },
+						{ type: 'null' }
+					]
 				}
 			}
 		}