From 7c9a65a72627ec3f0d56f39d089a006f98c4943f Mon Sep 17 00:00:00 2001
From: Angapay Divin <divin.angapay@lam.fr>
Date: Wed, 21 Sep 2022 16:16:14 +0200
Subject: [PATCH 1/2] display familly output category label on the dataset
 configuration

---
 .../attribute/output/tr-output.component.html     | 15 ++++++++++-----
 .../attribute/output/tr-output.component.ts       |  9 +++++++--
 .../containers/configure-dataset.component.html   |  1 +
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.html b/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.html
index 9b0457a..4274d5e 100644
--- a/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.html
+++ b/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
diff --git a/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.ts b/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.ts
index 8cecc57..fcca115 100644
--- a/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.ts
+++ b/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({
@@ -48,4 +49,8 @@ export class TrOutputComponent implements OnInit {
             ...this.form.value
         });
     }
+
+    getOutputFamilyLabel(idOutputFamilly: number): string {
+        return this.outputFamilyList.find(outputFamilly => outputFamilly.id === idOutputFamilly).label;
+    }
 }
diff --git a/client/src/app/admin/instance/dataset/containers/configure-dataset.component.html b/client/src/app/admin/instance/dataset/containers/configure-dataset.component.html
index 335ce69..fe0261f 100644
--- a/client/src/app/admin/instance/dataset/containers/configure-dataset.component.html
+++ b/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>
-- 
GitLab


From 6e8fc838f0c3e6b8a7c190c2886ad08f08a55a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Fri, 23 Sep 2022 11:03:30 +0200
Subject: [PATCH 2/2] Add Output family + category for detail config

---
 .../attribute/detail/table-detail.component.html          | 2 +-
 .../components/attribute/detail/tr-detail.component.html  | 4 +++-
 .../components/attribute/detail/tr-detail.component.ts    | 7 ++++++-
 .../attribute/output/table-output.component.html          | 2 +-
 .../components/attribute/output/tr-output.component.html  | 2 +-
 .../components/attribute/output/tr-output.component.ts    | 8 ++++----
 .../dataset/containers/configure-dataset.component.html   | 1 +
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/client/src/app/admin/instance/dataset/components/attribute/detail/table-detail.component.html b/client/src/app/admin/instance/dataset/components/attribute/detail/table-detail.component.html
index ae53a43..64784d8 100644
--- a/client/src/app/admin/instance/dataset/components/attribute/detail/table-detail.component.html
+++ b/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>
diff --git a/client/src/app/admin/instance/dataset/components/attribute/detail/tr-detail.component.html b/client/src/app/admin/instance/dataset/components/attribute/detail/tr-detail.component.html
index ecb4ec7..60b2752 100644
--- a/client/src/app/admin/instance/dataset/components/attribute/detail/tr-detail.component.html
+++ b/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>
diff --git a/client/src/app/admin/instance/dataset/components/attribute/detail/tr-detail.component.ts b/client/src/app/admin/instance/dataset/components/attribute/detail/tr-detail.component.ts
index 55994ad..0f167fb 100644
--- a/client/src/app/admin/instance/dataset/components/attribute/detail/tr-detail.component.ts
+++ b/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,
diff --git a/client/src/app/admin/instance/dataset/components/attribute/output/table-output.component.html b/client/src/app/admin/instance/dataset/components/attribute/output/table-output.component.html
index af9e087..ce2d981 100644
--- a/client/src/app/admin/instance/dataset/components/attribute/output/table-output.component.html
+++ b/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>
diff --git a/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.html b/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.html
index 4274d5e..6bc7ab3 100644
--- a/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.html
+++ b/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.html
@@ -7,7 +7,7 @@
             formControlName="id_output_category">
             <option value=""></option>
             <option *ngFor="let category of outputCategoryList" [ngValue]="category.id">
-                {{getOutputFamilyLabel(category.id_output_family)}}/{{category.label}}
+                {{ getOutputFamilyLabel(category.id_output_family) }} / {{ category.label }}
             </option>
         </select>
     </td>
diff --git a/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.ts b/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.ts
index fcca115..bbb225a 100644
--- a/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.ts
+++ b/client/src/app/admin/instance/dataset/components/attribute/output/tr-output.component.ts
@@ -43,14 +43,14 @@ 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,
             ...this.form.value
         });
     }
-
-    getOutputFamilyLabel(idOutputFamilly: number): string {
-        return this.outputFamilyList.find(outputFamilly => outputFamilly.id === idOutputFamilly).label;
-    }
 }
diff --git a/client/src/app/admin/instance/dataset/containers/configure-dataset.component.html b/client/src/app/admin/instance/dataset/containers/configure-dataset.component.html
index fe0261f..22498e4 100644
--- a/client/src/app/admin/instance/dataset/containers/configure-dataset.component.html
+++ b/client/src/app/admin/instance/dataset/containers/configure-dataset.component.html
@@ -136,6 +136,7 @@
                         <tr *ngFor="let attribute of (attributeList | async)"
                             detail
                             [attribute]="attribute"
+                            [outputFamilyList]="outputFamilyList | async"
                             [outputCategoryList]="outputCategoryList | async"
                             (save)="editAttribute($event)">
                         </tr>
-- 
GitLab