From cdbeadb03c0fad93685215f3d163ee30fb44e7f8 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 6 Feb 2024 10:24:43 -0800 Subject: [PATCH 1/8] Cleanup Inbox Table * Move pagination loading to inside the component to prevent it losing state * Clean up the inbox table as I did the search tables * Reset items per page on clear --- .../inbox-table/inbox-table.component.html | 9 ++- .../inbox-table/inbox-table.component.ts | 60 ++++--------------- .../features/home/inbox/inbox.component.ts | 3 +- 3 files changed, 18 insertions(+), 54 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 25327afdf9..1c818bd65c 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -1,6 +1,9 @@
- +
+ +
+
(); - - @ViewChild(MatPaginator) paginator!: MatPaginator; - @ViewChild(MatSort) sort?: MatSort; - +export class InboxTableComponent { _items: InboxResultDto[] = []; @Input() set items(applications: InboxResultDto[]) { this._items = applications; + this.isLoading = false; this.dataSource = new MatTableDataSource(applications); } - _totalCount = 0; - @Input() set totalCount(count: number) { - this._totalCount = count; - - // this will ensure the reset of subscriber once the table is hidden because of empty - this.initSorting(); - } - + @Input() totalCount: number = 0; @Input() type = 'Applications'; + @Input() pageIndex: number = 0; + @Output() tableChange = new EventEmitter(); displayedColumns: string[] = ['fileNumber', 'dateCreated', 'applicant', 'applicationType', 'status', 'lastUpdated']; dataSource = new MatTableDataSource(); - @Input() pageIndex: number = 0; itemsPerPage = 10; total = 0; sortDirection = 'DESC'; sortField = 'lastUpdate'; - - private subscribedToSort = false; + isLoading = false; constructor(private router: Router) {} - async onTableChange() { + onTableChange() { + this.isLoading = true; this.tableChange.emit({ pageIndex: this.pageIndex, itemsPerPage: this.itemsPerPage, @@ -61,33 +49,7 @@ export class InboxTableComponent implements OnDestroy { this.pageIndex = $event.pageIndex; this.itemsPerPage = $event.pageSize; - await this.onTableChange(); - } - - ngOnDestroy(): void { - this.$destroy.next(); - this.$destroy.complete(); - } - - private initSorting() { - if (this._totalCount <= 0) { - this.subscribedToSort = false; - } - - // push subscription to next render cycle, after the table is rendered - setTimeout(() => { - if (this.sort && !this.subscribedToSort) { - this.subscribedToSort = true; - this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => { - this.paginator.pageIndex = 0; - this.pageIndex = 0; - this.sortDirection = sortObj.direction.toUpperCase(); - this.sortField = sortObj.active; - - await this.onTableChange(); - }); - } - }); + this.onTableChange(); } async onRowClick(link: string) { diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts index 6975ffdf18..208f279f0b 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts @@ -206,6 +206,7 @@ export class InboxComponent implements OnInit, OnDestroy { async onClear() { this.searchForm.reset(); this.pageIndex = 0; + this.itemsPerPage = 10; await this.populateTable(); this.tabIndex = TAB_ORDER[this.currentTabName]; if (this.fileTypeFilterDropDownComponent) { @@ -318,7 +319,6 @@ export class InboxComponent implements OnInit, OnDestroy { this.pageIndex = event.pageIndex; this.itemsPerPage = event.itemsPerPage; - this.isLoading = true; switch (event.tableType) { case 'APP': await this.onApplicationSearch(); @@ -332,7 +332,6 @@ export class InboxComponent implements OnInit, OnDestroy { default: this.toastService.showErrorToast('Not implemented'); } - this.isLoading = false; } onFileTypeChange(fileTypes: string[]) { From e7533f398f458e25c0a75c7aa184bdef7565e42a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 6 Feb 2024 10:36:26 -0800 Subject: [PATCH 2/8] Bug Fixes * Change Area units to m2 where missed * Fix step index for NOI Edit Section --- .../pfrs-details/pfrs-details.component.html | 2 +- .../roso-details/roso-details.component.html | 5 +++-- .../notice-of-intent-details.component.html | 6 +++--- .../roso-details/roso-details.component.html | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html index aae60b9ec3..e26a33bfdf 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html @@ -50,7 +50,7 @@
{{ _applicationSubmission.soilToPlaceArea }} - ha + m2
Maximum Depth
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html index 4f1fa8616b..8ec3a2ec4c 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html @@ -34,7 +34,8 @@
Area
- {{ _applicationSubmission.soilToRemoveArea }} ha + {{ _applicationSubmission.soilToRemoveArea }} + m2
Maximum Depth
@@ -58,7 +59,7 @@
Area
{{ _applicationSubmission.soilAlreadyRemovedArea }} - ha + m2
Maximum Depth
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html index c0c255826b..5262069026 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html @@ -56,7 +56,7 @@

Primary Contact Information

-
@@ -123,7 +123,7 @@

Land Use of Adjacent Parcels

-
@@ -148,7 +148,7 @@

Proposal

>
-
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html index 6d18c33b0e..eb193d4da3 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html @@ -41,7 +41,7 @@
Area
- {{ _noiSubmission.soilToRemoveArea }} ha + {{ _noiSubmission.soilToRemoveArea }} m2
Maximum Depth
@@ -69,7 +69,7 @@
Area
{{ _noiSubmission.soilAlreadyRemovedArea }} - ha + m2
Maximum Depth
From 0b0f8b4a7efeb4e289e5702bd6c248ea7f0726a4 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 6 Feb 2024 10:44:39 -0800 Subject: [PATCH 3/8] Switch pid validators * Was being set as required when crown instead of fee simple --- .../parcels/parcel-entry/parcel-entry.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index 444569c277..ad45e840e0 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -260,13 +260,13 @@ export class ParcelEntryComponent implements OnInit { this.searchBy.setValue(null); this.pidPinPlaceholder = ''; this.isCrownLand = true; - this.pid.addValidators([Validators.required]); + this.pid.removeValidators([Validators.required]); this.purchaseDate.disable(); } else { this.searchBy.setValue('pid'); this.pidPinPlaceholder = 'Type 9 digit PID'; this.isCrownLand = false; - this.pid.removeValidators([Validators.required]); + this.pid.addValidators([Validators.required]); this.crownLandOwnerType.setValue(null); this.purchaseDate.enable(); } From 40bff65c87f207b58a7ea84c7eea6191e6667d41 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 6 Feb 2024 11:26:11 -0800 Subject: [PATCH 4/8] Show Correct Documents * Had cross sections instead of reclamation plans in several places --- .../roso-details/roso-details.component.html | 2 +- .../pfrs-details/pfrs-details.component.html | 4 +-- .../pofo-details/pofo-details.component.html | 4 +-- .../roso-details/roso-details.component.html | 4 +-- .../pofo-details/pofo-details.component.html | 29 +++++-------------- .../roso-details/roso-details.component.html | 29 +++++-------------- 6 files changed, 21 insertions(+), 51 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html index eb193d4da3..6337b33368 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html @@ -107,7 +107,7 @@
Reclamation Plan
- + {{ file.fileName }}
diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html index 747c34d3db..73b18432a7 100644 --- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html @@ -225,10 +225,10 @@
Reclamation Plan
- + {{ file.fileName }} - +
Is your proposal for aggregate extraction or placer mining?
diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html index cc775d83bd..e958c483d3 100644 --- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html @@ -149,10 +149,10 @@
Reclamation Plan
- + {{ file.fileName }} - +
diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html index 673913480f..30deb8ab54 100644 --- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html @@ -141,10 +141,10 @@
Reclamation Plan
- + {{ file.fileName }} - +
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html index 92d7428243..39c1e9bf7a 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -32,10 +32,7 @@
{{ _noiSubmission.soilProjectDuration }}
- +
@@ -60,20 +57,14 @@
{{ _noiSubmission.soilToPlaceMaximumDepth }} m - +
Average Depth
{{ _noiSubmission.soilToPlaceAverageDepth }} m - +
@@ -83,20 +74,14 @@
{{ _noiSubmission.soilAlreadyPlacedVolume }} m3 - +
Area
{{ _noiSubmission.soilAlreadyPlacedArea }} m2 - +
Maximum Depth
@@ -147,10 +132,10 @@
Reclamation Plan
- + {{ file.fileName }} - +
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html index 78153f3530..da49f8bb95 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html @@ -32,10 +32,7 @@
{{ _noiSubmission.soilProjectDuration }}
- +
@@ -60,20 +57,14 @@
{{ _noiSubmission.soilToRemoveMaximumDepth }} m - +
Average Depth
{{ _noiSubmission.soilToRemoveAverageDepth }} m - +
@@ -83,20 +74,14 @@
{{ _noiSubmission.soilAlreadyRemovedVolume }} m3 - +
Area
{{ _noiSubmission.soilAlreadyRemovedArea }} m2 - +
Maximum Depth
@@ -146,10 +131,10 @@
Reclamation Plan
- + {{ file.fileName }} - +
From d6f9c920fb682730dac2f935f167bf6f3171d87c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 6 Feb 2024 11:35:25 -0800 Subject: [PATCH 5/8] Only show LFNG Other Files on Review Last Step --- .../review-submit-fng/review-submit-fng.component.ts | 6 ++++-- .../review-submit/review-submit.component.ts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts index b484fdc1d5..8f3af7c8d7 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts @@ -11,7 +11,7 @@ import { ApplicationSubmissionDto } from '../../../../services/application-submi import { CodeService } from '../../../../services/code/code.service'; import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; -import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationFngSteps } from '../review-submission.component'; import { ToastService } from '../../../../services/toast/toast.service'; @@ -71,7 +71,9 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy { this.resolutionDocument = documents.filter( (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT ); - this.otherAttachments = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.OTHER); + this.otherAttachments = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.OTHER && document.source === DOCUMENT_SOURCE.LFNG + ); }); this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts index 8acd011147..e378a07b28 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts @@ -11,7 +11,7 @@ import { ApplicationSubmissionDto } from '../../../../services/application-submi import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service'; import { ToastService } from '../../../../services/toast/toast.service'; import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component'; -import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; +import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto'; import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints'; import { ReviewApplicationSteps } from '../review-submission.component'; import { SubmitConfirmationDialogComponent } from '../submit-confirmation-dialog/submit-confirmation-dialog.component'; @@ -81,7 +81,9 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy { (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT ); this.staffReport = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.STAFF_REPORT); - this.otherAttachments = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.OTHER); + this.otherAttachments = documents.filter( + (document) => document.type?.code === DOCUMENT_TYPE.OTHER && document.source === DOCUMENT_SOURCE.LFNG + ); }); this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => { From e27d59e6ca77216f9fe572cc124c6a8f2d7b9624 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Tue, 6 Feb 2024 14:41:03 -0800 Subject: [PATCH 6/8] comment out update Unknown applicants --- bin/migrate-oats-data/applications/migrate_application.py | 2 +- bin/migrate-oats-data/noi/notice_of_intent_migration.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py index 9e577e57ab..1897a487a6 100644 --- a/bin/migrate-oats-data/applications/migrate_application.py +++ b/bin/migrate-oats-data/applications/migrate_application.py @@ -69,7 +69,7 @@ def process_application_etl(batch_size): update_application_incomplete_date(batch_size) process_application_parcels(batch_size) process_application_owners(batch_size) - process_application_applicant_on_submissions(batch_size) + # process_application_applicant_on_submissions(batch_size) process_app_staff_journal(batch_size) process_application_decisions(batch_size) set_application_visibility() diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py index 9abca8b32e..4ae73f54e2 100644 --- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py +++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py @@ -177,7 +177,7 @@ def process_notice_of_intent(batch_size): link_notice_of_intent_primary_contacts(batch_size) - process_notice_of_intent_applicant_on_submissions(batch_size) + # process_notice_of_intent_applicant_on_submissions(batch_size) process_noi_staff_journal(batch_size) From 98c3f0a45be7a784cafeb16e730d453c567433d2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 6 Feb 2024 15:14:28 -0800 Subject: [PATCH 7/8] Text Updates * Update text for various parts of public NOI and SRW * Fix broken [*ngIf that has the extra bracket --- .../submission-documents.component.html | 2 +- .../submission/parcel/parcel.component.html | 2 +- .../notice-of-intent/submission/parcel/parcel.component.ts | 2 -- .../submission/roso-details/roso-details.component.html | 6 +++--- .../submission/submission-details.component.html | 2 +- .../notification/alc-review/alc-review.component.html | 2 +- .../submission-documents.component.html | 2 +- .../notification/submission/parcel/parcel.component.html | 4 +--- .../notification/submission/parcel/parcel.component.ts | 2 -- .../submission/submission-details.component.html | 2 +- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html index 45f473c3d5..c5429a7155 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html @@ -1,4 +1,4 @@ -

Application Documents

+

NOI Documents

diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html index b5ea5e4cfa..711c0dbd86 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html @@ -1,5 +1,5 @@

- {{ pageTitle }} + Notice of Intent Parcels

diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts index 1003ec555c..0a04e6d925 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts @@ -16,8 +16,6 @@ export class ParcelComponent { @Input() parcels: PublicParcelDto[] = []; PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; - pageTitle: string = 'Identify Parcel(s) Under Application'; - fileId = ''; submissionUuid = ''; diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html index 21a210a05f..1dedd56018 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html @@ -45,14 +45,14 @@
{{ noiSubmission.soilToRemoveVolume }} m3 - +
Area
{{ noiSubmission.soilToRemoveArea }} m2 - +
Maximum Depth
@@ -112,7 +112,7 @@ >
- +
Proposal Map / Site Plan
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html index bb1808e87c..617744affc 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html @@ -47,7 +47,7 @@

Government

Land Use

-

Land Use of Parcel(s) under Application

+

Land Use of Parcel(s) under Notice of Intent

Describe all agriculture that currently takes place on the parcel(s).
diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html index bc3633f49f..17d67ae729 100644 --- a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html +++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html @@ -1,6 +1,6 @@
-

ALC Review and Decision

+

ALC Review and Response

diff --git a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html index 45f473c3d5..50da3b831d 100644 --- a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html +++ b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html @@ -1,4 +1,4 @@ -

Application Documents

+

Notification Documents

diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html index 2e4020737c..b2d8d1c3fd 100644 --- a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html @@ -1,6 +1,4 @@ -

- {{ pageTitle }} -

+

Notification Parcels

diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts index acaab1ad3e..7296b0960d 100644 --- a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts +++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts @@ -17,8 +17,6 @@ export class ParcelComponent { @Input() parcels: PublicParcelDto[] = []; PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE; - pageTitle: string = 'Identify Parcel(s) Under Application'; - fileId = ''; submissionUuid = ''; diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html index e4e90ec4d5..413772ce72 100644 --- a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html +++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html @@ -47,6 +47,6 @@

Government

-

5. Purpose of SRW

+

Purpose of SRW

From 7207e44a791f3b1b1916af0b90a1411ca0a0efba Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 6 Feb 2024 16:18:15 -0800 Subject: [PATCH 8/8] Do not include Draft Decisions in Decisions Filters * For NOI and APP --- .../search/application/public-application-search.service.ts | 2 +- .../notice-of-intent/public-notice-of-intent-search.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 448cb1da86..d6ae5c19c5 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -198,7 +198,7 @@ export class PublicApplicationSearchService { query = query.leftJoin( ApplicationDecision, 'decision', - 'decision.application_uuid = "appSearch"."application_uuid"', + 'decision.application_uuid = "appSearch"."application_uuid" AND decision.is_draft = FALSE', ); return query; } diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index 6d167bdc34..e62df61df0 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -191,7 +191,7 @@ export class PublicNoticeOfIntentSearchService { query = query.leftJoin( NoticeOfIntentDecision, 'decision', - 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid"', + 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid" AND decision.is_draft = FALSE', ); return query; }