MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
amentis 2024-05-16 15:29:14 +03:00
parent 133562a061 346ef4476a
commit 6fe78b4059
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html
View File

@ -1,30 +1,28 @@
<div class="w-100"> <div class="mt-4 mr-4">
<div mat-dialog-title> <div class="row">
<div class="row"> <div class="col-auto ml-auto close-btn" (click)="close()">
<div class="col-auto ml-auto close-btn" (click)="close()"> <mat-icon>close</mat-icon>
<mat-icon>close</mat-icon>
</div>
</div> </div>
</div> </div>
</div>
<div mat-dialog-content class="row">
<ng-container *ngIf="fieldSet && propertiesFormGroup" class="row"> <div mat-dialog-content class="row">
<div class="col-12"> <ng-container *ngIf="fieldSet && propertiesFormGroup" class="row">
<div mat-dialog-content> <div class="col-12">
<app-description-form-field-set-title class="row" [fieldSet]="fieldSet" [path]="path"></app-description-form-field-set-title> <div mat-dialog-content>
</div> <app-description-form-field-set-title class="row" [fieldSet]="fieldSet" [path]="path"></app-description-form-field-set-title>
</div> </div>
<div *ngFor="let field of fieldSet.fields; let i = index;" class="col-12 compositeField"> </div>
<div class="row"> <div *ngFor="let field of fieldSet.fields; let i = index;" class="col-12 compositeField">
<h5 *ngIf="placeholderTitle" class="col-auto font-weight-bold">{{field.label}}</h5> <div class="row">
</div> <h5 *ngIf="placeholderTitle" class="col-auto font-weight-bold">{{field.label}}</h5>
<app-description-form-field class="col-12 compositeField" [propertiesFormGroup]="propertiesFormGroup.get('fields')" [field]="field" [fieldSet]="fieldSet" [isChild]="true"></app-description-form-field> </div>
</div> <app-description-form-field class="col-12 compositeField" [propertiesFormGroup]="propertiesFormGroup.get('fields')" [field]="field" [fieldSet]="fieldSet" [isChild]="true"></app-description-form-field>
</ng-container> </div>
</div> </ng-container>
</div>
<div mat-dialog-actions class="row">
<div class="ml-auto col-auto"><button class="normal-btn-light-sm" (click)="cancel()">{{'DESCRIPTION-EDITOR.ACTIONS.CANCEL' | translate}}</button></div> <div mat-dialog-actions class="row">
<div class="col-auto"><button class="normal-btn-sm" [disabled]="!propertiesFormGroup.get('fields').valid" (click)="save()">{{'DESCRIPTION-EDITOR.ACTIONS.SAVE' | translate}}</button></div> <div class="ml-auto col-auto"><button class="normal-btn-light-sm" (click)="cancel()">{{'DESCRIPTION-EDITOR.ACTIONS.CANCEL' | translate}}</button></div>
</div> <div class="col-auto"><button class="normal-btn-sm" [disabled]="!propertiesFormGroup.get('fields').valid" (click)="save()">{{'DESCRIPTION-EDITOR.ACTIONS.SAVE' | translate}}</button></div>
</div> </div>

1
dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts
View File

@ -123,7 +123,6 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
editTableMultiplicityFieldInDialog(fieldSetIndex: number) { editTableMultiplicityFieldInDialog(fieldSetIndex: number) {
const dialogRef = this.dialog.open(FormFieldSetEditorDialogComponent, { const dialogRef = this.dialog.open(FormFieldSetEditorDialogComponent, {
width: '750px',
disableClose: true, disableClose: true,
data: { data: {
fieldSet: this.fieldSet, fieldSet: this.fieldSet,