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

Reintroduces description property on Sections.

This commit is contained in:
Diamantis Tziotzios 2019-03-08 17:12:53 +02:00
parent b1ea68670a
commit 32d189af03
4 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.html
View File

@ -22,6 +22,10 @@
<input matInput type="number" placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.SECTION.FIELDS.ORDER' | translate}}" <input matInput type="number" placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.SECTION.FIELDS.ORDER' | translate}}"
formControlName="ordinal"> formControlName="ordinal">
</mat-form-field> </mat-form-field>
<mat-form-field class="col-md-3">
<input matInput type="text" placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.SECTION.FIELDS.DESCRIPTION' | translate}}"
formControlName="description">
</mat-form-field>
<!-- <div class="col-md-6"> <!-- <div class="col-md-6">
<label>Default Visibility</label> <label>Default Visibility</label>
<mat-radio-group formControlName="defaultVisibility" class="full-width"> <mat-radio-group formControlName="defaultVisibility" class="full-width">

41
dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html
View File

@ -5,44 +5,37 @@
<mat-panel-title> <mat-panel-title>
<h6>{{form.get('numbering').value}} {{form.get('title').value}}</h6> <h6>{{form.get('numbering').value}} {{form.get('title').value}}</h6>
</mat-panel-title> </mat-panel-title>
<mat-panel-description>
<h3 *ngIf="form.get('description').value">{{form.get('description').value}}</h3>
</mat-panel-description>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<div *ngFor="let compositeFieldFormGroup of form.get('compositeFields')['controls']; let i = index;" <mat-panel-description class="col-12">
class="col-12"> <h6 *ngIf="form.get('description').value">{{form.get('description').value}}</h6>
</mat-panel-description>
<div *ngFor="let compositeFieldFormGroup of form.get('compositeFields')['controls']; let i = index;" class="col-12">
<!-- <div *ngIf="isElementVisible(compositeField)" class="row"> --> <!-- <div *ngIf="isElementVisible(compositeField)" class="row"> -->
<!-- *ngIf="this.visibilityRulesService.checkElementVisibility(compositeFieldFormGroup.get('id').value)" --> <!-- *ngIf="this.visibilityRulesService.checkElementVisibility(compositeFieldFormGroup.get('id').value)" -->
<div class="row" <div class="row" *ngIf="this.visibilityRulesService.checkElementVisibility(compositeFieldFormGroup.get('id').value) && this.visibilityRulesService.scanIfChildsOfCompositeFieldHasVisibleItems(compositeFieldFormGroup)">
*ngIf="this.visibilityRulesService.checkElementVisibility(compositeFieldFormGroup.get('id').value) && this.visibilityRulesService.scanIfChildsOfCompositeFieldHasVisibleItems(compositeFieldFormGroup)">
<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)" <div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
class="col-12"> class="col-12">
<button mat-button color="primary" (click)="addMultipleField(i)" <button mat-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled">
[disabled]="compositeFieldFormGroup.disabled">
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}} {{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}
</button> </button>
</div> </div>
<app-form-composite-field class="align-self-center col-12" [form]="compositeFieldFormGroup" <app-form-composite-field class="align-self-center col-12" [form]="compositeFieldFormGroup" [datasetProfileId]="datasetProfileId"
[datasetProfileId]="datasetProfileId" [isChild]="false"></app-form-composite-field> [isChild]="false"></app-form-composite-field>
<div *ngIf="compositeFieldFormGroup" class="col-12"> <div *ngIf="compositeFieldFormGroup" class="col-12">
<div class="row"> <div class="row">
<div class="col-12" <div class="col-12" *ngFor="let multipleCompositeFieldFormGroup of compositeFieldFormGroup.get('multiplicityItems')['controls']; let j = index">
*ngFor="let multipleCompositeFieldFormGroup of compositeFieldFormGroup.get('multiplicityItems')['controls']; let j = index">
<div class="styleBorder row"> <div class="styleBorder row">
<app-form-composite-field class=" align-self-center col" <app-form-composite-field class=" align-self-center col" [form]="multipleCompositeFieldFormGroup" [datasetProfileId]="datasetProfileId"
[form]="multipleCompositeFieldFormGroup" [datasetProfileId]="datasetProfileId" [isChild]="true"></app-form-composite-field>
[isChild]="true"></app-form-composite-field>
<div class="col-auto align-self-center"> <div class="col-auto align-self-center">
<button mat-icon-button type="button" class="deleteBtn" <button mat-icon-button type="button" class="deleteBtn" (click)="deleteMultipeFieldFromCompositeFormGroup(i,j);">
(click)="deleteMultipeFieldFromCompositeFormGroup(i,j);">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12" <mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12" [formGroup]="compositeFieldFormGroup">
[formGroup]="compositeFieldFormGroup">
<input matInput formControlName="commentFieldValue" placeholder="comment"> <input matInput formControlName="commentFieldValue" placeholder="comment">
</mat-form-field> </mat-form-field>
<div class="col"></div> <div class="col"></div>
@ -56,10 +49,10 @@
</div> </div>
<div *ngIf="form.get('sections')" class="col-12"> <div *ngIf="form.get('sections')" class="col-12">
<div *ngFor="let subSectionFormGroup of form.get('sections')['controls']; let j = index;" class="row"> <div *ngFor="let subSectionFormGroup of form.get('sections')['controls']; let j = index;" class="row">
<app-form-section class="col-12" [form]="subSectionFormGroup" [path]="path+'.'+(j+1)" <app-form-section class="col-12" [form]="subSectionFormGroup" [path]="path+'.'+(j+1)" [pathName]="pathName+'.sections.'+j"
[pathName]="pathName+'.sections.'+j" [datasetProfileId]="datasetProfileId"></app-form-section> [datasetProfileId]="datasetProfileId"></app-form-section>
</div> </div>
</div> </div>
</mat-expansion-panel> </mat-expansion-panel>
</mat-accordion> </mat-accordion>
</div> </div>

4
dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss
View File

@ -8,3 +8,7 @@
border-radius: 0.5em; border-radius: 0.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
.mat-expansion-panel-header-description{
padding-bottom: 18px;
color: black;
}

1
dmp-frontend/src/assets/i18n/en.json
View File

@ -74,6 +74,7 @@
"TITLE": "Section Name", "TITLE": "Section Name",
"PAGE": "Page to appear", "PAGE": "Page to appear",
"ORDER": "Order", "ORDER": "Order",
"DESCRIPTION": "Description",
"FIELDS-TITLE": "Fields", "FIELDS-TITLE": "Fields",
"SUB-SECTIONS-TITLE": "Sub-Sections" "SUB-SECTIONS-TITLE": "Sub-Sections"
}, },