condition fix

src/app/sample/sample.component.html

@@ -197,7 +197,8 @@
           </h5>
           <div *ngIf="sample.condition.condition_template" [@inOut]>
             <rb-form-select [name]="'conditionSelect-' + gIndex" label="Condition"
-                            [(ngModel)]="sample.condition.condition_template">
+                            [(ngModel)]="sample.condition.condition_template"
+                            (ngModelChange)="reValidate()">
               <option [value]="sample.condition.condition_template">
                 {{d.id.conditionTemplates[sample.condition.condition_template].name}} - current
               </option>
@@ -213,7 +214,7 @@
                 <option *ngFor="let value of parameter.range.values" [value]="value">{{value}}</option>
                 <ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
               </rb-form-select>
-              <rb-form-input *ngSwitchDefault
+              <rb-form-input *ngSwitchDefault (focus)="checkFormAfterInit = true"
                              [name]="'conditionParameter-' + gIndex + '-' + i"
                              [label]="parameter.name" appValidate="string" required
                              [(ngModel)]="sample.condition[parameter.name]" #parameterInput="ngModel">
@@ -332,3 +333,4 @@
     Do you really want to delete {{samples.length > 1 ? 'these samples' : 'this sample'}}?
   </rb-alert>
 </ng-template>
+