From 4c7f584a5e00043073b4453d677d1eaf5518ef00 Mon Sep 17 00:00:00 2001 From: "QSL\\SumathiT" Date: Thu, 5 Sep 2024 16:32:06 -0700 Subject: [PATCH 1/7] Schedule check null for length checks. --- .../steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue | 4 ++-- .../steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue | 4 ++-- .../steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue index 3f5c4636c..2904f80c4 100644 --- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue +++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule1.vue @@ -71,7 +71,7 @@
Other (specify): {{ scheduleInfo.eventTypeComment |truncate-word-after(70)}} -
{{scheduleInfo.eventTypeComment|truncate-word-before(70)}}
+
{{scheduleInfo.eventTypeComment|truncate-word-before(70)}}
@@ -92,7 +92,7 @@ Time Method of attendance -
{{scheduleInfo.attendanceMethod|truncate-word-before(20)}}
+
{{scheduleInfo.attendanceMethod|truncate-word-before(20)}}
by another method of attendance as follows:
diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue index 468531086..65a782a0a 100644 --- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue +++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule2.vue @@ -109,7 +109,7 @@
Other (specify): {{ modReqInfo.waiveChangeRequirementComment |truncate-word-after(70)}} -
{{modReqInfo.waiveChangeRequirementComment|truncate-word-before(70)}}
+
{{modReqInfo.waiveChangeRequirementComment|truncate-word-before(70)}}
@@ -194,7 +194,7 @@
Other (specify): {{ modReqInfo.modifyChangeRequirementComment |truncate-word-after(70)}} -
{{modReqInfo.modifyChangeRequirementComment|truncate-word-before(70)}}
+
{{modReqInfo.modifyChangeRequirementComment|truncate-word-before(70)}}
diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue index 983bb828b..4cb18728c 100644 --- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue +++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/Schedule3.vue @@ -64,7 +64,7 @@ the rules, including a time limit set by an order or direction, even after the t Date (dd/mmm/yyyy) Method of attendance -
{{modReqInfo.judgeName|truncate-word-before(30)}}
+
{{modReqInfo.judgeName|truncate-word-before(30)}}
@@ -75,7 +75,7 @@ the rules, including a time limit set by an order or direction, even after the t
Other (specify): {{ modReqInfo.appliedRequirementsListComment |truncate-word-after(70)}} -
{{modReqInfo.appliedRequirementsListComment|truncate-word-before(70)}}
+
{{modReqInfo.appliedRequirementsListComment|truncate-word-before(70)}}
From d1e588ace86e67177e78b00eeb90ceb3c74c4f58 Mon Sep 17 00:00:00 2001 From: Hemanth Kona Date: Fri, 13 Sep 2024 17:30:12 -0400 Subject: [PATCH 2/7] PFCF-502: Fix Form # main section not showing up --- .../familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue b/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue index 7f4883f7e..c7a724392 100644 --- a/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue +++ b/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/CommonSection.vue @@ -502,7 +502,7 @@
- + From a4a040ad07d3ef7d86c52528949449b93ed7efeb Mon Sep 17 00:00:00 2001 From: Hemanth Kona Date: Fri, 13 Sep 2024 17:50:10 -0400 Subject: [PATCH 3/7] PFCF-503: Fix Form19 blank page issue --- .../steps/writtenResponse/reviewWR/pdf/Form19Layout.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/src/components/steps/writtenResponse/reviewWR/pdf/Form19Layout.vue b/web/src/components/steps/writtenResponse/reviewWR/pdf/Form19Layout.vue index 2d6cb54ce..74a39528f 100644 --- a/web/src/components/steps/writtenResponse/reviewWR/pdf/Form19Layout.vue +++ b/web/src/components/steps/writtenResponse/reviewWR/pdf/Form19Layout.vue @@ -543,12 +543,13 @@ export default class Form19Layout extends Vue { wrInformation.disagree = agreeDisagreeData.agreeDisagree.includes('disagree'); wrInformation.partialagreed = agreeDisagreeData.agreeDisagree.includes('partialagree'); wrInformation.partialdisagree = agreeDisagreeData.agreeDisagree.includes('partialdisagree'); - wrInformation.agreeAdditionalDetailsYesNo = agreeDisagreeData.agreeAdditionalDetailsYesNo.includes('y'); + wrInformation.agreeAdditionalDetailsYesNo = agreeDisagreeData.agreeAdditionalDetailsYesNo && agreeDisagreeData.agreeAdditionalDetailsYesNo.includes('y'); + if (wrInformation.agreed){ wrInformation.agreeDetails = agreeDisagreeData.agreeDetails; if (wrInformation.agreeAdditionalDetailsYesNo){ - wrInformation.agreeAdditionalDetails = agreeDisagreeData.agreeAdditionalDetails; - } + wrInformation.agreeAdditionalDetails = agreeDisagreeData.agreeAdditionalDetails; + } } if (wrInformation.disagree){ wrInformation.disagreeDetails = agreeDisagreeData.disAgreeDetails; From ac5673499e0def3ca1835fe76e1b5b9f1c586693 Mon Sep 17 00:00:00 2001 From: Hemanth Kona Date: Fri, 13 Sep 2024 18:44:39 -0400 Subject: [PATCH 4/7] PFCF-502: Fix Form 3 Schedule 1 part 2 q2 answer height --- .../steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue b/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue index 711053e85..88edff073 100644 --- a/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue +++ b/web/src/components/steps/familyLawMatter/reviewFLM/pdf/Schedules/Schedule1.vue @@ -72,7 +72,7 @@
List the details of the order you are asking for. You may leave this question blank. -
+
{{parentArrInfo.parentResp.expl}}
From 885ceeeb241efc931ddb388250c74e3b3c3c4dca Mon Sep 17 00:00:00 2001 From: Hemanth Kona Date: Thu, 24 Oct 2024 14:54:08 -0400 Subject: [PATCH 5/7] PFCF-500: Add Port Coquitlam Court to Early Resolution --- web/src/filters/locationRegistries.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/src/filters/locationRegistries.ts b/web/src/filters/locationRegistries.ts index 3cb3ebcc9..87f09ed0a 100644 --- a/web/src/filters/locationRegistries.ts +++ b/web/src/filters/locationRegistries.ts @@ -5,6 +5,7 @@ export const FamilyJusticeRegistries = [ ]; export const EarlyResolutionsRegistries = [ - "1201",//"Victoria Law Courts", - "3585"//"Surrey Provincial Court" + "1201", // "Victoria Law Courts", + "3585", // "Surrey Provincial Court" + "3531" // "Port Coquitlam Court" ]; \ No newline at end of file From 83a9230f167558546f2c4fb51a4a1dfc3528bcc1 Mon Sep 17 00:00:00 2001 From: Hemanth Kona Date: Tue, 12 Nov 2024 07:49:01 -0800 Subject: [PATCH 6/7] PFCF-506: Fix vulnerabilities in api image - Update requirements.txt dependencies - Update django from 4.1.10 to 4.1.13 - Update gunicorn from 19.7.1,<20 to 22.0.0,<23 - add setuptools >= 70.0.0 --- api/requirements.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/api/requirements.txt b/api/requirements.txt index bc4114b68..a4fb08ae0 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,5 +1,5 @@ # Main -django==4.1.10 +django==4.1.13 django-filter>=21.1,<22 djangorestframework>=3.13.1,<4 djangorestframework-bulk>=0.2.1,<1 @@ -12,7 +12,7 @@ psycopg2-binary>=2.7.3.1,<3 pynacl>=1.4 # Web Server -gunicorn>=19.7.1,<20 +gunicorn>=22.0.0,<23 whitenoise>=4.1.2,<4.2 # Documentation @@ -28,4 +28,5 @@ pillow>=9.2.0 numpy>=1.19.5 jsonschema>=3.2.0,<4 -PyPDF2 >=1.26.0,<3 \ No newline at end of file +PyPDF2 >=1.26.0,<3 +setuptools >= 70.0.0 From c5b20eb63dc1bd61c02a656a1f785db247209801 Mon Sep 17 00:00:00 2001 From: Hemanth Kona Date: Thu, 14 Nov 2024 10:16:25 -0800 Subject: [PATCH 7/7] PFCF-509: Fix Form 3 Header formatting --- .../components/utils/PopulateForms/components/FormHeader.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/components/utils/PopulateForms/components/FormHeader.vue b/web/src/components/utils/PopulateForms/components/FormHeader.vue index 9a8ed3b54..a6513800e 100644 --- a/web/src/components/utils/PopulateForms/components/FormHeader.vue +++ b/web/src/components/utils/PopulateForms/components/FormHeader.vue @@ -6,10 +6,10 @@
FORM 3
Provincial Court Family Rules (Rule 24)
-
+
-
+
Registry location: 
{{ tableItems[0].value }}