Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch up backport #2076

Merged
merged 22 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0097ba3
Merge pull request #1987 from bcgov/develop
trslater Dec 19, 2024
efa2af2
Merge pull request #2035 from bcgov/develop
trslater Dec 19, 2024
853ae5d
ALCS-2449 Added ALR field to the 3 missing types
fbarreta Dec 19, 2024
24f8d09
Merge pull request #2039 from bcgov/hotfix/ALCS-2449-return-alr-area-…
fbarreta Dec 20, 2024
0c30403
ALCS-2449 Merge into develop
fbarreta Dec 20, 2024
a4c2047
Change the way dates are accessed in template
trslater Dec 20, 2024
99d19c5
Fix failing test
trslater Dec 20, 2024
3f145b5
Merge pull request #2041 from bcgov/hotfix/ALCS-2449-merge-into-develop
fbarreta Dec 20, 2024
39b998e
Merge pull request #2042 from bcgov/hotfix/ALCS-2450
trslater Dec 20, 2024
a34af0a
ALCS-2453 Handle unique descriptions on condition types
fbarreta Jan 6, 2025
9b8d901
Merge pull request #2046 from bcgov/hotfix/ALCS-2453-handle-unique-de…
fbarreta Jan 6, 2025
577e8e4
ALCS-2451 Allow to remove check box if the value is zero
fbarreta Jan 6, 2025
4004153
Merge pull request #2048 from bcgov/hotfix/ALCS-2451-check-zero-on-ad…
fbarreta Jan 7, 2025
23db0b9
ALCS-2467 Check decisions
fbarreta Jan 14, 2025
13d4bf2
Merge pull request #2053 from bcgov/hotfix/ALCS-2467-check-decision-o…
fbarreta Jan 14, 2025
2454750
ALCS-2474 Fix single date updates
fbarreta Jan 17, 2025
ccb4b55
Merge pull request #2060 from bcgov/hotfix/ALCS-2474-fix-single-date-…
fbarreta Jan 17, 2025
a99eec2
ALCS-2478 Allow to add a new date on conditions component
fbarreta Jan 21, 2025
42c7dbd
Merge pull request #2069 from bcgov/hotfix/ALCS-2478-add-new-date-on-…
fbarreta Jan 21, 2025
e549089
ALCS-2478 Script created
fbarreta Jan 22, 2025
1e44358
Merge pull request #2075 from bcgov/hotfix/ALCS-2478-add-date-to-sing…
fbarreta Jan 22, 2025
91940e0
Merge branch 'develop' into backport
trslater Jan 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,20 @@ <h5>{{ data.applicationDecisionComponentType?.label }}</h5>
"
class="row-no-flex"
>
<div class="full-width">
<mat-form-field appearance="outline" class="row">
<mat-label>ALR Area Impacted (ha)</mat-label>
<input
matInput
min="0.01"
mask="separator.5"
thousandSeparator=","
separatorLimit="9999999999"
formControlName="alrArea"
required
/>
</mat-form-field>
</div>
</div>

<div *ngIf="data.applicationDecisionComponentTypeCode === COMPONENT_TYPE.POFO" class="row-no-flex">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddingDateToConditions1737579030699 implements MigrationInterface {

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
WITH conditions AS
(
SELECT c.uuid, c.type_code, t.date_type, COUNT(d.uuid) AS dates_count
FROM alcs.application_decision_condition c
INNER JOIN alcs.application_decision_condition_type t ON t.code = c.type_code
LEFT OUTER JOIN alcs.application_decision_condition_date d ON d.condition_uuid = c.uuid
WHERE
date_type = 'Single'
GROUP BY c.uuid, c.type_code, t.date_type
HAVING COUNT(d.uuid) = 0
)
INSERT INTO alcs.application_decision_condition_date
(
audit_created_at,
audit_updated_at,
audit_created_by,
date,
comment,
condition_uuid,
completed_date
)
SELECT
now(),
now(),
'migration_seed',
null,
null,
conditions.uuid,
null
FROM conditions;
`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
// N/A
}

}
Loading