diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java index c95fd4e60..81e7ffe36 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java @@ -75,9 +75,6 @@ public class DmpPropertiesPersist { .over(item.getDmpBlueprintValues()) .mapKey((k) -> ((UUID)k).toString()) .using((itm) -> this.validatorFactory.validator(DmpBlueprintValuePersist.DmpBlueprintValuePersistValidator.class)), - this.spec() - .must(() -> !this.isListNullOrEmpty(item.getContacts())) - .failOn(DmpPropertiesPersist._contacts).failWith(messageSource.getMessage("Validation_Required", new Object[]{DmpPropertiesPersist._contacts}, LocaleContextHolder.getLocale())), this.navSpec() .iff(() -> !this.isListNullOrEmpty(item.getContacts())) .on(DmpPropertiesPersist._contacts) diff --git a/dmp-frontend/src/app/core/common/enum/dmp-blueprint-field-type.ts b/dmp-frontend/src/app/core/common/enum/dmp-blueprint-field-type.ts index 9ac699b68..47c979fb3 100644 --- a/dmp-frontend/src/app/core/common/enum/dmp-blueprint-field-type.ts +++ b/dmp-frontend/src/app/core/common/enum/dmp-blueprint-field-type.ts @@ -1,6 +1,6 @@ export enum DmpBlueprintExtraFieldDataType { Text = 0, - RichTex = 1, + RichText = 1, Date = 2, Number = 3 } diff --git a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts index adc07ce77..ff6b6a35c 100644 --- a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts +++ b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts @@ -148,7 +148,7 @@ export class EnumUtils { toDmpBlueprintExtraFieldDataTypeString(status: DmpBlueprintExtraFieldDataType): string { switch (status) { case DmpBlueprintExtraFieldDataType.Text: return this.language.instant('TYPES.DMP-PROFILE-FIELD.DATA-TYPE.TEXT'); - case DmpBlueprintExtraFieldDataType.RichTex: return this.language.instant('TYPES.DMP-PROFILE-FIELD.DATA-TYPE.RICH-TEXT'); + case DmpBlueprintExtraFieldDataType.RichText: return this.language.instant('TYPES.DMP-PROFILE-FIELD.DATA-TYPE.RICH-TEXT'); case DmpBlueprintExtraFieldDataType.Date: return this.language.instant('TYPES.DMP-PROFILE-FIELD.DATA-TYPE.DATE'); case DmpBlueprintExtraFieldDataType.Number: return this.language.instant('TYPES.DMP-PROFILE-FIELD.DATA-TYPE.NUMBER'); } diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html index c34847d02..a0795c9c5 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html @@ -258,34 +258,34 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
-
- - - -
-
- - - - - - - - - - -
-
- - - -
-
- - - -
+
+
+
+ + {{field.label}} + + {{formGroup.get('properties').get('dmpBlueprintValues').get(field.id).get('fieldValue').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ +
+
+ + {{field.label}} + + {{formGroup.get('properties').get('dmpBlueprintValues').get(field.id).get('fieldValue').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+ + {{field.label}} + + {{formGroup.get('properties').get('dmpBlueprintValues').get(field.id).get('fieldValue').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} +