Verified Commit 890588b3 authored by João Capucho's avatar João Capucho
Browse files

Unify characteristic input/values into a component

parent 6ce15506
Loading
Loading
Loading
Loading
+2 −5
Original line number Diff line number Diff line
@@ -121,11 +121,8 @@
                                    <mat-label>Alias</mat-label>
                                    <input matInput formControlName="alias">
                                </mat-form-field>
                                <mat-form-field class="col-lg-6">
                                    <mat-label>Value</mat-label>
                                    <input matInput formControlName="value">
                                </mat-form-field>
                
                                <app-characteristic-input ngDefaultControl formControlName="value" class="col-lg-6"
                                    [valueType]="editFormCharacteristic.controls.valueType.value"></app-characteristic-input>
                            </div>
                        </div>
                
+7 −5
Original line number Diff line number Diff line
@@ -257,8 +257,10 @@
                                                          <span
                                                              *ngFor="let val of element.resourceSpecCharacteristicValue; let last = last"
                                                              [class.hidden]="!val || !val.isDefault">
                                                              <span
                                                                  *ngIf="val && val.isDefault">{{val.value.value}}
                                                              <span *ngIf="val && val.isDefault">
                                                                  <app-characteristic-value
                                                                    [value]="val.value.value"
                                                                    [valueType]="element.valueType"></app-characteristic-value>
                                                                  <span
                                                                      *ngIf="val.value.alias">({{val.value.alias}})</span>
                                                                  <!-- <span class="comma-separator">, </span> -->
+4 −2
Original line number Diff line number Diff line
@@ -223,7 +223,9 @@

                                <ng-container *ngSwitchDefault>
                                  <td class="align-middle">
                                    {{ specCharacteristic.value.value }}
                                    <app-characteristic-value
                                      [value]="specCharacteristic.value.value"
                                      [valueType]="specCharacteristic.valueType"></app-characteristic-value>
                                    <span *ngIf="specCharacteristic.value.alias">({{
                                      specCharacteristic.value.alias
                                      }})</span>
+2 −5
Original line number Diff line number Diff line
@@ -123,11 +123,8 @@
                                        <mat-label>Alias</mat-label>
                                        <input matInput formControlName="alias">
                                    </mat-form-field>
                                    <mat-form-field class="col-lg-6">
                                        <mat-label>Value</mat-label>
                                        <input matInput formControlName="value">
                                    </mat-form-field>
                    
                                    <app-characteristic-input ngDefaultControl formControlName="value" class="col-lg-6"
                                        [valueType]="editFormCharacteristic.controls.valueType.value"></app-characteristic-input>
                                </div>
                            </div>
                    
+15 −14
Original line number Diff line number Diff line
@@ -303,10 +303,11 @@
                                                            <span
                                                                *ngFor="let val of element.serviceSpecCharacteristicValue; let last = last"
                                                                [class.hidden]="!val || !val.isDefault">
                                                                <span
                                                                    *ngIf="val && val.isDefault">{{val.value.value}}
                                                                    <span
                                                                        *ngIf="val.value.alias">({{val.value.alias}})</span>
                                                                <span *ngIf="val && val.isDefault">
                                                                    <app-characteristic-value
                                                                      [value]="val.value.value"
                                                                      [valueType]="element.valueType"></app-characteristic-value>
                                                                    <span *ngIf="val.value.alias">({{val.value.alias}})</span>
                                                                    <!-- <span class="comma-separator">, </span> -->
                                                                </span>
                                                                <br>
Loading