From 643495781f55fb06a29f8d910c00e3458f8ad437 Mon Sep 17 00:00:00 2001
From: satyr <laskarisn@gmail.com>
Date: Fri, 10 Nov 2017 12:24:20 +0200
Subject: [PATCH] --

---
 dmp-frontend/src/app/form/dynamic-form.component.ts         | 4 +++-
 .../autocomplete-remote/autocomplete-remote.component.html  | 2 +-
 .../autocomplete-remote/autocomplete-remote.component.ts    | 2 +-
 .../src/app/form/fields/dynamic-form-field.component.html   | 6 ++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index 09dfad201..10b4a52f7 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -35,7 +35,9 @@ import * as scroll from '../../assets/jquery.scrollTo.min.js';
   selector: 'dynamic-form',
   templateUrl: './dynamic-form.component.html',
   styleUrls: ['./dynamic-form.component.css'],
-  providers: [FieldControlService, ServerService, dataModelBuilder]
+  providers: [
+    FieldControlService, ServerService, dataModelBuilder
+  ]
 })
 export class DynamicFormComponent implements OnInit {
 
diff --git a/dmp-frontend/src/app/form/fields/autocomplete-remote/autocomplete-remote.component.html b/dmp-frontend/src/app/form/fields/autocomplete-remote/autocomplete-remote.component.html
index 898c068e6..b31d2ade3 100644
--- a/dmp-frontend/src/app/form/fields/autocomplete-remote/autocomplete-remote.component.html
+++ b/dmp-frontend/src/app/form/fields/autocomplete-remote/autocomplete-remote.component.html
@@ -1,4 +1,4 @@
 
 <label *ngIf="label" for="{{id}}">{{label}}</label>
-<input auto-complete class="form-control" [value]="selectedValue" id="{{id}}" [(ngModel)]="selectedValue" (ngModelChange)="updateByQuery($event)" [source]="values" >
+<input auto-complete class="form-control"  id="{{id}}" [(ngModel)]="value" (ngModelChange)="updateByQuery($event)" [source]="values" >
 
diff --git a/dmp-frontend/src/app/form/fields/autocomplete-remote/autocomplete-remote.component.ts b/dmp-frontend/src/app/form/fields/autocomplete-remote/autocomplete-remote.component.ts
index b994cbb72..6bc3516de 100644
--- a/dmp-frontend/src/app/form/fields/autocomplete-remote/autocomplete-remote.component.ts
+++ b/dmp-frontend/src/app/form/fields/autocomplete-remote/autocomplete-remote.component.ts
@@ -29,7 +29,7 @@ export class AutocompleteRemoteComponent implements OnInit, ControlValueAccessor
   id : string = UUID.UUID();
   @Input() label : string;
   @Input() url : string;
-  @Input() selectedValue : string;
+  selectedValue : string;
 
 
   values : any[] = new Array();
diff --git a/dmp-frontend/src/app/form/fields/dynamic-form-field.component.html b/dmp-frontend/src/app/form/fields/dynamic-form-field.component.html
index 270116abf..e968a33d6 100644
--- a/dmp-frontend/src/app/form/fields/dynamic-form-field.component.html
+++ b/dmp-frontend/src/app/form/fields/dynamic-form-field.component.html
@@ -36,8 +36,10 @@
        [required]="field.required" [pattern] = "field.regex" (ngModelChange) = "toggleVisibility($event, field,false)"> <!--input or change event
       on change event the listener is triggered on blur -->
 
-      <div *ngSwitchCase="'dropdown'">     
-        <autocomplete-remote *ngIf="field.url" [formControlName]="field.key" [label]="field.label" [url]="field.url" ></autocomplete-remote>
+      <div *ngSwitchCase="'dropdown'">    
+
+        <autocomplete-remote *ngIf="field.url" [formControlName]="field.key" [url]="field.url" ></autocomplete-remote>
+        
         <select *ngIf="!field.url"  class="form-control" [id]="field.key" [formControlName]="field.key"  [required]="field.required" (change)="toggleVisibility($event, field, false)">
           <option *ngFor="let opt of field.options" [value]="opt._value"  >{{opt._label}}</option>
         </select>