Project

General

Profile

« Previous | Next » 

Revision 58676

[Trunk | Connect]:
1. assets/connect-assets/home/entities: svg files added for entity types in community first page.
2. connect-custom.css: Classes added for icons in entity types in community first page.
3. community.component: Analytics tab redesigned - entity tabs added & charts in cards.

View differences:

community.component.html
48 48
</ng-template>
49 49

  
50 50
<ng-template #analytics_tab_content let-type="type" let-typeName="typeName">
51
  <ng-container *ngIf="isEntityEnabled(type)
51
  <div *ngIf="analyticsActiveTab == type && isEntityEnabled(type)
52 52
            && statistics.statisticsSum && statistics.statisticsDisplay && statistics.statisticsSum[type].total>0
53 53
            &&
54 54
            (  statistics.statisticsDisplay.entities[type].numbers.map['total']['showInMonitor']
......
63 63
                && statistics.allowedChartsMode['showInMonitor'][type].length > 0)
64 64
            )">
65 65
      <div class="tab-header uk-margin-bottom">{{typeName}}</div>
66

  
66 67
      <ng-container *ngTemplateOutlet="stats; context: {
67
                          entity: type, entityName: typeName,
68
                          statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
69
                          allowedEntities: statistics.allowedEntitiesMode['showInMonitor'],
70
                          allowedCharts:statistics.allowedChartsMode['showInMonitor'],
71
                          showChartTitle:  statistics.chartTitlesMode['showInMonitor'],
72
                          chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}">
73
      </ng-container>
74
  </ng-container>
68
                            entity: type, entityName: typeName,
69
                            statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
70
                            allowedEntities: statistics.allowedEntitiesMode['showInMonitor'],
71
                            allowedCharts:statistics.allowedChartsMode['showInMonitor'],
72
                            showChartTitle:  statistics.chartTitlesMode['showInMonitor'],
73
                            chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}">
74
        </ng-container>
75
  </div>
75 76
</ng-template>
76 77

  
77 78
<ng-template #stats let-entity="entity" let-entityName="entityName" let-statisticsSum="statisticsSum"
......
89 90
  <div *ngIf="statisticsSum && statisticsDisplay && statisticsSum[entity].total > 0"
90 91
       [class]="'uk-grid uk-grid-small uk-grid-match ' + (showIn == 'showInMonitor' ? '  uk-child-width-1-3@s uk-child-width-1-6@m' : ' uk-child-width-1-1@s uk-child-width-1-3@m')" uk-grid>
91 92
    <div *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][showIn]" class="">
92
      <div class="uk-card portal-card uk-text-right uk-padding-small">
93
      <div class="uk-card uk-card-default uk-padding-small">
93 94
        <div
94
          class="uk-text-large">{{statisticsSum[entity].total|number}}</div>
95
          class="uk-h4 uk-text-bold">{{statisticsSum[entity].total|number}}</div>
95 96
<!--        <div>Total {{entityName}}</div>-->
96 97
        <div>Total</div>
97 98
      </div>
98 99
    </div>
99 100
    <div
100
      *ngIf="statisticsDisplay.entities[entity].numbers.map['project'][showIn]" class="">
101
      <div class="uk-card portal-card uk-text-right uk-padding-small">
101
      *ngIf="statisticsDisplay.entities[entity].numbers.map['project'][showIn] && statisticsSum[entity].projects" class="">
102
      <div class="uk-card uk-card-default uk-padding-small">
102 103
        <div
103
          class="uk-text-large">{{statisticsSum[entity].projects|number}} </div>
104
          class="uk-h4 uk-text-bold">{{statisticsSum[entity].projects|number}} </div>
104 105
<!--        <div>Total projects linked to {{entityName}}</div>-->
105 106
        <div>Total linked projects</div>
106 107
      </div>
107 108
    </div>
108 109
    <div
109
      *ngIf="statisticsDisplay.entities[entity].numbers.map['open'][showIn]" class="">
110
      <div class="uk-card portal-card uk-text-right uk-padding-small">
110
      *ngIf="statisticsDisplay.entities[entity].numbers.map['open'][showIn] && statisticsSum[entity].open_access" class="">
111
      <div class="uk-card uk-card-default uk-padding-small">
111 112
        <div
112
          class="uk-text-large">{{statisticsSum[entity].open_access|number}} </div>
113
          class="uk-h4 uk-text-bold">{{statisticsSum[entity].open_access|number}} </div>
113 114
<!--        <div>Open access {{entityName}}</div>-->
114 115
        <div>Open access</div>
115 116
      </div>
116 117
    </div>
117
    <div *ngIf="statisticsDisplay.entities[entity].numbers.map['closed'][showIn]" class="">
118
      <div class="uk-card portal-card uk-text-right uk-padding-small">
118
    <div *ngIf="statisticsDisplay.entities[entity].numbers.map['closed'][showIn] && statisticsSum[entity].closed_access" class="">
119
      <div class="uk-card uk-card-default uk-padding-small">
119 120
        <div
120
          class="uk-text-large">{{statisticsSum[entity].closed_access|number}} </div>
121
          class="uk-h4 uk-text-bold">{{statisticsSum[entity].closed_access|number}} </div>
121 122
<!--        <div>Closed access {{entityName}}</div>-->
122 123
        <div>Closed access</div>
123 124
      </div>
124 125
    </div>
125 126
    <div
126
      *ngIf="statisticsDisplay.entities[entity].numbers.map['embargo'][showIn]" class="">
127
      <div class="uk-card portal-card uk-text-right uk-padding-small">
127
      *ngIf="statisticsDisplay.entities[entity].numbers.map['embargo'][showIn] && statisticsSum[entity].embargo" class="">
128
      <div class="uk-card uk-card-default uk-padding-small">
128 129
        <div
129
          class="uk-text-large">{{statisticsSum[entity].embargo|number}} </div>
130
          class="uk-h4 uk-text-bold">{{statisticsSum[entity].embargo|number}} </div>
130 131
<!--        <div>Embargoed {{entityName}}</div>-->
131 132
        <div>Embargoed</div>
132 133
      </div>
133 134
    </div>
134 135
    <div
135
      *ngIf="statisticsDisplay.entities[entity].numbers.map['restricted'][showIn]"
136
      *ngIf="statisticsDisplay.entities[entity].numbers.map['restricted'][showIn] && statisticsSum[entity].restricted"
136 137
      class="">
137
      <div class="uk-card portal-card uk-text-right uk-padding-small">
138
      <div class="uk-card uk-card-default uk-padding-small">
138 139
        <div
139
          class="uk-text-large">{{statisticsSum[entity].restricted|number}} </div>
140
          class="uk-h4 uk-text-bold">{{statisticsSum[entity].restricted|number}} </div>
140 141
<!--        <div>Restricted {{entityName}}</div>-->
141 142
        <div>Restricted</div>
142 143
      </div>
......
152 153
          <ul class="uk-list">
153 154
            <li *ngFor="let chart of allowedCharts[entity]">
154 155

  
155
              <div class=" iframeContainer uk-height-medium uk-margin-medium-top">
156
                <div *ngIf="showChartTitle[chart]" class="  uk-h5 ">
157
                  {{chartsInfoMap[chart].title}}</div>
156
              <div class=" iframeContainer uk-height-medium uk-margin-medium-top uk-card uk-card-default uk-card-body">
157
                <div *ngIf="showChartTitle[chart]" class="">
158
                  {{chartsInfoMap[chart].title}}
159
                </div>
158 160
                <iframe [src]=chartsInfoMap[chart].url scrolling="no"></iframe>
159 161
              </div>
160 162
            </li>
......
172 174
    <div *ngIf="showIn == 'showInMonitor'" class="uk-grid uk-child-width-1-2@l uk-child-width-1-1@m  ">
173 175
      <div *ngFor="let chart of allowedCharts[entity]" class="uk-clearfix uk-margin-bottom">
174 176

  
175
        <div class=" iframeContainer uk-height-large uk-margin-medium-top">
176
          <div *ngIf="showChartTitle[chart]" class="  uk-h5 ">
177
            {{chartsInfoMap[chart].title}}</div>
178
          <iframe [src]=chartsInfoMap[chart].url scrolling="no" class=""></iframe>
177
        <div class=" iframeContainer uk-height-large uk-margin-medium-top uk-card uk-card-default uk-card-body">
178
            <div *ngIf="showChartTitle[chart]" class="">
179
              {{chartsInfoMap[chart].title}}
180
            </div>
181
            <iframe [src]=chartsInfoMap[chart].url scrolling="no" class=""></iframe>
179 182
        </div>
180 183

  
181 184
      </div>
......
282 285
              <a class="uk-width-1-1 uk-height-1-1">
283 286
                <div class="tab-header">Other Research</div><div class="number">{{orpTotal|number}}</div></a>
284 287
            </li>
285
            <li *ngIf="statistics && statistics.statisticsDisplay && statistics.statisticsDisplay.isActive"
286
                class="uk-padding-remove statistics" (click)="show='analysis'; activeTab='analytics'">
288
<!--            <li *ngIf="statistics && statistics.statisticsDisplay && statistics.statisticsDisplay.isActive"-->
289
            <li *ngIf="showAnalyticsTab()"
290
                class="uk-padding-remove statistics" (click)="show='analysis'; activeTab='analytics';">
287 291
              <a class="uk-width-1-1 uk-height-1-1">
288 292
                <div class="tab-header">Analytics</div>
289 293
                <div class="number">
......
428 432
            <li *ngIf="statistics && statistics.statisticsDisplay && statistics.statisticsDisplay.isActive"
429 433
                class="uk-overflow-auto">
430 434
              <div *ngIf="statistics && activeTab=='analytics'" class="uk-width-expand uk-padding">
435

  
436
                <div class="uk-text-center">
437
                  <button *ngIf="isEntityEnabled('publication')
438
                                && statistics.statisticsSum && statistics.statisticsDisplay && statistics.statisticsSum['publication'].total>0
439
                                &&
440
                                (  statistics.statisticsDisplay.entities['publication'].numbers.map['total']['showInMonitor']
441
                                || statistics.statisticsDisplay.entities['publication'].numbers.map['project']['showInMonitor']
442
                                || statistics.statisticsDisplay.entities['publication'].numbers.map['open']['showInMonitor']
443
                                || statistics.statisticsDisplay.entities['publication'].numbers.map['closed']['showInMonitor']
444
                                || statistics.statisticsDisplay.entities['publication'].numbers.map['embargo']['showInMonitor']
445
                                || statistics.statisticsDisplay.entities['publication'].numbers.map['restricted']['showInMonitor']
446
                                || ( statistics.allowedEntitiesMode['showInMonitor'] && statistics.statisticsSum
447
                                    && statistics.allowedChartsMode['showInMonitor'] && statistics.statisticsSum['publication']
448
                                    && statistics.allowedChartsMode['showInMonitor']['publication'] && statistics.statisticsSum['publication'].total > 0
449
                                    && statistics.allowedChartsMode['showInMonitor']['publication'].length > 0))"
450
                          [class]="(analyticsActiveTab == 'publication' ? 'active ' : '')+' publicationAnalytics uk-icon uk-icon-button uk-margin-right'"
451
                          uk-tooltip="title: Publications" (click)="analyticsActiveTab = 'publication'">
452
<!--                    <svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg"><rect style="stroke: var(&#45;&#45;portal-main-color);" fill="none" height="16" stroke="#000" width="12" x="3.5" y="2.5"></rect><polyline style="stroke: var(&#45;&#45;portal-main-color);" fill="none" points="5 0.5 17.5 0.5 17.5 17" stroke="#000"></polyline></svg>-->
453
                    <img src="assets/connect-assets/home/entities/publication.svg">
454
                  </button>
455
                  <button *ngIf="isEntityEnabled('dataset')
456
                              && statistics.statisticsSum && statistics.statisticsDisplay && statistics.statisticsSum['dataset'].total>0
457
                              &&
458
                              (  statistics.statisticsDisplay.entities['dataset'].numbers.map['total']['showInMonitor']
459
                              || statistics.statisticsDisplay.entities['dataset'].numbers.map['project']['showInMonitor']
460
                              || statistics.statisticsDisplay.entities['dataset'].numbers.map['open']['showInMonitor']
461
                              || statistics.statisticsDisplay.entities['dataset'].numbers.map['closed']['showInMonitor']
462
                              || statistics.statisticsDisplay.entities['dataset'].numbers.map['embargo']['showInMonitor']
463
                              || statistics.statisticsDisplay.entities['dataset'].numbers.map['restricted']['showInMonitor']
464
                              || ( statistics.allowedEntitiesMode['showInMonitor'] && statistics.statisticsSum
465
                              && statistics.allowedChartsMode['showInMonitor'] && statistics.statisticsSum['dataset']
466
                              && statistics.allowedChartsMode['showInMonitor']['dataset'] && statistics.statisticsSum['dataset'].total > 0
467
                              && statistics.allowedChartsMode['showInMonitor']['dataset'].length > 0))"
468
                          [class]="(analyticsActiveTab == 'dataset' ? 'active ' : '')+' datasetAnalytics uk-icon uk-icon-button uk-margin-right'"
469
                          uk-tooltip="title: Research Data" (click)="analyticsActiveTab = 'dataset'">
470
<!--                    <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" data-svg="database"><ellipse style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" cx="10" cy="4.64" rx="7.5" ry="3.14"></ellipse><path style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" d="M17.5,8.11 C17.5,9.85 14.14,11.25 10,11.25 C5.86,11.25 2.5,9.84 2.5,8.11"></path><path style="stroke: var(&#45;&#45;portal-main-color);"fill="none" stroke="#000" d="M17.5,11.25 C17.5,12.99 14.14,14.39 10,14.39 C5.86,14.39 2.5,12.98 2.5,11.25"></path><path style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" d="M17.49,4.64 L17.5,14.36 C17.5,16.1 14.14,17.5 10,17.5 C5.86,17.5 2.5,16.09 2.5,14.36 L2.5,4.64"></path></svg>-->
471
                    <img src="assets/connect-assets/home/entities/dataset.svg">
472
                  </button>
473
                  <button *ngIf="isEntityEnabled('software')
474
                              && statistics.statisticsSum && statistics.statisticsDisplay && statistics.statisticsSum['software'].total>0
475
                              &&
476
                              (  statistics.statisticsDisplay.entities['software'].numbers.map['total']['showInMonitor']
477
                              || statistics.statisticsDisplay.entities['software'].numbers.map['project']['showInMonitor']
478
                              || statistics.statisticsDisplay.entities['software'].numbers.map['open']['showInMonitor']
479
                              || statistics.statisticsDisplay.entities['software'].numbers.map['closed']['showInMonitor']
480
                              || statistics.statisticsDisplay.entities['software'].numbers.map['embargo']['showInMonitor']
481
                              || statistics.statisticsDisplay.entities['software'].numbers.map['restricted']['showInMonitor']
482
                              || ( statistics.allowedEntitiesMode['showInMonitor'] && statistics.statisticsSum
483
                              && statistics.allowedChartsMode['showInMonitor'] && statistics.statisticsSum['software']
484
                              && statistics.allowedChartsMode['showInMonitor']['software'] && statistics.statisticsSum['software'].total > 0
485
                              && statistics.allowedChartsMode['showInMonitor']['software'].length > 0))"
486
                          [class]="(analyticsActiveTab == 'software' ? 'active ' : '')+' softwareAnalytics uk-icon uk-icon-button uk-margin-right'"
487
                          uk-tooltip="title: Software" (click)="analyticsActiveTab = 'software'">
488
<!--                    <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" data-svg="cog"><circle style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" cx="9.997" cy="10" r="3.31"></circle><path style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" d="M18.488,12.285 L16.205,16.237 C15.322,15.496 14.185,15.281 13.303,15.791 C12.428,16.289 12.047,17.373 12.246,18.5 L7.735,18.5 C7.938,17.374 7.553,16.299 6.684,15.791 C5.801,15.27 4.655,15.492 3.773,16.237 L1.5,12.285 C2.573,11.871 3.317,10.999 3.317,9.991 C3.305,8.98 2.573,8.121 1.5,7.716 L3.765,3.784 C4.645,4.516 5.794,4.738 6.687,4.232 C7.555,3.722 7.939,2.637 7.735,1.5 L12.263,1.5 C12.072,2.637 12.441,3.71 13.314,4.22 C14.206,4.73 15.343,4.516 16.225,3.794 L18.487,7.714 C17.404,8.117 16.661,8.988 16.67,10.009 C16.672,11.018 17.415,11.88 18.488,12.285 L18.488,12.285 Z"></path></svg>-->
489
                    <img src="assets/connect-assets/home/entities/software.svg">
490
                  </button>
491
                  <button *ngIf="isEntityEnabled('orp')
492
                              && statistics.statisticsSum && statistics.statisticsDisplay && statistics.statisticsSum['orp'].total>0
493
                              &&
494
                              (  statistics.statisticsDisplay.entities['orp'].numbers.map['total']['showInMonitor']
495
                              || statistics.statisticsDisplay.entities['orp'].numbers.map['project']['showInMonitor']
496
                              || statistics.statisticsDisplay.entities['orp'].numbers.map['open']['showInMonitor']
497
                              || statistics.statisticsDisplay.entities['orp'].numbers.map['closed']['showInMonitor']
498
                              || statistics.statisticsDisplay.entities['orp'].numbers.map['embargo']['showInMonitor']
499
                              || statistics.statisticsDisplay.entities['orp'].numbers.map['restricted']['showInMonitor']
500
                              || ( statistics.allowedEntitiesMode['showInMonitor'] && statistics.statisticsSum
501
                              && statistics.allowedChartsMode['showInMonitor'] && statistics.statisticsSum['orp']
502
                              && statistics.allowedChartsMode['showInMonitor']['orp'] && statistics.statisticsSum['orp'].total > 0
503
                              && statistics.allowedChartsMode['showInMonitor']['orp'].length > 0))"
504
                          [class]="(analyticsActiveTab == 'orp' ? 'active ' : '')+' otherAnalytics uk-icon uk-icon-button'"
505
                          uk-tooltip="title: Other Research Products" (click)="analyticsActiveTab = 'orp'">
506
<!--                    <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" data-svg="world"><path style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" d="M1,10.5 L19,10.5"></path><path style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" d="M2.35,15.5 L17.65,15.5"></path><path style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" d="M2.35,5.5 L17.523,5.5"></path><path style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" d="M10,19.46 L9.98,19.46 C7.31,17.33 5.61,14.141 5.61,10.58 C5.61,7.02 7.33,3.83 10,1.7 C10.01,1.7 9.99,1.7 10,1.7 L10,1.7 C12.67,3.83 14.4,7.02 14.4,10.58 C14.4,14.141 12.67,17.33 10,19.46 L10,19.46 L10,19.46 L10,19.46 Z"></path><circle style="stroke: var(&#45;&#45;portal-main-color);" fill="none" stroke="#000" cx="10" cy="10.5" r="9"></circle></svg>-->
507
                    <img src="assets/connect-assets/home/entities/other.svg">
508
                  </button>
509
                </div>
510
                <hr>
511

  
431 512
                <ng-container *ngTemplateOutlet="analytics_tab_content; context: {
432 513
                  type: 'publication', typeName: 'publications'}">
433 514
                </ng-container>

Also available in: Unified diff