diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java index 334921e2a..97cc158aa 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java @@ -120,6 +120,7 @@ public class ExportXmlBuilderDatasetProfile { Element multiplicity = element.createElement("multiplicity"); multiplicity.setAttribute("max", "" + field.getMultiplicity().getMax()); multiplicity.setAttribute("min", "" + field.getMultiplicity().getMin()); + multiplicity.setAttribute("placeholder", field.getMultiplicity().getPlaceholder()); composite.appendChild(multiplicity); } if (field.getTitle() != null && !field.getTitle().isEmpty()) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Multiplicity.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Multiplicity.java index c0b4a8e9c..4a54bf6ec 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Multiplicity.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Multiplicity.java @@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlRootElement; public class Multiplicity { private int max; private int min; + private String placeholder; @XmlAttribute(name = "max") public int getMax() { @@ -27,10 +28,20 @@ public class Multiplicity { this.min = min; } + @XmlAttribute(name = "placeholder") + public String getPlaceholder() { + return placeholder; + } + + public void setPlaceholder(String placeholder) { + this.placeholder = placeholder; + } + public eu.eudat.models.data.components.commons.Multiplicity toAdminCompositeModelSection() { eu.eudat.models.data.components.commons.Multiplicity multiplicityEntity = new eu.eudat.models.data.components.commons.Multiplicity(); multiplicityEntity.setMax(max); multiplicityEntity.setMin(min); + multiplicityEntity.setPlaceholder(placeholder); return multiplicityEntity; } } \ No newline at end of file diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Multiplicity.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Multiplicity.java index d71c5aa7f..c4b69ce19 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Multiplicity.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Multiplicity.java @@ -4,6 +4,7 @@ public class Multiplicity { private int min; private int max; + private String placeholder; public int getMin() { return min; @@ -21,5 +22,11 @@ public class Multiplicity { this.max = max; } + public String getPlaceholder() { + return placeholder; + } + public void setPlaceholder(String placeholder) { + this.placeholder = placeholder; + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/FieldSet.java index c692e96d7..716e18f9f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/FieldSet.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/FieldSet.java @@ -121,6 +121,7 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable = []): FormGroup { - const formGroup = this.formBuilder.group({ - min: [{ value: this.min, disabled: (disabled && !skipDisable.includes('MultiplicityEditorModel.min')) }], - max: [{ value: this.max, disabled: (disabled && !skipDisable.includes('MultiplicityEditorModel.max')) }] + return this.formBuilder.group({ + min: [{value: this.min, disabled: (disabled && !skipDisable.includes('MultiplicityEditorModel.min'))}], + max: [{value: this.max, disabled: (disabled && !skipDisable.includes('MultiplicityEditorModel.max'))}], + placeholder: [{ + value: this.placeholder, + disabled: (disabled && !skipDisable.includes('MultiplicityEditorModel.placeholder')) + }] }); - return formGroup; } } 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 e56e4ce9f..73f3c306a 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 @@ -111,6 +111,12 @@ +
+ + + +
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 84724ca99..a4c353977 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 @@ -104,7 +104,7 @@ export class DatasetProfileEditorCompositeFieldComponent extends BaseComponent i try{ const multiplicity = this.form.get('multiplicity').value; - this.isMultiplicityEnabled = multiplicity.min > 0 || multiplicity.max >0; + this.isMultiplicityEnabled = multiplicity.min > 0 || multiplicity.max >0; } catch{ this.isMultiplicityEnabled = false; } @@ -120,7 +120,7 @@ export class DatasetProfileEditorCompositeFieldComponent extends BaseComponent i } } - + ngOnInit() { @@ -255,7 +255,7 @@ export class DatasetProfileEditorCompositeFieldComponent extends BaseComponent i description: formValue.description, hasCommentField: formValue.hasCommentField, commentFieldValue: '', - multiplicity: {max:formValue.multiplicity.max, min : formValue.multiplicity.min}, + multiplicity: {max: formValue.multiplicity.max, min: formValue.multiplicity.min, placeholder: formValue.multiplicity.placeholder}, multiplicityItems:null, fields: fields.map(editorField=>{ const model = new DatasetDescriptionFieldEditorModel().fromModel(editorField); diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.html index 391794eaf..6f0dd0648 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section-inner/form-section-inner.component.html @@ -1,15 +1,15 @@
- +
- +
- +
@@ -19,10 +19,14 @@
- + class="col-12 mt-1 ml-0 mr-0 addOneFieldButton"> + + + {{compositeFieldFormGroup.get('multiplicity').value.placeholder}} +
@@ -36,4 +40,4 @@
-
\ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html index 5408c7bb4..d0a526fce 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html @@ -31,10 +31,14 @@
- + class="col-12 mt-1 ml-0 mr-0 addOneFieldButton"> + + + {{compositeFieldFormGroup.get('multiplicity').value.placeholder}} +
@@ -79,14 +83,14 @@
- +
- +
@@ -96,10 +100,14 @@
- + class="col-12 mt-1 ml-0 mr-0 addOneFieldButton"> + + + {{fieldsetEntry.form.get('multiplicity').value.placeholder}} +
@@ -111,12 +119,12 @@ -->
- + - + @@ -132,7 +140,7 @@ - + diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts index 993b73227..21c3b2ad1 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts @@ -318,17 +318,20 @@ export class DatasetDescriptionFieldEditorModel extends BaseFormModel { export class DatasetDescriptionMultiplicityEditorModel extends BaseFormModel { public min: number; public max: number; + public placeholder: string; fromModel(item: Multiplicity): DatasetDescriptionMultiplicityEditorModel { this.min = item.min; this.max = item.max; + this.placeholder = item.placeholder; return this; } buildForm(): FormGroup { const formGroup = this.formBuilder.group({ min: [this.min], - max: [this.max] + max: [this.max], + placeholder: [this.placeholder] }); return formGroup; } diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index ea7c76aea..abca78016 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -367,6 +367,7 @@ "ADDITIONAL-INFORMATION": "Additional Information", "MULTIPLICITY-MIN": "Multiplicity Min", "MULTIPLICITY-MAX": "Multiplicity Max", + "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", "MULTIPLICITY-ADD-ONE-FIELD": "Add one more fieldset", "ORDER": "Order", "COMMENT-PLACEHOLDER": "Please Specify", @@ -385,6 +386,7 @@ "VIEW-STYLE": "Type", "MULTIPLICITY-MIN": "Multiplicity Min", "MULTIPLICITY-MAX": "Multiplicity Max", + "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", "ORDER": "Order", "DEFAULT-VALUE": "Default Value", "VALIDATION": "Validation",