From 0b721d731133aa11595e916c17639e1a298c4a15 Mon Sep 17 00:00:00 2001 From: Brianna Cerkiewicz Date: Fri, 31 Jan 2025 15:46:58 -0800 Subject: [PATCH 1/2] chore: update opt-in text Table 1 -> Table 2 --- ..._schedule_a1_regulated_product_and_more.py | 31 +++++++++++++++++++ .../models/opted_in_operation_detail.py | 2 +- .../optedInOperationText.tsx | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 bc_obps/registration/migrations/0072_alter_historicaloptedinoperationdetail_meets_producing_gger_schedule_a1_regulated_product_and_more.py diff --git a/bc_obps/registration/migrations/0072_alter_historicaloptedinoperationdetail_meets_producing_gger_schedule_a1_regulated_product_and_more.py b/bc_obps/registration/migrations/0072_alter_historicaloptedinoperationdetail_meets_producing_gger_schedule_a1_regulated_product_and_more.py new file mode 100644 index 0000000000..8b53e8b2f8 --- /dev/null +++ b/bc_obps/registration/migrations/0072_alter_historicaloptedinoperationdetail_meets_producing_gger_schedule_a1_regulated_product_and_more.py @@ -0,0 +1,31 @@ +# Generated by Django 5.0.11 on 2025-02-03 16:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('registration', '0071_remove_historicaloperation_documents_document_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='historicaloptedinoperationdetail', + name='meets_producing_gger_schedule_a1_regulated_product', + field=models.BooleanField( + blank=True, + db_comment='Does this operation produce a regulated product listed in Table 2 of Schedule A.1 of the GGERR?', + null=True, + ), + ), + migrations.AlterField( + model_name='optedinoperationdetail', + name='meets_producing_gger_schedule_a1_regulated_product', + field=models.BooleanField( + blank=True, + db_comment='Does this operation produce a regulated product listed in Table 2 of Schedule A.1 of the GGERR?', + null=True, + ), + ), + ] diff --git a/bc_obps/registration/models/opted_in_operation_detail.py b/bc_obps/registration/models/opted_in_operation_detail.py index e3295e48c3..b9a7299b58 100644 --- a/bc_obps/registration/models/opted_in_operation_detail.py +++ b/bc_obps/registration/models/opted_in_operation_detail.py @@ -30,7 +30,7 @@ class OptedInOperationDetail(TimeStampedModel): meets_producing_gger_schedule_a1_regulated_product = models.BooleanField( blank=True, null=True, - db_comment="Does this operation produce a regulated product listed in Table 1 of Schedule A.1 of the GGERR?", + db_comment="Does this operation produce a regulated product listed in Table 2 of Schedule A.1 of the GGERR?", ) meets_reporting_and_regulated_obligations = models.BooleanField( blank=True, diff --git a/bciers/apps/registration/app/data/jsonSchema/operationRegistration/optedInOperationText.tsx b/bciers/apps/registration/app/data/jsonSchema/operationRegistration/optedInOperationText.tsx index 52ba24076d..1329db2c86 100644 --- a/bciers/apps/registration/app/data/jsonSchema/operationRegistration/optedInOperationText.tsx +++ b/bciers/apps/registration/app/data/jsonSchema/operationRegistration/optedInOperationText.tsx @@ -64,7 +64,7 @@ const meetsNaicsCode1122562ClassificationRequirementsText = ( const meetsProducingGgerScheduleA1RegulatedProductText = ( - Does this operation produce a regulated product listed in Table 1 of + Does this operation produce a regulated product listed in Table 2 of Schedule A.1 of{" "} the GGERR From 478e5c49c7b045410befc0eac0d507f1d42c7d38 Mon Sep 17 00:00:00 2001 From: Brianna Cerkiewicz Date: Fri, 31 Jan 2025 15:47:37 -0800 Subject: [PATCH 2/2] test: update vitests for opt-in form Table 1 -> Table 2 --- .../components/operations/OperationInformationForm.test.tsx | 2 +- .../operations/registration/OptedInOperationForm.test.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bciers/apps/administration/tests/components/operations/OperationInformationForm.test.tsx b/bciers/apps/administration/tests/components/operations/OperationInformationForm.test.tsx index 82406f1e5c..7664089656 100644 --- a/bciers/apps/administration/tests/components/operations/OperationInformationForm.test.tsx +++ b/bciers/apps/administration/tests/components/operations/OperationInformationForm.test.tsx @@ -549,7 +549,7 @@ describe("the OperationInformationForm component", () => { // Questions - 6 const meetsProducingGgerScheduleA1RegulatedProductView = screen.getByText( - /does this operation produce a regulated product listed in table 1 of schedule a\.1 of \?/i, + /does this operation produce a regulated product listed in table 2 of schedule a\.1 of \?/i, ); within(meetsProducingGgerScheduleA1RegulatedProductView).getByRole("link", { name: /the ggerr/i, diff --git a/bciers/apps/registration/tests/components/operations/registration/OptedInOperationForm.test.tsx b/bciers/apps/registration/tests/components/operations/registration/OptedInOperationForm.test.tsx index 8e1a01b7b6..124f755921 100644 --- a/bciers/apps/registration/tests/components/operations/registration/OptedInOperationForm.test.tsx +++ b/bciers/apps/registration/tests/components/operations/registration/OptedInOperationForm.test.tsx @@ -149,7 +149,7 @@ describe("the OptedInOperationForm component", () => { // Questions - 6 const meetsProducingGgerScheduleA1RegulatedProductView = screen.getByText( - /does this operation produce a regulated product listed in table 1 of schedule a\.1 of \?/i, + /does this operation produce a regulated product listed in table 2 of schedule a\.1 of \?/i, ); within(meetsProducingGgerScheduleA1RegulatedProductView).getByRole("link", { name: /the ggerr/i,