From a48a6aa285e7038fc1fff83c827545a23b3a24e5 Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Wed, 13 Nov 2024 12:30:46 -0800 Subject: [PATCH 1/4] chore: update ORI query and add json attributes in backend / frontend --- .../src/v1/ams-oracle-connector/omrr-query.ts | 107 +++++++++++++----- backend/src/v1/types/omrr-data.ts | 1 + frontend/src/interfaces/omrr.ts | 2 + 3 files changed, 83 insertions(+), 27 deletions(-) diff --git a/backend/src/v1/ams-oracle-connector/omrr-query.ts b/backend/src/v1/ams-oracle-connector/omrr-query.ts index 7e0e5f6d..b1e3cb3c 100644 --- a/backend/src/v1/ams-oracle-connector/omrr-query.ts +++ b/backend/src/v1/ams-oracle-connector/omrr-query.ts @@ -38,18 +38,9 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI NULL as "Domestic Septic Tank Sludge", NULL as "Hatchery Waste", NULL as "Manure", - NULL as "Milk Processing Waste" - from CORRAL_GENERATED_VIEWS.AUTHORIZATIONOBJECT, - CORRAL_GENERATED_VIEWS.CLIENT, - CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, - CORRAL_GENERATED_VIEWS.DISCHARGETYPE, - CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, - CORRAL_GENERATED_VIEWS.ADDRESS, - CORRAL_GENERATED_VIEWS.ADDRESS "ADDRESS_2", - CORRAL_GENERATED_VIEWS.Wdrschedule_One, - CORRAL_GENERATED_VIEWS.Wdrschedule_two, - CORRAL_GENERATED_VIEWS.Bceniccode n, - CORRAL_GENERATED_VIEWS.Bceniccode n2 + NULL as "Milk Processing Waste" + NULL as "Plant Matter Derived From Processing Plants" + from CORRAL_GENERATED_VIEWS.AUTHORIZATIONOBJECT, CORRAL_GENERATED_VIEWS.CLIENT, CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, CORRAL_GENERATED_VIEWS.DISCHARGETYPE, CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, CORRAL_GENERATED_VIEWS.ADDRESS, CORRAL_GENERATED_VIEWS.ADDRESS "ADDRESS_2", CORRAL_GENERATED_VIEWS.Wdrschedule_One, CORRAL_GENERATED_VIEWS.Wdrschedule_two, CORRAL_GENERATED_VIEWS.Bceniccode n, CORRAL_GENERATED_VIEWS.Bceniccode n2 where AUTHORIZATIONOBJECT.AUTHORIZATIONTYPEID = AUTHORIZATIONTYPE.AUTHTYPEOBJECTID(+) AND AUTHORIZATIONOBJECT.AUTHORIZATIONNUMBER IS NOT NULL AND AUTHORIZATIONOBJECT.APPLICANTCLIENTID = CLIENT.CLIENTID(+) @@ -66,18 +57,80 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI Wdrschedule_two.CodeOfPractice = 'Composting Operations' and AUTHORIZATIONOBJECT.STATUS !='Withdrawn' Union - Select Distinct To_Number(REGISTRATION.REGAUTHORIZATIONNUMBER) As "Authorization Number", DECODE(AUTHORIZATIONTYPE.AUTHORIZATIONNAME, 'Organic Matter Recycling Regulation', 'Notification') As "Authorization Type", Case When Upper (CLIENT.DoingBusinessAs) Is Not Null Then (Case When Upper (CLIENT.DUP_FORMATTEDNAME) Is Not Null Then Upper (CLIENT.DUP_FORMATTEDNAME) Else InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME) End ) ||' doing business as ' || Upper (CLIENT.DoingBusinessAs) Else NVL(Upper (CLIENT.DUP_FORMATTEDNAME), InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME)) End As "Regulated Party", Decode (REGISTRATION.STATE, 'Cancelled', 'Inactive', 'Expired', 'Inactive', 'Active', 'Active') As "Authorization Status", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.REGISTRATIONDATE) as "Effective/Issue Date", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.AmendmentDate) as "Last Amendment Date", ADDRESS_2.INLINEDISPLAY As "Facility Location", REGISTRATION.LATITUDE As "Latitude", -1.0000000*(REGISTRATION.LONGITUDE) As "Longitude", NULL as "Waste Discharge Regulation", CORRAL_GENERATED_VIEWS.REGISTRATION.OMOPERATIONTYPE as "Operation Type", CORRAL_GENERATED_VIEWS.REGISTRATION.OMLANDBASEDTYPEOFPRODUCTION as "Material Land Applied", CORRAL_GENERATED_VIEWS.REGISTRATION.INTENDEDDATESLANDAPPLICATION as "Intended Dates of Land Application", CORRAL_GENERATED_VIEWS.REGISTRATION.OMDESIGNCAPACITY as "Facility Design Capacity (t/y)", CORRAL_GENERATED_VIEWS.REGISTRATION.OMCOMPOSTFACILITYPRODUCTTYPE as "Type of Compost Produced", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.YARDWASTE, 'Y', 'Yes', 'N', 'No') as "Yard Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BIOSOLIDS, 'Y', 'Yes', 'N', 'No') as "Biosolids", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.WHEY, 'Y', 'Yes', 'N', 'No') as "Whey", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.UNTREATUNPROCESSWOODRESIDUALS, 'Y', 'Yes', 'N', 'No') as "Untreated and Unprocessed Wood Residuals", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.POULTRYCARCASSES, 'Y', 'Yes', 'N', 'No') as "Poultry Carcasses", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FISHWASTE, 'Y', 'Yes', 'N', 'No') as "Fish Wastes", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FOODWASTE, 'Y', 'Yes', 'N', 'No') as "Food Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BREWERYWASTEWINERYWASTE, 'Y', 'Yes', 'N', 'No') as "Brewary Waste/Wine Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.ANIMALBEDDING, 'Y', 'Yes', 'N', 'No') as "Animal Bedding", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.DOMESTICSEPTICTANKSLUDGE, 'Y', 'Yes', 'N', 'No') as "Domestic Septic Tank Sludge", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.HATCHERYWASTE, 'Y', 'Yes', 'N', 'No') as "Hatchery Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MANURE, 'Y', 'Yes', 'N', 'No') as "Manure", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MILKPROCESSINGWASTE, 'Y', 'Yes', 'N', 'No') as "Milk Processing Waste" - From CORRAL_GENERATED_VIEWS.REGISTRATION, CORRAL_GENERATED_VIEWS.REGISTRATION_2 r2, CORRAL_GENERATED_VIEWS.Bceniccode n, CORRAL_GENERATED_VIEWS.Bceniccode n2, CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, CORRAL_GENERATED_VIEWS.CLIENT, CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, CORRAL_GENERATED_VIEWS.DISCHARGETYPE, CORRAL_GENERATED_VIEWS.ADDRESS, CORRAL_GENERATED_VIEWS.ADDRESS ADDRESS_2, CORRAL_GENERATED_VIEWS.Wdrschedule_One, CORRAL_GENERATED_VIEWS.Wdrschedule_two - Where r2.PRIMARYBCENICID = n.OBJECTID(+) - And r2.SECONDARYBCENICID = n2.OBJECTID(+) - And REGISTRATION.AuthorizationTypeID = AUTHORIZATIONTYPE.AUTHTYPEOBJECTID - And r2.WDRSCHEDULE1ID = Wdrschedule_One.ObjectId(+) - And r2.WDRSCHEDULE2ID = Wdrschedule_Two.ObjectId(+) - And REGISTRATION.objectID = r2.OBJECTID - And REGISTRATION.APPLICANTCLIENTID = CLIENT.CLIENTID - And REGISTRATION.REGAUTHORIZATIONNUMBER = DISCHARGEPOINT.REGAUTHORIZATIONNUMBER(+) - And DISCHARGEPOINT.DISCHARGETYPEID = DISCHARGETYPE.DISCHARGETYPEID(+) - And REGISTRATION.MAILINGADDRESSID = ADDRESS.OBJECTID(+) - And REGISTRATION.ADDRESSID = ADDRESS_2.OBJECTID(+) - and AUTHORIZATIONTYPE.AUTHORIZATIONNAME ='Organic Matter Recycling Regulation' - and REGISTRATION.STATE !='Withdrawn'`; \ No newline at end of file +Select Distinct To_Number(REGISTRATION.REGAUTHORIZATIONNUMBER) As "Authorization Number", + DECODE(AUTHORIZATIONTYPE.AUTHORIZATIONNAME, 'Organic Matter Recycling Regulation', + 'Notification') As "Authorization Type", + Case + When Upper(CLIENT.DoingBusinessAs) Is Not Null Then (Case + When Upper(CLIENT.DUP_FORMATTEDNAME) Is Not Null + Then Upper(CLIENT.DUP_FORMATTEDNAME) + Else InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME) End) || + ' doing business as ' || + Upper(CLIENT.DoingBusinessAs) + Else NVL(Upper(CLIENT.DUP_FORMATTEDNAME), InitCap(CLIENT.FIRSTNAME) || ' ' || + InitCap(CLIENT.LASTNAME)) End As "Regulated Party", + Decode(REGISTRATION.STATE, 'Cancelled', 'Inactive', 'Expired', 'Inactive', 'Active', + 'Active') As "Authorization Status", + To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.REGISTRATIONDATE) as "Effective/Issue Date", + To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.AmendmentDate) as "Last Amendment Date", + ADDRESS_2.INLINEDISPLAY As "Facility Location", + REGISTRATION.LATITUDE As "Latitude", + -1.0000000 * (REGISTRATION.LONGITUDE) As "Longitude", + NULL as "Waste Discharge Regulation", + CORRAL_GENERATED_VIEWS.REGISTRATION.OMOPERATIONTYPE as "Operation Type", + CORRAL_GENERATED_VIEWS.REGISTRATION.OMLANDBASEDTYPEOFPRODUCTION as "Material Land Applied", + CORRAL_GENERATED_VIEWS.REGISTRATION.INTENDEDDATESLANDAPPLICATION as "Intended Dates of Land Application", + CORRAL_GENERATED_VIEWS.REGISTRATION.OMDESIGNCAPACITY as "Facility Design Capacity (t/y)", + CORRAL_GENERATED_VIEWS.REGISTRATION.OMCOMPOSTFACILITYPRODUCTTYPE as "Type of Compost Produced", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.YARDWASTE, 'Y', 'Yes', 'N', + 'No') as "Yard Waste", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.BIOSOLIDS, 'Y', 'Yes', 'N', + 'No') as "Biosolids", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.WHEY, 'Y', 'Yes', 'N', + 'No') as "Whey", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.UNTREATUNPROCESSWOODRESIDUALS, 'Y', 'Yes', 'N', + 'No') as "Untreated and Unprocessed Wood Residuals", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.POULTRYCARCASSES, 'Y', 'Yes', 'N', + 'No') as "Poultry Carcasses", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.FISHWASTE, 'Y', 'Yes', 'N', + 'No') as "Fish Wastes", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.FOODWASTE, 'Y', 'Yes', 'N', + 'No') as "Food Waste", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.BREWERYWASTEWINERYWASTE, 'Y', 'Yes', 'N', + 'No') as "Brewary Waste/Wine Waste", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.ANIMALBEDDING, 'Y', 'Yes', 'N', + 'No') as "Animal Bedding", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.DOMESTICSEPTICTANKSLUDGE, 'Y', 'Yes', 'N', + 'No') as "Domestic Septic Tank Sludge", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.HATCHERYWASTE, 'Y', 'Yes', 'N', + 'No') as "Hatchery Waste", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.MANURE, 'Y', 'Yes', 'N', + 'No') as "Manure", + Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.MILKPROCESSINGWASTE, 'Y', 'Yes', 'N', + 'No') as "Milk Processing Waste" + Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.PlantMatterFromProcessingPlant, 'Y','Yes', 'N' , 'No') as "Plant Matter Derived From Processing Plants" +From CORRAL_GENERATED_VIEWS.REGISTRATION, + CORRAL_GENERATED_VIEWS.REGISTRATION_2 r2, + CORRAL_GENERATED_VIEWS.Bceniccode n, + CORRAL_GENERATED_VIEWS.Bceniccode n2, + CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, + CORRAL_GENERATED_VIEWS.CLIENT, + CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, + CORRAL_GENERATED_VIEWS.DISCHARGETYPE, + CORRAL_GENERATED_VIEWS.ADDRESS, + CORRAL_GENERATED_VIEWS.ADDRESS ADDRESS_2, + CORRAL_GENERATED_VIEWS.Wdrschedule_One, + CORRAL_GENERATED_VIEWS.Wdrschedule_two +Where r2.PRIMARYBCENICID = n.OBJECTID(+) + And r2.SECONDARYBCENICID = n2.OBJECTID(+) + And REGISTRATION.AuthorizationTypeID = AUTHORIZATIONTYPE.AUTHTYPEOBJECTID + And r2.WDRSCHEDULE1ID = Wdrschedule_One.ObjectId(+) + And r2.WDRSCHEDULE2ID = Wdrschedule_Two.ObjectId(+) + And REGISTRATION.objectID = r2.OBJECTID + And REGISTRATION.APPLICANTCLIENTID = CLIENT.CLIENTID + And REGISTRATION.REGAUTHORIZATIONNUMBER = DISCHARGEPOINT.REGAUTHORIZATIONNUMBER(+) + And DISCHARGEPOINT.DISCHARGETYPEID = DISCHARGETYPE.DISCHARGETYPEID(+) + And REGISTRATION.MAILINGADDRESSID = ADDRESS.OBJECTID(+) + And REGISTRATION.ADDRESSID = ADDRESS_2.OBJECTID(+) + and AUTHORIZATIONTYPE.AUTHORIZATIONNAME = 'Organic Matter Recycling Regulation' + and REGISTRATION.STATE !='Withdrawn'`; diff --git a/backend/src/v1/types/omrr-data.ts b/backend/src/v1/types/omrr-data.ts index 56501234..be317d71 100644 --- a/backend/src/v1/types/omrr-data.ts +++ b/backend/src/v1/types/omrr-data.ts @@ -27,4 +27,5 @@ export interface OmrrData { 'Hatchery Waste'?: boolean, 'Manure'?: boolean, 'Milk Processing Waste'?: boolean, + 'Plant Matter Derived From Processing Plants'?: boolean, } diff --git a/frontend/src/interfaces/omrr.ts b/frontend/src/interfaces/omrr.ts index 56f9bd07..6398ead4 100644 --- a/frontend/src/interfaces/omrr.ts +++ b/frontend/src/interfaces/omrr.ts @@ -27,6 +27,7 @@ export default interface OmrrData { 'Hatchery Waste'?: boolean Manure?: boolean 'Milk Processing Waste'?: boolean + 'Plant Matter Derived From Processing Plants'?: boolean // Extracted from Facility Location - not all facilities will have this set 'Postal Code'?: string @@ -47,4 +48,5 @@ export const omrrDataBooleanFields: (keyof OmrrData)[] = [ 'Hatchery Waste', 'Manure', 'Milk Processing Waste', + 'Plant Matter Derived From Processing Plants' ] From 57159f632c5263ad40a355a331edf64ef779fa22 Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Wed, 13 Nov 2024 12:34:02 -0800 Subject: [PATCH 2/4] Revert "chore: update ORI query and add json attributes in backend / frontend" This reverts commit a48a6aa285e7038fc1fff83c827545a23b3a24e5. --- .../src/v1/ams-oracle-connector/omrr-query.ts | 107 +++++------------- backend/src/v1/types/omrr-data.ts | 1 - frontend/src/interfaces/omrr.ts | 2 - 3 files changed, 27 insertions(+), 83 deletions(-) diff --git a/backend/src/v1/ams-oracle-connector/omrr-query.ts b/backend/src/v1/ams-oracle-connector/omrr-query.ts index b1e3cb3c..7e0e5f6d 100644 --- a/backend/src/v1/ams-oracle-connector/omrr-query.ts +++ b/backend/src/v1/ams-oracle-connector/omrr-query.ts @@ -38,9 +38,18 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI NULL as "Domestic Septic Tank Sludge", NULL as "Hatchery Waste", NULL as "Manure", - NULL as "Milk Processing Waste" - NULL as "Plant Matter Derived From Processing Plants" - from CORRAL_GENERATED_VIEWS.AUTHORIZATIONOBJECT, CORRAL_GENERATED_VIEWS.CLIENT, CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, CORRAL_GENERATED_VIEWS.DISCHARGETYPE, CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, CORRAL_GENERATED_VIEWS.ADDRESS, CORRAL_GENERATED_VIEWS.ADDRESS "ADDRESS_2", CORRAL_GENERATED_VIEWS.Wdrschedule_One, CORRAL_GENERATED_VIEWS.Wdrschedule_two, CORRAL_GENERATED_VIEWS.Bceniccode n, CORRAL_GENERATED_VIEWS.Bceniccode n2 + NULL as "Milk Processing Waste" + from CORRAL_GENERATED_VIEWS.AUTHORIZATIONOBJECT, + CORRAL_GENERATED_VIEWS.CLIENT, + CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, + CORRAL_GENERATED_VIEWS.DISCHARGETYPE, + CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, + CORRAL_GENERATED_VIEWS.ADDRESS, + CORRAL_GENERATED_VIEWS.ADDRESS "ADDRESS_2", + CORRAL_GENERATED_VIEWS.Wdrschedule_One, + CORRAL_GENERATED_VIEWS.Wdrschedule_two, + CORRAL_GENERATED_VIEWS.Bceniccode n, + CORRAL_GENERATED_VIEWS.Bceniccode n2 where AUTHORIZATIONOBJECT.AUTHORIZATIONTYPEID = AUTHORIZATIONTYPE.AUTHTYPEOBJECTID(+) AND AUTHORIZATIONOBJECT.AUTHORIZATIONNUMBER IS NOT NULL AND AUTHORIZATIONOBJECT.APPLICANTCLIENTID = CLIENT.CLIENTID(+) @@ -57,80 +66,18 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI Wdrschedule_two.CodeOfPractice = 'Composting Operations' and AUTHORIZATIONOBJECT.STATUS !='Withdrawn' Union -Select Distinct To_Number(REGISTRATION.REGAUTHORIZATIONNUMBER) As "Authorization Number", - DECODE(AUTHORIZATIONTYPE.AUTHORIZATIONNAME, 'Organic Matter Recycling Regulation', - 'Notification') As "Authorization Type", - Case - When Upper(CLIENT.DoingBusinessAs) Is Not Null Then (Case - When Upper(CLIENT.DUP_FORMATTEDNAME) Is Not Null - Then Upper(CLIENT.DUP_FORMATTEDNAME) - Else InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME) End) || - ' doing business as ' || - Upper(CLIENT.DoingBusinessAs) - Else NVL(Upper(CLIENT.DUP_FORMATTEDNAME), InitCap(CLIENT.FIRSTNAME) || ' ' || - InitCap(CLIENT.LASTNAME)) End As "Regulated Party", - Decode(REGISTRATION.STATE, 'Cancelled', 'Inactive', 'Expired', 'Inactive', 'Active', - 'Active') As "Authorization Status", - To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.REGISTRATIONDATE) as "Effective/Issue Date", - To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.AmendmentDate) as "Last Amendment Date", - ADDRESS_2.INLINEDISPLAY As "Facility Location", - REGISTRATION.LATITUDE As "Latitude", - -1.0000000 * (REGISTRATION.LONGITUDE) As "Longitude", - NULL as "Waste Discharge Regulation", - CORRAL_GENERATED_VIEWS.REGISTRATION.OMOPERATIONTYPE as "Operation Type", - CORRAL_GENERATED_VIEWS.REGISTRATION.OMLANDBASEDTYPEOFPRODUCTION as "Material Land Applied", - CORRAL_GENERATED_VIEWS.REGISTRATION.INTENDEDDATESLANDAPPLICATION as "Intended Dates of Land Application", - CORRAL_GENERATED_VIEWS.REGISTRATION.OMDESIGNCAPACITY as "Facility Design Capacity (t/y)", - CORRAL_GENERATED_VIEWS.REGISTRATION.OMCOMPOSTFACILITYPRODUCTTYPE as "Type of Compost Produced", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.YARDWASTE, 'Y', 'Yes', 'N', - 'No') as "Yard Waste", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.BIOSOLIDS, 'Y', 'Yes', 'N', - 'No') as "Biosolids", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.WHEY, 'Y', 'Yes', 'N', - 'No') as "Whey", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.UNTREATUNPROCESSWOODRESIDUALS, 'Y', 'Yes', 'N', - 'No') as "Untreated and Unprocessed Wood Residuals", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.POULTRYCARCASSES, 'Y', 'Yes', 'N', - 'No') as "Poultry Carcasses", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.FISHWASTE, 'Y', 'Yes', 'N', - 'No') as "Fish Wastes", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.FOODWASTE, 'Y', 'Yes', 'N', - 'No') as "Food Waste", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.BREWERYWASTEWINERYWASTE, 'Y', 'Yes', 'N', - 'No') as "Brewary Waste/Wine Waste", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.ANIMALBEDDING, 'Y', 'Yes', 'N', - 'No') as "Animal Bedding", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.DOMESTICSEPTICTANKSLUDGE, 'Y', 'Yes', 'N', - 'No') as "Domestic Septic Tank Sludge", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.HATCHERYWASTE, 'Y', 'Yes', 'N', - 'No') as "Hatchery Waste", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.MANURE, 'Y', 'Yes', 'N', - 'No') as "Manure", - Decode(CORRAL_GENERATED_VIEWS.REGISTRATION.MILKPROCESSINGWASTE, 'Y', 'Yes', 'N', - 'No') as "Milk Processing Waste" - Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.PlantMatterFromProcessingPlant, 'Y','Yes', 'N' , 'No') as "Plant Matter Derived From Processing Plants" -From CORRAL_GENERATED_VIEWS.REGISTRATION, - CORRAL_GENERATED_VIEWS.REGISTRATION_2 r2, - CORRAL_GENERATED_VIEWS.Bceniccode n, - CORRAL_GENERATED_VIEWS.Bceniccode n2, - CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, - CORRAL_GENERATED_VIEWS.CLIENT, - CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, - CORRAL_GENERATED_VIEWS.DISCHARGETYPE, - CORRAL_GENERATED_VIEWS.ADDRESS, - CORRAL_GENERATED_VIEWS.ADDRESS ADDRESS_2, - CORRAL_GENERATED_VIEWS.Wdrschedule_One, - CORRAL_GENERATED_VIEWS.Wdrschedule_two -Where r2.PRIMARYBCENICID = n.OBJECTID(+) - And r2.SECONDARYBCENICID = n2.OBJECTID(+) - And REGISTRATION.AuthorizationTypeID = AUTHORIZATIONTYPE.AUTHTYPEOBJECTID - And r2.WDRSCHEDULE1ID = Wdrschedule_One.ObjectId(+) - And r2.WDRSCHEDULE2ID = Wdrschedule_Two.ObjectId(+) - And REGISTRATION.objectID = r2.OBJECTID - And REGISTRATION.APPLICANTCLIENTID = CLIENT.CLIENTID - And REGISTRATION.REGAUTHORIZATIONNUMBER = DISCHARGEPOINT.REGAUTHORIZATIONNUMBER(+) - And DISCHARGEPOINT.DISCHARGETYPEID = DISCHARGETYPE.DISCHARGETYPEID(+) - And REGISTRATION.MAILINGADDRESSID = ADDRESS.OBJECTID(+) - And REGISTRATION.ADDRESSID = ADDRESS_2.OBJECTID(+) - and AUTHORIZATIONTYPE.AUTHORIZATIONNAME = 'Organic Matter Recycling Regulation' - and REGISTRATION.STATE !='Withdrawn'`; + Select Distinct To_Number(REGISTRATION.REGAUTHORIZATIONNUMBER) As "Authorization Number", DECODE(AUTHORIZATIONTYPE.AUTHORIZATIONNAME, 'Organic Matter Recycling Regulation', 'Notification') As "Authorization Type", Case When Upper (CLIENT.DoingBusinessAs) Is Not Null Then (Case When Upper (CLIENT.DUP_FORMATTEDNAME) Is Not Null Then Upper (CLIENT.DUP_FORMATTEDNAME) Else InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME) End ) ||' doing business as ' || Upper (CLIENT.DoingBusinessAs) Else NVL(Upper (CLIENT.DUP_FORMATTEDNAME), InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME)) End As "Regulated Party", Decode (REGISTRATION.STATE, 'Cancelled', 'Inactive', 'Expired', 'Inactive', 'Active', 'Active') As "Authorization Status", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.REGISTRATIONDATE) as "Effective/Issue Date", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.AmendmentDate) as "Last Amendment Date", ADDRESS_2.INLINEDISPLAY As "Facility Location", REGISTRATION.LATITUDE As "Latitude", -1.0000000*(REGISTRATION.LONGITUDE) As "Longitude", NULL as "Waste Discharge Regulation", CORRAL_GENERATED_VIEWS.REGISTRATION.OMOPERATIONTYPE as "Operation Type", CORRAL_GENERATED_VIEWS.REGISTRATION.OMLANDBASEDTYPEOFPRODUCTION as "Material Land Applied", CORRAL_GENERATED_VIEWS.REGISTRATION.INTENDEDDATESLANDAPPLICATION as "Intended Dates of Land Application", CORRAL_GENERATED_VIEWS.REGISTRATION.OMDESIGNCAPACITY as "Facility Design Capacity (t/y)", CORRAL_GENERATED_VIEWS.REGISTRATION.OMCOMPOSTFACILITYPRODUCTTYPE as "Type of Compost Produced", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.YARDWASTE, 'Y', 'Yes', 'N', 'No') as "Yard Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BIOSOLIDS, 'Y', 'Yes', 'N', 'No') as "Biosolids", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.WHEY, 'Y', 'Yes', 'N', 'No') as "Whey", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.UNTREATUNPROCESSWOODRESIDUALS, 'Y', 'Yes', 'N', 'No') as "Untreated and Unprocessed Wood Residuals", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.POULTRYCARCASSES, 'Y', 'Yes', 'N', 'No') as "Poultry Carcasses", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FISHWASTE, 'Y', 'Yes', 'N', 'No') as "Fish Wastes", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FOODWASTE, 'Y', 'Yes', 'N', 'No') as "Food Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BREWERYWASTEWINERYWASTE, 'Y', 'Yes', 'N', 'No') as "Brewary Waste/Wine Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.ANIMALBEDDING, 'Y', 'Yes', 'N', 'No') as "Animal Bedding", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.DOMESTICSEPTICTANKSLUDGE, 'Y', 'Yes', 'N', 'No') as "Domestic Septic Tank Sludge", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.HATCHERYWASTE, 'Y', 'Yes', 'N', 'No') as "Hatchery Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MANURE, 'Y', 'Yes', 'N', 'No') as "Manure", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MILKPROCESSINGWASTE, 'Y', 'Yes', 'N', 'No') as "Milk Processing Waste" + From CORRAL_GENERATED_VIEWS.REGISTRATION, CORRAL_GENERATED_VIEWS.REGISTRATION_2 r2, CORRAL_GENERATED_VIEWS.Bceniccode n, CORRAL_GENERATED_VIEWS.Bceniccode n2, CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, CORRAL_GENERATED_VIEWS.CLIENT, CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, CORRAL_GENERATED_VIEWS.DISCHARGETYPE, CORRAL_GENERATED_VIEWS.ADDRESS, CORRAL_GENERATED_VIEWS.ADDRESS ADDRESS_2, CORRAL_GENERATED_VIEWS.Wdrschedule_One, CORRAL_GENERATED_VIEWS.Wdrschedule_two + Where r2.PRIMARYBCENICID = n.OBJECTID(+) + And r2.SECONDARYBCENICID = n2.OBJECTID(+) + And REGISTRATION.AuthorizationTypeID = AUTHORIZATIONTYPE.AUTHTYPEOBJECTID + And r2.WDRSCHEDULE1ID = Wdrschedule_One.ObjectId(+) + And r2.WDRSCHEDULE2ID = Wdrschedule_Two.ObjectId(+) + And REGISTRATION.objectID = r2.OBJECTID + And REGISTRATION.APPLICANTCLIENTID = CLIENT.CLIENTID + And REGISTRATION.REGAUTHORIZATIONNUMBER = DISCHARGEPOINT.REGAUTHORIZATIONNUMBER(+) + And DISCHARGEPOINT.DISCHARGETYPEID = DISCHARGETYPE.DISCHARGETYPEID(+) + And REGISTRATION.MAILINGADDRESSID = ADDRESS.OBJECTID(+) + And REGISTRATION.ADDRESSID = ADDRESS_2.OBJECTID(+) + and AUTHORIZATIONTYPE.AUTHORIZATIONNAME ='Organic Matter Recycling Regulation' + and REGISTRATION.STATE !='Withdrawn'`; \ No newline at end of file diff --git a/backend/src/v1/types/omrr-data.ts b/backend/src/v1/types/omrr-data.ts index be317d71..56501234 100644 --- a/backend/src/v1/types/omrr-data.ts +++ b/backend/src/v1/types/omrr-data.ts @@ -27,5 +27,4 @@ export interface OmrrData { 'Hatchery Waste'?: boolean, 'Manure'?: boolean, 'Milk Processing Waste'?: boolean, - 'Plant Matter Derived From Processing Plants'?: boolean, } diff --git a/frontend/src/interfaces/omrr.ts b/frontend/src/interfaces/omrr.ts index 6398ead4..56f9bd07 100644 --- a/frontend/src/interfaces/omrr.ts +++ b/frontend/src/interfaces/omrr.ts @@ -27,7 +27,6 @@ export default interface OmrrData { 'Hatchery Waste'?: boolean Manure?: boolean 'Milk Processing Waste'?: boolean - 'Plant Matter Derived From Processing Plants'?: boolean // Extracted from Facility Location - not all facilities will have this set 'Postal Code'?: string @@ -48,5 +47,4 @@ export const omrrDataBooleanFields: (keyof OmrrData)[] = [ 'Hatchery Waste', 'Manure', 'Milk Processing Waste', - 'Plant Matter Derived From Processing Plants' ] From 7cef24ed2be635f2c07ce07806fe938adcc0ecfd Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Wed, 13 Nov 2024 12:36:50 -0800 Subject: [PATCH 3/4] chore: reformat query to not show so many changes --- backend/src/v1/ams-oracle-connector/omrr-query.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/v1/ams-oracle-connector/omrr-query.ts b/backend/src/v1/ams-oracle-connector/omrr-query.ts index 7e0e5f6d..2bd997a9 100644 --- a/backend/src/v1/ams-oracle-connector/omrr-query.ts +++ b/backend/src/v1/ams-oracle-connector/omrr-query.ts @@ -38,7 +38,8 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI NULL as "Domestic Septic Tank Sludge", NULL as "Hatchery Waste", NULL as "Manure", - NULL as "Milk Processing Waste" + NULL as "Milk Processing Waste", + NULL as "Plant Matter Derived From Processing Plants" from CORRAL_GENERATED_VIEWS.AUTHORIZATIONOBJECT, CORRAL_GENERATED_VIEWS.CLIENT, CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, @@ -66,7 +67,7 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI Wdrschedule_two.CodeOfPractice = 'Composting Operations' and AUTHORIZATIONOBJECT.STATUS !='Withdrawn' Union - Select Distinct To_Number(REGISTRATION.REGAUTHORIZATIONNUMBER) As "Authorization Number", DECODE(AUTHORIZATIONTYPE.AUTHORIZATIONNAME, 'Organic Matter Recycling Regulation', 'Notification') As "Authorization Type", Case When Upper (CLIENT.DoingBusinessAs) Is Not Null Then (Case When Upper (CLIENT.DUP_FORMATTEDNAME) Is Not Null Then Upper (CLIENT.DUP_FORMATTEDNAME) Else InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME) End ) ||' doing business as ' || Upper (CLIENT.DoingBusinessAs) Else NVL(Upper (CLIENT.DUP_FORMATTEDNAME), InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME)) End As "Regulated Party", Decode (REGISTRATION.STATE, 'Cancelled', 'Inactive', 'Expired', 'Inactive', 'Active', 'Active') As "Authorization Status", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.REGISTRATIONDATE) as "Effective/Issue Date", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.AmendmentDate) as "Last Amendment Date", ADDRESS_2.INLINEDISPLAY As "Facility Location", REGISTRATION.LATITUDE As "Latitude", -1.0000000*(REGISTRATION.LONGITUDE) As "Longitude", NULL as "Waste Discharge Regulation", CORRAL_GENERATED_VIEWS.REGISTRATION.OMOPERATIONTYPE as "Operation Type", CORRAL_GENERATED_VIEWS.REGISTRATION.OMLANDBASEDTYPEOFPRODUCTION as "Material Land Applied", CORRAL_GENERATED_VIEWS.REGISTRATION.INTENDEDDATESLANDAPPLICATION as "Intended Dates of Land Application", CORRAL_GENERATED_VIEWS.REGISTRATION.OMDESIGNCAPACITY as "Facility Design Capacity (t/y)", CORRAL_GENERATED_VIEWS.REGISTRATION.OMCOMPOSTFACILITYPRODUCTTYPE as "Type of Compost Produced", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.YARDWASTE, 'Y', 'Yes', 'N', 'No') as "Yard Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BIOSOLIDS, 'Y', 'Yes', 'N', 'No') as "Biosolids", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.WHEY, 'Y', 'Yes', 'N', 'No') as "Whey", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.UNTREATUNPROCESSWOODRESIDUALS, 'Y', 'Yes', 'N', 'No') as "Untreated and Unprocessed Wood Residuals", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.POULTRYCARCASSES, 'Y', 'Yes', 'N', 'No') as "Poultry Carcasses", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FISHWASTE, 'Y', 'Yes', 'N', 'No') as "Fish Wastes", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FOODWASTE, 'Y', 'Yes', 'N', 'No') as "Food Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BREWERYWASTEWINERYWASTE, 'Y', 'Yes', 'N', 'No') as "Brewary Waste/Wine Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.ANIMALBEDDING, 'Y', 'Yes', 'N', 'No') as "Animal Bedding", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.DOMESTICSEPTICTANKSLUDGE, 'Y', 'Yes', 'N', 'No') as "Domestic Septic Tank Sludge", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.HATCHERYWASTE, 'Y', 'Yes', 'N', 'No') as "Hatchery Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MANURE, 'Y', 'Yes', 'N', 'No') as "Manure", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MILKPROCESSINGWASTE, 'Y', 'Yes', 'N', 'No') as "Milk Processing Waste" + Select Distinct To_Number(REGISTRATION.REGAUTHORIZATIONNUMBER) As "Authorization Number", DECODE(AUTHORIZATIONTYPE.AUTHORIZATIONNAME, 'Organic Matter Recycling Regulation', 'Notification') As "Authorization Type", Case When Upper (CLIENT.DoingBusinessAs) Is Not Null Then (Case When Upper (CLIENT.DUP_FORMATTEDNAME) Is Not Null Then Upper (CLIENT.DUP_FORMATTEDNAME) Else InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME) End ) ||' doing business as ' || Upper (CLIENT.DoingBusinessAs) Else NVL(Upper (CLIENT.DUP_FORMATTEDNAME), InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME)) End As "Regulated Party", Decode (REGISTRATION.STATE, 'Cancelled', 'Inactive', 'Expired', 'Inactive', 'Active', 'Active') As "Authorization Status", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.REGISTRATIONDATE) as "Effective/Issue Date", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.AmendmentDate) as "Last Amendment Date", ADDRESS_2.INLINEDISPLAY As "Facility Location", REGISTRATION.LATITUDE As "Latitude", -1.0000000*(REGISTRATION.LONGITUDE) As "Longitude", NULL as "Waste Discharge Regulation", CORRAL_GENERATED_VIEWS.REGISTRATION.OMOPERATIONTYPE as "Operation Type", CORRAL_GENERATED_VIEWS.REGISTRATION.OMLANDBASEDTYPEOFPRODUCTION as "Material Land Applied", CORRAL_GENERATED_VIEWS.REGISTRATION.INTENDEDDATESLANDAPPLICATION as "Intended Dates of Land Application", CORRAL_GENERATED_VIEWS.REGISTRATION.OMDESIGNCAPACITY as "Facility Design Capacity (t/y)", CORRAL_GENERATED_VIEWS.REGISTRATION.OMCOMPOSTFACILITYPRODUCTTYPE as "Type of Compost Produced", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.YARDWASTE, 'Y', 'Yes', 'N', 'No') as "Yard Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BIOSOLIDS, 'Y', 'Yes', 'N', 'No') as "Biosolids", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.WHEY, 'Y', 'Yes', 'N', 'No') as "Whey", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.UNTREATUNPROCESSWOODRESIDUALS, 'Y', 'Yes', 'N', 'No') as "Untreated and Unprocessed Wood Residuals", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.POULTRYCARCASSES, 'Y', 'Yes', 'N', 'No') as "Poultry Carcasses", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FISHWASTE, 'Y', 'Yes', 'N', 'No') as "Fish Wastes", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FOODWASTE, 'Y', 'Yes', 'N', 'No') as "Food Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BREWERYWASTEWINERYWASTE, 'Y', 'Yes', 'N', 'No') as "Brewary Waste/Wine Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.ANIMALBEDDING, 'Y', 'Yes', 'N', 'No') as "Animal Bedding", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.DOMESTICSEPTICTANKSLUDGE, 'Y', 'Yes', 'N', 'No') as "Domestic Septic Tank Sludge", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.HATCHERYWASTE, 'Y', 'Yes', 'N', 'No') as "Hatchery Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MANURE, 'Y', 'Yes', 'N', 'No') as "Manure", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MILKPROCESSINGWASTE, 'Y', 'Yes', 'N', 'No') as "Milk Processing Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.PlantMatterFromProcessingPlant, 'Y','Yes', 'N' , 'No') as "Plant Matter Derived From Processing Plants" From CORRAL_GENERATED_VIEWS.REGISTRATION, CORRAL_GENERATED_VIEWS.REGISTRATION_2 r2, CORRAL_GENERATED_VIEWS.Bceniccode n, CORRAL_GENERATED_VIEWS.Bceniccode n2, CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, CORRAL_GENERATED_VIEWS.CLIENT, CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, CORRAL_GENERATED_VIEWS.DISCHARGETYPE, CORRAL_GENERATED_VIEWS.ADDRESS, CORRAL_GENERATED_VIEWS.ADDRESS ADDRESS_2, CORRAL_GENERATED_VIEWS.Wdrschedule_One, CORRAL_GENERATED_VIEWS.Wdrschedule_two Where r2.PRIMARYBCENICID = n.OBJECTID(+) And r2.SECONDARYBCENICID = n2.OBJECTID(+) @@ -80,4 +81,4 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI And REGISTRATION.MAILINGADDRESSID = ADDRESS.OBJECTID(+) And REGISTRATION.ADDRESSID = ADDRESS_2.OBJECTID(+) and AUTHORIZATIONTYPE.AUTHORIZATIONNAME ='Organic Matter Recycling Regulation' - and REGISTRATION.STATE !='Withdrawn'`; \ No newline at end of file + and REGISTRATION.STATE !='Withdrawn'`; From 326cc3278a0ccf350933f220029d38a7fa1dee89 Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Wed, 13 Nov 2024 12:38:51 -0800 Subject: [PATCH 4/4] chore: reformat query to not show so many changes and add types --- backend/src/v1/types/omrr-data.ts | 1 + frontend/src/interfaces/omrr.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/v1/types/omrr-data.ts b/backend/src/v1/types/omrr-data.ts index 56501234..be317d71 100644 --- a/backend/src/v1/types/omrr-data.ts +++ b/backend/src/v1/types/omrr-data.ts @@ -27,4 +27,5 @@ export interface OmrrData { 'Hatchery Waste'?: boolean, 'Manure'?: boolean, 'Milk Processing Waste'?: boolean, + 'Plant Matter Derived From Processing Plants'?: boolean, } diff --git a/frontend/src/interfaces/omrr.ts b/frontend/src/interfaces/omrr.ts index 56f9bd07..681b8891 100644 --- a/frontend/src/interfaces/omrr.ts +++ b/frontend/src/interfaces/omrr.ts @@ -27,7 +27,7 @@ export default interface OmrrData { 'Hatchery Waste'?: boolean Manure?: boolean 'Milk Processing Waste'?: boolean - + 'Plant Matter Derived From Processing Plants'?: boolean, // Extracted from Facility Location - not all facilities will have this set 'Postal Code'?: string } @@ -47,4 +47,5 @@ export const omrrDataBooleanFields: (keyof OmrrData)[] = [ 'Hatchery Waste', 'Manure', 'Milk Processing Waste', + 'Plant Matter Derived From Processing Plants' ]