diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html index 8fe9db113..2bc8aa4f8 100644 --- a/dmp-frontend/src/app/dmps/dmps.html +++ b/dmp-frontend/src/app/dmps/dmps.html @@ -18,7 +18,8 @@
- + +
diff --git a/dmp-frontend/src/app/projects/project.html b/dmp-frontend/src/app/projects/project.html index eea4ca7b2..f91e15b03 100644 --- a/dmp-frontend/src/app/projects/project.html +++ b/dmp-frontend/src/app/projects/project.html @@ -33,7 +33,7 @@ Status - Definition + Description Actions @@ -53,7 +53,7 @@ {{project?.startdate | date:'yyyy-MM-dd HH:mm:ss Z' }} {{project?.enddate | date:'yyyy-MM-dd HH:mm:ss Z'}} {{project?.status | statusToString}} - {{project?.definition}} + {{project?.description}} @@ -106,8 +106,14 @@
- - + + +
+
+ +
diff --git a/dmp-frontend/src/app/projects/projects.component.ts b/dmp-frontend/src/app/projects/projects.component.ts index 8a5733cff..33ae10f38 100644 --- a/dmp-frontend/src/app/projects/projects.component.ts +++ b/dmp-frontend/src/app/projects/projects.component.ts @@ -59,6 +59,7 @@ export class ProjectsComponent implements OnInit{ returnUrl: string; @Input() projectCount = 0; @Input() datasetDropDown:DropdownField; + @Input() statusDropDown: DropdownField; //@Input() dataSetVisibe:boolean; @Input() datasets: Dataset[]; project: any; @@ -88,6 +89,9 @@ export class ProjectsComponent implements OnInit{ this.datasetDropDown = new DropdownField(); this.datasetDropDown.options = []; this.datasets = []; + this.statusDropDown = new DropdownField(); + this.statusDropDown.options= [{key:'0', value:"Active"},{key:'1', value:"Inactive"}] + //this.projects = []; this.project = this.getEmptyProject(); } @@ -101,7 +105,7 @@ getEmptyProject(){ abbreviation:'', reference:'', uri:'', - definition:'', + description:'', enddate:'', startdate:'' } @@ -160,6 +164,7 @@ SaveProject(){ action = this.serverService.updateProject(this.project); action.subscribe( response =>{ + this.getProjects(); console.log("response"); console.log(response); }