fix: add additional fields to the visual editor closes #433

locale: update Russian translation closes #434 docs: update documentation
slipx06 · May 16, 2024 · ee6f908 · ee6f908
1 parent 6bef062
commit ee6f908
Show file tree

Hide file tree

Showing 19 changed files with 154 additions and 137 deletions.
diff --git a/dist/sunsynk-power-flow-card.js b/dist/sunsynk-power-flow-card.js
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -19,8 +19,8 @@ The card can be configured through the following attributes:
 | show_solar:     | Optional     | `true`                                              | Toggle display of solar information                                                                                                                                      |
 | show_battery:   | Optional     | `true`                                              | Toggle display of battery information                                                                                                                                    |
 | show_grid:      | Optional     | `true`                                              | Toggle display of grid information                                                                                                                                       |
-| card_height:    | Optional     | `396px`                                             | Only used when `panel_mode: false`. Sets the card height in pixels. Specify the value i.e. `400px` or provide a sensor i.e. `input.numer_height`                         |
-| card_width:     | Optional     | `100%`                                              | Only used when `panel_mode: true`. Sets the card width in pixels or percentage `400px` or `80%`. For adjustments when using the Panel(1 card) view types or grid layouts |
+| card_height:    | Optional     | `396px`                                             | Only used when `panel_mode: false`. Sets the card height in pixels. Specify the value i.e. `400px` or provide a sensor i.e. `input.number_height`                         |
+| card_width:     | Optional     | `100%`                                              | Only used when `panel_mode: true`. Sets the card width in pixels or percentage. Specify the value i.e. `400px`, `80%` or provide a sensor i.e. `input.number_width`. For adjustments when using the Panel(1 card) view types or grid layouts |
 | decimal_places: | Optional     | `2`                                                 | Sets the number of decimal places to display when using the `auto_scale` option.                                                                                         |
 | decimal_places_energy: | Optional     | `1`                                                 | Sets the number of decimal places to display for the daily energy values.                                                                                         |
 | dynamic_line_width: | Optional     | `false`                                          | Adjusts the width of the lines and animated dot based on the ratio of current power to `max_power` (defined in each section below). Requires `max_power` to be explicitly defined                                   |

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sunsynk-power-flow-card",
-  "version": "4.37.0",
+  "version": "4.37.1",
   "description": "A customizable Home Assistant card to emulate the Sunsynk System flow that's displayed on the Inverter screen.",
   "main": "sunsynk-power-flow-card.js",
   "scripts": {

diff --git a/src/cards/compact-card.ts b/src/cards/compact-card.ts
@@ -712,9 +712,9 @@ export const compactCard = (config: sunsynkPowerFlowCardConfig, inverterImg: str
                                 <stop offset="${(Number(data.pvPercentageBat < 2 ? 0 : data.pvPercentageBat) + Number(data.gridPercentageBat < 2 ? 0 : data.gridPercentageBat))}%"
                                       stop-color="${Number(data.gridPercentageBat) > 0 ? `${data.gridColour}` : `${data.batteryColour}`}"/>
                                 <stop offset="${(Number(data.pvPercentageBat < 2 ? 0 : data.pvPercentageBat) + Number(data.gridPercentageBat < 2 ? 0 : data.gridPercentageBat))}%"
-                                      stop-color="${Number(data.pvPercentageBat) === 100 ? data.solarColour : (Number(data.gridPercentageBat) === 100 ? data.gridColour : data.batteryColour)}"/>
+                                      stop-color="${data.batteryColour}"/>
                                 <stop offset="100%"
-                                      stop-color="${Number(data.pvPercentageBat) === 100 ? data.solarColour : (Number(data.gridPercentageBat) === 100 ? data.gridColour : data.batteryColour)}"/>
+                                      stop-color="${data.batteryColour}"/>
                             </linearGradient>
                         </defs>
                         <path class="${!config.show_battery ? 'st12' : ''}"
@@ -776,9 +776,9 @@ export const compactCard = (config: sunsynkPowerFlowCardConfig, inverterImg: str
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
                                     stop-color="${data.batteryPercentage > 0 ? data.batteryColour : data.solarColour}"/>
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                                 <stop offset="100%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                             </linearGradient>
                         </defs>
                         <path fill="${config.load.dynamic_colour ? 'url(#Lg)' : data.loadColour}"

diff --git a/src/cards/full-card.ts b/src/cards/full-card.ts
@@ -805,9 +805,9 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                                 <stop offset="${(Number(data.pvPercentageBat < 2 ? 0 : data.pvPercentageBat) + Number(data.gridPercentageBat < 2 ? 0 : data.gridPercentageBat))}%"
                                       stop-color="${Number(data.gridPercentageBat) > 0 ? `${data.gridColour}` : `${data.batteryColour}`}"/>
                                 <stop offset="${(Number(data.pvPercentageBat < 2 ? 0 : data.pvPercentageBat) + Number(data.gridPercentageBat < 2 ? 0 : data.gridPercentageBat))}%"
-                                      stop-color="${Number(data.pvPercentageBat) === 100 ? data.solarColour : (Number(data.gridPercentageBat) === 100 ? data.gridColour : data.batteryColour)}"/>
+                                      stop-color="${data.batteryColour}"/>
                                 <stop offset="100%"
-                                      stop-color="${Number(data.pvPercentageBat) === 100 ? data.solarColour : (Number(data.gridPercentageBat) === 100 ? data.gridColour : data.batteryColour)}"/>
+                                      stop-color="${data.batteryColour}"/>
                             </linearGradient>
                         </defs>
                         <path class="${!config.show_battery ? 'st12' : ''}"
@@ -1079,9 +1079,9 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
                                     stop-color="${data.batteryPercentage > 0 ? data.batteryColour : data.solarColour}"/>
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                                 <stop offset="100%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                             </linearGradient>
                         </defs>
                         <path display="${[1, 2].includes(data.additionalLoad) && !data.showAux ? '' : 'none'}"
@@ -1101,9 +1101,9 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
                                     stop-color="${data.batteryPercentage > 0 ? data.batteryColour : data.solarColour}"/>
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                                 <stop offset="100%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                             </linearGradient>
                         </defs>
                         <path display="${([1, 2].includes(data.additionalLoad) && data.showAux) ? '' : 'none'}"
@@ -1123,9 +1123,9 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
                                     stop-color="${data.batteryPercentage > 0 ? data.batteryColour : data.solarColour}"/>
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                                 <stop offset="100%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                             </linearGradient>
                         </defs>
                         <path display="${[4].includes(data.additionalLoad) && !data.showAux ? '' : 'none'}"
@@ -1146,9 +1146,9 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
                                     stop-color="${data.batteryPercentage > 0 ? data.batteryColour : data.solarColour}"/>
                                 <stop offset="${(data.gridPercentage + data.batteryPercentage)}%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                                 <stop offset="100%"
-                                    stop-color="${data.pvPercentage > 0 ? data.solarColour : data.solarColour}"/>
+                                    stop-color="${data.solarColour}"/>
                             </linearGradient>
                         </defs>
                         <path display="${[1, 2, 3, 4].includes(data.additionalLoad) ? 'none' : ''}"

diff --git a/src/editor.ts b/src/editor.ts
@@ -139,8 +139,11 @@ export class SunSynkCardEditor extends ScopedRegistryHost(LitElement) implements
                                 type: "grid",
                                 schema: [   
                                     {name: 'energy', selector: {number: {min: 0,}}},
-                                    //{name: "energy", selector: {entity: {device_class: SensorDeviceClass.ENERGY}}},
+                                    {name: "energy", selector: {entity: {}}},
                                     {name: 'shutdown_soc', selector: {number: {mode: 'box', min: 0, max: 100,}}},
+                                    {name: 'shutdown_soc', selector: {entity: {}}},
+                                    {name: 'shutdown_soc_offgrid', selector: {number: {mode: 'box', min: 0, max: 100,}}},
+                                    {name: 'shutdown_soc_offgrid', selector: {entity: {}}},
                                     {name: 'show_daily', selector: {boolean: {}}},
                                     {name: 'auto_scale', selector: {boolean: {}}},
                                     {name: 'invert_power', selector: {boolean: {}}},
@@ -154,6 +157,7 @@ export class SunSynkCardEditor extends ScopedRegistryHost(LitElement) implements
                                     {name: 'show_remaining_energy', selector: {boolean: {}}},
                                     {name: 'animation_speed', selector: {number: {}}},
                                     {name: 'max_power', selector: {number: {}}},
+                                    {name: 'max_power', selector: {entity: {}}},
                                 ]
                             }]
                         },

diff --git a/src/localize/languages/ca.json b/src/localize/languages/ca.json
@@ -140,6 +140,7 @@
       "invert_grid": "Invert Values",
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energy",
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",

diff --git a/src/localize/languages/cs.json b/src/localize/languages/cs.json
@@ -141,6 +141,7 @@
       "invert_grid": "Invert Values",
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energy",
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",

diff --git a/src/localize/languages/da.json b/src/localize/languages/da.json
@@ -141,6 +141,7 @@
       "invert_grid": "Inverter Værdier",
       "invert_load": "Inverter Værdier",
       "shutdown_soc": "Nedluknings SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energi",
       "auto_scale": "Auto Skalering",
       "three_phase": "Tre Faser",

diff --git a/src/localize/languages/de.json b/src/localize/languages/de.json
@@ -140,6 +140,7 @@
       "invert_grid": "Invert Values",
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energy",
       "aux_dynamic_colour": "Aux Dynamic Colour",
       "auto_scale": "Auto Scale",

diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json
@@ -141,6 +141,7 @@
     "invert_grid": "Invert Values",
     "invert_load": "Invert Values",
     "shutdown_soc": "Shutdown SOC",
+    "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
     "energy": "Energy",
     "auto_scale": "Auto Scale",
     "three_phase": "Three Phase",

diff --git a/src/localize/languages/es.json b/src/localize/languages/es.json
@@ -141,6 +141,7 @@
       "invert_grid": "Invert Values",
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energy",
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",

diff --git a/src/localize/languages/et.json b/src/localize/languages/et.json
@@ -141,6 +141,7 @@
       "invert_grid": "Invert Values",
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energy",
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",

diff --git a/src/localize/languages/fr.json b/src/localize/languages/fr.json
@@ -141,6 +141,7 @@
       "invert_grid": "Invert Values",
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energy",
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",

diff --git a/src/localize/languages/it.json b/src/localize/languages/it.json
@@ -141,6 +141,7 @@
       "invert_grid": "Invert Values",
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energy",
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",

diff --git a/src/localize/languages/nl.json b/src/localize/languages/nl.json
@@ -141,6 +141,7 @@
       "invert_grid": "Invert Values",
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energy",
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",

diff --git a/src/localize/languages/pt-br.json b/src/localize/languages/pt-br.json
@@ -141,6 +141,7 @@
       "invert_grid": "Inverter Valores",
       "invert_load": "Inverter Valores",
       "shutdown_soc": "Desligamento do SOC",
+      "shutdown_soc_offgrid": "Shutdown SOC (Off Grid)",
       "energy": "Energia",
       "auto_scale": "Escala automática",
       "three_phase": "Trifásico",