Skip to content

Commit 49ab0df

Browse files
committed
Merge branch 'feature/1324_application_edit' into stage
2 parents 38862db + 875dc61 commit 49ab0df

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

src/app/shared/components/forms/form-body-application/form-body-application.component.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@
3939
translate}}</label>
4040
<mat-form-field appearance="fill">
4141
<mat-label>{{'QUESTION.APPLICATION.START-DATE-PLACEHOLDER' | translate}}</mat-label>
42-
<input matInput [min]="today" [max]="serializedEndDate.value" [matDatepicker]="startDatePicker"
42+
<input matInput [max]="serializedEndDate.value" [matDatepicker]="startDatePicker"
4343
[formControl]="serializedStartDate"
4444
[ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('application.startDate'), 'is-valid' : formFailedSubmit && !errorFields.includes('application.startDate')}">
4545
<mat-datepicker-toggle matSuffix [for]="startDatePicker"></mat-datepicker-toggle>
4646
<mat-datepicker panelClass="datepicker-table-fix" #startDatePicker></mat-datepicker>
47+
<mat-hint>{{'QUESTION.APPLICATION.DATE-HINT' | translate}}</mat-hint>
4748
</mat-form-field>
4849
</div>
4950

@@ -56,6 +57,7 @@
5657
[ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('application.endDate'), 'is-valid' : formFailedSubmit && !errorFields.includes('application.endDate')}">
5758
<mat-datepicker-toggle matSuffix [for]="endDatePicker"></mat-datepicker-toggle>
5859
<mat-datepicker panelClass="datepicker-table-fix" #endDatePicker></mat-datepicker>
60+
<mat-hint>{{'QUESTION.APPLICATION.DATE-HINT' | translate}}</mat-hint>
5961
</mat-form-field>
6062
</div>
6163

@@ -102,9 +104,12 @@
102104
</div>
103105

104106
<div class="form-group mt-3">
107+
<label class="form-label" for="application.personalData">{{'APPLICATION.METADATA-FIELD.PERSONAL-DATA' |
108+
translate}}</label>
109+
<br />
105110
<mat-checkbox id="application.personalData" name="application.personalData"
106111
[(ngModel)]="application.personalData">
107-
<mat-label for="application.personalData" class="form-check-label text--bold margin-top-25px"
112+
<mat-label for="application.personalData" class="form-check-label margin-top-25px"
108113
style="white-space: initial">{{'QUESTION.APPLICATION.PERSONAL-DATA-PLACEHOLDER' | translate}}</mat-label>
109114
</mat-checkbox>
110115
</div>

src/app/shared/components/forms/form-body-application/form-body-application.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export class FormBodyApplicationComponent implements OnInit, OnDestroy {
4949
phoneCtrl: FormControl;
5050
controlledProperties = Object.values(ControlledPropertyTypes);
5151
deviceTypes: DropdownOption[] = [];
52-
today = new Date();
5352

5453
constructor(
5554
private restService: RestService,

src/assets/i18n/da.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,9 @@
623623
"APPLICATION": {
624624
"NAME-PLACEHOLDER": "Navngiv applikationen",
625625
"DESCRIPTION-PLACEHOLDER": "Lav kort beskrivelse af applikationen",
626-
"STATUS-PLACEHOLDER": "NO-PLACEHOLDER-DELETE-ME",
627-
"START-DATE-PLACEHOLDER": "Dato berører ikke funktionalitet i OS2IoT",
628-
"END-DATE-PLACEHOLDER": "Dato berører ikke funktionalitet i OS2IoT",
626+
"START-DATE-PLACEHOLDER": "Angiv en startdato for applikationen",
627+
"END-DATE-PLACEHOLDER": "Angiv en slutdato for applikationen",
628+
"DATE-HINT": "Dato berører ikke funktionalitet i OS2IoT",
629629
"CATEGORY-PLACEHOLDER": "Angiv den/de kategorier applikationen tilhører. Fx indeklima eller tracking",
630630
"OWNER-PLACEHOLDER": "Angiv afdeling eller lignende, der ejer data",
631631
"CONTACT-PERSON-PLACEHOLDER": "Angiv navn og eventuel afdeling på ansvarlig medarbejder",

0 commit comments

Comments
 (0)