diff --git a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts index 4807627d6..4a3196781 100644 --- a/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts +++ b/alcs-frontend/src/app/features/board/dialogs/noi-modification/create/create-noi-modification-dialog.component.ts @@ -79,7 +79,7 @@ export class CreateNoiModificationDialogComponent implements OnInit, OnDestroy { regionCode: formValues.region!, localGovernmentUuid: formValues.localGovernment!, submittedDate: formValues.submittedDate!.valueOf(), - boardCode: 'ceo', + boardCode: 'noi', modifiesDecisionUuids: formValues.modifiesDecisions!, description: formValues.description!, }; diff --git a/docs/jobs.md b/docs/jobs.md index 74572f780..61b8e9d8f 100644 --- a/docs/jobs.md +++ b/docs/jobs.md @@ -8,7 +8,7 @@ We receive the parcel data in a GDB from PMBC, this data changes and needs to be 1. Setup Portforwading as necessary to get access to Postgres 1. Truncate the existing parcel_lookup table 1. Run the following command replacing username and password as - necessary: `ogr2ogr -f "PostgreSQL" PG:"host=localhost port=5432 dbname=app user=postgres password=postgres active_schema=alcs" PMBC_export.gdb -nln parcel_lookup` + necessary: `ogr2ogr -f "PostgreSQL" PG:"host=localhost port=5432 dbname=app user=postgres password=postgres active_schema=alcs" PMBC_export.gdb -nln parcel_lookup -gt 10000 --config PG_USE_COPY YES` 1. Be patient, this will import ~2 million rows and will take ~10 minutes ## Running Jobs in Openshift diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index 41c4069f5..f57d2c84f 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -97,9 +97,7 @@ export class OwnerDialogComponent { this.corporateSummary.setValidators([Validators.required]); } else { this.organizationName.setValidators([]); - this.corporateSummary.setValidators([]); - this.corporateSummary.reset(); - this.files = []; + this.corporateSummary.setValidators([]); } this.corporateSummary.updateValueAndValidity(); this.organizationName.updateValueAndValidity(); @@ -113,6 +111,11 @@ export class OwnerDialogComponent { } this.isLoading = true; + + if (this.type.value === OWNER_TYPE.INDIVIDUAL) { + this.removeCorporateSummary(); + } + let documentUuid; if (this.pendingFile) { documentUuid = await this.uploadPendingFile(this.pendingFile); @@ -170,9 +173,15 @@ export class OwnerDialogComponent { if (this.form.valid) { this.isLoading = true; + if (this.type.value === OWNER_TYPE.INDIVIDUAL) { + this.removeCorporateSummary(); + } + let document; if (this.pendingFile) { document = await this.uploadPendingFile(this.pendingFile); + } else { + document = this.type.value === OWNER_TYPE.ORGANIZATION ? this.data.existingOwner?.corporateSummary : null; } const orgName = this.type.value === OWNER_TYPE.ORGANIZATION ? this.organizationName.getRawValue() : null; diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index cc432232c..dffb2fa52 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -129,6 +129,9 @@ export class NoticeOfIntentDecisionDto { @AutoMap(() => String) decisionMakerName: string | null; + @AutoMap(() => Boolean) + wasReleased: boolean; + @AutoMap(() => Boolean) isSubjectToConditions: boolean | null; diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 9ce85ebdd..7fa790d0b 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -285,16 +285,20 @@ export class NoticeOfIntentAdvancedSearchService { query = query.andWhere( 'noi.date_submitted_to_alc >= :date_submitted_from', { - date_submitted_from: new Date(searchDto.dateSubmittedFrom), + date_submitted_from: getStartOfDayToPacific( + searchDto.dateSubmittedFrom, + ), }, ); } if (searchDto.dateSubmittedTo !== undefined) { query = query.andWhere( - 'noi.date_submitted_to_alc <= :date_submitted_to', + 'noi.date_submitted_to_alc < :date_submitted_to', { - date_submitted_to: new Date(searchDto.dateSubmittedTo), + date_submitted_to: getNextDayToPacific( + searchDto.dateSubmittedTo, + ), }, ); } diff --git a/services/apps/alcs/src/providers/email/status-email.service.ts b/services/apps/alcs/src/providers/email/status-email.service.ts index d87d90204..9f01c965e 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.ts @@ -266,13 +266,12 @@ export class StatusEmailService { const toEmails: string[] = []; if (data.primaryContact && data.primaryContact.email) { toEmails.push(data.primaryContact.email); + if (data.ccGovernment && data.government?.emails) { ccEmails.push(...data.government.emails); } - } else { - if (data.ccGovernment && data.government?.emails) { - toEmails.push(...data.government.emails); - } + } else if (data.government?.emails) { + toEmails.push(...data.government.emails); } ccEmails.push(...data.ccEmails);