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 @@
| {{dmp?.description}} |
{{dmp?.created | date:'yyyy-MM-dd HH:mm:ss Z'}} |
{{dmp?.status | statusToString }} |
-
-
-
- |
+
+
+
+
+
+
+
+ |