minor changes
This commit is contained in:
parent
eedc7b735b
commit
5db9b577fb
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
<div class="jumbotron">
|
<div class="jumbotron">
|
||||||
<h1>Hello {{ userInfo?.name!=null ? userInfo?.name : userInfo?.email }}</h1>
|
<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> application. </p>
|
<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>
|
<p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
|
||||||
-->
|
-->
|
||||||
|
|
|
@ -17,12 +17,12 @@ export class RestBase {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
protocol: string = "http";
|
protocol: string = "http";
|
||||||
hostname: string ="localhost"
|
hostname: string ="localhost"
|
||||||
port: number = 8080;
|
port: number = 7070;
|
||||||
webappname: string = "dmp-backend";
|
webappname: string = "dmp-backend";
|
||||||
|
|
||||||
|
/*
|
||||||
protocol: string = "http";
|
protocol: string = "http";
|
||||||
hostname: string ="dl010.madgik.di.uoa.gr"
|
hostname: string ="dl010.madgik.di.uoa.gr"
|
||||||
port: number = 8080;
|
port: number = 8080;
|
||||||
|
@ -30,12 +30,12 @@ export class RestBase {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
protocol: string = "http";
|
protocol: string = "http";
|
||||||
hostname: string = "dionysus.di.uoa.gr" ;
|
hostname: string = "dionysus.di.uoa.gr" ;
|
||||||
port: number = 7070;
|
port: number = 8080;
|
||||||
webappname: string = "dmp-backend";
|
webappname: string = "dmp-backend";
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
proxyPath : string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/proxy/";
|
proxyPath : string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/proxy/";
|
||||||
|
|
|
@ -50,8 +50,11 @@ 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("dmps/"+dmpid);
|
if(eager)
|
||||||
|
return this.restBase.get("dmps/"+dmpid, {"eager": true});
|
||||||
|
else
|
||||||
|
return this.restBase.get("dmps/"+dmpid, {"eager": true});
|
||||||
}
|
}
|
||||||
|
|
||||||
public listDmpIDs(){
|
public listDmpIDs(){
|
||||||
|
|
|
@ -21,7 +21,8 @@ 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(
|
let getParams : any = {"eager":true};
|
||||||
|
this.serverService.getDmp(dmpid, getParams).subscribe(
|
||||||
response => {
|
response => {
|
||||||
this.dmp = response;
|
this.dmp = response;
|
||||||
debugger;
|
debugger;
|
||||||
|
|
Loading…
Reference in New Issue