From 6f6ee9876bb7329d4baf5bc21121543b12d07761 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 28 Aug 2019 16:53:17 +0300 Subject: [PATCH] Adds funder, project fields on DMP wizard --- .../editor/grant-tab/grant-tab.component.html | 4 +- .../editor/grant-tab/grant-tab.component.ts | 2 +- .../funder-editor-wizard.component.html | 52 +++++++++++++++ .../funder-editor-wizard.component.scss | 0 .../funder-editor-wizard.component.ts | 63 ++++++++++++++++++ .../grant-editor-wizard.component.html | 49 ++++++-------- .../grant-editor-wizard.component.ts | 42 ++++++------ .../project-editor-wizard.component.html | 60 +++++++++++++++++ .../project-editor-wizard.component.scss | 0 .../project-editor-wizard.component.ts | 66 +++++++++++++++++++ .../quick-wizard-editor.component.html | 33 ++++------ .../quick-wizard-editor.component.ts | 2 + .../quick-wizard-editor.model.ts | 26 ++++++-- .../ui/quick-wizard/quick-wizard.module.ts | 4 ++ dmp-frontend/src/assets/i18n/en.json | 16 +++-- dmp-frontend/src/styles.scss | 18 ----- 16 files changed, 341 insertions(+), 96 deletions(-) create mode 100644 dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html create mode 100644 dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.scss create mode 100644 dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts create mode 100644 dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html create mode 100644 dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.scss create mode 100644 dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html index b39e900be..9bc118398 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html @@ -68,11 +68,11 @@
settings_backup_restore - {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.EXIST' | translate}} + {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.EXIST-GRANT' | translate}}
add - {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.CREATE-NEW' | translate}} + {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.CREATE-NEW-GRANT' | translate}}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts index 2bb21c0e4..3ae7b0f21 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.ts @@ -95,7 +95,7 @@ export class GrantTabComponent implements OnInit { const funderRequestItem: RequestItem = new RequestItem(); funderRequestItem.criteria = new FunderCriteria(); funderRequestItem.criteria.like = query; - return this.funderService.getWithExternal(funderRequestItem); + return this.funderService.getWithExternal(funderRequestItem) } create() { diff --git a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html new file mode 100644 index 000000000..0cd02edc1 --- /dev/null +++ b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.html @@ -0,0 +1,52 @@ +
+
+ + + +
+

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-FUNDER' | translate}}

+ + + + + {{formGroup.get('existFunder').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+ +
+

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-NEW-FUNDER' | translate}}

+ + + + {{formGroup.get('label').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+ +
+
+
+
+

+ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.OR' | translate}} +

+
+
+
+
+
+
+ + + + +
+
+ + + +
+
diff --git a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.scss b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts new file mode 100644 index 000000000..ab1433438 --- /dev/null +++ b/dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts @@ -0,0 +1,63 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { FormGroup } from '@angular/forms'; +import { SingleAutoCompleteConfiguration } from '../../../library/auto-complete/single/single-auto-complete-configuration'; +import { FunderService } from '../../../core/services/funder/funder.service'; +import { RequestItem } from '../../../core/query/request-item'; +import { FunderCriteria } from '../../../core/query/funder/funder-criteria'; +import { FunderFormModel } from '../../dmp/editor/grant-tab/funder-form-model'; + +@Component({ + selector: 'app-quick-wizard-funder-editor-component', + templateUrl: './funder-editor-wizard.component.html', + styleUrls: ['./funder-editor-wizard.component.scss'] +}) +export class FunderEditorWizardComponent implements OnInit { + + isNew = false; + funder: FunderFormModel; + @Input() formGroup: FormGroup; + funderAutoCompleteConfiguration: SingleAutoCompleteConfiguration; + + constructor( + private funderService: FunderService + ) { } + + ngOnInit() { + + this.funderAutoCompleteConfiguration = { + filterFn: this.searchFunder.bind(this), + initialItems: (extraData) => this.searchFunder(''), + displayFn: (item) => item['label'], + titleFn: (item) => item['label'] + }; + + if (!this.formGroup) { + this.funder = new FunderFormModel(); + this.formGroup = this.funder.buildForm(); + } + + this.formGroup.get('existFunder').enable(); + this.formGroup.get('label').disable(); + } + + searchFunder(query: string) { + const funderRequestItem: RequestItem = new RequestItem(); + funderRequestItem.criteria = new FunderCriteria(); + funderRequestItem.criteria.like = query; + return this.funderService.getWithExternal(funderRequestItem); + } + + create() { + this.isNew = !this.isNew; + if (this.isNew) { + this.formGroup.get('existFunder').disable(); + this.formGroup.get('existFunder').reset(); + this.formGroup.get('label').enable(); + } else { + this.formGroup.get('existFunder').enable(); + this.formGroup.get('label').disable(); + this.formGroup.get('label').reset(); + } + } + +} diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html index 3348b2e57..ddb3a4e8c 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.html @@ -1,45 +1,40 @@
-
+ - - - + +
-

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT' | translate}}

+

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-GRANT' | translate}}

- + - - {{formGroup.get('grant').getError('backendError').message}} - + + {{grantformGroup.get('grant').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-NEW' | translate}}

+

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-NEW-GRANT' | translate}}

- + {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.FIELDS.LABEL-HINT' | translate}} - - {{formGroup.get('label').getError('backendError').message}} - + + {{grantformGroup.get('label').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.FIELDS.DESCRIPTION-HINT' | translate}} - - {{formGroup.get('description').getError('backendError').message}} - + + {{grantformGroup.get('description').getError('backendError').message}} + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
@@ -58,10 +53,8 @@
- - + +
diff --git a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts index 085a7ee41..5d7e81460 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts @@ -26,8 +26,8 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, isNew = false; grant: GrantEditorWizardModel; - @Input() formGroup: FormGroup; - //formGroup: FormGroup = null; + @Input() grantformGroup: FormGroup; + @Input() funderFormGroup: FormGroup; private uiNotificationService: UiNotificationService grantAutoCompleteConfiguration: SingleAutoCompleteConfiguration; @@ -57,17 +57,18 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, filterFn: this.searchGrant.bind(this), initialItems: (extraData) => this.searchGrant(''), displayFn: (item) => item['label'], - titleFn: (item) => item['label'] + titleFn: (item) => item['label'], + subtitleFn: (item) => item ? item['source'] : null }; - if (!this.formGroup) { + if (!this.grantformGroup) { this.grant = new GrantEditorWizardModel(); - this.formGroup = this.grant.buildForm(); + this.grantformGroup = this.grant.buildForm(); } - this.formGroup.get('existGrant').enable(); - this.formGroup.get('label').disable(); - this.formGroup.get('description').disable(); + this.grantformGroup.get('existGrant').enable(); + this.grantformGroup.get('label').disable(); + this.grantformGroup.get('description').disable(); // this.route.params // .pipe(takeUntil(this._destroyed)) @@ -98,7 +99,7 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, } public isFormValid() { - return this.formGroup.valid; + return this.grantformGroup.valid; } public touchAllFormFields(formControl: AbstractControl) { @@ -123,7 +124,7 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, onCallbackError(errorResponse: any) { this.setErrorModel(errorResponse.error.payload); - this.validateAllFormFields(this.formGroup); + this.validateAllFormFields(this.grantformGroup); } public setErrorModel(validationErrorModel: ValidationErrorModel) { @@ -151,22 +152,25 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, const grantRequestItem: RequestItem = new RequestItem(); grantRequestItem.criteria = new GrantCriteria(); grantRequestItem.criteria.like = query; + if (this.funderFormGroup.get('existFunder').value) { + grantRequestItem.criteria.funderReference = this.funderFormGroup.controls['existFunder'].value.reference; + } return this.grantService.getWithExternal(grantRequestItem); } create() { this.isNew = !this.isNew; if (this.isNew) { - this.formGroup.get('existGrant').disable(); - this.formGroup.get('existGrant').reset(); - this.formGroup.get('label').enable(); - this.formGroup.get('description').enable(); + this.grantformGroup.get('existGrant').disable(); + this.grantformGroup.get('existGrant').reset(); + this.grantformGroup.get('label').enable(); + this.grantformGroup.get('description').enable(); } else { - this.formGroup.get('existGrant').enable(); - this.formGroup.get('label').disable(); - this.formGroup.get('label').reset(); - this.formGroup.get('description').disable(); - this.formGroup.get('description').reset(); + this.grantformGroup.get('existGrant').enable(); + this.grantformGroup.get('label').disable(); + this.grantformGroup.get('label').reset(); + this.grantformGroup.get('description').disable(); + this.grantformGroup.get('description').reset(); } } } diff --git a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html new file mode 100644 index 000000000..96fbf5ed2 --- /dev/null +++ b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.html @@ -0,0 +1,60 @@ +
+ + + + + +
+

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-PROJECT' | translate}}

+ + + + + {{formGroup.get('project').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+ +
+

{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.ABOUT-NEW-PROJECT' | translate}}

+ + + + {{formGroup.get('label').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + + {{formGroup.get('description').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+ +
+
+
+
+

+ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.OR' | translate}} +

+
+
+
+
+
+
+ + + + +
+
+ + + + +
diff --git a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.scss b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts new file mode 100644 index 000000000..73c5c22dc --- /dev/null +++ b/dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts @@ -0,0 +1,66 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { SingleAutoCompleteConfiguration } from '../../../library/auto-complete/single/single-auto-complete-configuration'; +import { FormGroup } from '@angular/forms'; +import { ProjectService } from '../../../core/services/project/project.service'; +import { RequestItem } from '../../../core/query/request-item'; +import { ProjectCriteria } from '../../../core/query/project/project-criteria'; +import { ProjectFormModel } from '../../dmp/editor/grant-tab/project-form-model'; + +@Component({ + selector: 'app-quick-wizard-project-editor-component', + templateUrl: './project-editor-wizard.component.html', + styleUrls: ['./project-editor-wizard.component.scss'] +}) +export class ProjectEditorWizardComponent implements OnInit { + + isNew = false; + project: ProjectFormModel; + @Input() formGroup: FormGroup; + projectAutoCompleteConfiguration: SingleAutoCompleteConfiguration; + + constructor( + private projectService: ProjectService + ) { } + + ngOnInit() { + this.projectAutoCompleteConfiguration = { + filterFn: this.searchProject.bind(this), + initialItems: (extraData) => this.searchProject(''), + displayFn: (item) => item['label'], + titleFn: (item) => item['label'] + }; + + if (!this.formGroup) { + this.project = new ProjectFormModel(); + this.formGroup = this.project.buildForm(); + } + + this.formGroup.get('existProject').enable(); + this.formGroup.get('label').disable(); + this.formGroup.get('description').disable(); + } + + searchProject(query: string) { + const projectRequestItem: RequestItem = new RequestItem(); + projectRequestItem.criteria = new ProjectCriteria(); + projectRequestItem.criteria.like = query; + return this.projectService.getWithExternal(projectRequestItem); + } + + create() { + this.isNew = !this.isNew; + if (this.isNew) { + this.formGroup.get('existProject').disable(); + this.formGroup.get('existProject').reset(); + this.formGroup.get('label').enable(); + this.formGroup.get('description').enable(); + } else { + this.formGroup.get('existProject').enable(); + this.formGroup.get('label').disable(); + this.formGroup.get('label').reset(); + this.formGroup.get('description').disable(); + this.formGroup.get('description').reset(); + } + } + +} diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html index 404e06c41..e7feda185 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html @@ -10,14 +10,15 @@ {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.TITLE' | translate}} -
- - +
+ +
+ +
+
- +
@@ -26,14 +27,11 @@
- +
- +
@@ -47,9 +45,7 @@
- +
- - - + + +
diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index f3e7f2b63..72231b778 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -19,6 +19,7 @@ import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCru import { DatasetEditorWizardComponent } from '../dataset-editor/dataset-editor-wizard.component'; import { GrantEditorWizardModel } from '../grant-editor/grant-editor-wizard-model'; import { QuickWizardEditorWizardModel } from './quick-wizard-editor.model'; +import { FunderFormModel } from '../../dmp/editor/grant-tab/funder-form-model'; @Component({ selector: 'app-quick-wizard-editor-component', @@ -51,6 +52,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, ngOnInit(): void { this.quickWizard = new QuickWizardEditorWizardModel(); this.quickWizard.grant = new GrantEditorWizardModel(); + this.quickWizard.funder = new FunderFormModel(); this.formGroup = this.quickWizard.buildForm(); this.language.get('NAV-BAR.DMP-WIZARD').pipe(takeUntil(this._destroyed)).subscribe(x => { this.breadCrumbs = Observable.of([ diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.model.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.model.ts index 77278ff92..617c68ade 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.model.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.model.ts @@ -9,9 +9,15 @@ import { BackendErrorValidator } from "../../../common/forms/validation/custom-v import { ValidationErrorModel } from "../../../common/forms/validation/error-model/validation-error-model"; import { DatasetEditorWizardModel } from "../dataset-editor/dataset-editor-wizard-model"; import { DatasetWizardEditorModel } from "../../dataset/dataset-wizard/dataset-wizard-editor.model"; +import { FunderModel } from "../../../core/model/funder/funder"; +import { FunderFormModel } from "../../dmp/editor/grant-tab/funder-form-model"; +import { ProjectFormModel } from "../../dmp/editor/grant-tab/project-form-model"; +import { ProjectModel } from "../../../core/model/project/project"; export class QuickWizardEditorWizardModel { - public grant: GrantEditorWizardModel; + public grant: GrantEditorWizardModel; + public funder: FunderFormModel; + public project: ProjectFormModel; public dmp: DmpEditorWizardModel; public datasets: DatasetEditorWizardModel; public validationErrorModel: ValidationErrorModel = new ValidationErrorModel(); @@ -19,7 +25,17 @@ export class QuickWizardEditorWizardModel { fromModelGrant(item: GrantListingModel): QuickWizardEditorWizardModel { this.grant.fromModel(item); return this; - } + } + + fromModelFunder(item: FunderModel): QuickWizardEditorWizardModel { + this.funder.fromModel(item); + return this; + } + + fromModelProject(item: ProjectModel): QuickWizardEditorWizardModel { + this.project.fromModel(item); + return this; + } fromModelDmp(item: DmpModel): QuickWizardEditorWizardModel { this.dmp.fromModel(item); @@ -29,12 +45,14 @@ export class QuickWizardEditorWizardModel { fromModelDataset(item: DatasetWizardEditorModel[]): QuickWizardEditorWizardModel { this.datasets.fromModel(item); return this; - } + } buildForm(context: ValidationContext = null): FormGroup { // if (context == null) { context = this.createValidationContext(); } const formGroup = new FormBuilder().group({ - grant: new GrantEditorWizardModel().buildForm(), + grant: new GrantEditorWizardModel().buildForm(), + funder: new FunderFormModel().buildForm(), + project: new ProjectFormModel().buildForm(), dmp: new DmpEditorWizardModel().buildForm(), datasets: new DatasetEditorWizardModel().buildForm() diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.module.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.module.ts index 5df257c5b..e6925ddd6 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.module.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard.module.ts @@ -11,6 +11,8 @@ import { AutoCompleteModule } from '../../library/auto-complete/auto-complete.mo import { DatasetEditorWizardComponent } from './dataset-editor/dataset-editor-wizard.component'; import { DatasetDescriptionFormModule } from '../misc/dataset-description-form/dataset-description-form.module'; import { DmpModule } from '../dmp/dmp.module'; +import { FunderEditorWizardComponent } from './funder-editor/funder-editor-wizard.component'; +import { ProjectEditorWizardComponent } from './project-editor/project-editor-wizard.component'; @NgModule({ @@ -29,6 +31,8 @@ import { DmpModule } from '../dmp/dmp.module'; DmpEditorWizardComponent, QuickWizardEditorComponent, DatasetEditorWizardComponent, + FunderEditorWizardComponent, + ProjectEditorWizardComponent ], exports: [ DatasetEditorWizardComponent, diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index a725a36e3..0ae040941 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -988,8 +988,10 @@ "SAVE-AND-FINALIZE": "Save and Finalize", "NEXT": "Next", "BACK": "Back", - "CREATE-NEW": "Add Grant", - "EXIST": "Use Existing Grant", + "CREATE-NEW-GRANT": "Add Grant", + "EXIST-GRANT": "Use Existing Grant", + "CREATE-NEW-FUNDER": "Add Funder", + "EXIST-FUNDER": "Use Existing Funder", "CREATE-NEW-PROJECT": "Add Project", "EXIST-PROJECT": "Use Existing Project", "CREATE-NEW-FUNDER": "Add Funder", @@ -997,11 +999,17 @@ }, "FIRST-STEP": { "TITLE": "Grant", - "ABOUT": "Find the grant that your DMP is associated with and link it to funders' information. If the grant is not listed or you are creating a DMP for a grant proposal or for other purposes, use \"Add Grant\"", - "ABOUT-NEW": "If you are creating a DMP for a grant proposal, institutional or research community use or training and educational purposes, add information below by creating a new grant.", + "ABOUT-GRANT": "Find the grant that your DMP is associated with and link it to funders' information. If the grant is not listed or you are creating a DMP for a grant proposal or for other purposes, use \"Add Grant\"", + "ABOUT-NEW-GRANT": "If you are creating a DMP for a grant proposal, institutional or research community use or training and educational purposes, add information below by creating a new grant.", + "ABOUT-FUNDER": "Find the funder that you wish to associate with the DMP that will be created and then select a grant that funder is linked with. If the funder is not listed, use \"Add Funder\"", + "ABOUT-NEW-FUNDER": "If you you are creating a DMP for a grant proposal, institutional or research community use or training and educational purposes and you wish to associate it with a funder that is not listed then create a new funder", + "ABOUT-PROJECT": "Find the project that your DMP is associated with. If the project is not listed, use \"Add Project\"", + "ABOUT-NEW-PROJECT": "", "OR": "or", "FIELDS": { "SELECT-GRANT": "Select the grant that the DMP is associated with", + "SELECT-FUNDER": "Select the funder of the grant that the DMP is associated with", + "SELECT-PROJECT": "Select the project that the DMP is associated with", "GRANT-LABEL": "Grant Name", "FUNDER-LABEL": "Funder Name", "PROJECT-LABEL": "Project Name", diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss index 606abe7e0..107299ff2 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -32,7 +32,6 @@ $theme: mat-light-theme($primary, $accent); .lightblue-btn { background-color: rgba(0, 112, 192, 1) !important; - // background-color: rgb(70, 135, 240) !important; } .listing-item { @@ -57,7 +56,6 @@ $theme: mat-light-theme($primary, $accent); padding: 0.1em 1em; border-radius: 10em; background-color: rgba(0, 112, 192, 1); - // background-color: rgb(70, 135, 230); color: #fff; text-transform: uppercase; font-weight: 500; @@ -119,22 +117,6 @@ $theme: mat-light-theme($primary, $accent); margin-bottom: 0px; } - // .template-name { - // padding-left: 0px; - // border: 1px solid rgb(218, 227, 243); - // color: rgb(43, 104, 209); - // background-color: rgb(236, 241, 249); - // border-radius: 10em; - // justify-content: center; - // text-transform: uppercase; - // display: flex; - // width: 25em; - // height: 1.8em; - // margin-top: 15px; - // font-size: 13px; - // font-weight: 500; - // } - .draft-bookmark { color: #e7e6e6; display: inline;