diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts
index 976c8d77f..39b24b50b 100644
--- a/dmp-frontend/src/app/datasets/dataset.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset.component.ts
@@ -159,18 +159,7 @@ export class DatasetsComponent implements OnInit {
getDatasetForDmpMethod(dmpid) {
this.serverService.getDatasetForDmp({ "id": dmpid }).subscribe(
response => {
-
- console.log("response");
- console.log(response);
- this.datasets = [];
- response.forEach(resp => {
-
- let dt = new Dataset();
- dt.id = resp.id;
- dt.name = resp.label;
- dt.uriDataset = resp.uri;
- this.datasets.push(dt);
- });
+ this.tableData = response;
}
);
}
diff --git a/dmp-frontend/src/app/datasets/dataset.html b/dmp-frontend/src/app/datasets/dataset.html
index 8ffe6586f..490077f35 100644
--- a/dmp-frontend/src/app/datasets/dataset.html
+++ b/dmp-frontend/src/app/datasets/dataset.html
@@ -25,10 +25,7 @@
Label
- |
-
- Status
- |
+
Uri
|
@@ -38,6 +35,9 @@
Description
|
+
+ Status
+ |
Actions
|
diff --git a/dmp-frontend/src/app/dmps/dmp.component.ts b/dmp-frontend/src/app/dmps/dmp.component.ts
index b4f981f99..b4d2a5948 100644
--- a/dmp-frontend/src/app/dmps/dmp.component.ts
+++ b/dmp-frontend/src/app/dmps/dmp.component.ts
@@ -55,6 +55,7 @@ export class DmpComponent implements OnInit{
@Input() dmpCount = 0;
@Input() projectsDropDown:DropdownField;
@Input() dataSetVisibe:boolean;
+ @Input() statusDropDown: DropdownField;
//@Input() projects: Project[];
dmpIdforDatasets: string;
dmpLabelforDatasets:string;
@@ -73,6 +74,9 @@ export class DmpComponent implements OnInit{
private router: Router){
this.projectsDropDown = new DropdownField();
this.projectsDropDown.options = [];
+ this.statusDropDown = new DropdownField();
+ this.statusDropDown.options =[];
+ this.statusDropDown.options= [{key:'0', value:"active"},{key:'1', value:"inactive"}]
//this.projects = [];
this.dmpTableVisible = false;
this.dataSetVisibe = false;
diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html
index 14e01277d..f338b7428 100644
--- a/dmp-frontend/src/app/dmps/dmps.html
+++ b/dmp-frontend/src/app/dmps/dmps.html
@@ -1,6 +1,6 @@
-
+
@@ -99,12 +99,12 @@
-
+
+
+
+
@@ -115,7 +115,7 @@
-
+