diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html index a941f1fdcce68b589e73ac511740f410042fbabd..830e7fdc13d83d20206e66f7662afdc5e02e7f11 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html @@ -224,7 +224,7 @@ </table> </div> - <div *ngIf="this.profileService.profileMode === 'PUA'"> + <div *ngIf="this.profileService.profileMode === 'PUA' && isAloneAndSimple(matDataSource)"> <div class="pastis-panel-metadata-control"> <h2 class="pastis-dialog-config-title" matDialogTitle> @@ -233,9 +233,9 @@ </span> </h2> - <div class="ml-5"> + <div class="ml-5 row"> - <mat-form-field class="mr-3 vitamui-mat-select"> + <mat-form-field class="mr-3 vitamui-mat-select col-6"> <mat-select panelClass="vitamui-mat-select"> <mat-option *ngFor="" [value]=""> {{country.label}} @@ -257,14 +257,16 @@ translate}}<mat-icon class="pastis-icon-primary"><i class="vitamui-icon vitamui-icon-info"></i></mat-icon> </span> </h2> - <div class="ml-5 row"> - <mat-radio-button style="display: inline;"> - <span class="text-text-normal ml-3 row">{{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.FORMATAGE_PREDEFINI' | - translate}}: - </span> - <div class="ml-3"> - - <mat-form-field class="mr-3 vitamui-mat-select"> + <div class="ml-5"> + <div class="row"> + <div> + <mat-radio-button class="text-text-normal "> + {{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.FORMATAGE_PREDEFINI' | + translate}}: + </mat-radio-button> + </div> + <div> + <mat-form-field class="ml-3 vitamui-mat-select "> <mat-select panelClass="vitamui-mat-select"> <mat-option *ngFor="" [value]=""> {{country.label}} @@ -275,19 +277,26 @@ <i class="material-icons">keyboard_arrow_down</i> </div> </mat-form-field> + </div> + </div> + </div> + <div class="ml-5 mt-4"> + <div class="row"> + <div> + <mat-radio-button> + </mat-radio-button> + </div> + <div> + <vitamui-common-textarea [placeholder]="'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.SAISIR_EXPRESSION' | + translate"> + </vitamui-common-textarea> </div> - </mat-radio-button> + </div> </div> - <div class="ml-5 mt-4 row"> - <mat-radio-button> - <vitamui-common-textarea class="ml-3" [placeholder]="'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.SAISIR_EXPRESSION' | - translate"> - </vitamui-common-textarea> - </mat-radio-button> - </div> </div> + </div> <ng-template #complexElementWithouChild> diff --git a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts index 0e256894e447e5dfd55a22ece8c6bd88a37b6767..522fdf2e0c3df1967a047f8627491eb18524df7f 100644 --- a/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts +++ b/ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts @@ -428,6 +428,13 @@ export class FileTreeMetadataComponent { } } + isAloneAndSimple(metadatas: MatTableDataSource<MetadataHeaders>): boolean { + if (metadatas.data.length === 1 && !this.isElementComplex(metadatas.data[0].nomDuChamp)) { + return true; + } + return false; + } + onAddNode() { if (this.clickedNode.name === 'DescriptiveMetadata') { console.log("Yes")