Project

General

Profile

« Previous | Next » 

Revision 58853

Working on the new version of the oso - almost done with tha data part of the pages

View differences:

europe-map-overview.component.ts
42 42

  
43 43
  joinedPublicationsMap: Map<string, JoinedMapData>;
44 44
  joinedDatasetsMap: Map<string, JoinedMapData>;
45
  joinedRepositoriesMap: Map<string, JoinedMapData>;
46
  joinedJournalsMap: Map<string, JoinedMapData>;
45 47

  
46 48
  constructor(private dataService: DataService,
47 49
              private dataHandlerService: DataHandlerService,
......
62 64
        this.overviewMapData = this.dataHandlerService.convertRawMapDataToMapData(rawData);
63 65
        this.joinedPublicationsMap = this.dataHandlerService.createJoinedPublicationsCountryMap(rawData);
64 66
        this.joinedDatasetsMap = this.dataHandlerService.createJoinedDatasetsCountryMap(rawData);
67
        this.joinedRepositoriesMap = this.dataHandlerService.createJoinedRepositoriesCountryMap(rawData);
68
        this.joinedJournalsMap = this.dataHandlerService.createJoinedJournalsCountryMap(rawData);
65 69

  
66 70
        // console.log('Country map data', this.overviewMapData[this.activeView]);
67 71
        this.loadMap(this.overviewMapData[this.activeView], this.seriesColor, this.seriesColor);
......
329 333
        '<span class="number">' + params.data.value[2].toLocaleString() + '</span>' +
330 334
        '<span><i>repositories</i> from <br>openDOAR & re3data</span></div>';
331 335

  
336
      tooltip += '<div class="indicator uk-margin-small-top">' +
337
        '<span class="number">' + this.joinedRepositoriesMap.get(params.name).simple.toLocaleString() + '</span>' +
338
        '<span><i>repositories</i></span></div>';
339

  
332 340
      tooltip += '</div>';
333 341

  
334 342
    } else if (this.activeView === 'journals') {
......
336 344
      tooltip += '<div class="numbers">';
337 345
      tooltip += '<div class="indicator">' +
338 346
        '<span class="number">' + params.data.value[2].toLocaleString() + '</span>' +
339
        '<span><i>journals</i> from <br>DOAJ</span></div>';
347
        '<span><i>journals</i> from DOAJ</span></div>';
340 348

  
349
      tooltip += '<div class="indicator uk-margin-small-top">' +
350
        '<span class="number">' + this.joinedJournalsMap.get(params.name).simple.toLocaleString() + '</span>' +
351
        '<span><i>journals</i></span></div>';
352

  
341 353
      tooltip += '</div>';
342 354

  
343 355
    } else {

Also available in: Unified diff