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

update after code review #473

Merged
merged 1 commit into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
@@ -1,8 +1,6 @@
<div class="dialog-container">
<div class="title-bar">
{{ dialogUsage === 'confirm-cancel' ? 'Confirm Cancel' :
dialogUsage === 'confirm-delete' ? 'Confirm Delete' :
'Duplicate Found' }}
{{dialogTitle}}
</div>
<div class="dialog-content">
<div class="icon-and-text">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ import { MatIconModule } from '@angular/material/icon';
export class ConfirmationDialogComponent {
dialogUsage: string;

get dialogTitle(): string {
switch (this.dialogUsage) {
case 'confirm-cancel':
return 'Confirm Cancel';
case 'confirm-delete':
return 'Confirm Delete';
default:
return 'Duplicate Found';
}
}

constructor(
private readonly dialogRef: MatDialogRef<ConfirmationDialogComponent>,
@Inject(MAT_DIALOG_DATA) public data: { indicator: string }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@

<div class="form-item">
<label>Planned Hectares</label>
<input type="text" id="fiscalPlannedProjectSizeHa" formControlName="fiscalPlannedProjectSizeHa" />
<input type="number" id="fiscalPlannedProjectSizeHa" formControlName="fiscalPlannedProjectSizeHa" />
</div>

<div class="form-item">
<label>Completed Hectares</label>
<input type="text" id="fiscalCompletedSizeHa" formControlName="fiscalCompletedSizeHa" />
<input type="number" id="fiscalCompletedSizeHa" formControlName="fiscalCompletedSizeHa" />
</div>

<div class="form-item">
Expand Down Expand Up @@ -141,8 +141,9 @@

<div class="form-item budget-width">
<label>Forecast Amount</label>
<input type="Cost" id="fiscalForecastAmount"
formControlName="fiscalForecastAmount"/>
<input type="number" id="fiscalForecastAmount"
formControlName="fiscalForecastAmount"
/>
</div>

<div class="form-item budget-width">
Expand All @@ -151,7 +152,7 @@
</div>

<div class="form-item budget-width">
<label>Ancilliary Funding Provider</label>
<label>Ancillary Funding Provider</label>
<select id="ancillaryFundingSourceGuid" formControlName="ancillaryFundingSourceGuid">
<option value="" >Select</option>
<option *ngFor="let item of ancillaryFundingSourceCode"[value]="item.ancillaryFundingSourceGuid">
Expand All @@ -161,18 +162,18 @@
</div>

<div class="form-item budget-width">
<label>Ancilliary Funding Amount</label>
<input type="Cost" id="fiscalAncillaryFundAmount" formControlName="fiscalAncillaryFundAmount"/>
<label>Ancillary Funding Amount</label>
<input type="number" id="fiscalAncillaryFundAmount" formControlName="fiscalAncillaryFundAmount"/>
</div>

<div class="form-item budget-width">
<label>Reported Spend</label>
<input type="Cost" id="fiscalReportedSpendAmount" formControlName="fiscalReportedSpendAmount"/>
<input type="number" id="fiscalReportedSpendAmount" formControlName="fiscalReportedSpendAmount"/>
</div>

<div class="form-item cfs-width">
<label>CFS Actual Spend</label>
<input type="Cost" id="fiscalActualAmount" formControlName="fiscalActualAmount"/>
<input type="number" id="fiscalActualAmount" formControlName="fiscalActualAmount"/>
</div>
</form>
<div class="fiscal-footer">
Expand Down
Loading