diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBlueprintBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBlueprintBuilder.java index 38cb8584f..9bdd92024 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBlueprintBuilder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBlueprintBuilder.java @@ -74,7 +74,7 @@ public class DmpBlueprintBuilder extends BaseBuilder { +public class SystemFieldBuilder extends FieldBuilder { @Autowired public SystemFieldBuilder( @@ -21,12 +21,12 @@ public class SystemFieldBuilder extends FieldBuilder - + @@ -23,7 +23,7 @@ --> arrow_drop_down
-
+ diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html index bd2a4de2b..b9f8924af 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html @@ -33,6 +33,56 @@ + + +
+
+
+
{{'DMP-EDITOR.FIELDS.NAME' | translate}} *
+
+ + {{'DMP-EDITOR.FIELDS.NAME' | translate}} + + + +
+
+
+
+
{{'DMP-EDITOR.FIELDS.DESCRIPTION' | translate}} *
+ + +
+
+
+
{{'DMP-EDITOR.FIELDS.BLUEPRINT' | translate}} *
+ + {{'DMP-EDITOR.FIELDS.BLUEPRINT' | translate}} + + + +
+
+
+ +
+
+
+
+

{{'DMP-EDITOR.ACTIONS.OR-CONTINUE-WITH' | translate}}

+
+
+ +
+
+
+
+
+
+
DMP Blueprint
@@ -73,58 +123,15 @@
- - +
-
-
-
-
0.1 Title of DMP *
- - Title - - - -
-
-
0.2 Description of DMP *
- - -
-
-
0.3 Blueprint of DMP *
- - Select blueprint - - - -
-
-
- -
-
-
-
-

or continue with

-
-
- -
-
-
-
-
-
+
@@ -139,8 +146,8 @@
{{i + 1}}.{{j + 1}} {{field.label}}*
{{field.description}}
-
-
+
+
@@ -149,12 +156,11 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
- +
+
-
+
{{'DMP-EDITOR.PLACEHOLDER.RESEARCHERS' | translate}} @@ -172,7 +178,7 @@ {{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}
-
+
{{'DMP-EDITOR.PLACEHOLDER.ORGANIZATION' | translate}} @@ -189,7 +195,7 @@ {{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}
-
+
@@ -202,7 +208,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
@@ -217,16 +223,16 @@
-
+
-
+
-
+
-
+
@@ -236,7 +242,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
@@ -249,7 +255,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
-
-
+
+
-
+
- +
-
+
-
+
@@ -342,6 +347,6 @@
-
+
-
+
\ No newline at end of file diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts index 761e92394..2b1b5d76d 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts @@ -56,6 +56,7 @@ import { ExtraPropertiesFormModel } from '../editor/general-tab/extra-properties import { FunderFormModel } from '../editor/grant-tab/funder-form-model'; import { GrantTabModel } from '../editor/grant-tab/grant-tab-model'; import { ProjectFormModel } from '../editor/grant-tab/project-form-model'; +import { DmpBlueprintSectionFieldCategory } from '@app/core/common/enum/dmp-blueprint-section-field-category'; interface Visible { value: boolean; @@ -86,6 +87,7 @@ export class DmpEditorBlueprintComponent extends CheckDeactivateBaseComponent im isCreateNew = false; isCreateNewProject = false; isCreateNewFunder = false; + dmp: DmpEditorModel; dmpSectionIndex: number = 0; @@ -110,8 +112,6 @@ export class DmpEditorBlueprintComponent extends CheckDeactivateBaseComponent im sectionTemplates: Array> = new Array>(); - extraFieldTypesEnum = DmpBlueprintExtraFieldDataType; - private associates: UserModel[] = []; visibles: Visible[] = [ @@ -128,6 +128,16 @@ export class DmpEditorBlueprintComponent extends CheckDeactivateBaseComponent im profilesAutoCompleteConfiguration: MultipleAutoCompleteConfiguration; + + + + + dmpBlueprintSectionFieldCategory = DmpBlueprintSectionFieldCategory; + dmpBlueprintSystemFieldType = DmpBlueprintSystemFieldType; + //public dmpBlueprintSystemFieldTypeEnum = this.enumUtils.getEnumValues(DmpBlueprintSystemFieldType); + dmpBlueprintExtraFieldDataType = DmpBlueprintExtraFieldDataType; + //public dmpBlueprintExtraFieldDataTypeEnum = this.enumUtils.getEnumValues(DmpBlueprintExtraFieldDataType); + constructor( private dmpBlueprintService: DmpBlueprintService, private datasetService: DatasetService, @@ -858,11 +868,11 @@ export class DmpEditorBlueprintComponent extends CheckDeactivateBaseComponent im nameof(x => x.isActive) ] ) - .pipe(map(data => data as DmpBlueprint), takeUntil(this._destroyed)) - .subscribe( - data => successFunction(data), - error => this.onCallbackError(error) - ); + .pipe(map(data => data as DmpBlueprint), takeUntil(this._destroyed)) + .subscribe( + data => successFunction(data), + error => this.onCallbackError(error) + ); } registerFormEventsForDmpBlueprint(): void { diff --git a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts index 3f8e41b86..2ea3435b6 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts @@ -1,14 +1,13 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { AuthGuard } from '@app/core/auth-guard.service'; +import { CanDeactivateGuard } from '@app/library/deactivate/can-deactivate.guard'; +import { DmpCloneComponent } from './clone/dmp-clone.component'; +import { DmpEditorBlueprintComponent } from './dmp-editor-blueprint/dmp-editor-blueprint.component'; import { DmpEditorComponent } from './editor/dmp-editor.component'; import { InvitationAcceptedComponent } from './invitation/accepted/dmp-invitation-accepted.component'; import { DmpListingComponent } from './listing/dmp-listing.component'; -import { DmpWizardComponent } from './wizard/dmp-wizard.component'; import { DmpOverviewComponent } from './overview/dmp-overview.component'; -import { DmpCloneComponent } from './clone/dmp-clone.component'; -import { AuthGuard } from '@app/core/auth-guard.service'; -import { CanDeactivateGuard } from '@app/library/deactivate/can-deactivate.guard'; -import { DmpEditorBlueprintComponent } from './dmp-editor-blueprint/dmp-editor-blueprint.component'; const routes: Routes = [ { @@ -40,7 +39,7 @@ const routes: Routes = [ breadcrumb: true, title: 'GENERAL.TITLES.DMP-EDIT' }, - canDeactivate:[CanDeactivateGuard] + canDeactivate: [CanDeactivateGuard] }, { path: 'publicEdit/:publicId', @@ -49,7 +48,7 @@ const routes: Routes = [ breadcrumb: true, title: 'GENERAL.TITLES.DMP-PUBLIC-EDIT' }, - canDeactivate:[CanDeactivateGuard] + canDeactivate: [CanDeactivateGuard] }, { path: 'overview/:id', @@ -83,7 +82,7 @@ const routes: Routes = [ breadcrumbs: 'new', title: 'GENERAL.TITLES.DMP-NEW' }, - canDeactivate:[CanDeactivateGuard] + canDeactivate: [CanDeactivateGuard] }, // { // path: 'new/dataset', diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html index a083fdafb..61242374a 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html @@ -5,6 +5,7 @@
+ dgdfgdfgdf
1.1 {{'DMP-EDITOR.FIELDS.NAME' | translate}}*
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json index 95f451e8d..1ee43b27b 100644 --- a/dmp-frontend/src/assets/config/config.json +++ b/dmp-frontend/src/assets/config/config.json @@ -50,6 +50,7 @@ "value": "pl" } ], + "defaultBlueprintId": "86635178-36a6-484f-9057-a934e4eeecd5", "keycloak": { "enabled": true, "address": null, diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 42d059b9e..47bfb505e 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -1156,6 +1156,7 @@ "RELATED-GRANT": "Related Grant", "DESCRIPTION": "Description", "DESCRIPTION-HINT": "Briefly describe the context and purpose of the DMP", + "BLUEPRINT": "Blueprint", "ORGANISATIONS": "Organizations", "ORGANISATIONS-HINT": "Add here the names of the organizations contributing to the creation and revision of the DMPs", "RESEARCHERS": "Researchers", @@ -1189,6 +1190,8 @@ }, "ACTIONS": { "GO-TO-GRANT": "Go To DMP Grant", + "DEFAULT-BLUEPRINT": "Default Blueprint", + "OR-CONTINUE-WITH": "or continue with", "GO-TO-DATASETS": "Go To Datasets", "SAVE-CHANGES": "Save Changes", "SAVE": "Save", @@ -1206,6 +1209,7 @@ "PLACEHOLDER": { "DESCRIPTION": "Fill with description", "ORGANIZATION": "Select organization", + "BLUEPRINT": "Select Blueprint", "AUTHORS": "Select authors", "RESEARCHERS": "Select researchers" },