Merge pull request #2542 from bcgov/feat/prashanth-edit-addr-analyst-2515

Feat: LCFS - Edit Address in CR for analyst #2515

Author: prv-proton

backend/lcfs/web/api/calculator/repo.py

@@ -299,14 +299,7 @@ async def get_fuel_type_options(
             query = query.where(FuelCategory.fuel_category_id == fuel_category_id)
         if fuel_type_id:
             query = query.where(FuelType.fuel_type_id == fuel_type_id)
-            print("Generated SQL Query:")
-        from sqlalchemy.dialects import postgresql
 
-        print(
-            query.compile(
-                dialect=postgresql.dialect(), compile_kwargs={"literal_binds": True}
-            )
-        )
         fuel_type_results = (await self.db.execute(query)).all()
 
         return {

backend/lcfs/web/api/compliance_report/summary_repo.py

@@ -144,7 +144,10 @@ async def get_previous_summary(
             )
             .limit(1)
         )
-        return result.scalars().first().summary
+        previous_report = result.scalars().first()
+        if previous_report is not None:
+            return previous_report.summary
+        return None
 
     @repo_handler
     async def get_transferred_out_compliance_units(
@@ -213,13 +216,17 @@ def aggregate_quantities(
                 and record.fuel_type.fossil_derived == fossil_derived
             ):
                 fuel_category = self._format_category(record.fuel_category.category)
-                fuel_quantities[fuel_category] += record.quantity
+                fuel_quantities[fuel_category] = fuel_quantities.get(
+                    fuel_category, 0
+                ) + (record.quantity or 0)
             elif (
                 isinstance(record, OtherUses)
                 and record.fuel_type.fossil_derived == fossil_derived
             ):
                 fuel_category = self._format_category(record.fuel_category.category)
-                fuel_quantities[fuel_category] += record.quantity_supplied
+                fuel_quantities[fuel_category] = fuel_quantities.get(
+                    fuel_category, 0
+                ) + (record.quantity_supplied or 0)
 
         return dict(fuel_quantities)
 

frontend/src/assets/locales/en/reports.json

@@ -12,15 +12,14 @@
   },
   "noReportsFound": "No compliance reports found",
   "serviceAddrLabel": "Address for service",
+  "hoAddrLabel": "Head office (optional)",
+  "hoAddrLabelView": "Head office address",
+  "hoAddrLabelEdit": "Head office address (can be an international address)",
   "orgDetailsForm": {
     "serviceAddrLabelView": "Address for service in B.C.",
     "serviceAddrLabelEdit": "Address for service in B.C. (postal address)",
-    "bcRecordLabelView": "Address in B.C. (where records are maintained)",
-    "bcRecordLabelEdit": "Address in B.C. (where records are maintained, optional)"
+    "bcRecordLabel": "Address in B.C. where records are maintained"
   },
-  "hoAddrLabel": "Head office (optional)",
-  "hoAddrLabelView": "Head office address",
-  "hoAddrLabelEdit": "Head office address (can be an international address, optional)",
   "bcRecordLabel": "Address in B.C. (where records are maintained)",
   "activityHdrLabel": "Did <b>{{name}}</b> engage in any of the following activities between January 1, {{period}}, and December 31, {{period}}?",
   "quarterlyActivityHdrLabel": "Report your quarter {{quarter}} fuel supply as well as any supporting documents.",

frontend/src/components/BCDataGrid/BCGridViewer.jsx

@@ -113,7 +113,11 @@ export const BCGridViewer = forwardRef(
           })
         ]
 
-        onPaginationChange({ ...paginationOptions, page: 1, filters: filterArr })
+        onPaginationChange({
+          ...paginationOptions,
+          page: 1,
+          filters: filterArr
+        })
         sessionStorage.setItem(`${gridKey}-filter`, JSON.stringify(gridFilters))
       },
       [gridKey, onPaginationChange, paginationOptions.filters]
@@ -184,7 +188,7 @@ export const BCGridViewer = forwardRef(
           defaultColDef={{ ...defaultColDefParams, ...defaultColDef }}
           columnDefs={columnDefs}
           gridOptions={gridOptions}
-          rowData={!isLoading && data[dataKey]}
+          rowData={!isLoading && (data[dataKey] || [])}
           onGridReady={onGridReady}
           onSortChanged={handleSortChanged}
           onFilterChanged={handleFilterChanged}

frontend/src/views/ComplianceReports/components/AssessmentCard.jsx

@@ -8,6 +8,7 @@ import { roles } from '@/constants/roles'
 import { apiRoutes } from '@/constants/routes/index.js'
 import { COMPLIANCE_REPORT_STATUSES } from '@/constants/statuses'
 import { useCreateSupplementalReport } from '@/hooks/useComplianceReports'
+import { useCurrentUser } from '@/hooks/useCurrentUser'
 import { useOrganizationSnapshot } from '@/hooks/useOrganizationSnapshot.js'
 import { useApiService } from '@/services/useApiService.js'
 import { HistoryCard } from '@/views/ComplianceReports/components/HistoryCard.jsx'
@@ -32,6 +33,7 @@ export const AssessmentCard = ({
   const { t } = useTranslation(['report', 'org'])
   const navigate = useNavigate()
   const apiService = useApiService()
+  const { hasRoles } = useCurrentUser()
 
   const [isEditing, setIsEditing] = useState(false)
 
@@ -85,6 +87,15 @@ export const AssessmentCard = ({
     return chain.filter((report) => report.history && report.history.length > 0)
   }, [chain])
 
+  const isAddressEditable = useMemo(() => {
+    return (
+      !isEditing &&
+      (currentStatus === COMPLIANCE_REPORT_STATUSES.DRAFT ||
+        (hasRoles(roles.analyst) &&
+          currentStatus === COMPLIANCE_REPORT_STATUSES.SUBMITTED))
+    )
+  }, [isEditing, currentStatus, hasRoles])
+
   return (
     <BCWidgetCard
       component="div"
@@ -97,12 +108,11 @@ export const AssessmentCard = ({
           : t('report:orgDetails')
       }
       editButton={
-        (!isEditing &&
-          currentStatus === COMPLIANCE_REPORT_STATUSES.DRAFT && {
-            onClick: onEdit,
-            text: 'Edit',
-            id: 'edit'
-          }) ||
+        (isAddressEditable && {
+          onClick: onEdit,
+          text: 'Edit',
+          id: 'edit'
+        }) ||
         null
       }
       content={
@@ -167,7 +177,7 @@ export const AssessmentCard = ({
                           onClick={() => {
                             createSupplementalReport()
                           }}
-                          startIcon={<Assignment />}
+                          startIcon={<Assignment fontSize="1rem !important" />}
                           sx={{ mt: 3 }}
                           disabled={isLoading}
                         >

frontend/src/views/ComplianceReports/components/OrganizationAddress.jsx

@@ -238,9 +238,7 @@ export const OrganizationAddress = ({
     },
     {
       name: 'recordsAddress',
-      label: isEditing
-        ? t('report:orgDetailsForm.bcRecordLabelEdit')
-        : t('report:orgDetailsForm.bcRecordLabelView'),
+      label: t('report:orgDetailsForm.bcRecordLabel'),
       checkbox: true,
       checkboxLabel: 'same as address for service',
       onCheckboxChange: handleSameAddressChange,

frontend/src/views/ComplianceReports/components/ReportDetails.jsx

@@ -50,7 +50,8 @@ import {
   DeleteOutline,
   Edit,
   ExpandMore,
-  InfoOutlined
+  InfoOutlined,
+  NewReleasesOutlined
 } from '@mui/icons-material'
 
 const chipStyles = {
@@ -379,6 +380,15 @@ const ReportDetails = ({ canEdit, currentStatus = 'Draft', userRoles }) => {
         return (
           ((scheduleData && !isArrayEmpty(scheduleData)) || hasVersions) && (
             <Accordion
+              sx={{
+                '& .Mui-disabled': {
+                  backgroundColor: colors.light.main,
+                  opacity: '0.8 !important',
+                  '& .MuiTypography-root': {
+                    color: 'initial !important',
+                  }
+                }
+              }}
               key={index}
               expanded={
                 expanded.includes(`panel${index}`) &&
@@ -423,7 +433,20 @@ const ReportDetails = ({ canEdit, currentStatus = 'Draft', userRoles }) => {
                     </Role>
                   )}{' '}
                   {wasEdited(data?.[activity.key]) && (
-                    <StyledChip color="primary" label="Edited" />
+                    <Chip
+                      aria-label="changes were made since original report"
+                      icon={<NewReleasesOutlined fontSize="small" />}
+                      label={t('Edited')}
+                      size="small"
+                      sx={{
+                        ...chipStyles,
+                        color: colors.alerts.success.color,
+                        '& .MuiChip-icon': {
+                          color: colors.alerts.success.color
+                        },
+                        backgroundImage: `linear-gradient(195deg, ${colors.alerts.success.border},${colors.alerts.success.background})`
+                      }}
+                    />
                   )}
                 </BCTypography>
                 {allRecordsDeleted && (

frontend/src/views/ComplianceReports/components/__tests__/OrganizationAddress.test.jsx

@@ -216,7 +216,7 @@ describe('OrganizationAddress', () => {
 
     // The same check applies to the records address label:
     expect(
-      screen.getByText('report:orgDetailsForm.bcRecordLabelView:')
+      screen.getByText('report:orgDetailsForm.bcRecordLabel:')
     ).toBeInTheDocument()
     // No "Required" label for empty optional address
     expect(screen.queryByText('Required')).not.toBeInTheDocument()