Reorder definitions

volkszaehler · Feb 13, 2016 · 4143632 · 4143632
1 parent b36542b
commit 4143632
Showing 1 changed file with 122 additions and 122 deletions.
diff --git a/lib/Definition/EntityDefinition.json b/lib/Definition/EntityDefinition.json
@@ -45,17 +45,6 @@
 			"fr" : "Groupe"
 		}
 	},
-	{
-		"name"			: "user",
-		"icon"			: "user.png",
-		"interpreter"		: "Volkszaehler\\Interpreter\\AggregatorInterpreter",
-		"model"			: "Volkszaehler\\Model\\Aggregator",
-		"translation"		: {
-			"de" : "Nutzer",
-			"en" : "User",
-			"fr" : "Usager"
-		}
-	},
 	{
 		"name"			: "building",
 		"icon"			: "house.png",
@@ -67,51 +56,6 @@
 			"fr" : "Immeuble"
 		}
 	},
-	{
-		"name"			: "flow",
-		"optional"		: ["resolution", "tolerance", "local"],
-		"icon"			: "waterdrop.png",
-		"unit"			: "m^3/h",
-		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
-		"model"			: "Volkszaehler\\Model\\Channel",
-		"hasConsumption"	: true,
-		"translation"		: {
-			"de" : "Fließgeschwindigkeit",
-			"en" : "Flow rate",
-			"fr" : "Vitesse d'écoulement"
-		}
-	},
-	{
-		"name"			: "heat",
-		"required"		: ["resolution"],
-		"optional"		: ["tolerance", "cost", "local"],
-		"icon"			: "flame.png",
-		"unit"			: "W",
-		"scale"			: 1000,
-		"interpreter"		: "Volkszaehler\\Interpreter\\MeterInterpreter",
-		"model"			: "Volkszaehler\\Model\\Channel",
-		"hasConsumption"	: true,
-		"translation"		: {
-			"de" : "Wärmemengenzähler",
-			"en" : "Heat Meter",
-			"fr" : "Capteur d' énergie thermique"
-		}
-	},
-	{
-		"name"			: "heatsensor",
-		"required"		: ["resolution"],
-		"optional"		: ["tolerance", "cost", "local"],
-		"icon"			: "flame.png",
-		"unit"			: "W",
-		"scale"			: 1000,
-		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
-		"model"			: "Volkszaehler\\Model\\Channel",
-		"hasConsumption"	: true,
-		"translation"		: {
-			"de" : "Wärmemengensensor",
-			"en" : "Heat Sensor"
-		}
-	},
 	{
 		"name"			: "power",
 		"required"		: ["resolution"],
@@ -158,6 +102,32 @@
 			"en" : "El. Energy (absolute meter readings)"
 		}
 	},
+	{
+		"name"			: "voltage",
+		"optional"		: ["resolution", "tolerance", "local", "gap"],
+		"icon"			: "bolt.png",
+		"unit"			: "V",
+		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
+		"model"			: "Volkszaehler\\Model\\Channel",
+		"translation"		: {
+			"de" : "Spannungssensor",
+			"en" : "Voltage Meter",
+			"fr" : "Voltmètre"
+		}
+	},
+	{
+		"name"			: "current",
+		"optional"		: ["resolution", "tolerance", "local", "gap"],
+		"icon"			: "bolt.png",
+		"unit"			: "A",
+		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
+		"model"			: "Volkszaehler\\Model\\Channel",
+		"translation"		: {
+			"de" : "Stromsensor",
+			"en" : "Current Meter",
+			"fr" : "Courantmètre"
+		}
+	},
 	{
 		"name"			: "gas",
 		"required"		: ["resolution"],
@@ -187,6 +157,50 @@
 			"en" : "Gas (meter readings)"
 		}
 	},
+	{
+		"name"			: "heat",
+		"required"		: ["resolution"],
+		"optional"		: ["tolerance", "cost", "local"],
+		"icon"			: "flame.png",
+		"unit"			: "W",
+		"scale"			: 1000,
+		"interpreter"		: "Volkszaehler\\Interpreter\\MeterInterpreter",
+		"model"			: "Volkszaehler\\Model\\Channel",
+		"hasConsumption"	: true,
+		"translation"		: {
+			"de" : "Wärmemengenzähler",
+			"en" : "Heat Meter",
+			"fr" : "Capteur d' énergie thermique"
+		}
+	},
+	{
+		"name"			: "heatsensor",
+		"required"		: ["resolution"],
+		"optional"		: ["tolerance", "cost", "local"],
+		"icon"			: "flame.png",
+		"unit"			: "W",
+		"scale"			: 1000,
+		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
+		"model"			: "Volkszaehler\\Model\\Channel",
+		"hasConsumption"	: true,
+		"translation"		: {
+			"de" : "Wärmemengensensor",
+			"en" : "Heat Sensor"
+		}
+	},
+	{
+		"name"			: "temperature",
+		"optional"		: ["resolution", "tolerance", "local", "gap"],
+		"icon"			: "thermometer.png",
+		"unit"			: "°C",
+		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
+		"model"			: "Volkszaehler\\Model\\Channel",
+		"translation"		: {
+			"de" : "Temperatur",
+			"en" : "Temperature",
+			"fr" : "Température"
+		}
+	},
 	{
 		"name"			: "water",
 		"required"		: ["resolution"],
@@ -197,48 +211,65 @@
 		"model"			: "Volkszaehler\\Model\\Channel",
 		"hasConsumption"	: true,
 		"translation"		: {
-			"de" : "Wasser",
+			"de" : "Wassermengenzähler",
 			"en" : "Water",
 			"fr" : "Eau"
 		}
 	},
 	{
-		"name"			: "voltage",
-		"optional"		: ["resolution", "tolerance", "local", "gap"],
-		"icon"			: "bolt.png",
-		"unit"			: "V",
+		"name"			: "flow",
+		"optional"		: ["resolution", "tolerance", "local"],
+		"icon"			: "waterdrop.png",
+		"unit"			: "m^3/h",
 		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
 		"model"			: "Volkszaehler\\Model\\Channel",
+		"hasConsumption"	: true,
 		"translation"		: {
-			"de" : "Spannungssensor",
-			"en" : "Voltage Meter",
-			"fr" : "Voltmètre"
+			"de" : "Wassermengensensor",
+			"en" : "Flow rate",
+			"fr" : "Vitesse d'écoulement"
 		}
 	},
 	{
-		"name"			: "current",
-		"optional"		: ["resolution", "tolerance", "local", "gap"],
-		"icon"			: "bolt.png",
-		"unit"			: "A",
+		"name"			: "workinghours",
+		"required"		: ["resolution"],
+		"optional"		: ["tolerance", "local"],
+		"icon"			: "clock.png",
+		"unit"			: "h",
+		"interpreter"		: "Volkszaehler\\Interpreter\\MeterInterpreter",
+		"model"			: "Volkszaehler\\Model\\Channel",
+		"hasConsumption"	: true,
+		"translation"		: {
+			"de" : "Betriebsstundenzähler",
+			"en" : "Operation Hours Meter",
+			"fr" : "Compteur horaire"
+		}
+	},
+	{
+		"name"			: "workinghourssensor",
+		"required"		: ["resolution"],
+		"optional"		: ["tolerance", "local"],
+		"icon"			: "clock.png",
+		"unit"			: "",
+		"scale"			: 1000,
 		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
 		"model"			: "Volkszaehler\\Model\\Channel",
+		"hasConsumption"	: true,
 		"translation"		: {
-			"de" : "Stromsensor",
-			"en" : "Current Meter",
-			"fr" : "Courantmètre"
+			"de" : "Betriebsstundensensor"
 		}
 	},
 	{
-		"name"			: "temperature",
+		"name"			: "valve",
 		"optional"		: ["resolution", "tolerance", "local", "gap"],
-		"icon"			: "thermometer.png",
-		"unit"			: "°C",
+		"icon"			: "pipe.png",
+		"unit"			: "%",
 		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
 		"model"			: "Volkszaehler\\Model\\Channel",
 		"translation"		: {
-			"de" : "Temperatur",
-			"en" : "Temperature",
-			"fr" : "Température"
+			"de" : "Ventil",
+			"en" : "valve",
+			"fr" : "valve"
 		}
 	},
 	{
@@ -280,19 +311,6 @@
 			"fr" : "Vitesse du vent"
 		}
 	},
-	{
-		"name"			: "radiation",
-		"optional"		: ["resolution", "tolerance", "local", "gap"],
-		"icon"			: "radioactivity.png",
-		"unit"			: "μSv",
-		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
-		"model"			: "Volkszaehler\\Model\\Channel",
-		"translation"		: {
-			"de" : "Radioaktivität (Dosis)",
-			"en" : "Radioactivity (Dose)",
-			"fr" : "Radioactivité (Dose)"
-		}
-	},
 	{
 		"name"			: "luminosity",
 		"optional"		: ["resolution", "tolerance", "local", "gap"],
@@ -307,45 +325,27 @@
 		}
 	},
 	{
-		"name"			: "workinghours",
-		"required"		: ["resolution"],
-		"optional"		: ["tolerance", "local"],
-		"icon"			: "clock.png",
-		"unit"			: "h",
-		"interpreter"		: "Volkszaehler\\Interpreter\\MeterInterpreter",
-		"model"			: "Volkszaehler\\Model\\Channel",
-		"hasConsumption"	: true,
-		"translation"		: {
-			"de" : "Betriebsstundenzähler",
-			"en" : "Operation Hours Meter",
-			"fr" : "Compteur horaire"
-		}
-	},
-	{
-		"name"			: "workinghourssensor",
-		"required"		: ["resolution"],
-		"optional"		: ["tolerance", "local"],
-		"icon"			: "clock.png",
-		"unit"			: "",
-		"scale"			: 1000,
+		"name"			: "radiation",
+		"optional"		: ["resolution", "tolerance", "local", "gap"],
+		"icon"			: "radioactivity.png",
+		"unit"			: "μSv",
 		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
 		"model"			: "Volkszaehler\\Model\\Channel",
-		"hasConsumption"	: true,
 		"translation"		: {
-			"de" : "Betriebsstundensensor"
+			"de" : "Radioaktivität (Dosis)",
+			"en" : "Radioactivity (Dose)",
+			"fr" : "Radioactivité (Dose)"
 		}
 	},
 	{
-		"name"			: "valve",
-		"optional"		: ["resolution", "tolerance", "local", "gap"],
-		"icon"			: "pipe.png",
-		"unit"			: "%",
-		"interpreter"		: "Volkszaehler\\Interpreter\\SensorInterpreter",
-		"model"			: "Volkszaehler\\Model\\Channel",
+		"name"			: "user",
+		"icon"			: "user.png",
+		"interpreter"		: "Volkszaehler\\Interpreter\\AggregatorInterpreter",
+		"model"			: "Volkszaehler\\Model\\Aggregator",
 		"translation"		: {
-			"de" : "Ventil",
-			"en" : "valve",
-			"fr" : "valve"
+			"de" : "Nutzer",
+			"en" : "User",
+			"fr" : "Usager"
 		}
 	}
 ]