MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

last minute changes 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@43129 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2016-07-05 13:31:04 +00:00
parent 345b1439dd
commit 9fb43d9db6
4 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/app.component.ts
View File

@ -10,7 +10,7 @@ import {LinkingHomeComponent} from './claimPages/linking/linkingHome.component';
import {MyClaimsComponent} from './claimPages/myClaims/myClaims.component';
import {ProjectComponent} from './landingPages/project/project.component';
import {PublicationComponent} from './landingPages/publication/publication.component';
import {MyClaimsDemoComponent} from './claimPages/myClaimsDemo.component';
import 'rxjs/Rx';
@ -71,6 +71,7 @@ import 'rxjs/Rx';
{ path: '/search', component: SearchComponent, name: 'Search' },
{ path: '/linking', component: LinkingComponent, name: 'Linking' },
{ path: '/my-claims', component: MyClaimsComponent, name: 'MyClaims' },
{ path: '/demo', component: MyClaimsDemoComponent, name: 'MyClaimsDemo' },
{ path: '/project', component: ProjectComponent, name: 'Project' },
{ path: '/publication', component: PublicationComponent, name: 'Publication' }

10
src/app/claimPages/claims/claims.component.ts
View File

@ -27,7 +27,10 @@ export class ClaimsComponent {
ngOnInit() {
console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId);
if(this.isAdmin =='true' ){
if( this.myClaims == 'true' ){
console.info("Is myclaims");
this.fetchBy = "User";
}else{
console.info("Is admin");
console.info(this.isAdmin);
@ -38,11 +41,8 @@ export class ClaimsComponent {
console.info("Fetch by:"+this.fetchBy+"Fetch id:"+this.fetchId);
this.fetchId=this.fetchId?this.fetchId:'';
}else if( this.myClaims == 'true' ){
console.info("Is myclaims");
this.fetchBy = "User";
}
console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId);
console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId);
let page = +this._routeParams.get('page');
let size = +this._routeParams.get('size');

2
src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts
View File

@ -64,7 +64,7 @@ import {ClaimInsertComponent} from '../linking/insertClaim/insertClaim.component
publications;
datasets;
private show = 'context';
private showComp:string = 'true';
private showComp:string = 'false';
private enableButton:boolean=true;
keyword: string = "";

53
src/app/claimPages/myClaimsDemo.component.ts Normal file
View File

@ -0,0 +1,53 @@
import {Component, Input} from '@angular/core';
import {JSONP_PROVIDERS} from '@angular/http';
import {Observable} from 'rxjs/Observable';
import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
@Component({
selector: 'my-claims-demo',
directives: [ROUTER_DIRECTIVES],
template: `
<div *ngIf="user" class="container">
<div class="page-header">
<h1> My Claims Demo</h1>
</div>
<div>
<div class=""><a [routerLink]=" ['/Linking']">Linking</a></div>
<div class=""><a [routerLink]=" ['/MyClaims']">MyClaims</a></div>
<div class=""><a [routerLink]=" ['/Claims']">Claims Admin</a></div>
<p> Extra parameters for claims admin</p>
<div class=""><a href="claims?fetchBy=User&fetchId=amelie.baecker@uni-bielefeld.de">Claims By user</a></div>
<div class=""><a href="claims?fetchBy=Project&fetchId=corda_______::2c37878a0cede85dbbd1081bb9b4a2f8">Claims By project</a></div>
<div class=""><a href="claims?fetchBy=Context&fetchId=egi::country::gr">Claims By context</a></div>
<!-- <p>Orcid
<p>N.M.
0000-0002-3477-3082
</p>
</p> -->
<div class=""><a href="publication?articleId=od_______908::3a5b2885656a91307156325644e73b92" >Publication od_______908::3a5b2885656a91307156325644e73b92</a></div>
<!--<div class=""><a href="publication?articleId=od_______908::3a5b2885656a91307156325644e73b92" >Publication od_______908::3a5b2885656a91307156325644e73b92</a></div>
<div class=""><a href="publication?articleId=od_______908::3a5b2885656a91307156325644e73b92" >Publication od_______908::3a5b2885656a91307156325644e73b92</a></div>-->
</div>
</div>
`
//(click)="changeOrderby('target')"
//od_______908::3a5b2885656a91307156325644e73b92
})
export class MyClaimsDemoComponent {
constructor ( private _router: Router ) {
}
user:string="argirok@di.uoa.gr";
ngOnInit() {
}
goToPub(id: number){
this._router.navigate( ['Publication', { articleId: id}] );
}
}