-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release-0.2.0' into LCFS-1581-EditIconIDIRUsers
- Loading branch information
Showing
8 changed files
with
685 additions
and
3 deletions.
There are no files selected for viewing
177 changes: 177 additions & 0 deletions
177
backend/lcfs/db/migrations/versions/2025-01-06-22-09_fa98709e7952.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| """Add legacy fuel types | ||
| Revision ID: fa98709e7952 | ||
| Revises: 94306eca5261 | ||
| Create Date: 2025-01-06 22:09:52.936619 | ||
| """ | ||
|
|
||
| import sqlalchemy as sa | ||
| from alembic import op | ||
|
|
||
| # revision identifiers, used by Alembic. | ||
| revision = "fa98709e7952" | ||
| down_revision = "94306eca5261" | ||
| branch_labels = None | ||
| depends_on = None | ||
|
|
||
|
|
||
| def upgrade(): | ||
| op.execute( | ||
| """ | ||
| INSERT INTO fuel_type ( | ||
| fuel_type, | ||
| fossil_derived, | ||
| other_uses_fossil_derived, | ||
| default_carbon_intensity, | ||
| units, | ||
| unrecognized, | ||
| create_user, | ||
| update_user, | ||
| is_legacy | ||
| ) | ||
| VALUES | ||
| -- 1) Natural gas-based gasoline | ||
| ( | ||
| 'Natural gas-based gasoline', | ||
| FALSE, | ||
| TRUE, | ||
| 90.07, | ||
| 'Litres', | ||
| FALSE, | ||
| 'no_user', | ||
| 'no_user', | ||
| TRUE | ||
| ), | ||
| -- 2) Petroleum-based diesel | ||
| ( | ||
| 'Petroleum-based diesel', | ||
| FALSE, | ||
| TRUE, | ||
| 94.76, | ||
| 'Litres', | ||
| FALSE, | ||
| 'no_user', | ||
| 'no_user', | ||
| TRUE | ||
| ), | ||
| -- 3) Petroleum-based gasoline | ||
| ( | ||
| 'Petroleum-based gasoline', | ||
| FALSE, | ||
| TRUE, | ||
| 88.14, | ||
| 'Litres', | ||
| FALSE, | ||
| 'no_user', | ||
| 'no_user', | ||
| TRUE | ||
| ); | ||
| """ | ||
| ) | ||
|
|
||
| op.execute( | ||
| """ | ||
| INSERT INTO energy_density ( | ||
| fuel_type_id, | ||
| density, | ||
| uom_id, | ||
| create_user, | ||
| update_user | ||
| ) | ||
| SELECT | ||
| ft.fuel_type_id, | ||
| CASE | ||
| WHEN ft.fuel_type = 'Natural gas-based gasoline' THEN 34.69 | ||
| WHEN ft.fuel_type = 'Petroleum-based diesel' THEN 38.65 | ||
| WHEN ft.fuel_type = 'Petroleum-based gasoline' THEN 34.69 | ||
| END AS density, | ||
| 1 AS uom_id, | ||
| 'no_user' AS create_user, | ||
| 'no_user' AS update_user | ||
| FROM fuel_type ft | ||
| WHERE ft.fuel_type IN ( | ||
| 'Natural gas-based gasoline', | ||
| 'Petroleum-based diesel', | ||
| 'Petroleum-based gasoline' | ||
| ); | ||
| """ | ||
| ) | ||
|
|
||
| op.execute( | ||
| """ | ||
| INSERT INTO energy_effectiveness_ratio ( | ||
| fuel_category_id, | ||
| fuel_type_id, | ||
| end_use_type_id, | ||
| ratio, | ||
| create_user, | ||
| update_user, | ||
| effective_date, | ||
| effective_status, | ||
| expiration_date | ||
| ) | ||
| SELECT | ||
| CASE | ||
| WHEN ft.fuel_type = 'Petroleum-based diesel' THEN 2 | ||
| ELSE 1 | ||
| END AS fuel_category_id, | ||
| ft.fuel_type_id, | ||
| NULL AS end_use_type_id, | ||
| 1.0 AS ratio, | ||
| 'no_user' AS create_user, | ||
| 'no_user' AS update_user, | ||
| CURRENT_DATE AS effective_date, | ||
| TRUE AS effective_status, | ||
| NULL AS expiration_date | ||
| FROM fuel_type ft | ||
| WHERE ft.fuel_type IN ( | ||
| 'Natural gas-based gasoline', | ||
| 'Petroleum-based diesel', | ||
| 'Petroleum-based gasoline' | ||
| ); | ||
| """ | ||
| ) | ||
|
|
||
|
|
||
| def downgrade(): | ||
| op.execute( | ||
| """ | ||
| DELETE FROM energy_effectiveness_ratio | ||
| WHERE fuel_type_id IN ( | ||
| SELECT fuel_type_id | ||
| FROM fuel_type | ||
| WHERE fuel_type IN ( | ||
| 'Natural gas-based gasoline', | ||
| 'Petroleum-based diesel', | ||
| 'Petroleum-based gasoline' | ||
| ) | ||
| ); | ||
| """ | ||
| ) | ||
|
|
||
| op.execute( | ||
| """ | ||
| DELETE FROM energy_density | ||
| WHERE fuel_type_id IN ( | ||
| SELECT fuel_type_id | ||
| FROM fuel_type | ||
| WHERE fuel_type IN ( | ||
| 'Natural gas-based gasoline', | ||
| 'Petroleum-based diesel', | ||
| 'Petroleum-based gasoline' | ||
| ) | ||
| ); | ||
| """ | ||
| ) | ||
|
|
||
| op.execute( | ||
| """ | ||
| DELETE FROM fuel_type | ||
| WHERE fuel_type IN ( | ||
| 'Natural gas-based gasoline', | ||
| 'Petroleum-based diesel', | ||
| 'Petroleum-based gasoline' | ||
| ); | ||
| """ | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
frontend/src/views/Dashboard/components/cards/bceid/OrgUserSettingsCard.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| import React from 'react' | ||
| import { List, ListItemButton, Stack, Typography } from '@mui/material' | ||
| import { useNavigate } from 'react-router-dom' | ||
| import { useTranslation } from 'react-i18next' | ||
| import BCWidgetCard from '@/components/BCWidgetCard/BCWidgetCard' | ||
| import BCTypography from '@/components/BCTypography' | ||
| import withRole from '@/utils/withRole' | ||
| import { nonGovRoles } from '@/constants/roles' | ||
| import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' | ||
| import { faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons' | ||
| import { useCurrentUser } from '@/hooks/useCurrentUser' | ||
| import { ROUTES } from '@/constants/routes' | ||
|
|
||
| const linkStyle = { | ||
| textDecoration: 'underline', | ||
| color: 'link.main', | ||
| '&:hover': { color: 'info.main' } | ||
| } | ||
|
|
||
| const UserSettingsLink = ({ onClick, children }) => ( | ||
| <ListItemButton onClick={onClick}> | ||
| <Typography variant="subtitle2" sx={linkStyle}> | ||
| {children} | ||
| </Typography> | ||
| </ListItemButton> | ||
| ) | ||
|
|
||
| const OrgUserSettingsCard = () => { | ||
| const { t } = useTranslation(['dashboard']) | ||
| const { data: currentUser } = useCurrentUser() | ||
| const navigate = useNavigate() | ||
|
|
||
| const { title, firstName, lastName } = currentUser || {} | ||
| const name = [firstName, lastName].filter(Boolean).join(' ') | ||
| const displayName = [name, title].filter(Boolean).join(', ') | ||
|
|
||
| return ( | ||
| <BCWidgetCard | ||
| component="div" | ||
| disableHover={true} | ||
| color="nav" | ||
| icon="user" | ||
| title={t('dashboard:orgUserSettings.title')} | ||
| content={ | ||
| <Stack spacing={1}> | ||
| <BCTypography | ||
| variant="body2" | ||
| sx={{ fontWeight: 'bold', color: '#003366' }} | ||
| > | ||
| {displayName} | ||
| </BCTypography> | ||
|
|
||
| <List component="nav" sx={{ maxWidth: '100%', mt: 1 }}> | ||
| <UserSettingsLink onClick={() => navigate(ROUTES.NOTIFICATIONS)}> | ||
| {t('dashboard:orgUserSettings.notifications')} | ||
| </UserSettingsLink> | ||
|
|
||
| <UserSettingsLink | ||
| onClick={() => navigate(ROUTES.NOTIFICATIONS_SETTINGS)} | ||
| > | ||
| {t('dashboard:orgUserSettings.configureNotifications')} | ||
| </UserSettingsLink> | ||
|
|
||
| {/* TODO: Update the link to the help page */} | ||
| <UserSettingsLink onClick={() => navigate()}> | ||
| {t('dashboard:orgUserSettings.help')} | ||
| <FontAwesomeIcon | ||
| icon={faArrowUpRightFromSquare} | ||
| style={{ color: '#578260', marginLeft: 6 }} | ||
| /> | ||
| </UserSettingsLink> | ||
| </List> | ||
| </Stack> | ||
| } | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| export default withRole(OrgUserSettingsCard, nonGovRoles) |
Oops, something went wrong.