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 cce37ad56..2cf12e68d 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 @@ -121,6 +121,7 @@ public class ExportXmlBuilderDatasetProfile { multiplicity.setAttribute("max", "" + field.getMultiplicity().getMax()); multiplicity.setAttribute("min", "" + field.getMultiplicity().getMin()); multiplicity.setAttribute("placeholder", field.getMultiplicity().getPlaceholder()); + multiplicity.setAttribute("tableView", String.valueOf(field.getMultiplicity().getTableView())); 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 4a54bf6ec..13c01c684 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 @@ -9,6 +9,7 @@ public class Multiplicity { private int max; private int min; private String placeholder; + private boolean tableView; @XmlAttribute(name = "max") public int getMax() { @@ -37,11 +38,21 @@ public class Multiplicity { this.placeholder = placeholder; } + @XmlAttribute(name = "tableView") + public boolean getTableView() { + return tableView; + } + + public void setTableView(boolean tableView) { + this.tableView = tableView; + } + 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); + multiplicityEntity.setTableView(tableView); 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 c4b69ce19..2ad99dec3 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 @@ -5,6 +5,7 @@ public class Multiplicity { private int min; private int max; private String placeholder; + private boolean tableView; public int getMin() { return min; @@ -29,4 +30,12 @@ public class Multiplicity { public void setPlaceholder(String placeholder) { this.placeholder = placeholder; } + + public boolean getTableView() { + return tableView; + } + + public void setTableView(boolean tableView) { + this.tableView = tableView; + } } 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 716e18f9f..250541c30 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 @@ -122,6 +122,7 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable +
+ + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-TABLEVIEW' | translate}} + +
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 bc404e5e4..44c1e2c4e 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 @@ -261,7 +261,8 @@ export class DatasetProfileEditorCompositeFieldComponent extends BaseComponent i description: formValue.description, hasCommentField: formValue.hasCommentField, commentFieldValue: '', - multiplicity: {max: formValue.multiplicity.max, min: formValue.multiplicity.min, placeholder: formValue.multiplicity.placeholder}, + multiplicity: {max: formValue.multiplicity.max, min: formValue.multiplicity.min, + placeholder: formValue.multiplicity.placeholder, tableView: formValue.multiplicity.tableView}, multiplicityItems:null, fields: fields.map(editorField=>{ const model = new DatasetDescriptionFieldEditorModel().fromModel(editorField); 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 f13cd9493..5c8a74e46 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 @@ -334,11 +334,13 @@ export class DatasetDescriptionMultiplicityEditorModel extends BaseFormModel { public min: number; public max: number; public placeholder: string; + public tableView: boolean; fromModel(item: Multiplicity): DatasetDescriptionMultiplicityEditorModel { this.min = item.min; this.max = item.max; this.placeholder = item.placeholder; + this.tableView = item.tableView; return this; } @@ -346,7 +348,8 @@ export class DatasetDescriptionMultiplicityEditorModel extends BaseFormModel { const formGroup = this.formBuilder.group({ min: [this.min], max: [this.max], - placeholder: [this.placeholder] + placeholder: [this.placeholder], + tableView: [this.tableView] }); return formGroup; } diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 9e0e2ed4e..0151e067a 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "Multiplicity Min", "MULTIPLICITY-MAX": "Multiplicity Max", "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Add more", "ORDER": "Order", "COMMENT-PLACEHOLDER": "Please Specify", diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 6f563ad38..69d60cc52 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "Multiplicity Min", "MULTIPLICITY-MAX": "Multiplicity Max", "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Add more", "ORDER": "Order", "COMMENT-PLACEHOLDER": "Please Specify", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 1c1d11e2d..47e474d41 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "Multiplicidad mínima", "MULTIPLICITY-MAX": "Multiplicidad máxima", "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Add more", "ORDER": "Orden", "COMMENT-PLACEHOLDER": "Por favir especifique", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 9cf4eca81..f8fb87a90 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "Ελάχιστη τιμή Min", "MULTIPLICITY-MAX": "Μέγιστη τιμή Max", "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Add more", "ORDER": "Εντολή", "COMMENT-PLACEHOLDER": "Παρακαλώ προσδιορίστε", diff --git a/dmp-frontend/src/assets/i18n/hr.json b/dmp-frontend/src/assets/i18n/hr.json index 69b1ab7d2..e42b19f7c 100644 --- a/dmp-frontend/src/assets/i18n/hr.json +++ b/dmp-frontend/src/assets/i18n/hr.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "Višestrukost, minimalno polja", "MULTIPLICITY-MAX": "Višestrukost, maksimalno polja", "MULTIPLICITY-PLACEHOLDER": "", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Dodaj polje", "ORDER": "Redoslijed", "COMMENT-PLACEHOLDER": "Navedite", diff --git a/dmp-frontend/src/assets/i18n/pl.json b/dmp-frontend/src/assets/i18n/pl.json index 4dba630af..2e6d9a053 100644 --- a/dmp-frontend/src/assets/i18n/pl.json +++ b/dmp-frontend/src/assets/i18n/pl.json @@ -374,7 +374,8 @@ "MULTIPLICITY-MIN": "$Minimalna wielokrotność$", "MULTIPLICITY-MAX": "$Maksymalna wielokrotność$", "MULTIPLICITY-PLACEHOLDER": "$Tekst zastępujący wielokrotność$", - "MULTIPLICITY-ADD-ONE-FIELD": "Dodaj więcej", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", + "MULTIPLICITY-ADD-ONE-FIELD": "Dodaj więcej", "ORDER": "Kolejność", "COMMENT-PLACEHOLDER": "Proszę doprecyzować", "COMMENT-HINT": "Podaj dodatkowe informacje lub uzasadnienie swojego wyboru", diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json index 8123b7bca..6fea92d60 100644 --- a/dmp-frontend/src/assets/i18n/pt.json +++ b/dmp-frontend/src/assets/i18n/pt.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "Multiplicidade Min", "MULTIPLICITY-MAX": "Multiplicidade Máx", "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Add more", "ORDER": "Ordem", "COMMENT-PLACEHOLDER": "Por favor especifique", diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index 06032b3d8..6486d5afa 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "Multiplicity Min", "MULTIPLICITY-MAX": "Multiplicity Max", "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Add more", "ORDER": "Order", "COMMENT-PLACEHOLDER": "Please Specify", diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json index bd4751501..914b6694c 100644 --- a/dmp-frontend/src/assets/i18n/sr.json +++ b/dmp-frontend/src/assets/i18n/sr.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "Višestrukost, minimalno polja", "MULTIPLICITY-MAX": "Višestrukost, maksimalno polja", "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Add more", "ORDER": "Redosled", "COMMENT-PLACEHOLDER": "Navedite", diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index a99da8a5b..81806e879 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -374,6 +374,7 @@ "MULTIPLICITY-MIN": "En az Çokluk", "MULTIPLICITY-MAX": "En fazla Çokluk", "MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text", + "MULTIPLICITY-TABLEVIEW": "View inputs in table", "MULTIPLICITY-ADD-ONE-FIELD": "Add more", "ORDER": "Düzen", "COMMENT-PLACEHOLDER": "Lütfen Belirtiniz",