Adds logic on DMP quick wizard for saving new entities "Funder" and "Project".
This commit is contained in:
parent
9081ccadfe
commit
3140cf62bd
|
@ -44,7 +44,10 @@ public class QuickWizardController extends BaseController {
|
||||||
|
|
||||||
Funder funderEntity;
|
Funder funderEntity;
|
||||||
//Create Funder
|
//Create Funder
|
||||||
if (quickWizard.getFunder().getExistFunder() == null) {
|
if (quickWizard.getFunder().getExistFunder() == null
|
||||||
|
&& quickWizard.getFunder().getLabel() == null) {
|
||||||
|
funderEntity = null;
|
||||||
|
} else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() != null){
|
||||||
funderEntity = this.quickWizardManager.createOrUpdate(quickWizard.getFunder().toDataFunder(), principal);
|
funderEntity = this.quickWizardManager.createOrUpdate(quickWizard.getFunder().toDataFunder(), principal);
|
||||||
} else {
|
} else {
|
||||||
funderEntity = quickWizard.getFunder().getExistFunder().toDataModel();
|
funderEntity = quickWizard.getFunder().getExistFunder().toDataModel();
|
||||||
|
@ -57,11 +60,13 @@ public class QuickWizardController extends BaseController {
|
||||||
} else {
|
} else {
|
||||||
grantEntity = quickWizard.getGrant().getExistGrant().toDataModel();
|
grantEntity = quickWizard.getGrant().getExistGrant().toDataModel();
|
||||||
}
|
}
|
||||||
//grantEntity.setFunder(funderEntity);
|
|
||||||
|
|
||||||
Project projectEntity;
|
Project projectEntity;
|
||||||
//Create Project
|
//Create Project
|
||||||
if (quickWizard.getProject().getExistProject() == null) {
|
if (quickWizard.getProject().getExistProject() == null
|
||||||
|
&& quickWizard.getProject().getLabel() == null) {
|
||||||
|
projectEntity = null;
|
||||||
|
} else if (quickWizard.getProject().getExistProject() == null && quickWizard.getProject().getLabel() != null){
|
||||||
projectEntity = this.quickWizardManager.createOrUpdate(quickWizard.getProject().toDataProject(), principal);
|
projectEntity = this.quickWizardManager.createOrUpdate(quickWizard.getProject().toDataProject(), principal);
|
||||||
} else {
|
} else {
|
||||||
projectEntity = quickWizard.getProject().getExistProject().toDataModel();
|
projectEntity = quickWizard.getProject().getExistProject().toDataModel();
|
||||||
|
|
|
@ -52,7 +52,12 @@ public class QuickWizardManager {
|
||||||
UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
|
UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
|
||||||
createFunderIfItDoesntExist(newDmp, user);
|
createFunderIfItDoesntExist(newDmp, user);
|
||||||
createGrantIfItDoesntExist(newDmp, user);
|
createGrantIfItDoesntExist(newDmp, user);
|
||||||
|
if (newDmp.getProject() == null) {
|
||||||
|
newDmp.setProject(new Project());
|
||||||
|
newDmp.setProject(newDmp.getProject().projectFromGrant(newDmp.getGrant()));
|
||||||
|
}
|
||||||
createProjectIfItDoesntExist(newDmp, user);
|
createProjectIfItDoesntExist(newDmp, user);
|
||||||
|
|
||||||
apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().createOrUpdate(newDmp.getGrant());
|
apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().createOrUpdate(newDmp.getGrant());
|
||||||
DMP dmpret = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(newDmp);
|
DMP dmpret = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().createOrUpdate(newDmp);
|
||||||
if (dataManagementPlan.getAssociatedUsers().size() == 0)
|
if (dataManagementPlan.getAssociatedUsers().size() == 0)
|
||||||
|
|
Loading…
Reference in New Issue