Merge pull request #451 from andig/states

Set default style when creating channel
volkszaehler · Jul 30, 2016 · c05e1a6 · c05e1a6
2 parents f669124 + 6833e28
commit c05e1a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/htdocs/frontend/javascripts/wui.js b/htdocs/frontend/javascripts/wui.js
@@ -254,8 +254,14 @@ vz.wui.dialogs.init = function() {
 		$('#entity-create form table .optional').remove();
 
 		var container = $('#entity-create form table');
-		vz.wui.dialogs.addProperties(container, vz.capabilities.definitions.entities[$(this)[0].selectedIndex].required, "required");
-		vz.wui.dialogs.addProperties(container, vz.capabilities.definitions.entities[$(this)[0].selectedIndex].optional, "optional");
+		var entityDefinition = vz.capabilities.definitions.entities[$(this)[0].selectedIndex];
+		vz.wui.dialogs.addProperties(container, entityDefinition.required, "required");
+		vz.wui.dialogs.addProperties(container, entityDefinition.optional, "optional");
+
+		// set default style
+		if (entityDefinition.style) {
+			$(container).find('select[name=style] option[value=' + entityDefinition.style + ']').attr('selected', 'selected');
+		}
 	});
 	$('#entity-create select').change();
 
@@ -505,9 +511,9 @@ vz.wui.updateLegend = function() {
 		} else if (series.lines.states) {
 			y = null;
 			if (j < series.data.length) {				
-				var p2 = series.data[j];
-				if (p2)
-					y = p2[1];
+				var p3 = series.data[j];
+				if (p3)
+					y = p3[1];
 			}
 		} else { // no steps -> interpolate
 			var p1 = series.data[j - 1], p2 = series.data[j];

diff --git a/lib/Definition/EntityDefinition.json b/lib/Definition/EntityDefinition.json
@@ -283,6 +283,7 @@
 		"icon"			: "pipe.png",
 		"unit"			: "%",
 		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
+		"style"			: "states",
 		"model"			: "Volkszaehler\\Model\\Channel",
 		"translation"		: {
 			"de" : "Ventil",