From 5863ad4e1602c009ee9a12575093afc2122231e9 Mon Sep 17 00:00:00 2001 From: annampak Date: Tue, 17 Oct 2017 16:20:40 +0300 Subject: [PATCH] Get Projects --- .../src/app/projects/projects.component.ts | 18 ++++++++++-- .../src/app/services/server.service.ts | 29 ++++++++++++------- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dmp-frontend/src/app/projects/projects.component.ts b/dmp-frontend/src/app/projects/projects.component.ts index 61da8b3d9..ba4a9b4c1 100644 --- a/dmp-frontend/src/app/projects/projects.component.ts +++ b/dmp-frontend/src/app/projects/projects.component.ts @@ -35,8 +35,22 @@ export class ProjectsComponent implements OnInit{ } ngOnInit() { - this.projects = this.serverService.getDummyProjects() -} + //this.projects = this.serverService.getDummyProjects(); + this.projects = []; + this.serverService.getProjects().subscribe( + response => { + + console.log("response"); + console.log(response); + response.forEach(resp => { + let pr = new Project(); + pr.id = resp.id; + pr.name = resp.label; + this.projects.push(pr); + }); + } + ); + } diff --git a/dmp-frontend/src/app/services/server.service.ts b/dmp-frontend/src/app/services/server.service.ts index 7d35432ad..dd8cfa73a 100644 --- a/dmp-frontend/src/app/services/server.service.ts +++ b/dmp-frontend/src/app/services/server.service.ts @@ -69,22 +69,29 @@ export class ServerService { } - getDummyProjects(){ - let projects :Project[] =[]; + getProjects(){ + + let headers = new HttpHeaders().set("google-token", this.tokenService.getToken()); - let project = new Project; - project.name = "Project1"; - project.id = "Project1Id"; + console.log("google-token: "+ this.tokenService.getToken()); + + return this.httpClient.get("http://dl010.madgik.di.uoa.gr:8080/dmp-backend-no-sec/rest/project/listAllLabelIDs"); - projects.push(project); + // let projects :Project[] =[]; + + // let project = new Project; + // project.name = "Project1"; + // project.id = "Project1Id"; - let project2 = new Project; - project2.name = "Project2"; - project2.id = "Project2Id"; + // projects.push(project); - projects.push(project2); + // let project2 = new Project; + // project2.name = "Project2"; + // project2.id = "Project2Id"; - return projects; + // projects.push(project2); + + // return projects; } } \ No newline at end of file