UI: add unit property

assets/js/components/Config/PropertyEntry.vue

@@ -10,10 +10,11 @@
 		<PropertyField
 			:id="id"
 			v-model="value"
+			class="me-2"
 			:masked="Mask"
 			:property="Name"
 			:type="Type"
-			class="me-2"
+			:unit="Unit"
 			:required="Required"
 			:choice="Choice"
 		/>
@@ -37,6 +38,7 @@ export default {
 		Help: String,
 		Example: String,
 		Type: String,
+		Unit: String,
 		Mask: Boolean,
 		Choice: Array,
 		modelValue: [String, Number, Boolean, Object],

assets/js/components/Config/PropertyField.vue

@@ -163,9 +163,6 @@ export default {
 			if (this.unit) {
 				return this.unit;
 			}
-			if (this.property === "capacity") {
-				return "kWh";
-			}
 			return null;
 		},
 		icons() {

cmd/configure/helper.go

@@ -438,6 +438,10 @@ func (c *CmdConfigure) processInputConfig(param templates.Param) string {
 		label = langLabel
 	}
 
+	if param.Unit != "" {
+		label = fmt.Sprintf("%s (%s)", label, param.Unit)
+	}
+
 	value := c.askValue(question{
 		label:        label,
 		defaultValue: param.Default,

cmd/configure/survey.go

@@ -129,8 +129,13 @@ func (c *CmdConfigure) askParam(p templates.Param) string {
 		required = *p.Required
 	}
 
+	label := p.Description.String(c.lang)
+	if p.Unit != "" {
+		label = fmt.Sprintf("%s (%s)", label, p.Unit)
+	}
+
 	return c.askValue(question{
-		label:     p.Description.String(c.lang),
+		label:     label,
 		valueType: p.Type,
 		choice:    p.Choice,
 		mask:      mask,

templates/definition/charger/pulsatrix.yaml

@@ -6,9 +6,9 @@ requirements:
 params:
   - name: host #IP address or hostname (can be found on 3rd page of SECC display)
     required: true
-    description:
-      en: IP address or hostname (can be found on 3rd page of SECC display)
-      de: IP-Adresse oder Hostname (wird auf der dritten Displayseite des SECC angezeigt)
+    help:
+      en: Shown on 3rd page of SECC display
+      de: Wird auf der dritten Displayseite des SECC angezeigt
 render: |
   type: pulsatrix
   host: {{ .host }}

templates/definition/meter/sofarsolar-g3.yaml

@@ -38,8 +38,8 @@ params:
   - name: maxacpower
   - name: defaultmode
     help:
-      de: Standardmodus für die aktive Batteriesteuerung. Gültige Werte sind 0 (Eigenbedarfsmodus), 1 (Nutzungszeitmodus), 2 (Zeitmodus), 4 (Peak-shaving Modus)
-      en: Default mode for battery control. Valid values are 0 (self use), 1 (time of use), 2 (timing mode), 4 (peak-shaving mode)
+      de: Gültige Werte sind 0 (Eigenbedarfsmodus), 1 (Nutzungszeitmodus), 2 (Zeitmodus), 4 (Peak-shaving Modus)
+      en: Valid values are 0 (self use), 1 (time of use), 2 (timing mode), 4 (peak-shaving mode)
     default: 0 # self use
     advanced: true
   # battery control

templates/definition/meter/sonnenbatterie.yaml

@@ -38,9 +38,6 @@ params:
     default: self-consumption
     required: true
     advanced: true
-    help:
-      de: Standardmodus für die aktive Batteriesteuerung
-      en: Default mode for active battery control
     usages: ["battery"]
   - name: chargepower
     deprecated: true

tests/config-battery.spec.js

@@ -49,7 +49,7 @@ test.describe("battery meter", async () => {
     // edit #1
     await page.getByTestId("battery").getByRole("button", { name: "edit" }).click();
     await expectModalVisible(meterModal);
-    await meterModal.getByLabel("Battery capacity (kWh)").fill("20");
+    await meterModal.getByLabel("Battery capacity").fill("20");
     await meterModal.getByRole("button", { name: "Validate & save" }).click();
     await expectModalHidden(meterModal);