Changed switches to states

volkszaehler · Jul 28, 2016 · 27ab1e5 · 27ab1e5
1 parent c673de6
commit 27ab1e5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/htdocs/frontend/javascripts/wui.js b/htdocs/frontend/javascripts/wui.js
@@ -502,7 +502,7 @@ vz.wui.updateLegend = function() {
 				y = p[1];
 			else
 				y = null;
-		} else if (series.lines.switches) {
+		} else if (series.lines.states) {
 			y = null;
 			if (j < series.data.length) {				
 				var p2 = series.data[j];
@@ -844,8 +844,8 @@ vz.wui.drawPlot = function () {
 				title: entity.title,
 				unit : entity.definition.unit,
 				lines: {
-					show:       style == 'lines' || style == 'steps' || style == 'switches',
-					steps:      style == 'steps' || style == 'switches',
+					show:       style == 'lines' || style == 'steps' || style == 'states',
+					steps:      style == 'steps' || style == 'states',
 					fill:       fillstyle !== undefined ? fillstyle : false,
 					lineWidth:  linewidth
 				},

diff --git a/lib/Definition/EntityDefinition.json b/lib/Definition/EntityDefinition.json
@@ -270,7 +270,7 @@
 		"unit"			: "",
 		"scale"			: 1000,
 		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
-		"style"			: "switches",
+		"style"			: "states",
 		"model"			: "Volkszaehler\\Model\\Channel",
 		"hasConsumption"	: true,
 		"translation"		: {

diff --git a/lib/Definition/PropertyDefinition.json b/lib/Definition/PropertyDefinition.json
@@ -383,7 +383,7 @@
 		"options"		: [
 			"lines",
 			"steps",
-			"switches",
+			"states",
 			"points"
 		],
 		"translation"		: {