From 503cf583dd0c0006144e6dded16c4633e5b371a6 Mon Sep 17 00:00:00 2001 From: Nikolaos Laskaris Date: Wed, 8 Nov 2017 10:31:03 +0200 Subject: [PATCH 1/3] - --- dmp-backend/src/main/java/rest/entities/DMPs.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dmp-backend/src/main/java/rest/entities/DMPs.java b/dmp-backend/src/main/java/rest/entities/DMPs.java index 31a5bddde..0d594172d 100644 --- a/dmp-backend/src/main/java/rest/entities/DMPs.java +++ b/dmp-backend/src/main/java/rest/entities/DMPs.java @@ -303,6 +303,7 @@ public class DMPs { DMP clone = dMPDao.read(dmp.getId()); + try { Set users = new HashSet(); @@ -313,8 +314,11 @@ public class DMPs { clone.setModified(new Date()); clone.setStatus(new Short("0")); + String cloneLabel = dmp.getLabel(); + if(cloneLabel==null || cloneLabel.isEmpty()) //if the provided label is null or empty, use parent's label + "_clone" + cloneLabel = clone.getLabel()+"_clone"; clone.setVersion(clone.getVersion()+1); - clone.setLabel(clone.getLabel()+"_clone"); + clone.setLabel(cloneLabel); clone.setPrevious(clone.getId()); From d30d5c637f1dd5390c00facc63fdbb22a5ee1863 Mon Sep 17 00:00:00 2001 From: annampak Date: Wed, 8 Nov 2017 10:59:07 +0200 Subject: [PATCH 2/3] Button format on actions, loading spinner --- dmp-frontend/package-lock.json | 10 ++++++++++ dmp-frontend/package.json | 1 + dmp-frontend/src/app/app.module.ts | 3 ++- dmp-frontend/src/app/datasets/dataset.component.ts | 9 ++++++++- dmp-frontend/src/app/datasets/dataset.html | 2 +- dmp-frontend/src/app/dmps/dmp.component.ts | 10 ++++++---- dmp-frontend/src/app/dmps/dmps.html | 12 ++++++++---- 7 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dmp-frontend/package-lock.json b/dmp-frontend/package-lock.json index cefbed627..c1902a294 100644 --- a/dmp-frontend/package-lock.json +++ b/dmp-frontend/package-lock.json @@ -5509,6 +5509,16 @@ "ngx-slimscroll": "3.4.1" } }, + "ng4-loading-spinner": { + "version": "1.0.27", + "resolved": "https://registry.npmjs.org/ng4-loading-spinner/-/ng4-loading-spinner-1.0.27.tgz", + "integrity": "sha1-7HrRKbXcG1VZY7WvQQc2vISmPs4=", + "requires": { + "@angular/core": "4.3.6", + "rxjs": "5.4.3", + "zone.js": "0.8.17" + } + }, "ngx-slimscroll": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/ngx-slimscroll/-/ngx-slimscroll-3.4.1.tgz", diff --git a/dmp-frontend/package.json b/dmp-frontend/package.json index f5be48943..788707a9a 100644 --- a/dmp-frontend/package.json +++ b/dmp-frontend/package.json @@ -34,6 +34,7 @@ "moment": "^2.19.1", "ng-sidebar": "^6.0.4", "ng2-datepicker": "^2.1.3", + "ng4-loading-spinner": "^1.0.27", "ngx-webstorage": "^1.8.0", "rxjs": "^5.4.2", "zone.js": "^0.8.17" diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index 726c68d97..e7913c715 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -67,7 +67,7 @@ import { NgDatepickerModule } from 'ng2-datepicker'; import { StatusToString } from './pipes/various/status-to-string'; import { SidebarModule } from 'ng-sidebar'; import { UserWorkspaceComponent } from './user-workspace/user-workspace.component'; - +import { Ng4LoadingSpinnerModule } from 'ng4-loading-spinner'; @@ -114,6 +114,7 @@ import { UserWorkspaceComponent } from './user-workspace/user-workspace.componen AngularDraggableModule, DataTableModule, NgDatepickerModule, + Ng4LoadingSpinnerModule, SidebarModule.forRoot() ], diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts index cdacd04a2..ba7e092d3 100644 --- a/dmp-frontend/src/app/datasets/dataset.component.ts +++ b/dmp-frontend/src/app/datasets/dataset.component.ts @@ -10,6 +10,7 @@ import { DropdownField } from '../../app/form/fields/dropdown/field-dropdown'; import { Param } from '../entities/model/param'; import { StatusToString } from '../pipes/various/status-to-string'; import { ConfirmationComponent } from '../widgets/confirmation/confirmation.component'; +import { Ng4LoadingSpinnerService } from 'ng4-loading-spinner'; declare var $: any; @@ -77,7 +78,8 @@ export class DatasetsComponent implements OnInit { private serverService: ServerService, private route: ActivatedRoute, private router: Router, - private ngZone: NgZone) { + private ngZone: NgZone, + private spinnerService: Ng4LoadingSpinnerService) { this.dataset = this.createEmptyDataset(); this.datasetProfileDropDown = new DropdownField(); @@ -176,12 +178,17 @@ export class DatasetsComponent implements OnInit { getDatasetForDmpMethod(dmpid) { + this.spinnerService.show(); this.serverService.getDatasetForDmp({ "id": dmpid }).subscribe( response => { this.tableData = response; + }, error => { console.log("could not retrieve dataset for dpm: "+dmpid); + }, + () =>{ + this.spinnerService.hide(); } ); } diff --git a/dmp-frontend/src/app/datasets/dataset.html b/dmp-frontend/src/app/datasets/dataset.html index 81d97fcfb..109ef7adb 100644 --- a/dmp-frontend/src/app/datasets/dataset.html +++ b/dmp-frontend/src/app/datasets/dataset.html @@ -1,5 +1,5 @@ - + diff --git a/dmp-frontend/src/app/dmps/dmp.component.ts b/dmp-frontend/src/app/dmps/dmp.component.ts index 2886ddf43..5f2cdfe14 100644 --- a/dmp-frontend/src/app/dmps/dmp.component.ts +++ b/dmp-frontend/src/app/dmps/dmp.component.ts @@ -197,9 +197,9 @@ selectDmp(item){ this.datasetsComponent.getDatasetForDmpMethod(item.id); } -editRow(item, event){ +editRow(item, elementId){ this.isSelected = true; - if (event.toElement.id == "editDMP"){ + if (elementId == "editDMP"){ this.dmp.label = item.label; this.dmp.previous = item.previous; this.dmp.version = item.version; @@ -214,7 +214,7 @@ editRow(item, event){ },0); } - if(event.toElement.id == "changeVersionDMP"){ + if(elementId == "changeVersionDMP"){ this.dmp.label = item.label; this.dmp.previous = item.previous; this.dmp.version = item.version; @@ -226,10 +226,12 @@ editRow(item, event){ $("#newVersionDmpModal").modal("show"); } - if(event.toElement.id == "showDatasets"){ + if(elementId == "showDatasets"){ this.selectDmp(item); } + + return false; //return false will prevent browser from following the link } diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html index 75ef807d6..56d272294 100644 --- a/dmp-frontend/src/app/dmps/dmps.html +++ b/dmp-frontend/src/app/dmps/dmps.html @@ -70,10 +70,14 @@ - + From 2bf5153566365bc34b08ae0bbe44cacfaf497b3f Mon Sep 17 00:00:00 2001 From: annampak Date: Wed, 8 Nov 2017 12:07:56 +0200 Subject: [PATCH 3/3] actions in datasets and projects --- dmp-frontend/src/app/datasets/dataset.component.ts | 1 + dmp-frontend/src/app/datasets/dataset.html | 9 ++++++--- dmp-frontend/src/app/projects/project.html | 2 +- dmp-frontend/src/app/projects/projects.component.ts | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts index ba7e092d3..d55e6a17c 100644 --- a/dmp-frontend/src/app/datasets/dataset.component.ts +++ b/dmp-frontend/src/app/datasets/dataset.component.ts @@ -206,6 +206,7 @@ export class DatasetsComponent implements OnInit { else if(event.toElement.id == "describeDataset"){ this.describeDataset(item); } + return false; } diff --git a/dmp-frontend/src/app/datasets/dataset.html b/dmp-frontend/src/app/datasets/dataset.html index 109ef7adb..f803d3d69 100644 --- a/dmp-frontend/src/app/datasets/dataset.html +++ b/dmp-frontend/src/app/datasets/dataset.html @@ -61,9 +61,12 @@ - + diff --git a/dmp-frontend/src/app/projects/project.html b/dmp-frontend/src/app/projects/project.html index 975042ffb..9a243d53b 100644 --- a/dmp-frontend/src/app/projects/project.html +++ b/dmp-frontend/src/app/projects/project.html @@ -54,7 +54,7 @@ - diff --git a/dmp-frontend/src/app/projects/projects.component.ts b/dmp-frontend/src/app/projects/projects.component.ts index 6e96f1b0c..8b9dad21e 100644 --- a/dmp-frontend/src/app/projects/projects.component.ts +++ b/dmp-frontend/src/app/projects/projects.component.ts @@ -192,6 +192,8 @@ SaveProject(){ editRow(item, event){ this.project = item; //this will have id - that defines whether it's an update or not $("#newEditProjectModal").modal("show"); + + return false; }
{{dmp?.description}} {{dmp?.created | date:'yyyy-MM-dd HH:mm:ss Z'}} {{dmp?.status | statusToString }} - - - + + + + + + +
{{dataset?.description}} {{dataset?.created | date:'yyyy-MM-dd HH:mm:ss Z'}} {{dataset?.status | statusToString }} - - + + + + +
{{project?.enddate | date:'yyyy-MM-dd HH:mm:ss Z'}} {{project?.status | statusToString}} {{project?.description}} +