summaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src/app/shared/components/formControls
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-07-07 19:23:03 +0300
committerIttay Stern <ittay.stern@att.com>2019-07-08 16:13:43 +0300
commitf792671ae247a931f34d902e9276202b5016ef9a (patch)
tree6104971e8074c9a3d720836276ff18619719ec02 /vid-webpack-master/src/app/shared/components/formControls
parentfc62274e8d15964d63c62bf0e2f4abc040252ee9 (diff)
Merge from ecomp 718fd196 - Modern UI
Issue-ID: VID-378 Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/shared/components/formControls')
-rw-r--r--vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html5
-rw-r--r--vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts2
2 files changed, 4 insertions, 3 deletions
diff --git a/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html b/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html
index 6d13e52f8..12f62a96f 100644
--- a/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html
+++ b/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.html
@@ -6,7 +6,7 @@
[attr.data-tests-id]="data?.dataTestId"
name="{{data?.name}}"
[formControl]="form.controls[data.controlName]"
- [ngClass]="{'error-style' : (form?.controls[data?.controlName]?.touched && form?.controls[data?.controlName]?.errors) || data?.hasEmptyOptions ,
+ [ngClass]="{'error-style' : ((form?.controls[data?.controlName]?.touched && form?.controls[data?.controlName]?.errors) || data?.hasEmptyOptions) && data?.isRequired(),
'grayColor': form?.controls[data?.controlName]?.value == null || form?.controls[data?.controlName]?.value == undefined,
'blackColor' : form?.controls[data?.controlName]?.value != null}"
(blur)="data.onBlur()">
@@ -16,6 +16,5 @@
[value]="option[data.ngValue]" [disabled]="!option?.isPermitted && option?.isPermitted != undefined">{{option.name}}
</option>
</select>
- <form-control-error *ngIf="data?.hasEmptyOptions" [message]="'No results for this request. Please change criteria.'"></form-control-error>
+ <form-control-error *ngIf="data?.hasEmptyOptions && data?.isRequired()" [message]="'No results for this request. Please change criteria.'"></form-control-error>
</div>
-
diff --git a/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts b/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts
index 550feca22..8148368dd 100644
--- a/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts
+++ b/vid-webpack-master/src/app/shared/components/formControls/component/dropdown/dropdown.formControl.component.ts
@@ -11,11 +11,13 @@ export class DropdownFormControlComponent implements OnChanges{
@Input() data: DropdownFormControl = null;
@Input() form: FormGroup = null;
+
ngOnChanges(changes: SimpleChanges): void {
if (changes["data"] !== undefined && changes["data"].currentValue !== changes["data"].previousValue && changes["data"].firstChange) {
if(this.data.onInit){
this.data.onInit(this.data, this.form);
}
+ let isRequired: boolean =this.data.isRequired();
}
if (changes["data"] !== undefined) {