diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html index dc80ed622..c49ea413c 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.html @@ -58,40 +58,42 @@
-
- + +
-
+ + - --> - + +
+
+
- +
- +
- + @@ -115,6 +117,7 @@ +
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.scss index 8cf43a5e4..917a14a46 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.scss @@ -73,4 +73,13 @@ $blue-color-light: #5cf7f2; .fieldset-actions-list{ margin: 0; cursor: pointer; -} \ No newline at end of file +} + +// ::ng-deep .main-content-page .fieldset-header .field-title .mat-form-field-infix{ +// border-top: 0px; +// } + + +.numbering-label .mat-input-element:disabled{ + color: #212121; +} diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts index 5eec5bb38..864770e50 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; -import { FormArray, FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from '@angular/forms'; +import { AbstractControl, FormArray, FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from '@angular/forms'; import { FieldEditorModel } from '../../../admin/field-editor-model'; import { Guid } from '@common/types/guid'; import { RuleEditorModel } from '../../../admin/rule-editor-model'; @@ -31,6 +31,7 @@ import { DatasetIdentifierDataEditorModel } from '../../../admin/field-data/data import { CurrencyDataEditorModel } from '../../../admin/field-data/currency-data-editor-models'; import { ValidationDataEditorModel } from '../../../admin/field-data/validation-data-editor-models'; import { DatasetProfileService } from '@app/core/services/dataset-profile/dataset-profile.service'; +import { OrganizationsDataEditorModel } from '../../../admin/field-data/organizations-data-editor-models'; @Component({ selector: 'app-dataset-profile-editor-composite-field-component', @@ -356,11 +357,17 @@ export class DatasetProfileEditorCompositeFieldComponent implements OnInit, OnCh case this.viewTypeEnum.Select: fieldForm.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.ComboBox) fieldForm.addControl('data', new WordListFieldDataEditorModel().buildForm()); + + this.form.get('data').setValidators(this._atLeastOneElementListValidator('options')); + this.form.get('data').updateValueAndValidity(); break; case this.viewTypeEnum.Other: fieldForm.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.ComboBox) fieldForm.addControl('data', new AutoCompleteFieldDataEditorModel().buildForm()); //TODO SEE - + + fieldForm.get('data').setValidators(this._atLeastOneElementListValidator('autoCompleteSingleDataList')); + + break; case this.viewTypeEnum.InternalDmpEntities: fieldForm.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.InternalDmpEntities) @@ -409,8 +416,9 @@ export class DatasetProfileEditorCompositeFieldComponent implements OnInit, OnCh break; case this.viewTypeEnum.Organizations: fieldForm.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.Organizations) - // this.form.addControl('data', new OrganizationsDataEditorModel().buildForm()); - fieldForm.addControl('data', new DatasetsAutoCompleteFieldDataEditorModel().buildForm()); //TODO + this.form.addControl('data', new OrganizationsDataEditorModel().buildForm()); + // this.form.addControl('data', new OrganizationsDataEditorModel().buildForm()) + // fieldForm.addControl('data', new DatasetsAutoCompleteFieldDataEditorModel().buildForm()); //TODO break; case this.viewTypeEnum.DatasetIdentifier: fieldForm.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.DatasetIdentifier) @@ -432,51 +440,74 @@ export class DatasetProfileEditorCompositeFieldComponent implements OnInit, OnCh } - private customFieldValidator(): ValidatorFn{ - return (control):ValidationErrors | null=>{ - DatasetProfileFieldViewStyle - switch(control.get('viewStyle').get('renderStyle').value){ + // private customFieldValidator(): ValidatorFn{ + // return (control):ValidationErrors | null=>{ + // DatasetProfileFieldViewStyle + // switch(control.get('viewStyle').get('renderStyle').value){ - case DatasetProfileFieldViewStyle.TextArea: - return null; - case DatasetProfileFieldViewStyle.BooleanDecision: - return null; - case DatasetProfileFieldViewStyle.ComboBox: - return null; - case DatasetProfileFieldViewStyle.CheckBox: - return null; - case DatasetProfileFieldViewStyle.FreeText: - return null; - case DatasetProfileFieldViewStyle.RadioBox: - return null; - case DatasetProfileFieldViewStyle.DatePicker: - return null; - case DatasetProfileFieldViewStyle.InternalDmpEntities: - return null; - case DatasetProfileFieldViewStyle.ExternalDatasets: - return null; - case DatasetProfileFieldViewStyle.DataRepositories: - return null; - case DatasetProfileFieldViewStyle.Registries: - return null; - case DatasetProfileFieldViewStyle.Services: - return null; - case DatasetProfileFieldViewStyle.Tags: - return null; - case DatasetProfileFieldViewStyle.Researchers: - return null; - case DatasetProfileFieldViewStyle.Organizations: - return null; - case DatasetProfileFieldViewStyle.DatasetIdentifier: - return null; - case DatasetProfileFieldViewStyle.Currency: - return null; - case DatasetProfileFieldViewStyle.Validation: - return null; - default: - return {inputTypeNotValid: true} + // case DatasetProfileFieldViewStyle.TextArea: + // return null; + // case DatasetProfileFieldViewStyle.BooleanDecision: + // return null; + // case DatasetProfileFieldViewStyle.ComboBox: + // return null; + // case DatasetProfileFieldViewStyle.CheckBox: + // return null; + // case DatasetProfileFieldViewStyle.FreeText: + // return null; + // case DatasetProfileFieldViewStyle.RadioBox: + // return null; + // case DatasetProfileFieldViewStyle.DatePicker: + // return null; + // case DatasetProfileFieldViewStyle.InternalDmpEntities: + // return null; + // case DatasetProfileFieldViewStyle.ExternalDatasets: + // return null; + // case DatasetProfileFieldViewStyle.DataRepositories: + // return null; + // case DatasetProfileFieldViewStyle.Registries: + // return null; + // case DatasetProfileFieldViewStyle.Services: + // return null; + // case DatasetProfileFieldViewStyle.Tags: + // return null; + // case DatasetProfileFieldViewStyle.Researchers: + // return null; + // case DatasetProfileFieldViewStyle.Organizations: + // return null; + // case DatasetProfileFieldViewStyle.DatasetIdentifier: + // return null; + // case DatasetProfileFieldViewStyle.Currency: + // return null; + // case DatasetProfileFieldViewStyle.Validation: + // return null; + // default: + // return {inputTypeNotValid: true} + // } + // } + // } + + + private _atLeastOneElementListValidator(arrayToCheck): ValidatorFn{ + return (control: AbstractControl): ValidationErrors | null=>{ + + const fa = control.get(arrayToCheck) as FormArray; + + if(fa.length === 0){ + return {emptyArray: true}; } + return null; } } + + calculateLabelWidth(numbering: string){ + + const width = numbering.split('.').reduce((acc,item)=> item+acc,'').length; + + + return {'width':width+'em'} + } } + + diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component.html index 7a4d43997..49f8f0267 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component.html @@ -40,7 +40,7 @@ - + diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component.html index c8e89ae4c..4ca660d04 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component.html @@ -12,9 +12,19 @@
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-SOURCE-TITLE' | translate}}
- -
- + +
+
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-TYPE' | translate}} @@ -26,12 +36,12 @@ {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-URL' | translate}} - + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-OPTIONS-ROOT' | translate}} + [formControl]="this.singleForm.get('optionsRoot')" required> {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-LABEL' | translate}} diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss index 9a774bbed..1ef7f3f98 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.scss @@ -11,4 +11,10 @@ mat-radio-button{ padding-right: 1em; +} + +li.list-inline-item{ + .mat-icon{ + vertical-align: bottom; + } } \ No newline at end of file diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts index ab43c4780..9f5a80663 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts @@ -1,6 +1,6 @@  import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; -import { AbstractControl, AbstractControlOptions, FormArray, FormControl, FormGroup, FormGroupDirective, NgForm } from '@angular/forms'; +import { AbstractControl, AbstractControlOptions, FormArray, FormControl, FormGroup, FormGroupDirective, NgForm, ValidationErrors, ValidatorFn } from '@angular/forms'; import { DatasetProfileFieldViewStyle } from '@app/core/common/enum/dataset-profile-field-view-style'; import { ValidationType } from '@app/core/common/enum/validation-type'; import { DatasetProfileService } from '@app/core/services/dataset-profile/dataset-profile.service'; @@ -422,10 +422,19 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements case this.viewTypeEnum.Select: this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.ComboBox) this.form.addControl('data', new WordListFieldDataEditorModel().buildForm()); + + this.form.get('data').setValidators(this._atLeastOneElementListValidator('options')); + this.form.get('data').updateValueAndValidity(); + break; case this.viewTypeEnum.Other: this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.ComboBox) this.form.addControl('data', new AutoCompleteFieldDataEditorModel().buildForm()); //TODO SEE + + this.form.get('data').setValidators(this._atLeastOneElementListValidator('autoCompleteSingleDataList')); + this.form.get('data').updateValueAndValidity(); + + break; case this.viewTypeEnum.InternalDmpEntities: this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.InternalDmpEntities) @@ -438,6 +447,10 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements case this.viewTypeEnum.RadioBox: this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.RadioBox) this.form.addControl('data', new RadioBoxFieldDataEditorModel().buildForm()); + + this.form.get('data').setValidators(this._atLeastOneElementListValidator('options')); + this.form.get('data').updateValueAndValidity(); + break; case this.viewTypeEnum.TextArea: this.form.get('viewStyle').get('renderStyle').setValue(DatasetProfileFieldViewStyle.TextArea) @@ -531,4 +544,16 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements this.delete.emit(); } + + private _atLeastOneElementListValidator(arrayToCheck): ValidatorFn{ + return (control: AbstractControl): ValidationErrors | null=>{ + + const fa = control.get(arrayToCheck) as FormArray; + + if(fa.length === 0){ + return {emptyArray: true}; + } + return null; + } + } } \ No newline at end of file diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.html index 48ec99375..887fe5c06 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.html @@ -1,7 +1,7 @@ 
- +
-
+
- + + + done + + + {{idx+1}} + {{step.label}}
@@ -39,10 +47,15 @@
- @@ -147,7 +160,7 @@
-
+
-
+
@@ -173,8 +186,8 @@
-
-
+
+
@@ -219,17 +232,22 @@
-
- {{'DATASET-PROFILE-EDITOR.STEPS.PAGE-INFO.ACTIONS.NOTHING-HERE-HINT'| translate}} -
- {{'DATASET-PROFILE-EDITOR.STEPS.PAGE-INFO.ACTIONS.START-CREATING-PAGE-START'| translate}} - - - - {{'DATASET-PROFILE-EDITOR.STEPS.PAGE-INFO.ACTIONS.START-CREATING-PAGE-END'| translate}} - - add - +
+
+
+ {{'DATASET-PROFILE-EDITOR.STEPS.PAGE-INFO.ACTIONS.NOTHING-HERE-HINT'| translate}} +
+
+
+
+ {{'DATASET-PROFILE-EDITOR.STEPS.PAGE-INFO.ACTIONS.START-CREATING-PAGE-START'| translate}} + + add + + {{'DATASET-PROFILE-EDITOR.STEPS.PAGE-INFO.ACTIONS.START-CREATING-PAGE-END'| translate}} + +
+
@@ -240,32 +258,70 @@
- + - + +
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss index 6664c447f..701956c07 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss @@ -35,7 +35,7 @@ letter-spacing: 0px; color: #212121; opacity: 0.81; - margin-top: 1.625rem; + // margin-top: 1.625rem; margin-bottom: 0.625rem; } @@ -71,11 +71,11 @@ transition-timing-function: ease-out; transition-delay: 50ms; box-shadow: 0px 1px 2px #bfbfbf; - background-color: #f7dd72; + background-color: #F7DD72; } #progress-container{ - box-shadow: 0px 1px 2px #bfbfbf; - border-radius: .3em; + box-shadow: 1px 1px 6px #00000029;; + // border-radius: .3em; } // .import-btn { // background: #ffffff 0% 0% no-repeat padding-box; @@ -87,68 +87,103 @@ // color: #000; // border: 1px solid #000; // } - .navigate-btn { +.navigate-btn { border-radius: 30px; background-color: #f7dd72; padding-left: 2em; padding-right: 2em; - } + box-shadow: 0px 3px 6px #1E202029; + + transition-property: background-color, color; + transition-duration: 200ms; + transition-delay: 50ms; + transition-timing-function: ease-in-out; +} +.navigate-btn-disabled{ +background-color: #CBCBCB; +color: #FFF; +} + $blue-color : #129D99; $blue-color-light: #5cf7f2; - .actions-list{ - border: 1px solid $blue-color; - border-radius: 3px; - padding-top: 1rem; - padding-bottom: 1rem; - } -#style-6::-webkit-scrollbar-track -{ - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - background-color: #F5F5F5; + +// #DEDEDE + + + +.stepper-title-label{ + cursor: pointer; + transition-property: color, opacity; + transition-duration: 200ms; + transition-delay: 50ms; + transition-timing-function: ease-in-out; + color: #212121; } -#style-6::-webkit-scrollbar -{ - width: 6px; - background-color: #F5F5F5; +.stepper-title-label-locked{ + color: #DEDEDE; } -#style-6::-webkit-scrollbar-thumb -{ - background-color: rgb(162, 163, 163); - background-image: -webkit-linear-gradient(45deg, - rgba(255, 255, 255, .2) 25%, - transparent 25%, - transparent 50%, - rgba(255, 255, 255, .2) 50%, - rgba(255, 255, 255, .2) 75%, - transparent 75%, - transparent) +.stepper-title-label-completed{ + opacity: 0.5; +} +.page-infos{ + padding: 2em; +} +.mat-subheader{ + padding: 0px; +} + +//for the acitons list toolbar +// .mat-list-item.mat-list-item-with-avatar{ +// padding-left: 0em; +// } + + +.actions-list{ + // border: 1px solid $blue-color; + box-shadow: 0px 3px 12px #129D9999; + border-radius: 4px; + // padding-top: 1rem; + padding: 1em 0.9em; + min-width: 166px; + + .mat-list-item-content{ + padding: 0px; + } + + + .action-list-item{ + display: flex; + align-items: center; + cursor: pointer; + + + .action-list-icon{ + font-size: 1.2em; + padding-right: 1em; + height: auto; + } + .action-list-text{ + font-size: 0.9em;; + } + } + .action-list-label{ + color: #212121; + font-size: small; + opacity: 0.6; + } + .list-unstyled{ + margin-bottom: 0.2rem; + } } - -#style-2::-webkit-scrollbar-track -{ - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - border-radius: 10px; - background-color: #F5F5F5; -} - -#style-2::-webkit-scrollbar -{ - width: 4px; - background-color: #F5F5F5; -} - -#style-2::-webkit-scrollbar-thumb -{ - border-radius: 2px; - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3); - background-color: rgb(158, 158, 158)// #FFF;//$blue-color-light;// rgb(162, 163, 163);// #D62929; -} \ No newline at end of file +// .mli{ +// height: auto; +// } \ No newline at end of file diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts index 513930b1f..a740c641c 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts @@ -703,12 +703,12 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn //define entry type switch (tce.childType) { case ToCEntryType.Page: + const pagesArray = (this.form.get('pages') as FormArray); - const page: PageEditorModel = new PageEditorModel(this.dataModel.pages.length); + const page: PageEditorModel = new PageEditorModel(pagesArray.length); const pageForm = page.buildForm(); // this.dataModel.pages.push(page); - const pagesArray = (this.form.get('pages') as FormArray); pagesArray.push(pageForm); this.refreshToCEntries(); @@ -1388,6 +1388,37 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn + } + + isStepCompleted(stepIndex: number){ + + let stepCompleted = false; + this.steps.forEach((step,index)=>{ + if(stepIndex === index){ + if(step.stepControl){ + stepCompleted = step.stepControl.valid; + } + } + }); + + return stepCompleted; + } + + isStepUnlocked(stepIndex: number): boolean{ + if(stepIndex === 0) return true; + + //if previous step is valid then unlock + let stepUnlocked: boolean = false; + this.steps.forEach((step,index)=>{ + + if(index+1 == stepIndex){//previous step + if(step.stepControl.valid){ + stepUnlocked = true; + } + } + }); + + return stepUnlocked; } validateStep(step: CdkStep){ @@ -1604,11 +1635,35 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn }); }else{ - + // if(aControl.errors){ + // invalidControls.push({ + // id: aControl.get('id')? aControl.get('id').value: null, + // errors:aControl.errors, + // key: aControl.get('title')? aControl.get('title').value: 'unspecified', + // invalidSubControls:[]//TODO TO CHECK + // }); + // } + if(control.errors){ + // invalidControls.push({ + // id: aControl.get('id')? aControl.get('id').value: null, + // errors:aControl.errors, + // key: aControl.get('title')? aControl.get('title').value: 'unspecified', + // invalidSubControls:[]//TODO TO CHECK + // }); + + invalidControls.push({ + errors:control.errors, + id: control.get('id')? control.get('id').value: null, + invalidSubControls: [], + key: key + }); + } invalidControls.push(...this._getErrors(control)) ; } }); + + break; case 'fa': // const fa = (aControl as FormArray); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.html b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.html index 71f4cad7c..d22fba745 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.html @@ -5,8 +5,9 @@
+ + @@ -21,7 +22,7 @@ [ngStyle]="{'font-size' : (parentLink.type == tocEntryType.FieldSet? '.9rem':'1rem')}" > --> - @@ -39,17 +40,18 @@ - delete + delete
+
--> -
+
add --> - Subsection + +
+ add + + {{'DATASET-PROFILE-EDITOR.STEPS.PAGE-INFO.ACTIONS.CREATE-NEW-SUBSECTION' |translate}} +
+ + + @@ -193,10 +209,21 @@ -
- diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss index 53d3424d6..9c12602f4 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.scss @@ -71,10 +71,6 @@ } -.active{ - font-weight: bold; -} - .table-item-actions{ // display: none; display: inline-block; @@ -104,12 +100,18 @@ } -// .border-left-active{ -// border-left: 1px solid #000; -// } +.border-left-active{ + border-left: 1px solid #000; +} + + +.side-bolder{ + border-left: 1px solid red; +} .cdk-link-list { + display: block; // background: white; overflow: hidden; @@ -171,4 +173,20 @@ $yellow: #f7dd72; font-weight: bold; min-width: 2em; text-align: center; -} \ No newline at end of file +} + +.table-label-element{ + cursor: pointer; + // font-weight: normal; + + // transition-property: font-weight; + // transition-duration: 160ms; + // transition-delay: 50ms; + // transition-timing-function: ease-in-out; +} + + +.table-label-element-active{ + font-weight: bold; + // color: red; +} diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html index cbcfb374b..69f4169ce 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html @@ -2,7 +2,9 @@ -
+ +

{{'DMP-EDITOR.STEPPER.USER-GUIDE' | translate}}

+
@@ -19,6 +21,7 @@ [isDragging]="isDragging" [draggingItemId]="draggingItemId" [parentRootId]="ROOT_ID" + style="padding-right: 1em;" > + + + + + + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}
@@ -237,9 +252,24 @@
- + {{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }} --> + + + + + + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + {{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 0d346d5c7..9f7703eb1 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -297,9 +297,12 @@ "PAGE-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.", "ACTIONS": { "CREATE-FIRST-PAGE": "Create the first Section", + "CREATE-NEW-SUBSECTION": "Create new subsection", + "CREATE-NEW-SECTION": "Create new section", + "CREATE-FIRST-SECTION":"Create the first section", "NOTHING-HERE-HINT": "Nothing here yet.", "START-CREATING-PAGE-START": "Start by ", - "START-CREATING-PAGE-END": "creating the first Section." + "START-CREATING-PAGE-END": "creating the first section." }, "PAGE": "Section" }, diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 253482a62..f98f692f0 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -297,9 +297,12 @@ "PAGE-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.", "ACTIONS": { "CREATE-FIRST-PAGE": "Create the first Section", + "CREATE-NEW-SUBSECTION": "Create new subsection", + "CREATE-NEW-SECTION": "Create new section", + "CREATE-FIRST-SECTION":"Create the first section", "NOTHING-HERE-HINT": "Nothing here yet.", "START-CREATING-PAGE-START": "Start by ", - "START-CREATING-PAGE-END": "creating the first Section." + "START-CREATING-PAGE-END": "creating the first section." }, "PAGE": "Section" }, @@ -473,7 +476,7 @@ "ADD-PAGE": "Add Page +", "ADD-SECTION": "Add Section +", "VALIDATE": "Validate", - "PREVIEW-AND-FINALIZE": "Preview and finalize", + "PREVIEW-AND-FINALIZE": "Preview & Finalize", "FIELD": { "MAKE-IT-REQUIRED": "Make input required", "ADD-VISIBILITY-RULE": "Add visibility rule", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 2f54c2032..d993846e2 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -297,9 +297,12 @@ "PAGE-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.", "ACTIONS": { "CREATE-FIRST-PAGE": "Create the first Section", + "CREATE-NEW-SUBSECTION": "Create new subsection", + "CREATE-NEW-SECTION": "Create new section", + "CREATE-FIRST-SECTION":"Create the first section", "NOTHING-HERE-HINT": "Nothing here yet.", "START-CREATING-PAGE-START": "Start by ", - "START-CREATING-PAGE-END": "creating the first Section." + "START-CREATING-PAGE-END": "creating the first section." }, "PAGE": "Section" }, diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index e9cf82725..fdb8108eb 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -297,9 +297,12 @@ "PAGE-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.", "ACTIONS": { "CREATE-FIRST-PAGE": "Create the first Section", + "CREATE-NEW-SUBSECTION": "Create new subsection", + "CREATE-NEW-SECTION": "Create new section", + "CREATE-FIRST-SECTION":"Create the first section", "NOTHING-HERE-HINT": "Nothing here yet.", "START-CREATING-PAGE-START": "Start by ", - "START-CREATING-PAGE-END": "creating the first Section." + "START-CREATING-PAGE-END": "creating the first section." }, "PAGE": "Section" }, diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json index e706e0844..0e2a7f8f8 100644 --- a/dmp-frontend/src/assets/i18n/pt.json +++ b/dmp-frontend/src/assets/i18n/pt.json @@ -297,9 +297,12 @@ "PAGE-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.", "ACTIONS": { "CREATE-FIRST-PAGE": "Create the first Section", + "CREATE-NEW-SUBSECTION": "Create new subsection", + "CREATE-NEW-SECTION": "Create new section", + "CREATE-FIRST-SECTION":"Create the first section", "NOTHING-HERE-HINT": "Nothing here yet.", "START-CREATING-PAGE-START": "Start by ", - "START-CREATING-PAGE-END": "creating the first Section." + "START-CREATING-PAGE-END": "creating the first section." }, "PAGE": "Section" }, diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index 737728f49..108e6d326 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -297,9 +297,12 @@ "PAGE-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.", "ACTIONS": { "CREATE-FIRST-PAGE": "Create the first Section", + "CREATE-NEW-SUBSECTION": "Create new subsection", + "CREATE-NEW-SECTION": "Create new section", + "CREATE-FIRST-SECTION":"Create the first section", "NOTHING-HERE-HINT": "Nothing here yet.", "START-CREATING-PAGE-START": "Start by ", - "START-CREATING-PAGE-END": "creating the first Section." + "START-CREATING-PAGE-END": "creating the first section." }, "PAGE": "Section" }, diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json index e7b873976..94f334189 100644 --- a/dmp-frontend/src/assets/i18n/sr.json +++ b/dmp-frontend/src/assets/i18n/sr.json @@ -297,9 +297,12 @@ "PAGE-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.", "ACTIONS": { "CREATE-FIRST-PAGE": "Create the first Section", + "CREATE-NEW-SUBSECTION": "Create new subsection", + "CREATE-NEW-SECTION": "Create new section", + "CREATE-FIRST-SECTION":"Create the first section", "NOTHING-HERE-HINT": "Nothing here yet.", "START-CREATING-PAGE-START": "Start by ", - "START-CREATING-PAGE-END": "creating the first Section." + "START-CREATING-PAGE-END": "creating the first section." }, "PAGE": "Section" }, diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 2065f9b1c..b31e3e921 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -297,9 +297,12 @@ "PAGE-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.", "ACTIONS": { "CREATE-FIRST-PAGE": "Create the first Section", + "CREATE-NEW-SUBSECTION": "Create new subsection", + "CREATE-NEW-SECTION": "Create new section", + "CREATE-FIRST-SECTION":"Create the first section", "NOTHING-HERE-HINT": "Nothing here yet.", "START-CREATING-PAGE-START": "Start by ", - "START-CREATING-PAGE-END": "creating the first Section." + "START-CREATING-PAGE-END": "creating the first section." }, "PAGE": "Section" },