From e4276815a9d0c6a8eecab339b7752019fce625a0 Mon Sep 17 00:00:00 2001
From: annabakouli <annabakouli@gmail.com>
Date: Fri, 12 Jan 2018 11:38:34 +0200
Subject: [PATCH] no message

---
 .../dynamic-field-boolean-decision.component.html |  2 +-
 .../dynamic-field-checkbox.html                   |  2 +-
 .../dynamic-field-dropdown.html                   |  2 +-
 .../dynamic-field-radiobox.component.html         |  2 +-
 .../dynamic-form-field.component.html             |  4 ++--
 .../autocomplete/autocomplete.component.ts        | 15 +++++++++++----
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html
index acefeb835..7899a785f 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="form">
-    <mat-radio-group formControlName="value">
+    <mat-radio-group formControlName="value" [required]="field.validationRequired">
         <mat-radio-button name="{{field.id}}" value="true">Yes</mat-radio-button>
         <br>
         <mat-radio-button name="{{field.id}}" value="false">No</mat-radio-button>
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html
index 20064c7c4..e4aaf4246 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html
@@ -1,5 +1,5 @@
 <div [formGroup]="form" class="form-group">
-    <mat-checkbox formControlName="value">{{field.data.label}}</mat-checkbox>
+    <mat-checkbox formControlName="value" [required]="field.validationRequired">{{field.data.label}}</mat-checkbox>
     <!-- <input type="checkbox" formControlName="value"> -->
 </div>
 
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
index 783cef0fb..a0ba2b0fd 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
@@ -1,6 +1,6 @@
 <div [formGroup]="form">
     <mat-form-field>
-        <mat-select formControlName="value">
+        <mat-select formControlName="value" [required]="field.validationRequired">
             <mat-option *ngFor="let opt of field.data.options" [value]="opt.value">{{opt.label}}</mat-option>
         </mat-select>
         <mat-error *ngIf="form.get('value').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>                
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
index 4b3613cd3..2153f7a93 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="form">
-    <mat-radio-group formControlName="value">
+    <mat-radio-group formControlName="value" [required]="field.validationRequired">
         <div *ngFor="let option of this.field.data.options let index = index">
         <mat-radio-button [value]="option.value" >{{option.label}}</mat-radio-button>
       </div>
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
index f0c33eb4c..ddfc08b4e 100644
--- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
+++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
@@ -11,7 +11,7 @@
 
     <div *ngSwitchCase="'freetext'">
       <mat-form-field>
-        <input matInput formControlName="value" placeholder="{{field.data.label}}">
+        <input matInput formControlName="value" placeholder="{{field.data.label}}" [required]="field.validationRequired">  
         <mat-error *ngIf="form.get('value').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>        
       </mat-form-field>
     </div>
@@ -33,7 +33,7 @@
 
     <div *ngSwitchCase="'textarea'">
       <mat-form-field>
-        <textarea matInput formControlName="value" matTextareaAutosize matAutosizeMinRows="2" matAutosizeMaxRows="10"> </textarea>
+        <textarea matInput formControlName="value" matTextareaAutosize matAutosizeMinRows="2" matAutosizeMaxRows="10" [required]="field.validationRequired"> </textarea>
         <button mat-button *ngIf="form.get('value').value" matSuffix mat-icon-button aria-label="Clear" (click)="this.form.patchValue({'value': ''})">
             <mat-icon>close</mat-icon>
           </button>
diff --git a/dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts b/dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts
index fe4b42617..77bd66a04 100644
--- a/dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts
+++ b/dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts
@@ -67,19 +67,26 @@ export class AutocompleteComponent implements OnInit {
 
 		const valueChanges = this.control.valueChanges.share();
 		valueChanges.subscribe(searchTerm => {
-			this.loading = true;
 			if (this.hasSelectedItem) {
 				this.resetFormControlValue();
+			}else{
+				this.loading = true;				
 			}
 		});
 		valueChanges
 			.debounceTime(this.delay)
-			.finally(() => this.loading = false)
 			.distinctUntilChanged()
 			.switchMap(val => {
-				//if (this.hasSelectedItem) return [];
+				if (this.hasSelectedItem) {
+					this.loading = false;
+					return [];
+				}
+
 				this.configuration.requestItem.criteria.like = this.control.value;
-				return this.configuration.callback(this.configuration.requestItem).map(result=>this.filteredItems = (<any[]>result))
+				return this.configuration.callback(this.configuration.requestItem).map(result => {
+					this.filteredItems = (<any[]>result)
+					this.loading = false;
+				})
 			}).subscribe()
 
 		// this.filteredItems = this.inputField.nativeElement.valueChanges.startWith(null)