MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

no message

This commit is contained in:
annabakouli 2017-12-07 17:15:28 +02:00
parent 52111af904
commit 21df6ccdd1
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/form/dynamic-form.component.ts
View File

@ -84,7 +84,7 @@ export class DynamicFormComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.serverService.getDmp(this.datasetId).subscribe( this.serverService.getSingleDataset(this.datasetId).subscribe(
response => { response => {
this.dataModel = new JsonSerializer<DatasetModel>().fromJSONObject(response, DatasetModel); this.dataModel = new JsonSerializer<DatasetModel>().fromJSONObject(response, DatasetModel);
this.pages = this.getPages(this.dataModel); this.pages = this.getPages(this.dataModel);

15
dmp-frontend/src/app/services/server.service.ts
View File

@ -47,10 +47,14 @@ export class ServerService {
return this.restBase.get("dmp/listDMPLabelID"); return this.restBase.get("dmp/listDMPLabelID");
} }
public getDmp(dmpid : string){ public getDmp(dmpid : string, eager? : boolean){
return this.restBase.get("datasetprofile/get/"+dmpid); if(eager)
return this.restBase.get("dmps/"+dmpid, {"eager": true});
else
return this.restBase.get("dmps/"+dmpid, {"eager": true});
} }
public getDmpHistory(dmpid: string){ public getDmpHistory(dmpid: string){
return this.restBase.get("dmp/history/"+dmpid); return this.restBase.get("dmp/history/"+dmpid);
} }
@ -160,11 +164,10 @@ export class ServerService {
public updateDataset(id:string,properties:any){ public updateDataset(id:string,properties:any){
return this.restBase.post("datasetprofile/save/"+id,properties); return this.restBase.post("datasetprofile/save/"+id,properties);
} }
/*
logOut() { public getSingleDataset(id){
this.tokenService.logout(); return this.restBase.get("datasetprofile/get/"+id);
} }
*/
getThroughProxy(url : string, query: string){ getThroughProxy(url : string, query: string){
return this.restBase.proxy_get_wQuery(url, query); return this.restBase.proxy_get_wQuery(url, query);

2
dmp-frontend/src/app/viewers/dmp-detailed/dmp-detailed.component.ts
View File

@ -30,7 +30,7 @@ export class DmpDetailedComponent implements OnInit {
let sub = this.route.queryParams.subscribe(params => { let sub = this.route.queryParams.subscribe(params => {
let dmpid = params.dmpid; let dmpid = params.dmpid;
this.serverService.getDmp(dmpid).subscribe( this.serverService.getDmp(dmpid,true).subscribe(
response => { response => {
this.dmp = response; this.dmp = response;