From 27ac98f9f6f3ca3777630eac29eb785c5b283b84 Mon Sep 17 00:00:00 2001 From: annabakouli Date: Thu, 18 Jan 2018 12:47:11 +0200 Subject: [PATCH 01/79] no message --- dmp-backend/pom.xml | 6 +++--- dmp-backend/src/main/java/eu/eudat/EuDatApplication.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml index f5b7c114d..de4496fa1 100644 --- a/dmp-backend/pom.xml +++ b/dmp-backend/pom.xml @@ -5,7 +5,7 @@ dmp-backend dmp-backend 0.0.1-SNAPSHOT - war + org.springframework.boot spring-boot-starter-parent @@ -187,11 +187,11 @@ 3.5 - + diff --git a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java index 5e5dab495..42087b1a9 100644 --- a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java +++ b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java @@ -18,10 +18,10 @@ import java.util.List; public class EuDatApplication extends SpringBootServletInitializer { private static final Logger logger = LoggerFactory.getLogger(EuDatApplication.class); - @Override + /*@Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { return builder.sources(EuDatApplication.class); - } + }*/ public static void main(String[] args) { SpringApplication.run(EuDatApplication.class, args); From e4d1fd5398286be2fdd6900d1977180d63b34f11 Mon Sep 17 00:00:00 2001 From: annampak Date: Fri, 19 Jan 2018 10:09:35 +0200 Subject: [PATCH 02/79] make public butto, save and finalize, dataset profile field --- .../dataset-wizard.component.html | 2 +- .../datasets/dataset-listing.component.html | 13 ++++++++++-- .../app/datasets/dataset-listing.component.ts | 4 ++++ .../src/app/form/dynamic-form.component.html | 10 ++++----- .../src/app/form/dynamic-form.component.ts | 21 ++++++++++++------- .../dataset-wizard/dataset-wizard.service.ts | 3 ++- dmp-frontend/src/assets/lang/en.json | 4 ++++ 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html index 57d67afeb..1062f5bee 100644 --- a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html @@ -13,7 +13,7 @@ --> - + {{profile.label}} diff --git a/dmp-frontend/src/app/datasets/dataset-listing.component.html b/dmp-frontend/src/app/datasets/dataset-listing.component.html index 3c4e24dbe..e7837f08e 100644 --- a/dmp-frontend/src/app/datasets/dataset-listing.component.html +++ b/dmp-frontend/src/app/datasets/dataset-listing.component.html @@ -67,11 +67,20 @@ {{'DATASET-LISTING.COLUMNS.ACTIONS' | translate}} - + + + + + + + - + + diff --git a/dmp-frontend/src/app/datasets/dataset-listing.component.ts b/dmp-frontend/src/app/datasets/dataset-listing.component.ts index 5ae82eabf..dff7bda1f 100644 --- a/dmp-frontend/src/app/datasets/dataset-listing.component.ts +++ b/dmp-frontend/src/app/datasets/dataset-listing.component.ts @@ -85,6 +85,10 @@ export class DatasetListingComponent implements OnInit { return defaultCriteria; } + makeItPublic(){ + + } + } export class DatasetDataSource extends DataSource { diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html index 1d6fbc41b..a707b6a45 100644 --- a/dmp-frontend/src/app/form/dynamic-form.component.html +++ b/dmp-frontend/src/app/form/dynamic-form.component.html @@ -6,11 +6,11 @@ -
- - + + +
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts index ef9647a91..ca445111c 100644 --- a/dmp-frontend/src/app/form/dynamic-form.component.ts +++ b/dmp-frontend/src/app/form/dynamic-form.component.ts @@ -78,7 +78,6 @@ export class DynamicFormComponent implements OnInit { if (params && "page" in params) this.changeCurrentPage(params["page"]); }); - /* else{ this.addSection(); @@ -88,16 +87,22 @@ export class DynamicFormComponent implements OnInit { this.visibilityRulesService.formGroup = this.form; let rules:Rule[] = new JsonSerializer().fromJSONArray(TestModel.rules,Rule); this.visibilityRulesService.buildVisibilityRules(rules) */ + } + + submit(){ + this.datasetWizardService.saveDataset(this.dataModel.id, this.dataModel.status, this.form.value).subscribe(data => { + this.router.navigateByUrl("/datasets/" + this.dataModel.dmp.id); + }); } - submit() { + save(){ + this.dataModel.status= "0"; + this.submit(); } - - onSubmit(){ - this.datasetWizardService.saveDataset(this.dataModel.id, this.form.value).subscribe(data => { - this.router.navigateByUrl("/datasets/" + this.dataModel.dmp.id); - }); - + + saveFinalize() { + this.dataModel.status= "1"; + this.submit(); } toggleSidebar() { diff --git a/dmp-frontend/src/app/services/dataset-wizard/dataset-wizard.service.ts b/dmp-frontend/src/app/services/dataset-wizard/dataset-wizard.service.ts index c5306cade..46d89affe 100644 --- a/dmp-frontend/src/app/services/dataset-wizard/dataset-wizard.service.ts +++ b/dmp-frontend/src/app/services/dataset-wizard/dataset-wizard.service.ts @@ -43,7 +43,8 @@ export class DatasetWizardService { return this.http.post(this.actionUrl + 'createOrUpdate', datasetModel, { headers: this.headers }); } - public saveDataset(datasetId:String, formValue){ + public saveDataset(datasetId:String, datasetStatus:String, formValue){ + formValue.status = datasetStatus; return this.http.post(HostConfiguration.Server +'datasetprofile/save/'+datasetId, formValue, { headers: this.headers }) } } diff --git a/dmp-frontend/src/assets/lang/en.json b/dmp-frontend/src/assets/lang/en.json index 2a9758dc6..0f21c7123 100644 --- a/dmp-frontend/src/assets/lang/en.json +++ b/dmp-frontend/src/assets/lang/en.json @@ -85,6 +85,10 @@ "DATAREPOSITORIES": "Data Repositories", "REGISTRIES": "Registries", "SERVICES": "Services" + }, + "ACTIONS": { + "EDIT": "Edit", + "MAKE-IT-PUBLIC": "Make it public" } }, "PROJECT-EDITOR": { From 6a93ed8ef8f0c019604a446f425f5e1cdba2dafb Mon Sep 17 00:00:00 2001 From: annabakouli Date: Fri, 19 Jan 2018 11:31:05 +0200 Subject: [PATCH 03/79] no message --- .../form/form.component.ts | 36 +++---- .../section-form/section-form.component.ts | 35 ++---- .../main-sign-in/main-sign-in.component.html | 2 +- .../src/app/models/DataSetProfile/Page.ts | 15 +-- dmp-admin/src/index.html | 16 +-- .../controllers/DatasetWizardController.java | 28 ++--- .../eu/eudat/dao/entities/DMPDaoImpl.java | 2 +- .../eu/eudat/dao/entities/DatasetDaoImpl.java | 2 +- .../dao/entities/DatasetProfileDaoImpl.java | 2 +- .../dao/entities/ExternalDatasetDaoImpl.java | 2 +- .../eudat/dao/entities/InvitationDaoImpl.java | 2 +- .../eu/eudat/dao/entities/ProjectDaoImpl.java | 2 +- .../eudat/dao/entities/UserInfoDaoImpl.java | 2 +- .../src/main/java/eu/eudat/entities/DMP.java | 10 +- .../main/java/eu/eudat/entities/Dataset.java | 12 +-- .../datasetprofiledefinition/Page.java | 55 ++++++++++ .../datasetprofiledefinition/Section.java | 8 +- .../ViewStyleModel.java | 102 +++++++++++------- .../java/eu/eudat/managers/AdminManager.java | 1 + .../managers/DataManagementPlanManager.java | 6 +- .../eu/eudat/managers/DatasetManager.java | 9 +- .../main/java/eu/eudat/models/DataModel.java | 1 + .../eu/eudat/models/HintedModelFactory.java | 19 ++++ .../admin/components/datasetprofile/Page.java | 57 ++++++++++ .../components/datasetprofile/Section.java | 6 +- .../admin/composite/DatasetProfile.java | 10 +- .../eudat/models/dataset/DataRepository.java | 5 + .../java/eu/eudat/models/dataset/Dataset.java | 6 +- .../eu/eudat/models/dataset/Registry.java | 5 + .../java/eu/eudat/models/dataset/Service.java | 5 + .../DatasetProfileAutocompleteItem.java | 5 + .../DatasetProfileListingModel.java | 5 + .../DataManagentPlanListingModel.java | 5 + .../datasetwizard/DatasetWizardModel.java | 13 ++- .../eudat/models/dmp/DataManagementPlan.java | 5 + .../eu/eudat/models/dmp/Organisation.java | 5 + .../java/eu/eudat/models/dmp/Researcher.java | 5 + .../ExternalDatasetListingModel.java | 5 + .../DataManagementPlanListingModel.java | 5 +- .../listingmodels/DatasetListingModel.java | 5 + .../java/eu/eudat/models/project/Project.java | 5 + .../models/project/ProjectCriteriaModel.java | 5 + .../models/project/ProjectListingModel.java | 5 + .../components/datasetprofile/Section.java | 6 +- .../models/user/composite/DatasetProfile.java | 13 ++- .../user/composite/DatasetProfilePage.java | 37 +++++++ .../user/composite/PagedDatasetProfile.java | 56 ++++++++++ .../eu/eudat/models/userinfo/UserInfo.java | 7 +- .../userinfo/UserInfoInvitationModel.java | 5 + .../eu/eudat/queryable/QueryableList.java | 4 +- .../QueryableHibernateList.java | 14 ++- dmp-frontend/src/app/app.constants.ts | 4 +- .../dataset-wizard.component.html | 2 +- .../datasetprofile/DatasetProfileModel.ts | 5 +- .../app/models/datasets/DatasetWizardModel.ts | 4 +- 55 files changed, 524 insertions(+), 169 deletions(-) create mode 100644 dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java diff --git a/dmp-admin/src/app/dataset-profile-form/form/form.component.ts b/dmp-admin/src/app/dataset-profile-form/form/form.component.ts index b16ca40e2..993f34174 100644 --- a/dmp-admin/src/app/dataset-profile-form/form/form.component.ts +++ b/dmp-admin/src/app/dataset-profile-form/form/form.component.ts @@ -25,28 +25,22 @@ export class FormComponent { constructor(public restBase: RestBase, private datasetProfileService: DatasetProfileService, private route: ActivatedRoute) { this.profileID = route.snapshot.params['id']; - } ngOnInit() { - this.dataModel = new JsonSerializer().fromJSONObject(new DatasetProfileModel(), DatasetProfileModel); - this.form = this.dataModel.buildForm(); + this.dataModel = new JsonSerializer().fromJSONObject(new DatasetProfileModel(), DatasetProfileModel); + this.form = this.dataModel.buildForm(); if (this.profileID) { this.datasetProfileService.getDatasetProfileById(this.profileID).subscribe((data) => { - this.dataModel = new JsonSerializer().fromJSONObject(data, DatasetProfileModel); this.form = this.dataModel.buildForm(); }); } - else{ - - this.addSection(); - this.addPage(0); + else { + this.addSection(); + this.addPage(0); } - - // this.dataModel = new JsonSerializer().fromJSONObject(TestModel, DatasetProfileModel); - // this.form = this.dataModel.buildForm(); } onIsMultiplicityEnabledChange(isMultiplicityEnabled: boolean) { @@ -63,31 +57,31 @@ export class FormComponent { } addPage(number) { - let page: Page = new Page(this.dataModel.pages.length); - this.dataModel.pages.push(page); - (this.form.get("pages")).push(page.buildForm()); + let page: Page = new Page(this.dataModel.pages.length); + this.dataModel.pages.push(page); + (this.form.get("pages")).push(page.buildForm()); } DeleteSection(index) { - this.dataModel.sections.splice(index,1); + this.dataModel.sections.splice(index, 1); (this.form.get("sections")).removeAt(index) } DeletePage(index) { - this.dataModel.pages.splice(index, 1); - (this.form.get("pages")).removeAt(index) + this.dataModel.pages.splice(index, 1); + (this.form.get("pages")).removeAt(index) } createForm(data) { return this.restBase.post("/admin/addDmp", data); } - updateForm(id,data) { - return this.restBase.post("/admin/addDmp/"+id, data); + updateForm(id, data) { + return this.restBase.post("/admin/addDmp/" + id, data); } onSubmit() { let data = this.form.value; - - if(this.profileID) this.updateForm(this.profileID, data).subscribe(); + + if (this.profileID) this.updateForm(this.profileID, data).subscribe(); else this.createForm(data).subscribe(); } diff --git a/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts index ffa4723ac..0ab425d3c 100644 --- a/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts +++ b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core'; -import { FormGroup } from '@angular/forms'; +import { FormGroup } from '@angular/forms'; import { Section } from 'app/models/DataSetProfile/Section'; import { FieldGroup } from 'app/models/DataSetProfile/FieldGroup'; import { FormArray } from '@angular/forms/src/model'; @@ -24,36 +24,21 @@ export class SectionFormComponent { constructor() { } ngOnInit() { - var self = this; - - this.form.root.get("pages").valueChanges.subscribe(function(value) { - self.keepPageSelectionValid(value); - }); + var self = this; + this.form.root.get("pages").valueChanges.subscribe(function (value) { + self.keepPageSelectionValid(value); + }); } - // addGroupField() { - // let fieldGroup: FieldGroup = new FieldGroup(); - // if (this.dataModel.fieldGroups) - // this.dataModel.fieldGroups.push(fieldGroup); - // (this.form.get("fieldGroups")).push(fieldGroup.buildForm()); - // } - addField() { let fieldSet: FieldSet = new FieldSet(); let field: Field = new Field(); - //let fieldGroup: FieldGroup = new FieldGroup(); fieldSet.fields.push(field); - //fieldGroup.compositeFields.push(fieldSet); if (this.dataModel.fieldSets) this.dataModel.fieldSets.push(fieldSet); (this.form.get("fieldSets")).push(fieldSet.buildForm()); } - // DeleteFieldGroup(index) { - // this.dataModel.fieldGroups.splice(index, 1); - // (this.form.get("fieldGroups")).removeAt(index) - // } - addSectioninSection() { let section: Section = new Section(); this.dataModel.sections.push(section); @@ -65,15 +50,15 @@ export class SectionFormComponent { (this.form.get("sections")).removeAt(index); } - DeleteFieldSet(index){ + DeleteFieldSet(index) { this.dataModel.fieldSets.splice(index, 1); (this.form.get("fieldSets")).removeAt(index); } keepPageSelectionValid(pagesJson: Array) { - let selectedPage = this.form.get("page").value as number; - let pages: Array = new JsonSerializer().fromJSONArray(pagesJson, Page); - if (!isNaN(selectedPage) && pages.find(elem => elem.id === selectedPage) === undefined) - this.form.get("page").reset(); + let selectedPage = this.form.get("page").value as String; + let pages: Array = new JsonSerializer().fromJSONArray(pagesJson, Page); + if (pages.find(elem => elem.id === selectedPage) === undefined) + this.form.get("page").reset(); } } \ No newline at end of file diff --git a/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html b/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html index c6a336722..13b9a844f 100644 --- a/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html +++ b/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html @@ -3,7 +3,7 @@