Project

General

Profile

« Previous | Next » 

Revision 61002

[Library|Trunk]
- Remove inline argument for parsed contexts, projects, remove unused code with <mark> tag

View differences:

modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/tabResult.component.html
74 74
         <span *ngIf="result['projects'].length > 15">...</span>
75 75
        </div>
76 76

  
77
        <mark *ngIf="result.embargoEndDate != undefined && result.embargoEndDate != ''">Embargo End Date: {{result.embargoEndDate}}</mark>
77
        <span *ngIf="result.embargoEndDate != undefined && result.embargoEndDate != ''">Embargo End Date: {{result.embargoEndDate}}</span>
78 78

  
79 79
        <div *ngIf="result.startYear && result.endYear"> Start year: {{result.startYear}} - End year: {{result.endYear}}</div>
80 80
        <div *ngIf="showOrganizations && result['organizations'] != undefined && result['organizations'].length > 0">
modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/landing-utils/parsingFunctions.class.ts
21 21
    let fundedByProject: Project = {
22 22
      "id": "", "acronym": "", "title": "",
23 23
      "funderShortname": "", "funderName": "",
24
      "funding": "", "code": "", "provenanceAction": "", "inline": false
24
      "funding": "", "code": "", "provenanceAction": ""
25 25
    };
26 26
    
27 27
    if (relation.title != 'unidentified') {
......
545 545
  parseContexts(_contexts: any): {
546 546
    "labelContext": string, "idContext": string,
547 547
    "labelCategory": string, "idCategory": string,
548
    "labelConcept": string, "idConcept": string, inline: boolean
548
    "labelConcept": string, "idConcept": string
549 549
  }[] {
550 550
    let contexts = new Array<{
551 551
      "labelContext": string, "idContext": string,
552 552
      "labelCategory": string, "idCategory": string,
553
      "labelConcept": string, "idConcept": string, inline: boolean
553
      "labelConcept": string, "idConcept": string
554 554
    }>();
555 555
    
556 556
    let position = 0;
......
574 574
                
575 575
                contexts[position] = {"labelContext": "", "idContext": "",
576 576
                                      "labelCategory": "", "idCategory": "",
577
                                      "labelConcept": "", "idConcept": "", inline: false};
577
                                      "labelConcept": "", "idConcept": ""};
578 578
                contexts[position]['labelContext'] = context.label;
579 579
                contexts[position]['idContext'] = context.id;
580 580
                contexts[position]['labelCategory'] = category.label;
......
587 587
            } else {
588 588
              contexts[position] = {"labelContext": "", "idContext": "",
589 589
                                    "labelCategory": "",  "idCategory": "",
590
                                    "labelConcept": "", "idConcept": "", inline: false};
590
                                    "labelConcept": "", "idConcept": ""};
591 591
              contexts[position]['labelContext'] = context.label;
592 592
              contexts[position]['idContext'] = context.id;
593 593
              contexts[position]['labelCategory'] = category.label;
......
600 600
        } else {
601 601
          contexts[position] = {"labelContext": "", "idContext": "",
602 602
            "labelCategory": "",  "idCategory": "",
603
            "labelConcept": "", "idConcept": "", inline: false};
603
            "labelConcept": "", "idConcept": ""};
604 604
          contexts[position]['labelContext'] = context.label;
605 605
          contexts[position]['idContext'] = context.id;
606 606
          contexts[position]['labelCategory'] = null;
modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/landing-utils/fundedBy.component.ts
8 8
  template: `
9 9
    <div class="uk-text-muted">Funded by</div>
10 10
    <span *ngFor="let item of fundedByProjects.slice(0, showNum) let i=index">
11
          <a>
12
            <mark *ngIf="item.inline">
11
          <a>             
12
            <span>
13 13
              <span
14 14
                  *ngIf="item['funderShortname'] || item['funderName']">{{item['funderShortname'] ? item['funderShortname'] : item['funderName']}}</span>
15 15
              <span *ngIf="!item['funderShortname'] && !item['funderName']">[no funder available]</span>
16 16
              <span
17 17
                  *ngIf="item['acronym'] || item['title']">| {{ item['acronym'] ? item['acronym'] : item['title']}}</span>
18
            </mark>
19
            <span *ngIf="!item.inline">
20
              <span
21
                  *ngIf="item['funderShortname'] || item['funderName']">{{item['funderShortname'] ? item['funderShortname'] : item['funderName']}}</span>
22
              <span *ngIf="!item['funderShortname'] && !item['funderName']">[no funder available]</span>
23
              <span
24
                  *ngIf="item['acronym'] || item['title']">| {{ item['acronym'] ? item['acronym'] : item['title']}}</span>
25 18
            </span>
26 19
          </a>
27 20
          <div class="default-dropdown uk-margin-remove-top uk-padding-small uk-dropdown"
modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/landing-utils/relatedTo.component.ts
6 6
  template: `
7 7
    <div class="uk-text-muted">Communities</div>
8 8
    <div class="uk-margin-small-left" *ngFor="let item of contexts.slice(0, showNum); let i=index">
9
        <span *ngIf="!item['inline']">
9
        <span>
10 10
          <span>{{item['labelContext']}}</span>
11 11
          <span *ngIf="item['labelCategory']"><span
12 12
              uk-icon="icon: arrow-right"></span>{{item['labelCategory']}}</span>
13 13
          <span *ngIf="item['labelConcept']">: {{item['labelConcept']}}</span>
14
        </span>
15
      <mark *ngIf="item['inline']">
16
        <span>{{item['labelContext']}}</span>
17
        <span *ngIf="item['labelCategory']"><span
18
            uk-icon="icon: arrow-right"></span>{{item['labelCategory']}}</span>
19
        <span *ngIf="item['labelConcept']">: {{item['labelConcept']}}</span>
20
      </mark>
14
        </span>       
21 15
    </div>
22 16
    <div *ngIf="showNum > threshold" class="uk-text-right">
23 17
      <a (click)="showNum = threshold; scroll()">
......
33 27
})
34 28

  
35 29
export class RelatedToComponent {
36
  @Input() contexts: { "labelContext": string, "labelCategory": string, "labelConcept": string, "inline": boolean }[];
30
  @Input() contexts: { "labelContext": string, "labelCategory": string, "labelConcept": string }[];
37 31
  
38 32
  public threshold: number = 5;
39 33
  public showNum: number = 5;
modules/uoa-services-library/trunk/ng-openaire-library/src/app/utils/entities/resultLandingInfo.ts
61 61
  
62 62
  contexts: { "labelContext": string, "idContext": string,
63 63
              "labelCategory": string, "idCategory": string,
64
              "labelConcept": string, "idConcept": string, "inline": boolean }[];
64
              "labelConcept": string, "idConcept": string}[];
65 65
  
66 66
  deletedByInferenceIds: string[];
67 67
  
modules/uoa-services-library/trunk/ng-openaire-library/src/app/utils/result-preview/result-preview.ts
46 46
  contribution?: string;
47 47
  currency?: string;
48 48
  provenanceAction?: string;
49
  inline?: boolean
50 49
}
51 50

  
52 51
export interface Author {

Also available in: Unified diff