-
-
+
+
+
-
+
@@ -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;