andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 08:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'emsesp:dev' into dev

Browse Source
This commit is contained in:
Proddy
2024-04-26 20:33:59 +02:00
committed by GitHub
parent 56c9d3c265 aeb10aa6ab
commit 444bd67f07
24 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/project/ApplicationSettings.tsx
View File

@@ -644,7 +644,7 @@ const ApplicationSettings: FC = () => {
margin="normal"
select
>
<MenuItem value={1}>{LL.VALUE(1)}</MenuItem>
<MenuItem value={1}>{LL.VALUE(5)}</MenuItem>
<MenuItem value={2}>{LL.INDEX()}</MenuItem>
</TextField>
</Grid>

4
interface/src/project/CustomEntities.tsx
View File

@@ -248,8 +248,8 @@ const CustomEntities: FC = () => {
<HeaderCell stiff>{LL.ID_OF(LL.DEVICE())}</HeaderCell>
<HeaderCell stiff>{LL.ID_OF(LL.TYPE(1))}</HeaderCell>
<HeaderCell stiff>{LL.OFFSET()}</HeaderCell>
<HeaderCell stiff>{LL.TYPE(1)}</HeaderCell>
<HeaderCell stiff>{LL.VALUE(1)}</HeaderCell>
<HeaderCell stiff>{LL.TYPE(0)}</HeaderCell>
<HeaderCell stiff>{LL.VALUE(0)}</HeaderCell>
</HeaderRow>
</Header>
<Body>

6
interface/src/project/CustomEntitiesDialog.tsx
View File

@@ -113,7 +113,7 @@ const CustomEntitiesDialog = ({
<Grid item xs={4}>
<TextField
name="ram"
label={LL.VALUE(1) + ' ' + LL.TYPE(1)}
label={LL.VALUE(0) + ' ' + LL.TYPE(1)}
value={editItem.ram}
variant="outlined"
onChange={updateFormValue}
@@ -129,7 +129,7 @@ const CustomEntitiesDialog = ({
<Grid item xs={4}>
<TextField
name="value"
label={LL.DEFAULT(0) + ' ' + LL.VALUE(1)}
label={LL.DEFAULT(0) + ' ' + LL.VALUE(0)}
value={editItem.value}
variant="outlined"
onChange={updateFormValue}
@@ -202,7 +202,7 @@ const CustomEntitiesDialog = ({
<Grid item xs={4}>
<TextField
name="value_type"
label={LL.VALUE(1) + ' ' + LL.TYPE(1)}
label={LL.VALUE(0) + ' ' + LL.TYPE(1)}
value={editItem.value_type}
variant="outlined"
onChange={updateFormValue}

2
interface/src/project/Devices.tsx
View File

@@ -357,7 +357,7 @@ const Devices: FC = () => {
{
accessor: (dv: DeviceValue) =>
typeof dv.v === 'number' ? new Intl.NumberFormat().format(dv.v) : dv.v,
name: LL.VALUE(1)
name: LL.VALUE(0)
},
{
accessor: (dv: DeviceValue) =>

8
interface/src/project/DevicesDialog.tsx
View File

@@ -106,7 +106,7 @@ const DevicesDialog = ({
? LL.RUN_COMMAND()
: writeable
? LL.CHANGE_VALUE()
: LL.VALUE(1)}
: LL.VALUE(0)}
</DialogTitle>
<DialogContent dividers>
<Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
@@ -117,7 +117,7 @@ const DevicesDialog = ({
{editItem.l ? (
<TextField
name="v"
label={LL.VALUE(1)}
label={LL.VALUE(0)}
value={editItem.v}
disabled={!writeable}
autoFocus
@@ -135,7 +135,7 @@ const DevicesDialog = ({
<ValidatedTextField
fieldErrors={fieldErrors}
name="v"
label={LL.VALUE(1)}
label={LL.VALUE(0)}
value={numberValue(Math.round((editItem.v as number) * 10) / 10)}
autoFocus
disabled={!writeable}
@@ -159,7 +159,7 @@ const DevicesDialog = ({
<ValidatedTextField
fieldErrors={fieldErrors}
name="v"
label={LL.VALUE(1)}
label={LL.VALUE(0)}
value={editItem.v}
disabled={!writeable}
autoFocus

2
interface/src/project/Scheduler.tsx
View File

@@ -247,7 +247,7 @@ const Scheduler: FC = () => {
<HeaderCell stiff>{LL.SCHEDULE(0)}</HeaderCell>
<HeaderCell stiff>{LL.TIME(0)}</HeaderCell>
<HeaderCell stiff>{LL.COMMAND(0)}</HeaderCell>
<HeaderCell stiff>{LL.VALUE(1)}</HeaderCell>
<HeaderCell stiff>{LL.VALUE(0)}</HeaderCell>
<HeaderCell stiff>{LL.NAME(0)}</HeaderCell>
</HeaderRow>
</Header>

2
interface/src/project/SchedulerDialog.tsx
View File

@@ -238,7 +238,7 @@ const SchedulerDialog = ({
/>
<TextField
name="value"
label={LL.VALUE(1)}
label={LL.VALUE(0)}
multiline
margin="normal"
fullWidth

4
interface/src/project/SensorsAnalogDialog.tsx
View File

@@ -199,7 +199,7 @@ const SensorsAnalogDialog = ({
<Grid item xs={4}>
<TextField
name="o"
label={LL.VALUE(1)}
label={LL.VALUE(0)}
value={numberValue(editItem.o)}
fullWidth
type="number"
@@ -216,7 +216,7 @@ const SensorsAnalogDialog = ({
<Grid item xs={4}>
<TextField
name="o"
label={LL.VALUE(1)}
label={LL.VALUE(0)}
value={numberValue(editItem.o)}
fullWidth
select