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

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

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

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

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

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

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

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

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