diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-id.model.ts b/dmp-frontend/src/app/core/model/dataset/dataset-id.model.ts index 5020bbbcb..1063a3cbf 100644 --- a/dmp-frontend/src/app/core/model/dataset/dataset-id.model.ts +++ b/dmp-frontend/src/app/core/model/dataset/dataset-id.model.ts @@ -6,11 +6,16 @@ export class DatasetIdModel { type: string; constructor(data: any) { + try{ const parsed = JSON.parse(data); if (!isNullOrUndefined(parsed)) { this.identifier = parsed.identifier; this.type = parsed.type; } + } + catch(error){ + console.warn('Could not parse DatasetIdModel'); + } } buildForm(): FormGroup { diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/rule-editor-model.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/rule-editor-model.ts index 6d029f80e..6e878666c 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/rule-editor-model.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/rule-editor-model.ts @@ -1,4 +1,4 @@ -import { FormGroup } from "@angular/forms"; +import { FormGroup, Validators } from "@angular/forms"; import { Rule } from "../../../../core/model/admin/dataset-profile/dataset-profile"; import { BaseFormModel } from "../../../../core/model/base-form-model"; @@ -21,9 +21,9 @@ export class RuleEditorModel extends BaseFormModel { buildForm(disabled: boolean = false, skipDisable: Array = []): FormGroup { const formGroup = this.formBuilder.group({ // sourceField: [this.sourceField], - target: [{ value: this.target, disabled: (disabled && !skipDisable.includes('RuleEditorModel.target')) }], + target: [{ value: this.target, disabled: (disabled && !skipDisable.includes('RuleEditorModel.target')) }, [Validators.required]], ruleStyle: [{ value: this.ruleStyle, disabled: (disabled && !skipDisable.includes('RuleEditorModel.ruleStyle')) }], - value: [{ value: this.value, disabled: (disabled && !skipDisable.includes('RuleEditorModel.value')) }], + value: [{ value: this.value, disabled: (disabled && !skipDisable.includes('RuleEditorModel.value')) }, [Validators.required]], ruleType: [{ value: this.ruleType, disabled: (disabled && !skipDisable.includes('RuleEditorModel.ruleType')) }], valueType: [{ value: this.valueType, disabled: (disabled && !skipDisable.includes('RuleEditorModel.valueType')) }] }); 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 da00e51bb..2b5a1f2fe 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,4 +1,4 @@ -import { Component, Input, OnChanges, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, OnChanges, OnInit } from '@angular/core'; import { AbstractControl, FormArray, FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from '@angular/forms'; import { FieldEditorModel } from '../../../admin/field-editor-model'; import { Guid } from '@common/types/guid'; @@ -73,6 +73,7 @@ export class DatasetProfileEditorCompositeFieldComponent implements OnInit, OnCh viewStyleEnum = DatasetProfileFieldViewStyle; viewTypeEnum = ViewStyleType; + private myCustomValidators:EditorCustomValidators = new EditorCustomValidators(); constructor( @@ -245,7 +246,6 @@ export class DatasetProfileEditorCompositeFieldComponent implements OnInit, OnCh } - // generatePreview(){ // const editorModel = new DatasetDescriptionCompositeFieldEditorModel(); // editorModel.title = this.form.get('title').value; @@ -806,7 +806,6 @@ export class DatasetProfileEditorCompositeFieldComponent implements OnInit, OnCh } (this.form.get('fields')).push(new FieldEditorModel().fromModel(field).buildForm()); - // fieldForm.get('viewStyle').get('renderStyle').updateValueAndValidity(); // fieldForm.get('data').updateValueAndValidity(); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html index ef6136738..2045e38f4 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.html @@ -9,7 +9,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
  • +
  • visibility
  • 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 4ca3a48ec..4e5684788 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 @@ -380,7 +380,25 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements // }); }; - + get canApplyVisibility():boolean{ + + + switch(this.viewType){ + case this.viewTypeEnum.TextArea: + case this.viewTypeEnum.FreeText: + case this.viewTypeEnum.BooleanDecision: + case this.viewTypeEnum.RadioBox: + case this.viewTypeEnum.Select: + case this.viewTypeEnum.CheckBox: + case this.viewTypeEnum.DatePicker: + return true; + + } + + + return false; + + } // validTicket:string; // generatePreview(){ @@ -417,6 +435,9 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements const field: Field = this.form.getRawValue(); field.defaultValue = {type:null, value: null}; + if(!this.canApplyVisibility){ + field.visible.rules = []; + } @@ -767,6 +788,8 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements fields.removeAt(index); fields.insert(index, form); this.form = form; + + } setTimeout(() => { //TODO diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/rule/dataset-profile-editor-rule.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/rule/dataset-profile-editor-rule.component.html index 7ce02a6bf..dd2a26762 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/rule/dataset-profile-editor-rule.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/rule/dataset-profile-editor-rule.component.html @@ -25,7 +25,7 @@ {{'DATASET-PROFILE-EDITOR.STEPS.FORM.RULE.FIELDS.RULE-THEN'| translate}} - + + [disabled]="parentIds.includes(option.id) || hiddenBy.includes(option.id)" + [matTooltip]="getToolTipMessage(option.id)" + [matTooltipShowDelay]="700" + > {{option.label? option.label:'<'+ ('DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.UNTITLED' | translate) + '>'}}
    @@ -55,7 +58,10 @@ + [disabled]="parentIds.includes(option.id) ||hiddenBy.includes(option.id)" + [matTooltip]="getToolTipMessage(option.id)" + [matTooltipShowDelay]="700" + > {{option.label? option.label:'<'+ ('DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.UNTITLED' | translate) + '>'}}
    diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/rule/dataset-profile-editor-rule.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/rule/dataset-profile-editor-rule.component.ts index bb9cb6463..14963db30 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/rule/dataset-profile-editor-rule.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/rule/dataset-profile-editor-rule.component.ts @@ -1,8 +1,10 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { FormArray, FormControl, FormGroup } from '@angular/forms'; import { DatasetProfileFieldViewStyle } from '../../../../../../core/common/enum/dataset-profile-field-view-style'; import { DatasetProfileComboBoxType } from '../../../../../../core/common/enum/dataset-profile-combo-box-type'; import { ToCEntryType } from '../../../table-of-contents/table-of-contents-entry'; +import { Rule } from '@app/core/model/admin/dataset-profile/dataset-profile'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-dataset-profile-editor-rule-component', @@ -12,6 +14,7 @@ import { ToCEntryType } from '../../../table-of-contents/table-of-contents-entry export class DatasetProfileEditorRuleComponent implements OnInit{ + @Input() form: FormArray; @Input() viewStyleForCheck: DatasetProfileFieldViewStyle; @@ -20,6 +23,16 @@ export class DatasetProfileEditorRuleComponent implements OnInit{ @Input() comboBoxTypeForCheck: DatasetProfileComboBoxType; @Input() viewOnly: boolean; + + options: OptionItem[]; + sectionOptions: OptionItem[]; + fieldSetOptions: OptionItem[]; + fieldOptions: OptionItem[]; + + constructor(private language: TranslateService){ + + } + targetValidation() { //TODO } @@ -29,8 +42,11 @@ export class DatasetProfileEditorRuleComponent implements OnInit{ } ngOnInit(): void { + this._computeOptions(); + } + + private _computeOptions(){ this.options = this.getOptions(); - // TODO TO SEE IF THE COMPONENT IS NOT DESTROYED AND THE FORM UPDATES this.sectionOptions = []; this.fieldOptions = []; @@ -50,12 +66,39 @@ export class DatasetProfileEditorRuleComponent implements OnInit{ break; } }); + //remove options to hide if given fieldset is already hidden by option + this.fieldOptions.forEach(e=>this._buildHiddenBy(e)); + this.fieldSetOptions.forEach(e=>this._buildHiddenBy(e)); } - options: OptionItem[]; - sectionOptions: OptionItem[]; - fieldSetOptions: OptionItem[]; - fieldOptions: OptionItem[]; + + + + computeOptions(isOpened: boolean){ + if(isOpened){ + this._computeOptions(); + } + } + + private _buildHiddenBy(fo:OptionItem){ + try{ + this.fieldOptions.forEach(foption=>{ + const rules = (foption.form.get('visible').get('rules') as FormArray).controls.map(c=>(c as FormGroup).getRawValue()) as Rule[] + const targets = rules.map(rule=>rule.target); + targets.forEach(target=>{ + if(fo.parentsIds.includes(target) && !fo.hiddenBy.includes(foption.id)){ + fo.hiddenBy.push(...foption.parentsIds); + } + }) + + }); + }catch{ + console.log('error'); + } + } + + + getOptions():OptionItem[]{ @@ -96,7 +139,9 @@ export class DatasetProfileEditorRuleComponent implements OnInit{ type: type, label: type ===ToCEntryType.Field? form.get('data').get('label').value :form.get('title').value, // parentsIds: [form.get('id').value] - parentsIds: [...parentIds, form.get('id').value] + parentsIds: [...parentIds, form.get('id').value], + form: form, + hiddenBy:[] } result.push(currentOptionItem); @@ -130,6 +175,26 @@ export class DatasetProfileEditorRuleComponent implements OnInit{ } return []; } + get hiddenBy(): string[]{ + if(!this.formControlForCheck.get('id')) return []; + + const current = this.options.find(opt=> opt.id === this.formControlForCheck.get('id').value); + + if(current){ + return current.hiddenBy; + } + return []; + } + + getToolTipMessage(id: string){ + if(this.parentIds.includes(id)){ + // return 'Cannot hide element that contain the field'; + return this.language.instant('DATASET-PROFILE-EDITOR.STEPS.FORM.RULE.HINTS.ELEMENT-CHILD-OF-TARGET'); + }else if(this.hiddenBy.includes(id)){ + return this.language.instant('DATASET-PROFILE-EDITOR.STEPS.FORM.RULE.HINTS.ELEMENT-HIDDEN-FROM-ELEMENT'); + } + return ''; + } } @@ -138,5 +203,7 @@ interface OptionItem{ id: string, label: string, type: ToCEntryType, - parentsIds: string[] + parentsIds: string[], + form:FormGroup, + hiddenBy:string[] } \ 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.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.ts index 4876d2e42..ea6b8089f 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section-fieldset/dataset-profile-editor-section-fieldset.component.ts @@ -118,7 +118,8 @@ export class DatasetProfileEditorSectionFieldSetComponent implements OnInit, OnC this.numbering = this.tocentry.numbering; this._selectedFieldSetId = null; - this._scrollToElement(this.tocentry.id); + // this._scrollToElement(this.tocentry.id); + this._scrollOnTop(); }else if(this.tocentry.type === ToCEntryType.FieldSet){ this.form = this.tocentry.form.parent.parent; const numberingArray = this.tocentry.numbering.split('.'); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss index 8026d4970..456be7372 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss @@ -69,10 +69,11 @@ mat-row:hover { // // background-color: #eef0fb; // } -::ng-deep .mat-paginator-container { +:host ::ng-deep .mat-paginator-container { flex-direction: row-reverse !important; justify-content: space-between !important; background-color: #f6f6f6; + align-items: center; // height: 30px; // min-height: 30px !important; } 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 6eab86109..72a3d7179 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 @@ -72,7 +72,7 @@
    stringValue).replace(new RegExp('{', 'g'), '{"').replace(new RegExp('=', 'g'), '":"').replace(new RegExp(',', 'g'), '",').replace(new RegExp(', ', 'g'), ', "').replace(new RegExp('}', 'g'), '"}'); @@ -397,6 +400,9 @@ export class FormFieldComponent extends BaseComponent implements OnInit { } const tagArray = JSON.parse(stringValue); this.form.patchValue({'value': tagArray}); + }catch(e){ + console.warn('Could not parse tags'); + } } filterTags(value: string): Observable { diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index adeb3eb94..879fccd01 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -468,6 +468,10 @@ "RULE-THEN": "then show Field With Id", "FIELDSETS": "Questions", "FIELDS":"Inputs" + }, + "HINTS":{ + "ELEMENT-CHILD-OF-TARGET":"This element is parent of selected input.", + "ELEMENT-HIDDEN-FROM-ELEMENT":"This element hides the element or a parent element of the input you are trying to apply visibility rule from." } }, "FORM-VALIDATION":{ @@ -515,8 +519,8 @@ "FIELDSET": { "ADD-INPUT": "Add new input", "COMMENT-FIELD": "Comment field", - "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the givven question.", - "ENABLE-MULTIPLICITY": "User may provide more than one answer to the givven question.", + "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the given question.", + "ENABLE-MULTIPLICITY": "User may provide more than one answer to the given question.", "MULTIPLICITY": "Multiplicity", "MORE": "More.." } diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index efbd317d3..3c6d4e1a4 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -468,6 +468,10 @@ "RULE-THEN": "then show Field With Id", "FIELDSETS": "Questions", "FIELDS":"Inputs" + }, + "HINTS":{ + "ELEMENT-CHILD-OF-TARGET":"This element is parent of selected input.", + "ELEMENT-HIDDEN-FROM-ELEMENT":"This element hides the element or a parent element of the input you are trying to apply visibility rule from." } }, "FORM-VALIDATION":{ @@ -515,8 +519,8 @@ "FIELDSET": { "ADD-INPUT": "Add new input", "COMMENT-FIELD": "Comment field", - "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the givven question.", - "ENABLE-MULTIPLICITY": "User may provide more than one answer to the givven question.", + "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the given question.", + "ENABLE-MULTIPLICITY": "User may provide more than one answer to the given question.", "MULTIPLICITY": "Multiplicity", "MORE": "More.." } diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 284c21235..13d676603 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -468,6 +468,10 @@ "RULE-THEN": "entonces muestra el campo con identificación", "FIELDSETS": "Questions", "FIELDS":"Inputs" + }, + "HINTS":{ + "ELEMENT-CHILD-OF-TARGET":"This element is parent of selected input.", + "ELEMENT-HIDDEN-FROM-ELEMENT":"This element hides the element or a parent element of the input you are trying to apply visibility rule from." } }, "FORM-VALIDATION":{ @@ -515,8 +519,8 @@ "FIELDSET": { "ADD-INPUT": "Add new input", "COMMENT-FIELD": "Comment field", - "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the givven question.", - "ENABLE-MULTIPLICITY": "User may provide more than one answer to the givven question.", + "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the given question.", + "ENABLE-MULTIPLICITY": "User may provide more than one answer to the given question.", "MULTIPLICITY": "Multiplicity", "MORE": "More.." } diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 18618c198..ab983afeb 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -468,6 +468,10 @@ "RULE-THEN": "τότε δείξε το Πεδίο με ταυτοποίηση", "FIELDSETS": "Questions", "FIELDS":"Inputs" + }, + "HINTS":{ + "ELEMENT-CHILD-OF-TARGET":"This element is parent of selected input.", + "ELEMENT-HIDDEN-FROM-ELEMENT":"This element hides the element or a parent element of the input you are trying to apply visibility rule from." } }, "FORM-VALIDATION":{ @@ -515,8 +519,8 @@ "FIELDSET": { "ADD-INPUT": "Add new input", "COMMENT-FIELD": "Comment field", - "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the givven question.", - "ENABLE-MULTIPLICITY": "User may provide more than one answer to the givven question.", + "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the given question.", + "ENABLE-MULTIPLICITY": "User may provide more than one answer to the given question.", "MULTIPLICITY": "Multiplicity", "MORE": "More.." } diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json index 107ada514..04a41867c 100644 --- a/dmp-frontend/src/assets/i18n/pt.json +++ b/dmp-frontend/src/assets/i18n/pt.json @@ -468,6 +468,10 @@ "RULE-THEN": "então mostrar Campo com o Id", "FIELDSETS": "Questions", "FIELDS":"Inputs" + }, + "HINTS":{ + "ELEMENT-CHILD-OF-TARGET":"This element is parent of selected input.", + "ELEMENT-HIDDEN-FROM-ELEMENT":"This element hides the element or a parent element of the input you are trying to apply visibility rule from." } }, "FORM-VALIDATION":{ @@ -515,8 +519,8 @@ "FIELDSET": { "ADD-INPUT": "Add new input", "COMMENT-FIELD": "Comment field", - "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the givven question.", - "ENABLE-MULTIPLICITY": "User may provide more than one answer to the givven question.", + "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the given question.", + "ENABLE-MULTIPLICITY": "User may provide more than one answer to the given question.", "MULTIPLICITY": "Multiplicity", "MORE": "More.." } diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index 2a86bd292..0140d68cd 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -468,6 +468,10 @@ "RULE-THEN": "then show Field With Id", "FIELDSETS": "Questions", "FIELDS":"Inputs" + }, + "HINTS":{ + "ELEMENT-CHILD-OF-TARGET":"This element is parent of selected input.", + "ELEMENT-HIDDEN-FROM-ELEMENT":"This element hides the element or a parent element of the input you are trying to apply visibility rule from." } }, "FORM-VALIDATION":{ @@ -515,8 +519,8 @@ "FIELDSET": { "ADD-INPUT": "Add new input", "COMMENT-FIELD": "Comment field", - "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the givven question.", - "ENABLE-MULTIPLICITY": "User may provide more than one answer to the givven question.", + "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the given question.", + "ENABLE-MULTIPLICITY": "User may provide more than one answer to the given question.", "MULTIPLICITY": "Multiplicity", "MORE": "More.." } diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json index 9d8816e7c..3aacf3569 100644 --- a/dmp-frontend/src/assets/i18n/sr.json +++ b/dmp-frontend/src/assets/i18n/sr.json @@ -468,6 +468,10 @@ "RULE-THEN": "tada prikazati polje sa Id", "FIELDSETS": "Questions", "FIELDS":"Inputs" + }, + "HINTS":{ + "ELEMENT-CHILD-OF-TARGET":"This element is parent of selected input.", + "ELEMENT-HIDDEN-FROM-ELEMENT":"This element hides the element or a parent element of the input you are trying to apply visibility rule from." } }, "FORM-VALIDATION":{ @@ -515,8 +519,8 @@ "FIELDSET": { "ADD-INPUT": "Add new input", "COMMENT-FIELD": "Comment field", - "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the givven question.", - "ENABLE-MULTIPLICITY": "User may provide more than one answer to the givven question.", + "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the given question.", + "ENABLE-MULTIPLICITY": "User may provide more than one answer to the given question.", "MULTIPLICITY": "Multiplicity", "MORE": "More.." } diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 5b35c6215..956b83b7a 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -468,6 +468,10 @@ "RULE-THEN": "sonra alanı kimliği ile göster", "FIELDSETS": "Questions", "FIELDS":"Inputs" + }, + "HINTS":{ + "ELEMENT-CHILD-OF-TARGET":"This element is parent of selected input.", + "ELEMENT-HIDDEN-FROM-ELEMENT":"This element hides the element or a parent element of the input you are trying to apply visibility rule from." } }, "FORM-VALIDATION":{ @@ -515,8 +519,8 @@ "FIELDSET": { "ADD-INPUT": "Add new input", "COMMENT-FIELD": "Comment field", - "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the givven question.", - "ENABLE-MULTIPLICITY": "User may provide more than one answer to the givven question.", + "INCLUDE-COMMENT-FIELD": "A comment field input is appended to the given question.", + "ENABLE-MULTIPLICITY": "User may provide more than one answer to the given question.", "MULTIPLICITY": "Multiplicity", "MORE": "More.." } diff --git a/dmp-frontend/src/assets/splash/about/how-it-works.html b/dmp-frontend/src/assets/splash/about/how-it-works.html index 704a265a3..31beaf045 100644 --- a/dmp-frontend/src/assets/splash/about/how-it-works.html +++ b/dmp-frontend/src/assets/splash/about/how-it-works.html @@ -180,7 +180,7 @@
    -
    +
    -
    +
    DMP editor DMP outputs Dataset editor