Merge pull request #1898 from bcgov/fix/daniel-fixes-1871

fix: 2 Bug Fixes

Author: dhaselhan

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

@@ -105,12 +105,7 @@ def apply_sub_filters(self, pagination, conditions):
             elif filter.field == "organization":
                 continue
             elif filter.field == "type":
-                field = get_field_for_filter(ComplianceReport, "reporting_frequency")
-                filter_value = (
-                    ReportingFrequency.ANNUAL.value
-                    if filter_value.lower().startswith("c")
-                    else ReportingFrequency.QUARTERLY.value
-                )
+                field = get_field_for_filter(ComplianceReport, "nickname")
             elif filter.field == "compliance_period":
                 continue
             else:

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

@@ -99,10 +99,6 @@ async def create_supplemental_report(
         The report_id can be any report in the series (original or supplemental).
         Supplemental reports are only allowed if the status of the current report is 'Assessed'.
         """
-        # check if we're passing a specifc user otherwise use request user
-        if not user:
-            user = self.request.user
-
         # Fetch the current report using the provided report_id
         current_report = await self.repo.get_compliance_report_by_id(
             report_id, is_model=True

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

@@ -173,4 +173,4 @@ async def create_supplemental_report(
     """
     Create a supplemental compliance report.
     """
-    return await service.create_supplemental_report(report_id)
+    return await service.create_supplemental_report(report_id, request.user)

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

@@ -27,11 +27,7 @@ export const reportsColDefs = (t, bceidRole) => [
     field: 'type',
     headerName: t('report:reportColLabels.type'),
     flex: 2,
-    valueGetter: ({ data }) => {
-      const typeLabel = t('report:complianceReport')
-      const nickname = data.nickname ? ` - ${data.nickname}` : ''
-      return `${typeLabel}${nickname}`
-    },
+    valueGetter: ({ data }) => data.nickname,
     filter: 'agTextColumnFilter', // Enable text filtering
     filterParams: {
       textFormatter: (value) => value.replace(/\s+/g, '').toLowerCase(),