Rollback form

src/app/search/components/criteria/search-type/between.component.html

 <div class="form-group row">
     <label class="col-3 col-form-label">{{ label }}</label>
     <div class="col">
-        <div class="input-group">
-            <input type="text" class="form-control" [placeholder]="getPlaceholderMin()" [formControl]="fieldMin"
-                autocomplete="off">
-            <div class="input-group-prepend">
-                <span class="input-group-text"><= x <=</span>
-            </div>
-            <input type="text" class="form-control" [placeholder]="getPlaceholderMax()" [formControl]="fieldMax"
-                autocomplete="off">
-        </div>
+        <input type="text" class="form-control" [placeholder]="getPlaceholderMin()" [formControl]="fieldMin"
+            autocomplete="off" />
+    </div>
+    <div class="col">
+        <input type="text" class="form-control" [placeholder]="getPlaceholderMax()" [formControl]="fieldMax"
+            autocomplete="off" />
     </div>
     <div class="col-2 text-center">
         <button class="btn btn-outline-success" *ngIf="!fieldMin.disabled"

src/app/search/components/criteria/search-type/datalist.component.html

 <div class="form-group row">
     <label class="col-3 col-form-label">{{ label }}</label>
     <div class="col">
-        <div class="input-group mb-3">
-            <div class="input-group-prepend">
-                <span class="input-group-text">{{ operator | formLabelOperator }}</span>
-            </div>
-            <input [attr.list]="getDatalistId()" 
-                type="text" 
-                class="form-control" 
-                [placeholder]="getPlaceholder()"
-                [formControl]="field" 
-                autocomplete="off" />
-            </div>
-        </div>
-        <div class="col-2 text-center">
-            <button class="btn btn-outline-success" *ngIf="!field.disabled" [hidden]="!field.value"
-            (click)="emitAdd()">
+        <input [attr.list]="getDatalistId()" type="text" class="form-control" [placeholder]="getPlaceholder()"
+            [formControl]="field" autocomplete="off" />
+        <datalist [id]="getDatalistId()">
+            <option *ngFor="let option of options" [value]="option.value">
+        </datalist>
+    </div>
+    <div class="col-2 text-center">
+        <button class="btn btn-outline-success" *ngIf="!field.disabled" [hidden]="!field.value" (click)="emitAdd()">
             <span class="fas fa-plus fa-fw"></span>
         </button>
         <button class="btn btn-outline-danger" *ngIf="field.disabled" (click)="emitDelete()">
             <span class="fa fa-times fa-fw"></span>
         </button>
     </div>
-</div>
-
-<datalist [id]="getDatalistId()">
-    <option *ngFor="let option of options" [value]="option.value">
-</datalist>
\ No newline at end of file
+</div>
\ No newline at end of file

src/app/search/components/criteria/search-type/date.component.html

 <div class="form-group row">
     <label class="col-3 col-form-label">{{ label }}</label>
     <div class="col">
-        <div class="input-group mb-3">
-            <div class="input-group-prepend">
-                <span class="input-group-text">{{ operator | formLabelOperator }}</span>
-            </div>
-            <input type="text" 
-                placeholder="Pick a date..." 
-                class="form-control" 
-                [formControl]="field"
-                [bsValue]="field.value" 
-                [bsConfig]="{ dateInputFormat: 'YYYY-MM-DD' }" 
-                bsDatepicker>
-        </div>
+        <input type="text" 
+            placeholder="Pick a date..." 
+            class="form-control" 
+            [formControl]="field"
+            [bsValue]="field.value" 
+            [bsConfig]="{ dateInputFormat: 'YYYY-MM-DD' }" 
+            bsDatepicker>
     </div>
     <div class="col-2 text-center">
         <button class="btn btn-outline-success" *ngIf="!field.disabled" [hidden]="!field.value"

src/app/search/components/criteria/search-type/datetime.component.html

@@ -25,31 +25,6 @@
             </div>
         </div>
     </div>
-
-    <!-- <div class="col">
-        <div class="input-group mb-3">
-            <div class="input-group-prepend">
-                <span class="input-group-text">{{ operator | formLabelOperator }}</span>
-            </div>
-            <input type="text" 
-                placeholder="Pick a date..." 
-                class="form-control" 
-                [formControl]="date" 
-                [bsValue]="date.value"
-                [bsConfig]="{ dateInputFormat: 'YYYY-MM-DD' }" 
-                (change)="change()" 
-                bsDatepicker>
-            <ng-select (change)="change()" [formControl]="hh" [multiple]="false" placeholder="HH...">
-                <ng-option *ngFor="let hour of hours" [value]="hour">{{ hour }}</ng-option>
-            </ng-select>
-            <div class="input-group-prepend">
-                <span class="input-group-text"> : </span>
-            </div>
-            <ng-select (change)="change()" [formControl]="mm" [multiple]="false" placeholder="MM..." class="ng-select">
-                <ng-option *ngFor="let min of minutes" [value]="min">{{ min }}</ng-option>
-            </ng-select>
-        </div>
-    </div> -->
     <div class="col-2 text-center">
         <button class="btn btn-outline-success" *ngIf="!date.disabled || !hh.disabled || !mm.disabled"
             [hidden]="!isValidFields" (click)="emitAdd()">

src/app/search/components/criteria/search-type/field.component.html

 <div class="form-group row">
     <label class="col-3 col-form-label">{{ label }}</label>
     <div class="col">
-        <div class="input-group mb-3">
-            <div class="input-group-prepend">
-                <span class="input-group-text">{{ operator | formLabelOperator }}</span>
-            </div>
-            <input
-                [type]="getType()" 
-                class="form-control" 
-                [placeholder]="getPlaceholder()" 
-                [formControl]="field"
-                autocomplete="off">
-        </div>
+        <input
+            [type]="getType()" 
+            class="form-control" 
+            [placeholder]="getPlaceholder()" 
+            [formControl]="field"
+            autocomplete="off">
     </div>
     <div class="col-2 text-center">
         <button class="btn btn-outline-success" *ngIf="!field.disabled" [hidden]="!field.value" (click)="emitAdd()">

src/app/search/components/criteria/search-type/radio.component.html

 <div class="form-group row">
     <label class="col-3 col-form-label">{{ label }}</label>
     <div class="col">
-        <div class="container">
-            <div class="row justify-content-start">
-                <div *ngFor="let option of options" class="col">
-                    <div class="form-check w-auto">
-                        <input class="form-check-input" type="radio" id="cb_{{option.value}}" [formControl]="radio"
-                            [value]="option.value">
-                        <label class="form-check-label" for="cb_{{option.value}}">{{ option.label }}</label>
-                    </div>
-                </div>
-                <div *ngFor="let option of options" class="col m-auto">
-                    <div class="form-check">
-                        <input class="form-check-input" type="radio" id="cb_{{option.value}}" [formControl]="radio"
-                            [value]="option.value">
-                        <label class="form-check-label" for="cb_{{option.value}}">{{ option.label }}</label>
-                    </div>
-                </div>
-                <!-- <div *ngFor="let option of options" class="form-check form-check-inline">
-                    <input class="form-check-input" type="radio" id="cb_{{option.value}}" [formControl]="radio"
-                        [value]="option.value">
-                    <label class="form-check-label" for="cb_{{option.value}}">{{ option.label }}</label>
-                </div> -->
-            </div>
+        <div *ngFor="let option of options" class="form-check form-check-inline">
+            <input class="form-check-input" type="radio" id="cb_{{option.value}}" [formControl]="radio"
+                [value]="option.value">
+            <label class="form-check-label" for="cb_{{option.value}}">{{ option.label }}</label>
         </div>
     </div>
     <div class="col-2 text-center">