From 9fb43d9db6bdd52e17867c4c84f63914ff0d9890 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 5 Jul 2016 13:31:04 +0000 Subject: [PATCH] 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 --- src/app/app.component.ts | 3 +- src/app/claimPages/claims/claims.component.ts | 10 ++-- .../inlineClaimContext.component.ts | 2 +- src/app/claimPages/myClaimsDemo.component.ts | 53 +++++++++++++++++++ 4 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 src/app/claimPages/myClaimsDemo.component.ts diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3ace19cf..d7ab681f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -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' } diff --git a/src/app/claimPages/claims/claims.component.ts b/src/app/claimPages/claims/claims.component.ts index 210daf91..3e83ad13 100644 --- a/src/app/claimPages/claims/claims.component.ts +++ b/src/app/claimPages/claims/claims.component.ts @@ -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'); diff --git a/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts b/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts index 971b1207..38672061 100644 --- a/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts +++ b/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts @@ -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 = ""; diff --git a/src/app/claimPages/myClaimsDemo.component.ts b/src/app/claimPages/myClaimsDemo.component.ts new file mode 100644 index 00000000..02535d02 --- /dev/null +++ b/src/app/claimPages/myClaimsDemo.component.ts @@ -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: ` +
+ +
+
Linking
+
MyClaims
+
Claims Admin
+

Extra parameters for claims admin

+
Claims By user
+
Claims By project
+
Claims By context
+ + +
Publication od_______908::3a5b2885656a91307156325644e73b92
+ +
+
+ + + +` +//(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}] ); + } +}