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 ae53a43249c09f7380c6d5f6537b6ea13dbaf4bf..64784d8fd030fff24798a7e7f775decaf7c87231 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 @@ Name - Output category + Output family / category Display Save 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 ecb4ec71877ba64a3137d3bd0bcdc813d8c680b0..60b2752e0eeae20048b48b99af9d11a9675844b3 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 @@ 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 55994ad2e510bef40578b588941fa430204d3f9f..0f167fbcb3440631455aa5b5b614e8b91e92a4c8 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 = 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 af9e087b3ebb5704048b85a845f837ef9529db8d..ce2d981a171b12ffa3e062ab3512403e6430549d 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 @@ Name - Output category + Output family / category Display Selected Save 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 9b0457ab2a377e2e3bb5e3eb9c6c718b4584d548..6bc7ab3d6079473276e473b338ca68d07811f0fc 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 @@ - - + - + - + - + \ 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 8cecc5701b8beed519b36bd7f23e660a49b84f71..bbb225aa668c2a6c66cd470e77eddd359f6fe878 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 = 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, 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 335ce696773d2357819b74082d43223c31e0d8ea..22498e4a4add4cc73806e3ba4be79c7f3829e309 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 @@ @@ -135,6 +136,7 @@