dynamic table WIP

common/utils/websrv/frontend/src/app/components/commands/commands.component.html

@@ -67,7 +67,7 @@
         <mat-form-field [ngSwitch]="col.type">
           <mat-slide-toggle *ngSwitchCase="IOptionType.boolean" [formControl]="row.booleanFC"
             [checked]="row.isEnabledFC.value" [disabled]="!col.modifiable"></mat-slide-toggle>
-          <input *ngSwitchCase="IOptionType.boolean" matInput [formControl]="row.stringFC"
+          <input *ngSwitchCase="IOptionType.string" matInput [formControl]="row.stringFC"
             [disabled]="!col.modifiable" />
         </mat-form-field>
       </mat-cell>

common/utils/websrv/frontend/src/app/components/commands/commands.component.ts

 import { Component } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { map } from 'rxjs/internal/operators/map';
-<<<<<<< HEAD
-import { tap, mergeMap, filter } from 'rxjs/operators';
-import { CommandsApi, IArgType, ILog } from 'src/app/api/commands.api';
-=======
-import { CommandsApi, IArgType, IColumn, IRow } from 'src/app/api/commands.api';
->>>>>>> websrv-table
+import { CommandsApi, IArgType, IColumn } from 'src/app/api/commands.api';
 import { CmdCtrl } from 'src/app/controls/cmd.control';
 import { RowCtrl } from 'src/app/controls/row.control';
 import { VarCtrl } from 'src/app/controls/var.control';