Innovenergy
/
Innovenergy_trunk
3
1
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

city and model on list view

This commit is contained in:
Yinyin Liu 2026-04-29 14:34:20 +02:00
parent ed00b742a1
commit 49ae2b7806
6 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
typescript/frontend-marios2/src/content/dashboards/Installations/FlatInstallationView.tsx
View File

@ -327,21 +327,33 @@ const FlatInstallationView = (props: FlatInstallationViewProps) => {
<TableCell>
<FormattedMessage id="name" defaultMessage="Name" />
</TableCell>
{product === 4 && (
<TableCell>
<FormattedMessage id="model" defaultMessage="Model" />
</TableCell>
)}
<TableCell>
<FormattedMessage
id="location"
defaultMessage="Location"
/>
</TableCell>
<TableCell>
<FormattedMessage id="country" defaultMessage="Country" />
</TableCell>
{product !== 4 && (
<TableCell>
<FormattedMessage id="country" defaultMessage="Country" />
</TableCell>
)}
<TableCell>
<FormattedMessage
id="orderNumbers"
defaultMessage="Order Numbers"
/>
</TableCell>
{product === 4 && (
<TableCell>
<FormattedMessage id="city" defaultMessage="City" />
</TableCell>
)}
<TableCell>
<FormattedMessage id="status" defaultMessage="Status" />
</TableCell>
@ -396,6 +408,21 @@ const FlatInstallationView = (props: FlatInstallationViewProps) => {
</Typography>
</TableCell>
{product === 4 && (
<TableCell>
<Typography
variant="body2"
fontWeight="bold"
color="text.primary"
gutterBottom
noWrap
sx={{ marginTop: '10px', fontSize: 'small' }}
>
{installation.installationModel || ''}
</Typography>
</TableCell>
)}
<TableCell>
<Typography
variant="body2"
@ -409,18 +436,20 @@ const FlatInstallationView = (props: FlatInstallationViewProps) => {
</Typography>
</TableCell>
<TableCell>
<Typography
variant="body2"
fontWeight="bold"
color="text.primary"
gutterBottom
noWrap
sx={{ marginTop: '10px', fontSize: 'small' }}
>
{installation.country}
</Typography>
</TableCell>
{product !== 4 && (
<TableCell>
<Typography
variant="body2"
fontWeight="bold"
color="text.primary"
gutterBottom
noWrap
sx={{ marginTop: '10px', fontSize: 'small' }}
>
{installation.country}
</Typography>
</TableCell>
)}
<TableCell>
<Typography
@ -435,6 +464,21 @@ const FlatInstallationView = (props: FlatInstallationViewProps) => {
</Typography>
</TableCell>
{product === 4 && (
<TableCell>
<Typography
variant="body2"
fontWeight="bold"
color="text.primary"
gutterBottom
noWrap
sx={{ marginTop: '10px', fontSize: 'small' }}
>
{installation.city || ''}
</Typography>
</TableCell>
)}
<TableCell>
<div
style={{

12
typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/FlatInstallationView.tsx
View File

@ -136,16 +136,16 @@ const FlatInstallationView = (props: FlatInstallationViewProps) => {
<FormattedMessage id="name" defaultMessage="Name" />
</TableCell>
<TableCell>
<FormattedMessage id="installationSN" defaultMessage="Installation SN" />
<FormattedMessage id="model" defaultMessage="Model" />
</TableCell>
<TableCell>
<FormattedMessage id="DeviceType" defaultMessage="Device Type" />
</TableCell>
<TableCell>
<FormattedMessage id="canton" defaultMessage="Canton" />
<FormattedMessage id="installationSN" defaultMessage="Installation SN" />
</TableCell>
<TableCell>
<FormattedMessage id="country" defaultMessage="Country" />
<FormattedMessage id="city" defaultMessage="City" />
</TableCell>
<TableCell>
<FormattedMessage id="status" defaultMessage="Status" />
@ -202,7 +202,7 @@ const FlatInstallationView = (props: FlatInstallationViewProps) => {
noWrap
sx={{ marginTop: '10px', fontSize: 'small' }}
>
{installation.serialNumber}
{installation.installationModel || ''}
</Typography>
</TableCell>
@ -228,7 +228,7 @@ const FlatInstallationView = (props: FlatInstallationViewProps) => {
noWrap
sx={{ marginTop: '10px', fontSize: 'small' }}
>
{installation.canton || ''}
{installation.serialNumber}
</Typography>
</TableCell>
@ -241,7 +241,7 @@ const FlatInstallationView = (props: FlatInstallationViewProps) => {
noWrap
sx={{ marginTop: '10px', fontSize: 'small' }}
>
{installation.country}
{installation.city || ''}
</Typography>
</TableCell>

1
typescript/frontend-marios2/src/lang/de.json
View File

@ -82,6 +82,7 @@
"deleteInstallation": "Installation löschen",
"confirmDeleteInstallation": "Möchten Sie diese Installation löschen?",
"installationModel": "Installationsmodell",
"model": "Modell",
"externalEms": "Externes EMS",
"externalEmsOther": "Externes EMS (angeben)",
"emsNo": "Nein",

1
typescript/frontend-marios2/src/lang/en.json
View File

@ -64,6 +64,7 @@
"deleteInstallation": "Delete Installation",
"confirmDeleteInstallation": "Do you want to delete this installation?",
"installationModel": "Installation Model",
"model": "Model",
"externalEms": "External EMS",
"externalEmsOther": "External EMS (specify)",
"emsNo": "No",

1
typescript/frontend-marios2/src/lang/fr.json
View File

@ -76,6 +76,7 @@
"deleteInstallation": "Supprimer l'installation",
"confirmDeleteInstallation": "Voulez-vous supprimer cette installation ?",
"installationModel": "Modèle d'installation",
"model": "Modèle",
"externalEms": "EMS externe",
"externalEmsOther": "EMS externe (préciser)",
"emsNo": "Non",

1
typescript/frontend-marios2/src/lang/it.json
View File

@ -64,6 +64,7 @@
"deleteInstallation": "Elimina installazione",
"confirmDeleteInstallation": "Vuoi eliminare questa installazione?",
"installationModel": "Modello di installazione",
"model": "Modello",
"externalEms": "EMS esterno",
"externalEmsOther": "EMS esterno (specificare)",
"emsNo": "No",