/modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/continent-overview.component.ts - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 58946

Added by Stefania Martziou almost 4 years ago

Created the indicator tables for the open science tab of the europe page

     import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
     import { DataService } from '../../services/data.service';
     import { DataHandlerService } from '../../services/data-handler.service';
     import { EuropeData } from '../../domain/overview-map-data';
     import {CountryTableData, EuropeData} from '../../domain/overview-map-data';
     import { environment } from '../../../environments/environment';
     import { TreemapHighchartsData } from '../../domain/treemap-highcharts-data';
     import {Observable} from 'rxjs';
     @Component({
       selector: 'app-continent-overview',
-...
       greenVsGoldPublicationsChartURL: SafeResourceUrl;
       loadingPublicationsAbsoluteTable: boolean = true;
       loadingPublicationsPercentageTable: boolean = true;
       publicationsTableContentSelection: string = 'affiliated';
       publicationsAbsoluteTableData: CountryTableData[];
       publicationsPercentageTableData: CountryTableData[];
       // Open Science Tab
       // datasets subtab
       openScienceDatasetsTabIsInitialised: boolean = false;
-...
       datasetsWithPIDByFunderData: TreemapHighchartsData[];
       datasetsWithLicenceByFunderData: TreemapHighchartsData[];
       loadingDatasetsAbsoluteTable: boolean = true;
       loadingDatasetsPercentageTable: boolean = true;
       datasetsTableContentSelection: string = 'affiliated';
       datasetsAbsoluteTableData: CountryTableData[];
       datasetsPercentageTableData: CountryTableData[];
       // Open Science Tab
       // software subtab
       openScienceSoftwareTabIsInitialised: boolean = false;
-...
       softwareWithPIDByFunderData: TreemapHighchartsData[];
       softwareWithLicenceByFunderData: TreemapHighchartsData[];
       loadingSoftwareAbsoluteTable: boolean = true;
       loadingSoftwarePercentageTable: boolean = true;
       softwareTableContentSelection: string = 'affiliated';
       softwareAbsoluteTableData: CountryTableData[];
       softwarePercentageTableData: CountryTableData[];
       // Open Science Tab
       // other research products subtab
       openScienceOtherTabIsInitialised: boolean = false;
-...
       otherWithPIDByFunderData: TreemapHighchartsData[];
       otherWithLicenceByFunderData: TreemapHighchartsData[];
       loadingOtherAbsoluteTable: boolean = true;
       loadingOtherPercentageTable: boolean = true;
       otherTableContentSelection: string = 'affiliated';
       otherAbsoluteTableData: CountryTableData[];
       otherPercentageTableData: CountryTableData[];
       constructor(private dataService: DataService,
                   private dataHandlerService: DataHandlerService,
                   private route: ActivatedRoute,
-...
+            }
           );
           this.getPublicationsTableData(this.publicationsTableContentSelection);
           this.openSciencePubsTabIsInitialised = true;
+        }
+      }
-...
+            }
           );
           this.getDatasetsTableData(this.datasetsTableContentSelection);
           this.openSciencePubsTabIsInitialised = true;
+        }
+      }
-...
+            }
           );
           this.getSoftwareTableData(this.softwareTableContentSelection);
           this.openScienceSoftwareTabIsInitialised = true;
+        }
+      }
-...
+            }
           );
           this.getOtherTableData(this.otherTableContentSelection);
           this.openScienceOtherTabIsInitialised = true;
+        }
+      }
       getContent(type: string, contentSelection: string): void {
         if (type === 'publication') {
           this.publicationsTableContentSelection = contentSelection;
           this.getPublicationsTableData(this.publicationsTableContentSelection);
         } else if (type === 'dataset') {
           this.datasetsTableContentSelection = contentSelection;
           this.getDatasetsTableData(this.datasetsTableContentSelection);
         } else if (type === 'software') {
           this.softwareTableContentSelection = contentSelection;
           this.getSoftwareTableData(this.softwareTableContentSelection);
         } else if (type === 'other') {
           this.otherTableContentSelection = contentSelection;
           this.getOtherTableData(this.otherTableContentSelection);
+        }
+      }
       getPublicationsTableData(contentSelection: string) {
         this.loadingPublicationsAbsoluteTable = true;
         this.loadingPublicationsPercentageTable = true;
         this.dataService.getIndicatorsTableData('publication', contentSelection).subscribe(
           rawData => {
             this.publicationsAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
             this.publicationsPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
             this.loadingPublicationsAbsoluteTable = false;
             this.loadingPublicationsPercentageTable = false;
           }, error => {
             console.log(error);
             this.loadingPublicationsAbsoluteTable = false;
             this.loadingPublicationsPercentageTable = false;
+          }
         );
+      }
       getDatasetsTableData(contentSelection: string) {
         this.loadingDatasetsAbsoluteTable = true;
         this.loadingDatasetsPercentageTable = true;
         this.dataService.getIndicatorsTableData('dataset', contentSelection).subscribe(
           rawData => {
             this.datasetsAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
             this.datasetsPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
             this.loadingDatasetsAbsoluteTable = false;
             this.loadingDatasetsPercentageTable = false;
           }, error => {
             console.log(error);
             this.loadingDatasetsAbsoluteTable = false;
             this.loadingDatasetsPercentageTable = false;
+          }
         );
+      }
       getSoftwareTableData(contentSelection: string) {
         this.loadingSoftwareAbsoluteTable = true;
         this.loadingSoftwarePercentageTable = true;
         this.dataService.getIndicatorsTableData('software', contentSelection).subscribe(
           rawData => {
             this.softwareAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
             this.softwarePercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
             this.loadingSoftwareAbsoluteTable = false;
             this.loadingSoftwarePercentageTable = false;
           }, error => {
             console.log(error);
             this.loadingSoftwareAbsoluteTable = false;
             this.loadingSoftwarePercentageTable = false;
+          }
         );
+      }
       getOtherTableData(contentSelection: string) {
         this.loadingOtherAbsoluteTable = true;
         this.loadingOtherPercentageTable = true;
         this.dataService.getIndicatorsTableData('other', contentSelection).subscribe(
           rawData => {
             this.otherAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
             this.otherPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
             this.loadingOtherAbsoluteTable = false;
             this.loadingOtherPercentageTable = false;
           }, error => {
             console.log(error);
             this.loadingOtherAbsoluteTable = false;
             this.loadingOtherPercentageTable = false;
+          }
         );
+      }
+    }

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 58946

Added by Stefania Martziou almost 4 years ago