diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java index c9588db00..12cab1917 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java @@ -66,6 +66,7 @@ public class Admin extends BaseController { datasetprofile.setDefinition(modelDefinition.getDefinition()); datasetprofile.setStatus(modelDefinition.getStatus()); datasetprofile.setLabel(modelDefinition.getLabel()); + datasetprofile.setDescription(modelDefinition.getDescription()); this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(datasetprofile); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java index ded2935c8..adff4a1fd 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java @@ -27,7 +27,7 @@ public class AdminManager { String xml = XmlBuilder.generateXml(viewStyleDoc); eu.eudat.data.entities.DatasetProfile datasetProfile = apiContext.getOperationsContext().getBuilderFactory().getBuilder(DatasetProfileBuilder.class).definition(xml).label(profile.getLabel()) - .status(profile.getStatus()).created(new Date()) + .status(profile.getStatus()).created(new Date()).description(profile.getDescription()) .build(); return datasetProfile; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java index 0e2279b91..2e151941f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java @@ -56,6 +56,7 @@ public class DatasetProfileManager { eu.eudat.models.data.admin.composite.DatasetProfile datasetprofile = AdminManager.generateDatasetProfileModel(profile); datasetprofile.setLabel(profile.getLabel()); datasetprofile.setStatus(profile.getStatus()); + datasetprofile.setDescription(profile.getDescription()); return datasetprofile; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java index b80006228..8adde4152 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java @@ -10,15 +10,12 @@ import java.util.List; public class DatasetProfile { private String label; - private List
sections; + private String description; private List pages; + private List
sections; private Short status; private Short version; - public List
getSections() { - return sections; - } - public void setSections(List
sections) { this.sections = sections; } public String getLabel() { return label; @@ -27,6 +24,13 @@ public class DatasetProfile { this.label = label; } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public List getPages() { return pages; } @@ -34,6 +38,11 @@ public class DatasetProfile { this.pages = pages; } + public List
getSections() { + return sections; + } + public void setSections(List
sections) { this.sections = sections; } + public Short getStatus() { return status; } @@ -52,6 +61,7 @@ public class DatasetProfile { public DatasetProfile toShort() { DatasetProfile shortProfile = new DatasetProfile(); shortProfile.setLabel(this.label); + shortProfile.setDescription(this.description); List
shortSection = new LinkedList<>(); for (Section toshortSection : this.getSections()) { shortSection.add(toshortSection.toShort()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileAutocompleteItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileAutocompleteItem.java index 211f6a079..34eac149e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileAutocompleteItem.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileAutocompleteItem.java @@ -9,13 +9,12 @@ import java.util.UUID; public class DatasetProfileAutocompleteItem implements DataModel { private UUID id; - private String label; + private String description; public UUID getId() { return id; } - public void setId(UUID id) { this.id = id; } @@ -23,15 +22,22 @@ public class DatasetProfileAutocompleteItem implements DataModel { diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor-model.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor-model.ts index dc809e5e1..c29aaae47 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor-model.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor-model.ts @@ -12,6 +12,7 @@ export class DatasetProfileEditorModel extends BaseFormModel { public label: string; public status: number; public version: number; + private description: string; fromModel(item: DatasetProfile): DatasetProfileEditorModel { if (item.sections) { this.sections = item.sections.map(x => new SectionEditorModel().fromModel(x)); } @@ -19,12 +20,14 @@ export class DatasetProfileEditorModel extends BaseFormModel { this.label = item.label; this.status = item.status; this.version = item.version; + this.description = item.description; return this; } buildForm(disabled: boolean = false, skipDisable: Array = []): FormGroup { const formGroup: FormGroup = new FormBuilder().group({ label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.label')) }, [Validators.required]], + description: [{ value: this.description, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.description')) }, [Validators.required]], status: [{ value: this.status, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.status')) }], version: [{ value: this.version, disabled: (disabled && !skipDisable.includes('DatasetProfileEditorModel.version')) }] }); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html index b4987a4f6..7c99265c8 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html @@ -6,6 +6,12 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts index bafec33bd..43efbe454 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts @@ -73,7 +73,8 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O filterFn: this.filterDatasetTemplate.bind(this), initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item['description'] }; dmpAutoCompleteConfiguration = { diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts index dd4f63619..8ff56903e 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts @@ -70,7 +70,8 @@ export class GeneralTabComponent extends BaseComponent implements OnInit { filterFn: this.filterProfiles.bind(this), initialItems: (excludedItems: any[]) => this.filterProfiles('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item['description'] }; this.organisationsAutoCompleteConfiguration = { diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts index abec1f6d5..e62dde822 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts @@ -55,7 +55,8 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni filterFn: this.filterDatasetTemplate.bind(this), initialItems: (excludedItems: any[]) => this.filterDatasetTemplate('').map(result => result.filter(resultItem => excludedItems.map(x => x.id).indexOf(resultItem.id) === -1)), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item['description'] }; projectAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { diff --git a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts index 7d64018f2..ed6d82adf 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts @@ -55,7 +55,8 @@ export class DmpEditorWizardComponent extends BaseComponent implements OnInit, I filterFn: this.filterProfiles.bind(this), initialItems: (extraData) => this.filterProfiles(''), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item['description'] }; if (this.formGroup == null) { diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 0a58c136c..1485dca54 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -126,6 +126,7 @@ }, "FIELDS": { "DATASET-TITLE": "Dataset Description Template Name", + "DATASET-DESCRIPTION": "Description", "ROLES": "Roles" }, "STEPS": {