Skip to content

Commit

Permalink
Merge pull request #723 from JustinMacaulay/feature/add-comma-sep-for…
Browse files Browse the repository at this point in the history 
…-cur

EMCRI-638 Comma Seperators for Monetary values.
  • Loading branch information
@GeorgeWalker
GeorgeWalker authored Jan 15, 2025
2 parents cda6342 + 3492d75 commit 9cc2285
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 85 deletions.
4 changes: 2 additions & 2 deletions ...dfa/src/app/feature-components/dfa-project-amendment/dfa-project-amendment.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
id="currencyBoxestimatedAdditionalProjectCost"
formControlName="estimatedAdditionalProjectCost"
matInput
mask="separator.2" thousandSeparator="" decimalMarker="."
mask="separator.2" thousandSeparator="," decimalMarker="."
maxlength="100"/>
<span class="currencyText">CA$</span>
</div>
Expand Down Expand Up @@ -300,7 +300,7 @@
id="currencyBoxapprovedAdditionalProjectCost"
formControlName="approvedAdditionalProjectCost"
matInput
mask="separator.2" thousandSeparator="" decimalMarker="."
mask="separator.2" thousandSeparator="," decimalMarker="."
maxlength="100"/>
<span class="currencyText">CA$</span>
</div>
Expand Down
46 changes: 23 additions & 23 deletions .../embc-dfa/src/app/sharedModules/forms/dfa-claim-main-forms/invoice/invoice.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</div>
</div>
</div>

<hr class="hr-align" *ngIf="isReadOnly === true" />
<div class="row">
<div class="col-md-12">
Expand Down Expand Up @@ -143,7 +143,7 @@
></mat-datepicker-toggle>
<mat-datepicker #invoiceDatePicker [disabled]="isReadOnly === true"
></mat-datepicker>

</mat-form-field>
</div>
<div class="col-md-1"></div>
Expand All @@ -157,29 +157,29 @@
<mat-radio-group
formControlName="isGoodsReceivedonInvoiceDate"
class="primary-radio-group horizontal-radio-group"

aria-label="Select an option">
<mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>

<mat-error *ngIf="
invoiceForm.get('isGoodsReceivedonInvoiceDate').invalid &&
invoiceForm.get('isGoodsReceivedonInvoiceDate').hasError('required')
">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; This is required
</mat-error>
</mat-radio-group>

</div>
</div>
<br />

<div class="row" [hidden]="(formCreationService.invoiceForm$ | async)?.value
.isGoodsReceivedonInvoiceDate != 'false'">
<p style="font-size: 15px">
Select the date that the goods or services were received<span style="color:red" >*</span>
</p>
<div class="col-md-6">

<mat-form-field appearance="outline" >
<input matInput
[matDatepicker]="goodsReceivedDatePicker"
Expand All @@ -191,10 +191,10 @@
></mat-datepicker-toggle>
<mat-datepicker #goodsReceivedDatePicker [disabled]="isReadOnly === true"
></mat-datepicker>

</mat-form-field>
</div>

</div>
<br *ngIf="(formCreationService.invoiceForm$ | async)?.value
.isGoodsReceivedonInvoiceDate == 'false'"/>
Expand All @@ -206,7 +206,7 @@
<mat-form-field appearance="outline">
<textarea [disabled]="isReadOnly" matInput
formControlName="purposeOfGoodsServiceReceived"

required
style="resize:none"
cdkTextareaAutosize
Expand All @@ -215,9 +215,9 @@
cdkAutosizeMaxRows="5"
maxlength="200"></textarea>
<!--<mat-hint>{{ remainingLength }} characters remaining.</mat-hint>-->

</mat-form-field>

<br/>
</div>
</div>
Expand All @@ -230,7 +230,7 @@
<mat-radio-group
formControlName="isClaimforPartofTotalInvoice"
class="primary-radio-group horizontal-radio-group"

(change)="selectDamageDates($event)"
aria-label="Select an option">
<mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
Expand All @@ -240,7 +240,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; This is required
</mat-error>
</mat-radio-group>

</div>
</div>
<br/>
Expand Down Expand Up @@ -275,7 +275,7 @@
Net invoiced being claimed (excluding taxes)<span style="color:red" >*</span>
</p>
<mat-form-field appearance="outline" class="mat-form-round monetary-input">

<div class="searchDiv">
<input
(focusin)="setHelpText(3, tooltip)"
Expand All @@ -284,21 +284,21 @@
[formControl]="invoiceForm.controls['netInvoiceBeingClaimed']"
matInput
required
mask="separator.2" thousandSeparator="" decimalMarker="."
mask="separator.2" thousandSeparator="," decimalMarker="."
(keyup)="CalculateInvoice($event);"
maxlength="100"/>
<span class="currencyText">CA$</span>
</div>
</mat-form-field>
</div>
</div>
</div>

<div class="row pst-box">
<div class="col-md-4 aln-txt">
<p style="font-size: 15px">
PST
</p>

</div>
<div class="col-md-8 inputCurrency">
$&nbsp;<mat-form-field class="monetary-input-small" appearance="outline" style="height: 30px !important">
Expand All @@ -307,7 +307,7 @@
(focusin)="setHelpText(4, tooltip)"
[formControl]="invoiceForm.controls['pst']"
matInput
mask="separator.2" thousandSeparator="" decimalMarker="."
mask="separator.2" thousandSeparator="," decimalMarker="."
(keyup)="CalculateInvoice($event);"
maxlength="100"/>
</mat-form-field>
Expand All @@ -324,7 +324,7 @@
(focusin)="setHelpText(5, tooltip)"
[formControl]="invoiceForm.controls['grossGST']"
matInput
mask="separator.2" thousandSeparator="" decimalMarker="."
mask="separator.2" thousandSeparator="," decimalMarker="."
(keyup)="CalculateInvoice($event);"
maxlength="100"/>
</mat-form-field>
Expand Down Expand Up @@ -372,10 +372,10 @@
<input
(focusin)="setHelpText(6, tooltip)"
#eligibleGST

[formControl]="invoiceForm.controls['eligibleGST']"
matInput
mask="separator.2" thousandSeparator="" decimalMarker="."
mask="separator.2" thousandSeparator="," decimalMarker="."
(keyup)="CalculateInvoice($event);"
maxlength="100"/>
</mat-form-field>
Expand Down Expand Up @@ -415,6 +415,6 @@
</div>
</div>
</form>

</mat-card-content>
</mat-card>
Loading

0 comments on commit 9cc2285

Please sign in to comment.