From 100fe2c1b4f1f5b99602303326f4864647e60c87 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Fri, 17 Jun 2016 16:08:50 +0000 Subject: [PATCH] linking home added to linking procedure git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@42946 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../claimContext/claimContext.component.ts | 7 +- .../claimProject/claimProject.component.ts | 3 +- .../claimPublication.component.html | 4 +- .../claimPublication.component.ts | 8 +- src/app/linking/linking.component.ts | 156 ++++++++++-------- src/app/linking/linkingHome.component.ts | 24 +-- 6 files changed, 116 insertions(+), 86 deletions(-) diff --git a/src/app/linking/claimContext/claimContext.component.ts b/src/app/linking/claimContext/claimContext.component.ts index 08990a12..cc70c156 100644 --- a/src/app/linking/claimContext/claimContext.component.ts +++ b/src/app/linking/claimContext/claimContext.component.ts @@ -12,11 +12,10 @@ import {ContextsService} from '../../services/contexts.service';
-

Select Community and Category:

-
+
  • Community:
    • @@ -27,7 +26,7 @@ import {ContextsService} from '../../services/contexts.service';
    • Category:
      • diff --git a/src/app/linking/claimProject/claimProject.component.ts b/src/app/linking/claimProject/claimProject.component.ts index 1d3413d0..afbc7299 100644 --- a/src/app/linking/claimProject/claimProject.component.ts +++ b/src/app/linking/claimProject/claimProject.component.ts @@ -18,8 +18,7 @@ import {OpenaireProjectsService} from '../../services/openaireProjects.service';
      +
      • Select funder:
      • {{funder.field.field[1]['@value']}}
        • diff --git a/src/app/linking/claimPublication/claimPublication.component.html b/src/app/linking/claimPublication/claimPublication.component.html index 30ebfa23..02a5e7e6 100644 --- a/src/app/linking/claimPublication/claimPublication.component.html +++ b/src/app/linking/claimPublication/claimPublication.component.html @@ -30,7 +30,7 @@
      -

      +

@@ -46,7 +46,7 @@

Not the right author? Choose one of these:

- +
  • {{authorGivenNames[i]}} {{authorFamilyNames[i]}} : {{item}} diff --git a/src/app/linking/claimPublication/claimPublication.component.ts b/src/app/linking/claimPublication/claimPublication.component.ts index 6456c14e..8917565d 100644 --- a/src/app/linking/claimPublication/claimPublication.component.ts +++ b/src/app/linking/claimPublication/claimPublication.component.ts @@ -173,7 +173,12 @@ search(term: string, size : number, page : number){ add(item, itemSource, itemType, itemUrl, itemTitle){ var result ={id: item.DOI, type :itemType, source : itemSource, title: itemTitle,url: itemUrl, result: item, accessRights: 'OPEN', embargoEndDate:''}; console.info("Add result:"+result.id+" "+result.source+" "+item); - this.selectedPublications.push(result); + var index:number =this.selectedPublications.indexOf(result); + item.selected=true; + if (index== -1) { + this.selectedPublications.push(result); + } + //do not remove it from the list // var index:number =this.crossrefResults.indexOf(item); // if (index > -1) { @@ -185,6 +190,7 @@ search(term: string, size : number, page : number){ } remove(item){ var index:number =this.selectedPublications.indexOf(item); + item.selected=false; if (index > -1) { this.selectedPublications.splice(index, 1); this.publicationsChange.emit({ diff --git a/src/app/linking/linking.component.ts b/src/app/linking/linking.component.ts index acca5542..d5ba238f 100644 --- a/src/app/linking/linking.component.ts +++ b/src/app/linking/linking.component.ts @@ -8,6 +8,7 @@ import {ClaimDatasetComponent} from './claimDataset/claimDataset.component'; import {ClaimSelectedComponent} from './selected/selected.component'; import {ClaimInsertComponent} from './insertClaim/insertClaim.component'; import {ClaimProjectsComponent} from './claimProject/claimProject.component'; +import {LinkingHomeComponent} from './linkingHome.component'; // import { MD_RADIO_DIRECTIVES, MdRadioDispatcher } from '@angular2-material/radio'; // import { MD_INPUT_DIRECTIVES } from '@angular2-material/input'; @@ -16,71 +17,79 @@ import {ClaimProjectsComponent} from './claimProject/claimProject.component'; @Component({ selector: 'linking', //providers: [MdRadioDispatcher], - directives: [ROUTER_DIRECTIVES, ClaimContextComponent, ClaimPublicationComponent, ClaimSelectedComponent, ClaimInsertComponent,ClaimDatasetComponent, ClaimProjectsComponent], + directives: [ROUTER_DIRECTIVES, ClaimContextComponent, ClaimPublicationComponent, ClaimSelectedComponent, ClaimInsertComponent,ClaimDatasetComponent, ClaimProjectsComponent, LinkingHomeComponent], template: ` -

    Linking Research Results

    -
    -
    -
    -
    +
    +
    +

    Link research resutls

    +
    + +
    +
    +
    +
    + - -
    -
    - - + + Publication + Dataset + --> +
    +
    + + +
    + + + + + +
    - - - - - - -
    - -
    -
    - -
    -
    - -
    -
    - -
    - -
    - +
    - +
    + +
    +
    + +
    +
    + +
    +
    +

    TODO software

    +
    +
    + +
    + +
    +
    + +
    +
    +
    + +
    -
    - -
    -
    -
    - - -
    - - - + + +
    +
    ` @@ -97,38 +106,46 @@ export class LinkingComponent { projects=[]; publications=[]; datasets=[]; - show = "project"; + show = "home"; searchType="publication"; date='8-6-2016'; keyword: string = ""; + chosenType:string ="project"; ngOnInit() { } next(){ - if((this.show == 'project' )){ + if((this.show == 'project' || this.show == 'context' || this.show == 'software')){ this.show='result'; }else if((this.show == 'result' && this.keyword == '')||(this.show == 'dataset' || this.show == 'publication')){ - this.show='context'; + this.show='claim'; }else if(this.show == 'result' ){ if(this.searchType == 'publication' ){ this.show="publication"; }else{ this.show="dataset"; } - }else if(this.show == 'context'){ - this.show='claim'; } } prev(){ if(this.show == 'result'){ - this.show='project'; - }else if(this.show == 'context'){ - this.show='result'; + if(this.chosenType == 'project'){ + this.show='project'; + }else if(this.chosenType == 'context'){ + this.show='context'; + }else if(this.chosenType == 'software'){ + this.show='software'; + }else{ + this.show='home'; + + } + }else if(this.show == 'context' || this.show == 'project' || this.show == 'software' ){ + this.show='home'; }else if(this.show == 'dataset' || this.show == 'publication'){ this.show='result'; } else if(this.show == 'claim'){ - this.show='context'; + this.show='result'; } } goto(term: string) { @@ -168,4 +185,9 @@ export class LinkingComponent { typeChanged(type:string) { this.searchType = type; } + chosenTypeChange($event) { + this.chosenType = this.show; + this.show=$event.value; + + } } diff --git a/src/app/linking/linkingHome.component.ts b/src/app/linking/linkingHome.component.ts index ecf08bba..ca8aad4a 100644 --- a/src/app/linking/linkingHome.component.ts +++ b/src/app/linking/linkingHome.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, Output, EventEmitter } from '@angular/core'; import {RouteConfig, ROUTER_DIRECTIVES, Router} from '@angular/router-deprecated'; import {JSONP_PROVIDERS} from '@angular/http'; import {Observable} from 'rxjs/Observable'; @@ -6,11 +6,6 @@ import {Observable} from 'rxjs/Observable'; @Component({ selector: 'linking-home', template: ` -
    -
    -

    Link research resutls

    -
    -
    @@ -18,7 +13,7 @@ import {Observable} from 'rxjs/Observable';

    Link with project

    Link your research result with funded projects.

    - Link with project + Link with project
    @@ -26,7 +21,7 @@ import {Observable} from 'rxjs/Observable';

    Link with Community

    Link your research result with research communities.

    - Link with community + Link with community
    @@ -34,18 +29,27 @@ import {Observable} from 'rxjs/Observable';

    Link with Software

    ....

    - Link with software + Link with software
    -
    `, + `, directives: [ ...ROUTER_DIRECTIVES ], }) export class LinkingHomeComponent { + @Output() chosenTypeChange = new EventEmitter(); + chosenType:string = "result"; + select(type:string){ + console.info('Changed!'+type); + this.chosenType = type; + this.chosenTypeChange.emit({ + value: this.chosenType + }); + } }