Merge branch...

Merge branch '68-affichage-famille-output-category-dans-la-configuration-d-un-dataset-output' into 'develop'

Resolve "Affichage famille + output category dans la configuration d'un dataset (output)"

Closes #68

See merge request !61

client/src/app/admin/instance/dataset/components/attribute/detail/table-detail.component.html

@@ -3,7 +3,7 @@
         <thead>
             <tr>
                 <th scope="col" style="min-width:150px">Name</th>
-                <th scope="col" style="min-width:150px">Output category</th>
+                <th scope="col" style="min-width:150px">Output family / category</th>
                 <th scope="col" style="min-width:100px;width:100px;">Display</th>
                 <th scope="col" style="width:50px">Save</th>
             </tr>

client/src/app/admin/instance/dataset/components/attribute/detail/tr-detail.component.html

@@ -5,7 +5,9 @@
     <td>
         <select class="form-control" name="id_detail_output_category" (change)="detailOutputCategoryOnChange()" formControlName="id_detail_output_category">
             <option value=""></option>
-            <option *ngFor="let category of outputCategoryList" [ngValue]="category.id">{{category.label}}</option>
+            <option *ngFor="let category of outputCategoryList" [ngValue]="category.id">
+                {{ getOutputFamilyLabel(category.id_output_family) }} / {{ category.label }}
+            </option>
         </select>
     </td>
     <td>

client/src/app/admin/instance/dataset/components/attribute/detail/tr-detail.component.ts

@@ -10,7 +10,7 @@
 import { Component, Input, Output, EventEmitter, ChangeDetectionStrategy, OnInit } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 
-import { Attribute, OutputCategory } from 'src/app/metamodel/models';
+import { Attribute, OutputCategory, OutputFamily } from 'src/app/metamodel/models';
 
 @Component({
     selector: '[detail]',
@@ -21,6 +21,7 @@ import { Attribute, OutputCategory } from 'src/app/metamodel/models';
 export class TrDetailComponent implements OnInit {
     @Input() attribute: Attribute
     @Input() outputCategoryList: OutputCategory[];
+    @Input() outputFamilyList: OutputFamily[];
     @Output() save: EventEmitter<Attribute> = new EventEmitter();
 
     public form = new UntypedFormGroup({
@@ -41,6 +42,10 @@ export class TrDetailComponent implements OnInit {
         }
     }
 
+    getOutputFamilyLabel(idOutputFamilly: number): string {
+        return this.outputFamilyList.find(outputFamilly => outputFamilly.id === idOutputFamilly).label;
+    }
+
     submit(): void {
         this.save.emit({
             ...this.attribute,

client/src/app/admin/instance/dataset/components/attribute/output/table-output.component.html

@@ -3,7 +3,7 @@
         <thead>
             <tr>
                 <th scope="col" style="min-width:150px">Name</th>
-                <th scope="col" style="min-width:150px">Output category</th>
+                <th scope="col" style="min-width:150px">Output family / category</th>
                 <th scope="col" style="min-width:100px;width:100px;">Display</th>
                 <th scope="col" style="width:50px">Selected</th>
                 <th scope="col" style="width:50px">Save</th>

client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.html

@@ -3,20 +3,25 @@
         <input type="text" class="form-control" name="name" formControlName="name">
     </td>
     <td>
-        <select class="form-control" name="id_output_category" (change)="outputCategoryOnChange()" formControlName="id_output_category">
+        <select class="form-control" name="id_output_category" (change)="outputCategoryOnChange()"
+            formControlName="id_output_category">
             <option value=""></option>
-            <option *ngFor="let category of outputCategoryList" [ngValue]="category.id">{{category.label}}</option>
+            <option *ngFor="let category of outputCategoryList" [ngValue]="category.id">
+                {{ getOutputFamilyLabel(category.id_output_family) }} / {{ category.label }}
+            </option>
         </select>
     </td>
     <td>
-        <input *ngIf="form.controls.id_output_category.value" type="number" class="form-control" name="output_display" formControlName="output_display">
+        <input *ngIf="form.controls.id_output_category.value" type="number" class="form-control" name="output_display"
+            formControlName="output_display">
     </td>
     <td>
-        <input *ngIf="form.controls.id_output_category.value" type="checkbox" class="form-control" name="selected" formControlName="selected">
+        <input *ngIf="form.controls.id_output_category.value" type="checkbox" class="form-control" name="selected"
+            formControlName="selected">
     </td>
     <td class="text-center align-middle">
         <button (click)="submit()" [disabled]="form.invalid || form.pristine" class="btn btn-outline-primary">
             <span class="fas fa-save"></span>
         </button>
     </td>
-</ng-container>
+</ng-container>
\ No newline at end of file

client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.ts

@@ -10,17 +10,18 @@
 import { Component, Input, Output, EventEmitter, ChangeDetectionStrategy, OnInit } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 
-import { Attribute, OutputCategory } from 'src/app/metamodel/models';
+import { Attribute, OutputCategory, OutputFamily } from 'src/app/metamodel/models';
 
 @Component({
     selector: '[output]',
     templateUrl: 'tr-output.component.html',
-    styleUrls: [ '../tr.component.scss' ],
+    styleUrls: ['../tr.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class TrOutputComponent implements OnInit {
     @Input() attribute: Attribute;
     @Input() outputCategoryList: OutputCategory[];
+    @Input() outputFamilyList: OutputFamily[];
     @Output() save: EventEmitter<Attribute> = new EventEmitter();
 
     public form = new UntypedFormGroup({
@@ -42,6 +43,10 @@ export class TrOutputComponent implements OnInit {
         }
     }
 
+    getOutputFamilyLabel(idOutputFamilly: number): string {
+        return this.outputFamilyList.find(outputFamilly => outputFamilly.id === idOutputFamilly).label;
+    }
+
     submit(): void {
         this.save.emit({
             ...this.attribute,

client/src/app/admin/instance/dataset/containers/configure-dataset.component.html

@@ -120,6 +120,7 @@
                         <tr *ngFor="let attribute of (attributeList | async)"
                             output
                             [attribute]="attribute"
+                            [outputFamilyList]="outputFamilyList | async"
                             [outputCategoryList]="outputCategoryList | async"
                             (save)="editAttribute($event)">
                         </tr>
@@ -135,6 +136,7 @@
                         <tr *ngFor="let attribute of (attributeList | async)"
                             detail
                             [attribute]="attribute"
+                            [outputFamilyList]="outputFamilyList | async"
                             [outputCategoryList]="outputCategoryList | async"
                             (save)="editAttribute($event)">
                         </tr>