Project

General

Profile

« Previous | Next » 

Revision 57893

Finished the first implementation of the overview page and the country page

View differences:

country-page.component.html
35 35
                        <img src="../../../assets/img/icons/PUBLICATIONS.svg" width="30" height="30">
36 36
                      </div>
37 37
                      <h2 class="uk-margin-remove">
38
                        <span class="number">18,165</span>
39
                        <!--<span *ngIf="overviewData.overview.publications?.oa" class="number">{{overviewData.overview.publications.oa | number}}</span>-->
40
                        <!--<span *ngIf="!overviewData.overview.publications || !overviewData.overview.publications.oa" class="number">--</span>-->
38
                        <!--<span class="number">2,321,300</span>-->
39
                        <span *ngIf="!countryData || !countryData.publications || !countryData.publications.oa" class="number">--</span>
40
                        <span *ngIf="countryData?.publications?.oa" class="number">{{countryData.publications.oa | number}}</span>
41 41
                      </h2>
42 42
                    </div>
43 43
                    <div class="uk-margin-top">
44 44
                      <!--<span class="uk-text-muted uk-text-small">Number of OA publications</span>-->
45 45
                      <span class="">Number of OA publications</span>
46 46
                    </div>
47
                    <div class="uk-margin-top">
48
                      <span class="number">30%</span> are OA
47
                    <!--<div class="uk-margin-top">-->
48
                      <!--<span class="number">96.8%</span> are OA-->
49
                    <!--</div>-->
50
                    <div *ngIf="countryData?.publications?.percentage" class="uk-margin-top">
51
                      <span class="number">{{countryData.publications.percentage | number}}%</span> are OA
49 52
                    </div>
50
                    <!--<div *ngIf="overviewData.overview.publications?.percentage" class="uk-margin-top">-->
51
                      <!--<span class="number">{{overviewData.overview.publications.percentage | number}}%</span> are OA-->
52
                    <!--</div>-->
53 53
                  </div>
54 54
                </div>
55 55
              </div>
......
61 61
                        <img src="../../../assets/img/icons/DATASETS.svg" width="30" height="30">
62 62
                      </div>
63 63
                      <h2 class="uk-margin-remove">
64
                        <span class="number">12,812</span>
65
                        <!--<span *ngIf="overviewData.overview.datasets?.oa" class="number">{{overviewData.overview.datasets.oa | number}}</span>-->
66
                        <!--<span *ngIf="!overviewData.overview.datasets || !overviewData.overview.datasets.oa" class="number">--</span>-->
64
                        <!--<span class="number">14,730</span>-->
65
                        <span *ngIf="!countryData || !countryData.datasets || !countryData.datasets.oa" class="number">--</span>
66
                        <span *ngIf="countryData?.datasets?.oa" class="number">{{countryData.datasets.oa | number}}</span>
67 67
                      </h2>
68 68
                    </div>
69 69
                    <div class="uk-margin-top">
70 70
                      <!--<span class="uk-text-muted uk-text-small">Number of OA publications</span>-->
71 71
                      <span class="">Number of OA datasets</span>
72 72
                    </div>
73
                    <div class="uk-margin-top">
74
                      <span class="number">30%</span> are OA
73
                    <!--<div class="uk-margin-top">-->
74
                      <!--<span class="number">89.7%</span> are OA-->
75
                    <!--</div>-->
76
                    <div *ngIf="countryData?.datasets?.percentage" class="uk-margin-top">
77
                      <span class="number">{{countryData.datasets.percentage | number}}%</span> are OA
75 78
                    </div>
76
                    <!--<div *ngIf="overviewData.overview.datasets?.percentage" class="uk-margin-top">-->
77
                      <!--<span class="number">{{overviewData.overview.datasets.percentage | number}}%</span> are OA-->
78
                    <!--</div>-->
79 79
                  </div>
80 80
                </div>
81 81
              </div>
......
87 87
                        <img src="../../../assets/img/icons/REPOSITORIES.svg" width="30" height="30">
88 88
                      </div>
89 89
                      <h2 class="uk-margin-remove">
90
                        <span class="number">512</span>
91
                        <!--<span *ngIf="overviewData.overview.repositories?.oa" class="number">{{overviewData.overview.repositories.oa | number}}</span>-->
92
                        <!--<span *ngIf="!overviewData.overview.repositories || !overviewData.overview.repositories.oa" class="number">--</span>-->
90
                        <!--<span class="number">101</span>-->
91
                        <span *ngIf="!countryData || !countryData.repositories || !countryData.repositories.oa" class="number">--</span>
92
                        <span *ngIf="countryData?.repositories?.oa" class="number">{{countryData.repositories.oa | number}}</span>
93 93
                      </h2>
94 94
                    </div>
95 95
                    <div class="uk-margin-top">
......
110 110
                        <img src="../../../assets/img/icons/JOURNAL.svg" width="30" height="30">
111 111
                      </div>
112 112
                      <h2 class="uk-margin-remove">
113
                        <span class="number">1356</span>
113
                        <!--<span class="number">164</span>-->
114
                        <span *ngIf="!countryData || !countryData.journals || !countryData.journals.oa" class="number">--</span>
115
                        <span *ngIf="countryData?.journals?.oa" class="number">{{countryData.journals.oa | number}}</span>
114 116
                        <!--<span *ngIf="overviewData.overview.journals?.oa" class="number">{{overviewData.overview.journals.oa | number}}</span>-->
115 117
                        <!--<span *ngIf="!overviewData.overview.journals || !overviewData.overview.journals.oa" class="number">--</span>-->
116 118
                      </h2>
......
133 135
                        <img src="../../../assets/img/icons/POLICES.svg" width="30" height="30">
134 136
                      </div>
135 137
                      <h2 class="uk-margin-remove">
136
                        <span class="number">798</span>
138
                        <span class="number">--</span>
137 139
                        <!--<span *ngIf="overviewData.overview.policies?.oa" class="number">{{overviewData.overview.policies.oa | number}}</span>-->
138 140
                        <!--<span *ngIf="!overviewData.overview.policies || !overviewData.overview.policies.oa" class="number">--</span>-->
139 141
                      </h2>
......
159 161
            <!--<span class="sub-heading">The Best Images From Around The World</span>-->
160 162
          </h2>
161 163
          <div class="uk-grid">
162
            <div class="uk-width-1-2">
164
            <div class="uk-width-1-3">
163 165
              <div class="md-card">
164 166
                <div class="md-card-toolbar">
165 167
                  <div class="md-card-toolbar-actions">
......
172 174
                  </h3>
173 175
                </div>
174 176
                <div class="md-card-content">
175
                  <img src="../../../assets/img/mocks/monthly-average-temperat.png">
177
                  <iframe *ngIf="greenGoldLineChartURL" width="100%" height="350" [src]="greenGoldLineChartURL"></iframe>
178
                  <!--<img src="../../../assets/img/mocks/monthly-average-temperat.png">-->
176 179
                </div>
177 180
              </div>
178 181
            </div>
179
            <div class="uk-width-1-2">
182
            <div class="uk-width-1-3">
180 183
              <div class="md-card">
181 184
                <div class="md-card-toolbar">
182 185
                  <div class="md-card-toolbar-actions">
......
189 192
                  </h3>
190 193
                </div>
191 194
                <div class="md-card-content">
192
                  <img src="../../../assets/img/mocks/stacked-bar-chart.png">
195
                  <iframe *ngIf="goldOrganisationsChartURL" width="100%" height="350" [src]="goldOrganisationsChartURL"></iframe>
193 196
                </div>
194 197
              </div>
195 198
            </div>
199
            <div class="uk-width-1-3">
200
              <div class="md-card">
201
                <div class="md-card-toolbar">
202
                  <div class="md-card-toolbar-actions">
203
                    <i class="fas fa-lg fa-info-circle"></i>
204
                    <i class="fas fa-lg fa-download uk-margin-left"></i>
205
                    <i class="fas fa-lg fa-file-pdf uk-margin-left"></i>
206
                  </div>
207
                  <h3 class="md-card-toolbar-heading-text">
208
                    <!--Card Heading-->
209
                  </h3>
210
                </div>
211
                <div class="md-card-content">
212
                  <iframe *ngIf="greenOrganisationsChartURL" width="100%" height="350" [src]="greenOrganisationsChartURL"></iframe>
213
                </div>
214
              </div>
215
            </div>
196 216
          </div>
197 217
        </div>
198 218

  
......
216 236
                  </h3>
217 237
                </div>
218 238
                <div class="md-card-content">
219
                  <img src="../../../assets/img/mocks/snow-depth-at-vikjafjell.png">
239
                  <iframe *ngIf="publicationsDataSetsSoftwareByYearGraphURL" width="100%" height="350" [src]="publicationsDataSetsSoftwareByYearGraphURL"></iframe>
220 240
                </div>
221 241
              </div>
222 242
            </div>
......
231 251
                    <i class="fas fa-lg fa-file-pdf uk-margin-left"></i>
232 252
                  </div>
233 253
                  <h3 class="md-card-toolbar-heading-text">
234
                    <!--Card Heading-->
254
                    Organisations
235 255
                  </h3>
236 256
                </div>
237 257
                <div class="md-card-content">
238
                  <table class="uk-table uk-table-small uk-table-divider">
239
                    <thead>
240
                    <tr>
241
                      <th>Table Heading</th>
242
                      <th>Table Heading</th>
243
                      <th>Table Heading</th>
244
                    </tr>
245
                    </thead>
246
                    <tbody>
247
                    <tr>
248
                      <td>Table Data</td>
249
                      <td>Table Data</td>
250
                      <td>Table Data</td>
251
                    </tr>
252
                    <tr>
253
                      <td>Table Data</td>
254
                      <td>Table Data</td>
255
                      <td>Table Data</td>
256
                    </tr>
257
                    <tr>
258
                      <td>Table Data</td>
259
                      <td>Table Data</td>
260
                      <td>Table Data</td>
261
                    </tr>
262
                    </tbody>
263
                  </table>
258
                  <iframe *ngIf="publicationsDataSetsSoftwareByOrganisationTableURL" width="100%" height="730" [src]="publicationsDataSetsSoftwareByOrganisationTableURL"></iframe>
259
                  <!--<table class="uk-table uk-table-small uk-table-divider">-->
260
                    <!--<thead>-->
261
                    <!--<tr>-->
262
                      <!--<th>Table Heading</th>-->
263
                      <!--<th>Table Heading</th>-->
264
                      <!--<th>Table Heading</th>-->
265
                    <!--</tr>-->
266
                    <!--</thead>-->
267
                    <!--<tbody>-->
268
                    <!--<tr>-->
269
                      <!--<td>Table Data</td>-->
270
                      <!--<td>Table Data</td>-->
271
                      <!--<td>Table Data</td>-->
272
                    <!--</tr>-->
273
                    <!--<tr>-->
274
                      <!--<td>Table Data</td>-->
275
                      <!--<td>Table Data</td>-->
276
                      <!--<td>Table Data</td>-->
277
                    <!--</tr>-->
278
                    <!--<tr>-->
279
                      <!--<td>Table Data</td>-->
280
                      <!--<td>Table Data</td>-->
281
                      <!--<td>Table Data</td>-->
282
                    <!--</tr>-->
283
                    <!--</tbody>-->
284
                  <!--</table>-->
264 285
                </div>
265 286
              </div>
266 287
            </div>
......
273 294
                    <i class="fas fa-lg fa-file-pdf uk-margin-left"></i>
274 295
                  </div>
275 296
                  <h3 class="md-card-toolbar-heading-text">
276
                    <!--Card Heading-->
297
                    Repositories
277 298
                  </h3>
278 299
                </div>
279 300
                <div class="md-card-content">
280
                  <table class="uk-table uk-table-small uk-table-divider">
281
                    <thead>
282
                    <tr>
283
                      <th>Table Heading</th>
284
                      <th>Table Heading</th>
285
                      <th>Table Heading</th>
286
                    </tr>
287
                    </thead>
288
                    <tbody>
289
                    <tr>
290
                      <td>Table Data</td>
291
                      <td>Table Data</td>
292
                      <td>Table Data</td>
293
                    </tr>
294
                    <tr>
295
                      <td>Table Data</td>
296
                      <td>Table Data</td>
297
                      <td>Table Data</td>
298
                    </tr>
299
                    <tr>
300
                      <td>Table Data</td>
301
                      <td>Table Data</td>
302
                      <td>Table Data</td>
303
                    </tr>
304
                    </tbody>
305
                  </table>
301
                  <iframe *ngIf="publicationsDataSetsSoftwareByRepoTableURL" width="100%" height="730" [src]="publicationsDataSetsSoftwareByRepoTableURL"></iframe>
302
                  <!--<table class="uk-table uk-table-small uk-table-divider">-->
303
                    <!--<thead>-->
304
                    <!--<tr>-->
305
                      <!--<th>Table Heading</th>-->
306
                      <!--<th>Table Heading</th>-->
307
                      <!--<th>Table Heading</th>-->
308
                    <!--</tr>-->
309
                    <!--</thead>-->
310
                    <!--<tbody>-->
311
                    <!--<tr>-->
312
                      <!--<td>Table Data</td>-->
313
                      <!--<td>Table Data</td>-->
314
                      <!--<td>Table Data</td>-->
315
                    <!--</tr>-->
316
                    <!--<tr>-->
317
                      <!--<td>Table Data</td>-->
318
                      <!--<td>Table Data</td>-->
319
                      <!--<td>Table Data</td>-->
320
                    <!--</tr>-->
321
                    <!--<tr>-->
322
                      <!--<td>Table Data</td>-->
323
                      <!--<td>Table Data</td>-->
324
                      <!--<td>Table Data</td>-->
325
                    <!--</tr>-->
326
                    <!--</tbody>-->
327
                  <!--</table>-->
306 328
                </div>
307 329
              </div>
308 330
            </div>
......
329 351
                  </h3>
330 352
                </div>
331 353
                <div class="md-card-content">
332
                  <img src="../../../assets/img/mocks/historic-world-populatio.png">
354
                  <iframe *ngIf="publicationsDataSetsSoftwareByFunderGraphURL" width="100%" height="450" [src]="publicationsDataSetsSoftwareByFunderGraphURL"></iframe>
333 355
                </div>
334 356
              </div>
335 357
            </div>
......
356 378
                  </h3>
357 379
                </div>
358 380
                <div class="md-card-content">
359
                  <img src="../../../assets/img/mocks/historic-world-populatio-2.png">
381
                  <iframe *ngIf="topProjectsByPublicationsGraphURL" width="100%" height="350" [src]="topProjectsByPublicationsGraphURL"></iframe>
360 382
                </div>
361 383
              </div>
362 384
            </div>
......
373 395
                  </h3>
374 396
                </div>
375 397
                <div class="md-card-content">
376
                  <img src="../../../assets/img/mocks/historic-world-populatio-3.png">
398
                  <iframe *ngIf="topProjectsByDatasetsGraphURL" width="100%" height="350" [src]="topProjectsByDatasetsGraphURL"></iframe>
377 399
                </div>
378 400
              </div>
379 401
            </div>
......
390 412
                  </h3>
391 413
                </div>
392 414
                <div class="md-card-content">
393
                  <img src="../../../assets/img/mocks/historic-world-populatio-4.png">
415
                  <iframe *ngIf="topProjectsBySoftwareGraphURL" width="100%" height="350" [src]="topProjectsBySoftwareGraphURL"></iframe>
394 416
                </div>
395 417
              </div>
396 418
            </div>
......
409 431

  
410 432
            <div class="numbers">
411 433
              <div class="uk-margin-medium-top">
412
                <div class="number">18,165</div>
434
                <div class="number">--</div>
413 435
                <div class="uk-margin-top">R&D expenditure</div>
414 436
              </div>
415 437
              <div class="uk-margin-medium-top">
416
                <div class="number">327</div>
438
                <div *ngIf="!countryData || !countryData.funders || !countryData.funders.oa" class="number">--</div>
439
                <div *ngIf="countryData?.funders?.oa" class="number">{{countryData.funders.oa}}</div>
440
                <div class="uk-margin-top">funding sources</div>
441
              </div>
442
              <div class="uk-margin-medium-top">
443
                <div *ngIf="!countryData || !countryData.funders || !countryData.funders.total" class="number">--</div>
444
                <div *ngIf="countryData?.funders?.total" class="number">{{countryData.funders.total}}</div>
417 445
                <div class="uk-margin-top">funding organizations</div>
418 446
              </div>
419 447
              <div class="uk-margin-medium-top">
420
                <div class="number">18,165</div>
448
                <div *ngIf="!countryData || !countryData.ecFundedOrganizations || !countryData.ecFundedOrganizations.oa" class="number">--</div>
449
                <div *ngIf="countryData?.ecFundedOrganizations?.oa" class="number">{{countryData.ecFundedOrganizations.oa}}</div>
421 450
                <div class="uk-margin-top">organizations funded by the European commission since 2013</div>
422 451
              </div>
423 452
            </div>

Also available in: Unified diff