Skip to content

Commit

Permalink
Merge branch 'release-0.2.0' into fix/hamed-relocate-comments-widget-…
Browse files Browse the repository at this point in the history
…1454
  • Loading branch information
dhaselhan authored Dec 18, 2024
2 parents 5ad8fc1 + deab8ae commit 3bc241e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions frontend/src/assets/locales/en/finalSupplyEquipment.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"fseTitle": "Final supply equipment (FSE)",
"addFSErowsTitle": "Add new final supply equipment(s) (FSE)",
"fseSubtitle": "Report dates of supply for your FSE. If your billing location is different from your equipment location provided below use the Notes field. Use the Notes field if you use any Other options.",
"reportingResponsibilityInfo": "If you are reporting on behalf of an FSE for which you hold allocated reporting responsibility, please list the utility account holder's organization name associated with the specific station, rather than your own organization's name.",
"newFinalSupplyEquipmentBtn": "New final supply equipment",
"noFinalSupplyEquipmentsFound": "No final supply equipments found",
"finalSupplyEquipmentDownloadBtn": "Download as Excel",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,19 @@ export const AddEditFinalSupplyEquipments = () => {
<BCTypography
variant="body4"
color="primary"
sx={{ marginY: '2rem' }}
sx={{ marginTop: '2rem' }}
component="div"
>
{t('finalSupplyEquipment:fseSubtitle')}
</BCTypography>
<BCTypography
variant="body4"
color="primary"
sx={{ marginBottom: '2rem', marginTop: '1rem' }}
component="div"
>
{t('finalSupplyEquipment:reportingResponsibilityInfo')}
</BCTypography>
</div>
<BCBox my={2} component="div" style={{ height: '100%', width: '100%' }}>
<BCGridEditor
Expand Down

0 comments on commit 3bc241e

Please sign in to comment.