Skip to content
Snippets Groups Projects
Commit 9a38e12e authored by Samuel Eickelberg's avatar Samuel Eickelberg
Browse files

Fixed date formatting in statements

parent 7520e954
No related branches found
No related tags found
No related merge requests found
......@@ -23,7 +23,7 @@
<label for="city">{{'dcc.location.city' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.city [required]="strict" id="city" matInput name="city">
<input [(ngModel)]=contact.location!.city id="city" matInput name="city">
</mat-form-field>
</div>
<div class="dcc-row">
......@@ -31,7 +31,7 @@
<label for="countryCode">{{'dcc.location.countryCode' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.countryCode [required]="strict" id="countryCode" matInput name="countryCode"
<input [(ngModel)]=contact.location!.countryCode id="countryCode" matInput name="countryCode"
oninput="this.value = this.value.toUpperCase()">
</mat-form-field>
</div>
......@@ -40,7 +40,7 @@
<label for="postalCode">{{'dcc.location.postalCode' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.postalCode [required]="strict" id="postalCode" matInput name="postalCode">
<input [(ngModel)]=contact.location!.postalCode id="postalCode" matInput name="postalCode">
</mat-form-field>
</div>
<div class="dcc-row">
......@@ -48,7 +48,7 @@
<label for="stateCode">{{'dcc.location.stateCode' | translate}} <span class="asterix">*</span> </label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.stateCode [required]="strict" id="stateCode" matInput name="stateCode">
<input [(ngModel)]=contact.location!.stateCode id="stateCode" matInput name="stateCode">
</mat-form-field>
</div>
<div class="dcc-row">
......@@ -56,7 +56,7 @@
<label for="street">{{'dcc.location.street' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.street [required]="strict" id="street" matInput name="street">
<input [(ngModel)]=contact.location!.street id="street" matInput name="street">
</mat-form-field>
</div>
<div class="dcc-row">
......@@ -64,7 +64,7 @@
<label for="houseNumber">{{'dcc.location.houseNumber' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.houseNumber [required]="strict" id="houseNumber" matInput name="houseNumber">
<input [(ngModel)]=contact.location!.houseNumber id="houseNumber" matInput name="houseNumber">
</mat-form-field>
</div>
<div class="dcc-row">
......
......@@ -54,12 +54,19 @@
</div>
<div class="dcc-row">
<div class="label-container">
<label for="date">{{'dcc.date' | translate}}</label>
<label for="date">{{'dcc.date' | translate}}</label>
</div>
<mat-form-field appearance="fill">
<input (ngModelChange)="item.date = dccService.marshalCustomDate($event)" [(ngModel)]=item.date
[matDatepicker]="statementDate" id="date" matInput name="date" readonly>
<mat-hint>JJJJ-MM-TT</mat-hint>
<input
(ngModelChange)="item.date = dccService.marshalCustomDate($event)"
[matDatepicker]="statementDate"
[ngModel]="item.date"
id="date"
matInput
name="date"
readonly
/>
<mat-hint>{{'dcc.YYYYMMDD' | translate}}</mat-hint>
<mat-datepicker-toggle [for]="statementDate" matSuffix></mat-datepicker-toggle>
<mat-datepicker #statementDate></mat-datepicker>
</mat-form-field>
......
......@@ -43,20 +43,6 @@ export class DccMeasurementMetadataComponent implements OnInit {
}
}
}
marshalCustomDate(value: Date): string {
const result = new Array<string>();
if (value) {
result.push(value.getFullYear().toString());
result.push((value.getMonth() + 1).toString());
result.push(value.getDate().toString());
}
for (let i = 0; i < result.length; i++) {
if (result[i].length === 1) {
result[i] = '0' + result[i];
}
}
return result[0] + '-' + result[1] + '-' + result[2];}
toggleCard(index: number) {
this.isExpanded[index] = !this.isExpanded[index];
......@@ -72,6 +58,6 @@ export class DccMeasurementMetadataComponent implements OnInit {
onDateChange(event: any) {
const date: Date = event.value;
this.item.date = this.marshalCustomDate(date);
this.item.date = this.dccService.marshalCustomDate(date);
}
}
......@@ -378,7 +378,7 @@
</div>
</mat-step>
<mat-step>
<ng-template i18n matStepLabel>{{'dcc.statements' | translate}}</ng-template>
<ng-template matStepLabel>{{'dcc.statements' | translate}}</ng-template>
<ng-container *ngIf="!showEmptyStatement">
<mat-card appearance="outlined" class="statements">
<mat-card-content>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment