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

minor changes

This commit is contained in:
Nikolaos Laskaris 2017-11-22 19:33:29 +02:00
parent eedc7b735b
commit 5db9b577fb
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-frontend/src/app/homepage/homepage.component.html
View File

@ -1,7 +1,7 @@
<div class="jumbotron">
<h1>Hello {{ userInfo?.name!=null ? userInfo?.name : userInfo?.email }}</h1>
<p>Welcome {{ userInfo?.created != userInfo?.lastloggedin ? "back" : "" }} to the <a href="https://en.wikipedia.org/wiki/Data_management_plan">Data Management Plans</a> application. </p>
<h2>Hello {{ userInfo?.name!=null ? userInfo?.name : userInfo?.email }}</h2>
<p>Welcome {{ userInfo?.created != userInfo?.lastloggedin ? "back" : "" }} to the <a href="https://en.wikipedia.org/wiki/Data_management_plan">Data Management Plans</a> composer application. </p>
<!--
<p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
-->

10
dmp-frontend/src/app/services/rest-base.ts
View File

@ -17,12 +17,12 @@ export class RestBase {
/*
protocol: string = "http";
hostname: string ="localhost"
port: number = 8080;
port: number = 7070;
webappname: string = "dmp-backend";
/*
protocol: string = "http";
hostname: string ="dl010.madgik.di.uoa.gr"
port: number = 8080;
@ -30,12 +30,12 @@ export class RestBase {
*/
/*
protocol: string = "http";
hostname: string = "dionysus.di.uoa.gr" ;
port: number = 7070;
port: number = 8080;
webappname: string = "dmp-backend";
*/
proxyPath : string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/proxy/";

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

@ -50,8 +50,11 @@ export class ServerService {
return this.restBase.get("dmp/listDMPLabelID");
}
public getDmp(dmpid : string){
return this.restBase.get("dmps/"+dmpid);
public getDmp(dmpid : string, eager? : boolean){
if(eager)
return this.restBase.get("dmps/"+dmpid, {"eager": true});
else
return this.restBase.get("dmps/"+dmpid, {"eager": true});
}
public listDmpIDs(){

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

@ -21,7 +21,8 @@ export class DmpDetailedComponent implements OnInit {
let sub = this.route.queryParams.subscribe(params => {
let dmpid = params.dmpid;
this.serverService.getDmp(dmpid).subscribe(
let getParams : any = {"eager":true};
this.serverService.getDmp(dmpid, getParams).subscribe(
response => {
this.dmp = response;
debugger;