diff --git a/config/pumpingStation.json b/config/pumpingStation.json index 621a636..d51c82b 100644 --- a/config/pumpingStation.json +++ b/config/pumpingStation.json @@ -205,19 +205,19 @@ "overrides": [ { "matcher": { "id": "byRegexp", "options": "^(outflowLevel|inflowLevel|overflowLevel|heightBasin|dryRunLevel|highVolumeSafetyLevel|level)$" }, - "properties": [{ "id": "unit", "value": "lengthm" }] + "properties": [{ "id": "unit", "value": "lengthm" }, { "id": "decimals", "value": 2 }] }, { "matcher": { "id": "byRegexp", "options": "^(volume|maxVol|minVol|maxVolAtOverflow|minVolAtOutflow|minVolAtInflow)$" }, - "properties": [{ "id": "unit", "value": "m3" }] + "properties": [{ "id": "unit", "value": "m3" }, { "id": "decimals", "value": 2 }] }, { - "matcher": { "id": "byRegexp", "options": "Percent$" }, - "properties": [{ "id": "unit", "value": "percent" }] + "matcher": { "id": "byRegexp", "options": "^volumePercent$" }, + "properties": [{ "id": "unit", "value": "percent" }, { "id": "decimals", "value": 1 }] } ] }, - "gridPos": { "h": 20, "w": 8, "x": 4, "y": 6 }, + "gridPos": { "h": 20, "w": 6, "x": 4, "y": 6 }, "id": 17, "options": { "inlineEditing": false, @@ -227,7 +227,7 @@ "root": { "name": "Basin", "type": "frame", - "placement": { "left": 0, "top": 0, "width": 480, "height": 600 }, + "placement": { "left": 0, "top": 0, "width": 400, "height": 600 }, "background": { "color": { "fixed": "transparent" } }, "border": { "color": { "fixed": "dark-green" } }, "elements": [ @@ -405,7 +405,7 @@ { "name": "Readout Level Label", "type": "text", - "placement": { "top": 562, "left": 8, "width": 70, "height": 16 }, + "placement": { "top": 562, "left": 4, "width": 50, "height": 16 }, "background": { "color": { "fixed": "transparent" } }, "border": { "color": { "fixed": "transparent" }, "width": 0 }, "config": { "text": { "mode": "fixed", "fixed": "level" }, "color": { "fixed": "#888888" }, "size": 10, "align": "right", "valign": "middle" } @@ -413,7 +413,7 @@ { "name": "Readout Level", "type": "metric-value", - "placement": { "top": 562, "left": 82, "width": 86, "height": 16 }, + "placement": { "top": 562, "left": 56, "width": 80, "height": 16 }, "background": { "color": { "fixed": "transparent" } }, "border": { "color": { "fixed": "transparent" }, "width": 0 }, "config": { "text": { "mode": "field", "fixed": "", "field": "level" }, "color": { "fixed": "#1a1a1a" }, "size": 12, "align": "left", "valign": "middle" } @@ -421,7 +421,7 @@ { "name": "Readout Volume Label", "type": "text", - "placement": { "top": 562, "left": 168, "width": 60, "height": 16 }, + "placement": { "top": 562, "left": 140, "width": 50, "height": 16 }, "background": { "color": { "fixed": "transparent" } }, "border": { "color": { "fixed": "transparent" }, "width": 0 }, "config": { "text": { "mode": "fixed", "fixed": "volume" }, "color": { "fixed": "#888888" }, "size": 10, "align": "right", "valign": "middle" } @@ -429,7 +429,7 @@ { "name": "Readout Volume", "type": "metric-value", - "placement": { "top": 562, "left": 232, "width": 70, "height": 16 }, + "placement": { "top": 562, "left": 192, "width": 80, "height": 16 }, "background": { "color": { "fixed": "transparent" } }, "border": { "color": { "fixed": "transparent" }, "width": 0 }, "config": { "text": { "mode": "field", "fixed": "", "field": "volume" }, "color": { "fixed": "#1a1a1a" }, "size": 12, "align": "left", "valign": "middle" } @@ -437,7 +437,7 @@ { "name": "Readout Fill Label", "type": "text", - "placement": { "top": 562, "left": 302, "width": 50, "height": 16 }, + "placement": { "top": 562, "left": 276, "width": 40, "height": 16 }, "background": { "color": { "fixed": "transparent" } }, "border": { "color": { "fixed": "transparent" }, "width": 0 }, "config": { "text": { "mode": "fixed", "fixed": "fill" }, "color": { "fixed": "#888888" }, "size": 10, "align": "right", "valign": "middle" } @@ -445,7 +445,7 @@ { "name": "Readout Fill", "type": "metric-value", - "placement": { "top": 562, "left": 356, "width": 70, "height": 16 }, + "placement": { "top": 562, "left": 318, "width": 70, "height": 16 }, "background": { "color": { "fixed": "transparent" } }, "border": { "color": { "fixed": "transparent" }, "width": 0 }, "config": { "text": { "mode": "field", "fixed": "", "field": "volumePercent" }, "color": { "fixed": "#1a1a1a" }, "size": 12, "align": "left", "valign": "middle" } @@ -472,7 +472,7 @@ }, "overrides": [] }, - "gridPos": { "h": 10, "w": 12, "x": 12, "y": 6 }, + "gridPos": { "h": 10, "w": 14, "x": 10, "y": 6 }, "id": 8, "options": { "legend": { "displayMode": "list", "placement": "bottom" }, @@ -497,7 +497,7 @@ }, "overrides": [] }, - "gridPos": { "h": 10, "w": 12, "x": 12, "y": 16 }, + "gridPos": { "h": 10, "w": 14, "x": 10, "y": 16 }, "id": 9, "options": { "legend": { "displayMode": "list", "placement": "bottom" },