OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code style changes to evcc widget

Browse Source
This commit is contained in:
shamoon 2023-05-17 09:57:43 -07:00
parent 93ba5d3c92
commit a136c6bdc4
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/locales/en/common.json
View File

@ -93,11 +93,12 @@
"songs": "Songs" "songs": "Songs"
}, },
"evcc": { "evcc": {
"pvPower": "Production", "pv_power": "Production",
"batterySoc": "Battery", "battery_soc": "Battery",
"gridpower": "Grid", "grid_power": "Grid",
"homepower": "Consumption", "home_power": "Consumption",
"chargePower": "Charger" "charge_power": "Charger",
"watt_hour": "Wh"
}, },
"flood": { "flood": {
"download": "Download", "download": "Download",

25
src/widgets/evcc/component.jsx
View File

@ -8,30 +8,29 @@ export default function Component({ service }) {
const { t } = useTranslation(); const { t } = useTranslation();
const { widget } = service; const { widget } = service;
const { data: resultData, error: resultError } = useWidgetAPI(widget, "result"); const { data: stateData, error: stateError } = useWidgetAPI(widget, "state");
if (stateError) {
if (resultError) { return <Container service={service} error={stateError} />;
return <Container service={service} error={resultError} />;
} }
if (!resultData) { if (!stateData) {
return ( return (
<Container service={service}>, <Container service={service}>,
<Block label="evcc.pvPower" /> <Block label="evcc.pv_power" />
<Block label="evcc.gridpower" /> <Block label="evcc.grid_power" />
<Block label="evcc.homepower" /> <Block label="evcc.home_power" />
<Block label="evcc.chargePower"/> <Block label="evcc.charge_power"/>
</Container> </Container>
); );
} }
return ( return (
<Container service={service}> <Container service={service}>
<Block label="evcc.pvPower" value={t("common.number", { value: resultData.result.pvPower })} /> <Block label="evcc.pv_power" value={`${t("common.number", { value: stateData.result.pvPower })} ${t("evcc.watt_hour")}`} />
<Block label="evcc.gridpower" value={t("common.number", { value: resultData.result.gridPower })} /> <Block label="evcc.grid_power" value={`${t("common.number", { value: stateData.result.gridPower })} ${t("evcc.watt_hour")}`} />
<Block label="evcc.homepower" value={t("common.number", { value: resultData.result.homePower }) } /> <Block label="evcc.home_power" value={`${t("common.number", { value: stateData.result.homePower })} ${t("evcc.watt_hour")}`} />
<Block label="evcc.chargePower" value={t("common.number", { value: resultData.result.loadpoints[0].chargePower })} /> <Block label="evcc.charge_power" value={`${t("common.number", { value: stateData.result.loadpoints[0].chargePower })} ${t("evcc.watt_hour")}`} />
</Container> </Container>
); );
} }

2
src/widgets/evcc/widget.js
View File

@ -5,7 +5,7 @@ const widget = {
proxyHandler: genericProxyHandler, proxyHandler: genericProxyHandler,
mappings: { mappings: {
result: { state: {
endpoint: "state", endpoint: "state",
} }
}, },