Project

General

Profile

« Previous | Next » 

Revision 51317

1. Change of SearchResult field for funders (used for project results):
instead of funders: {"funderShortname": string, "funderName": string}[]
now: funderShortname: string // only 1 funder per project and we don't use the full name
2. Addition of SearchResult field for project results: acronym: string, code: string
3. Parsing of funders changed (searchProjects.service): when more than 1 funders in 'fundingtree', keep 'shortname' of the first one
4. Parsing of project's acronym and code parsed and stored in corresponding fields (not in the title.name)
5. Adjust new fields display in 'tabResult.component' and 'searchResult.component'

View differences:

searchResult.component.html
10 10
        <!-- <h4 class = "{{result.title.accessMode}} {{result.title.sc39}}" [title] = result.title.accessMode > -->
11 11
        <h4  [title] = result.title.accessMode >
12 12
            <a [queryParams]="routerHelper.createQueryParam(urlParam,result.id)" routerLinkActive="router-link-active" routerLink="/search/{{type}}">
13
                <p *ngIf="result['title'].name != undefined && result['title'].name != ''"
14
                    [innerHTML]="result['title'].name">
15
                </p>
16
                <p *ngIf="result['title'].name == undefined || result['title'].name == ''">
17
                    [no title available]
18
                </p>
13
                <p *ngIf="result['title'].name || result.acronym"><span *ngIf="result.acronym">{{result.acronym}}</span><span *ngIf="result['title'].name">-</span><span [innerHTML]="result['title'].name"></span><span *ngIf="result.code">({{result.code}})</span></p>
14
                <p *ngIf="!result['title'].name && !result.acronym">[no title available]<span *ngIf="result.code">({{result.code}})</span></p>
19 15
            </a>
20 16
        </h4>
21 17
        <span *ngIf="result.types && result.types.length > 0" [class]="'uk-label custom-label label-blue label-'+result.entityType" title="Type">{{result.types.join(", ")}}</span>
22 18
        <span *ngIf="result.languages && result.languages.length > 0" class="uk-label custom-label  label-language " title="Language">{{result.languages.join(", ")}}</span>
23 19
        <span *ngIf="result.title && result.title.accessMode" [class]="'uk-label custom-label  label-'+ result.title.accessMode " title="Access Mode">{{result.title.accessMode}}</span>
24
        <span *ngIf="result['funders'] && result['funders'].length > 0" class="uk-label custom-label label-funder " title="Funder"><span *ngFor="let funder of result['funders'] let i=index">
20
        <!-- <span *ngIf="result['funders'] && result['funders'].length > 0" class="uk-label custom-label label-funder " title="Funder"><span *ngFor="let funder of result['funders'] let i=index">
25 21

  
26 22
            <span *ngIf="funder.funderShortname">
27 23
              {{funder.funderShortname}}</span><span
28 24

  
29 25
              *ngIf="i < result['funders'].length-1">, </span>
30
        </span></span>
26
        </span></span> -->
27
        <span *ngIf="result['funderShortname']" class="uk-label custom-label label-funder " title="Funder">{{result['funderShortname']}}></span>
31 28
        <span *ngIf="result.openAccessMandate != undefined && result.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span>
32 29

  
33 30
        <span *ngIf="result.title  && result.title.sc39" class="uk-label custom-label label-sc39 " title="Special Clause 39">Special Clause 39</span>
......
94 91
          </span>
95 92
          <span *ngIf="result.startYear && result.endYear"> (start {{result.startYear}} - end {{result.endYear}})</span>
96 93
        </div> -->
97
        <div *ngIf="result.startYear && result.endYear"> Start year: {{result.startYear}} - End year: {{result.endYear}})</div>
94
        <div *ngIf="result.startYear && result.endYear"> Start year: {{result.startYear}} - End year: {{result.endYear}}</div>
98 95
        <div *ngIf="showOrganizations && result['organizations'] != undefined && result['organizations'].length > 0">
99 96
            <span> Organization: </span>
100 97
            <span *ngFor="let organization of result['organizations'].slice(0,10) let i=index">

Also available in: Unified diff