[Connect|Trunk]
Update community page: new stats layout (overview and chart analysis) apply changes to stats component to get display options both for monitor and dashboard views App component: remove monitor from menu git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@56109 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki
parent
957e6723b3
commit
ef629531e6
|
|
@ -297,10 +297,10 @@ export class AppComponent {
|
|||
new MenuItem("","Projects","","/search/find/projects/",false,["project"],["/search/find/projects"],this.properties.environment!="development"?{}:{communityId:community.communityId}),
|
||||
new MenuItem("","Content Providers","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],this.properties.environment!="development"?{}:{communityId:community.communityId}),
|
||||
]},
|
||||
{
|
||||
/*{
|
||||
rootItem: new MenuItem("monitor","Monitor","","/monitor",false,[],["/monitor"],this.properties.environment!="development"?{}:{communityId:community.communityId}),
|
||||
items: []
|
||||
},
|
||||
},*/
|
||||
{
|
||||
rootItem: new MenuItem("share","Share","","",false,[],["/participate/deposit-publications","/participate/deposit-datasets","/participate/share-zenodo"],this.properties.environment!="development"?{}:{communityId:community.communityId}),
|
||||
items: [
|
||||
|
|
|
|||
|
|
@ -158,206 +158,331 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="uk-section tm-middle uk-container uk-margin-small-top uk-padding-remove-top" id="tm-main">
|
||||
<div class="uk-container uk-margin-bottom uk-grid">
|
||||
<div class="uk-width-expand uk-padding-remove">
|
||||
<article *ngIf="communityInfo" class="uk-article ">
|
||||
<div *ngIf="communityId != null && communityId != '' && community != null">
|
||||
<div class="uk-section tm-middle uk-container uk-margin-small-top uk-padding-remove-top" id="tm-main">
|
||||
<div class="uk-container uk-margin-bottom uk-grid">
|
||||
<div class="uk-width-expand uk-padding-remove">
|
||||
<article *ngIf="communityInfo" class="uk-article ">
|
||||
<div *ngIf="communityId != null && communityId != '' && community != null">
|
||||
|
||||
|
||||
<!-- <div *ngIf="isRouteEnabled('/search/find')" class="uk-margin-top">
|
||||
<div class="uk-text-bold uk-h5">Search research results</div>
|
||||
<search-form [setFormCentered]=false [placeholderText]="getSearchPlaceHolder()" link="/search/find"></search-form>
|
||||
</div>-->
|
||||
<ng-template #stats let-entity="entity" let-entityName="entityName" let-statisticsSum="statisticsSum"
|
||||
let-statisticsDisplay="statisticsDisplay" let-allowedEntities="allowedEntities"
|
||||
let-allowedCharts="allowedCharts" let-chartsUrlMap="chartsUrlMap" let-chartsTitleMap="chartsTitleMap">
|
||||
<!-- <div *ngIf="isRouteEnabled('/search/find')" class="uk-margin-top">
|
||||
<div class="uk-text-bold uk-h5">Search research results</div>
|
||||
<search-form [setFormCentered]=false [placeholderText]="getSearchPlaceHolder()" link="/search/find"></search-form>
|
||||
</div>-->
|
||||
<ng-template #stats let-entity="entity" let-entityName="entityName" let-statisticsSum="statisticsSum"
|
||||
let-statisticsDisplay="statisticsDisplay" let-allowedEntities="allowedEntities"
|
||||
let-allowedCharts="allowedCharts" let-chartsInfoMap="chartsInfoMap"
|
||||
let-showChartTitle="showChartTitle"
|
||||
let-showIn="showIn">
|
||||
|
||||
<div *ngIf="
|
||||
<div *ngIf="
|
||||
statisticsSum && statisticsDisplay &&
|
||||
statisticsSum[entity].total>0" class="uk-grid uk-child-width-1-3">
|
||||
<div
|
||||
class="uk-card portal-card uk-text-right uk-margin-left uk-padding-small"
|
||||
*ngIf="statisticsDisplay.entities[entity].numbers.map['total']['showInMonitor']">
|
||||
<div *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][showIn]" class="uk-padding-remove">
|
||||
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small">
|
||||
<div
|
||||
class="uk-text-large">{{statisticsSum[entity].total|number}}</div>
|
||||
<div>Total
|
||||
{{entityName}}</div>
|
||||
</div>
|
||||
<div class="uk-card portal-card uk-text-right uk-margin-left uk-padding-small"
|
||||
*ngIf="statisticsDisplay.entities[entity].numbers.map['open']['showInMonitor']">
|
||||
</div>
|
||||
<div
|
||||
*ngIf="statisticsDisplay.entities[entity].numbers.map['project'][showIn]" class="uk-padding-remove">
|
||||
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small">
|
||||
<div
|
||||
class="uk-text-large">{{statisticsSum[entity].projects|number}} </div>
|
||||
<div>Total projects linked to {{entityName}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
*ngIf="statisticsDisplay.entities[entity].numbers.map['open'][showIn]" class="uk-padding-remove">
|
||||
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small">
|
||||
<div
|
||||
class="uk-text-large">{{statisticsSum[entity].open_access|number}} </div>
|
||||
<div>Open access
|
||||
{{entityName}}</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div *ngIf=" allowedEntities &&
|
||||
<div *ngIf="statisticsDisplay.entities[entity].numbers.map['closed'][showIn]" class="uk-padding-remove">
|
||||
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small">
|
||||
<div
|
||||
class="uk-text-large">{{statisticsSum[entity].closed_access|number}} </div>
|
||||
<div>Closed access
|
||||
{{entityName}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
*ngIf="statisticsDisplay.entities[entity].numbers.map['embargo'][showIn]" class="uk-padding-remove">
|
||||
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small">
|
||||
<div
|
||||
class="uk-text-large">{{statisticsSum[entity].embargo|number}} </div>
|
||||
<div>Embargo
|
||||
{{entityName}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
*ngIf="statisticsDisplay.entities[entity].numbers.map['restricted'][showIn]"
|
||||
class="uk-padding-remove">
|
||||
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small">
|
||||
<div
|
||||
class="uk-text-large">{{statisticsSum[entity].restricted|number}} </div>
|
||||
<div>Restricted
|
||||
{{entityName}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div *ngIf=" allowedEntities &&
|
||||
statisticsSum && allowedCharts && statisticsSum[entity] &&
|
||||
allowedCharts[entity] && statisticsSum[entity].total>0 &&
|
||||
allowedCharts[entity].length>0" class="uk-position-relative uk-visible-toggle" uk-slider="">
|
||||
<ul class="uk-slider-items " uk-grid>
|
||||
<li *ngFor="let chart of allowedCharts[entity]" >
|
||||
allowedCharts[entity].length>0">
|
||||
<div *ngIf="showIn == 'showInDashboard'">
|
||||
<div class="uk-position-relative uk-visible-toggle" uk-slider="">
|
||||
<ul class="uk-slider-items " uk-grid>
|
||||
<li *ngFor="let chart of allowedCharts[entity]">
|
||||
|
||||
<div class=" iframeContainer uk-height-medium uk-margin-top">
|
||||
<div class=" uk-h5 uk-text-muted" >
|
||||
{{chartsTitleMap[chart]}}</div>
|
||||
<iframe [src]=chartsUrlMap[chart] scrolling="no"></iframe>
|
||||
<div class=" iframeContainer uk-height-medium uk-margin-top">
|
||||
<div *ngIf="showChartTitle[chart]" class=" uk-h5 uk-text-muted">
|
||||
{{chartsInfoMap[chart].title}}</div>
|
||||
<iframe [src]=chartsInfoMap[chart].url scrolling="no"></iframe>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<a *ngIf="(allowedCharts[entity].length > 2)"
|
||||
class="uk-position-center-left uk-position-small uk-hidden-hover" href="#" uk-slidenav-previous
|
||||
uk-slider-item="previous"></a>
|
||||
<a *ngIf="(allowedCharts[entity].length > 2)"
|
||||
class="uk-position-center-right uk-position-small uk-hidden-hover" href="#" uk-slidenav-next
|
||||
uk-slider-item="next"></a>
|
||||
</div>
|
||||
<div *ngIf=" allowedEntities &&
|
||||
statisticsSum && allowedCharts && statisticsSum[entity] &&
|
||||
allowedCharts[entity] && statisticsSum[entity].total>0 &&
|
||||
allowedCharts[entity].length>0">
|
||||
<hr class="uk-margin-top">
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="showIn == 'showInMonitor'" class="uk-grid uk-child-width-1-2 ">
|
||||
<div *ngFor="let chart of allowedCharts[entity]" class="uk-clearfix uk-margin-bottom">
|
||||
|
||||
<div class=" iframeContainer uk-height-large uk-margin-top">
|
||||
<div *ngIf="showChartTitle[chart]" class=" uk-h5 uk-text-muted">
|
||||
{{chartsInfoMap[chart].title}}</div>
|
||||
<iframe [src]=chartsInfoMap[chart].url scrolling="no" class=""></iframe>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<a *ngIf="(allowedCharts[entity].length > 2)"
|
||||
class="uk-position-center-left uk-position-small uk-hidden-hover" href="#" uk-slidenav-previous uk-slider-item="previous"></a>
|
||||
<a *ngIf="(allowedCharts[entity].length > 2)"
|
||||
class="uk-position-center-right uk-position-small uk-hidden-hover" href="#" uk-slidenav-next uk-slider-item="next"></a>
|
||||
</div>
|
||||
<div *ngIf=" allowedEntities &&
|
||||
statisticsSum && allowedCharts && statisticsSum[entity] &&
|
||||
allowedCharts[entity] && statisticsSum[entity].total>0 &&
|
||||
allowedCharts[entity].length>0" >
|
||||
<hr class="uk-margin-top">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</ng-template>
|
||||
<div class="uk-margin-large-top uk-grid customTabs">
|
||||
</ng-template>
|
||||
<div class="uk-float-right">
|
||||
<button [class]="'uk-button '+((overview)?'uk-disabled ':' uk-button-default ')"
|
||||
(click)="overview=!overview;">Overview
|
||||
</button>
|
||||
{{" "}}
|
||||
<button [class]="'uk-button '+((!overview)?'uk-disabled ':' uk-button-default ')"
|
||||
(click)="overview=!overview;">Chart Analysis
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
||||
<ul class=" customTabsTitle uk-tab uk-tab-left uk-width-1-5"
|
||||
data-uk-tab="{connect: '#resultTabs'">
|
||||
<li *ngIf="isEntityEnabled('publication')" (click)="searchPublications()" class="uk-active"><a
|
||||
href="#">publications</a></li>
|
||||
<li *ngIf="isEntityEnabled('dataset')" (click)="searchResearchData()"><a href="#">research data</a></li>
|
||||
<li *ngIf="isEntityEnabled('software')" (click)="searchSoftware()"><a href="#">software</a></li>
|
||||
<li *ngIf="isEntityEnabled('orp')" (click)="searchOrps()"><a href="#">other research products</a></li>
|
||||
</ul>
|
||||
<div class="uk-margin-top customTabs">
|
||||
|
||||
<ul id="resultTabs" class=" customTabsContent uk-switcher uk-width-expand" style="min-height:450px;">
|
||||
<li *ngIf="isEntityEnabled('publication')" class="uk-padding">
|
||||
|
||||
<ul class=" uk-margin-remove"
|
||||
data-uk-tab="{connect: '#resultTabs'">
|
||||
<li *ngIf="isEntityEnabled('publication')" (click)="searchPublications()" class="uk-active"><a
|
||||
href="#">publications</a></li>
|
||||
<li *ngIf="isEntityEnabled('dataset')" (click)="searchResearchData()"><a href="#">research data</a></li>
|
||||
<li *ngIf="isEntityEnabled('software')" (click)="searchSoftware()"><a href="#">software</a></li>
|
||||
<li *ngIf="isEntityEnabled('orp')" (click)="searchOrps()"><a href="#">other research products</a></li>
|
||||
</ul>
|
||||
|
||||
<ul id="resultTabs" class=" customTabsContent uk-switcher " style="min-height:450px;">
|
||||
<li *ngIf="isEntityEnabled('publication')" class="uk-padding">
|
||||
<div *ngIf="overview">
|
||||
<div *ngIf="statistics !=null && activeTab == 'publication'">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'publication', entityName:
|
||||
'publications' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntities, allowedCharts:statistics.allowedCharts,
|
||||
chartsUrlMap:statistics.chartsUrlMap, chartsTitleMap:statistics.chartsTitleMap}"></ng-container>
|
||||
allowedEntities: statistics.allowedEntitiesMode['showInDashboard'],
|
||||
allowedCharts:statistics.allowedChartsMode['showInDashboard'], showChartTitle: statistics.chartTitlesMode['showInDashboard'],
|
||||
|
||||
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInDashboard'}"></ng-container>
|
||||
</div>
|
||||
<results-comp [results]=publicationResults [total]=publicationTotal resultType="publication"
|
||||
[community]=community [params]=params [showLoading]="showLoading"
|
||||
[properties]="properties"
|
||||
class=""></results-comp>
|
||||
</div>
|
||||
<div *ngIf="!overview">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'publication', entityName:
|
||||
'publications' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'],
|
||||
allowedCharts:statistics.allowedChartsMode['showInMonitor'], showChartTitle: statistics.chartTitlesMode['showInMonitor'],
|
||||
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}"></ng-container>
|
||||
|
||||
</li>
|
||||
<li *ngIf="isEntityEnabled('dataset')" class="uk-padding">
|
||||
</div>
|
||||
|
||||
|
||||
</li>
|
||||
<li *ngIf="isEntityEnabled('dataset')" class="uk-padding">
|
||||
<div *ngIf="overview">
|
||||
<div *ngIf="statistics !=null && activeTab == 'dataset'">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'dataset', entityName:
|
||||
'research data' , statisticsSum:statistics.statisticsSum,
|
||||
statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntities, allowedCharts:statistics.allowedCharts, chartsUrlMap:statistics.chartsUrlMap, chartsTitleMap:statistics.chartsTitleMap}"></ng-container>
|
||||
</div>
|
||||
<results-comp [results]=researchDataResults [total]=researchDataTotal resultType="dataset"
|
||||
[community]=community [params]=params [showLoading]="showLoading"
|
||||
[properties]="properties" class="uk-width-expand"></results-comp>
|
||||
allowedEntities: statistics.allowedEntitiesMode['showInDashboard'],
|
||||
allowedCharts:statistics.allowedChartsMode['showInDashboard'], showChartTitle: statistics.chartTitlesMode['showInDashboard'],
|
||||
|
||||
</li>
|
||||
<li *ngIf="isEntityEnabled('software')" class="uk-padding">
|
||||
<div *ngIf="statistics !=null && activeTab == 'software'">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'software', entityName:
|
||||
'software' , statisticsSum:statistics.statisticsSum,
|
||||
statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntities, allowedCharts:statistics.allowedCharts, chartsUrlMap:statistics.chartsUrlMap, chartsTitleMap:statistics.chartsTitleMap}"></ng-container>
|
||||
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInDashboard'}"></ng-container>
|
||||
</div>
|
||||
<results-comp [results]=softwareResults [total]=softwareTotal resultType="software"
|
||||
[community]=community [params]=params [showLoading]="showLoading"
|
||||
[properties]="properties" class="uk-width-expand"></results-comp>
|
||||
<results-comp [results]=publicationResults [total]=publicationTotal resultType="dataset"
|
||||
[community]=community [params]=params [showLoading]="showLoading"
|
||||
[properties]="properties"
|
||||
class=""></results-comp>
|
||||
</div>
|
||||
<div *ngIf="!overview">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'dataset', entityName:
|
||||
'research data' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'],
|
||||
allowedCharts:statistics.allowedChartsMode['showInMonitor'], showChartTitle: statistics.chartTitlesMode['showInMonitor'],
|
||||
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}"></ng-container>
|
||||
|
||||
</li>
|
||||
<li *ngIf="isEntityEnabled('orp')" class="uk-padding">
|
||||
<div *ngIf="statistics !=null && activeTab == 'orp' ">
|
||||
</div>
|
||||
|
||||
|
||||
</li>
|
||||
<li *ngIf="isEntityEnabled('software')" class="uk-padding">
|
||||
<div *ngIf="overview">
|
||||
<div *ngIf="statistics !=null && activeTab == 'software'">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'publication', entityName:
|
||||
'software' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntitiesMode['showInDashboard'],
|
||||
allowedCharts:statistics.allowedChartsMode['showInDashboard'], showChartTitle: statistics.chartTitlesMode['showInDashboard'],
|
||||
|
||||
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInDashboard'}"></ng-container>
|
||||
</div>
|
||||
<results-comp [results]=publicationResults [total]=publicationTotal resultType="software"
|
||||
[community]=community [params]=params [showLoading]="showLoading"
|
||||
[properties]="properties"
|
||||
class=""></results-comp>
|
||||
</div>
|
||||
<div *ngIf="!overview">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'software', entityName:
|
||||
'software' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'],
|
||||
allowedCharts:statistics.allowedChartsMode['showInMonitor'], showChartTitle: statistics.chartTitlesMode['showInMonitor'],
|
||||
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}"></ng-container>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</li>
|
||||
<li *ngIf="isEntityEnabled('orp')" class="uk-padding">
|
||||
<div *ngIf="overview">
|
||||
<div *ngIf="statistics !=null && activeTab == 'orp'">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'orp', entityName:
|
||||
'other products' , statisticsSum:statistics.statisticsSum,
|
||||
statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntities, allowedCharts:statistics.allowedCharts, chartsUrlMap:statistics.chartsUrlMap, chartsTitleMap:statistics.chartsTitleMap}"></ng-container>
|
||||
allowedEntities: statistics.allowedEntitiesMode['showInDashboard'],
|
||||
allowedCharts:statistics.allowedChartsMode['showInDashboard'], showChartTitle: statistics.chartTitlesMode['showInDashboard'],
|
||||
|
||||
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInDashboard'}"></ng-container>
|
||||
</div>
|
||||
<results-comp [results]=orpResults [total]=orpTotal resultType="other" [community]=community
|
||||
[params]=params [showLoading]="showLoading" [properties]="properties"
|
||||
class="uk-width-expand"></results-comp>
|
||||
<results-comp [results]=publicationResults [total]=publicationTotal resultType="publication"
|
||||
[community]=community [params]=params [showLoading]="showLoading"
|
||||
[properties]="properties"
|
||||
class=""></results-comp>
|
||||
</div>
|
||||
<div *ngIf="!overview">
|
||||
<ng-container *ngTemplateOutlet="stats; context: { entity: 'orp', entityName:
|
||||
'publications' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
|
||||
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'],
|
||||
allowedCharts:statistics.allowedChartsMode['showInMonitor'], showChartTitle: statistics.chartTitlesMode['showInMonitor'],
|
||||
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}"></ng-container>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- <hr>-->
|
||||
<!--<div *ngIf="statistics && statistics.allowedEntities && countOtherGraphs()>0">
|
||||
<div class="uk-text-bold uk-h5">
|
||||
Other Graphs
|
||||
</div>
|
||||
<!-- <hr>-->
|
||||
<!--<div *ngIf="statistics && statistics.allowedEntities && countOtherGraphs()>0">
|
||||
<div class="uk-text-bold uk-h5">
|
||||
Other Graphs
|
||||
</div>
|
||||
<div *ngIf="statistics && statistics.allowedEntities" class="uk-margin-top uk-grid">
|
||||
<ng-container *ngFor="let entity of statistics.allowedEntities">
|
||||
<ng-container *ngIf="statistics.statisticsSum[entity].total>0 && statistics.allowedCharts[entity].length>0 && activeTab!=entity">
|
||||
<div *ngIf="statistics && statistics.allowedEntities" class="uk-margin-top uk-grid">
|
||||
<ng-container *ngFor="let entity of statistics.allowedEntities">
|
||||
<ng-container *ngIf="statistics.statisticsSum[entity].total>0 && statistics.allowedCharts[entity].length>0 && activeTab!=entity">
|
||||
|
||||
<ng-container *ngIf="statistics.allowedCharts[entity] " >
|
||||
<div *ngFor="let chart of statistics.allowedCharts[entity]" class="uk-width-1-2@m uk-first-column">
|
||||
<div class="iframeContainer">
|
||||
<iframe [src]=statistics.chartsUrlMap[chart] scrolling="no"></iframe>
|
||||
</div>
|
||||
<ng-container *ngIf="statistics.allowedCharts[entity] " >
|
||||
<div *ngFor="let chart of statistics.allowedCharts[entity]" class="uk-width-1-2@m uk-first-column">
|
||||
<div class="iframeContainer">
|
||||
<iframe [src]=statistics.chartsUrlMap[chart] scrolling="no"></iframe>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
</div>
|
||||
</div>-->
|
||||
</ng-container>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<statistics-for-dashboard [currentMode]="'showInDashboard'"></statistics-for-dashboard>
|
||||
|
||||
</div>
|
||||
<statistics-for-dashboard [currentMode]="'showInDashboard'"></statistics-for-dashboard>
|
||||
|
||||
|
||||
<div class="communityPanelBackground uk-margin-top uk-padding-small">
|
||||
<div class="uk-container uk-margin-top uk-margin-bottom "
|
||||
*ngIf="communityId != null && communityId != '' && community != null && communityInfo!=null" >
|
||||
<div class="uk-grid">
|
||||
<div class="uk-width-2-5@m uk-width-1-1@s uk-first-column uk-margin-top">
|
||||
<div *ngIf="community.date != null"><span
|
||||
class="lowOpacityColor">Created</span> {{community.date | date:'dd-MM-yyyy'}}</div>
|
||||
<subscribe *ngIf="communityId != null" [communityId]="communityId" showNumbers=true class=""></subscribe>
|
||||
<div *ngIf=" isRouteEnabled('/participate/share-zenodo')" class="">
|
||||
<a [queryParams]=params routerLinkActive="router-link-active" routerLink="/participate/share-zenodo">
|
||||
<span class="lowOpacityColor">Zenodo communities </span> <span>
|
||||
<div class="communityPanelBackground uk-margin-top uk-padding-small">
|
||||
<div class="uk-container uk-margin-top uk-margin-bottom "
|
||||
*ngIf="communityId != null && communityId != '' && community != null && communityInfo!=null">
|
||||
<div class="uk-grid">
|
||||
<div class="uk-width-2-5@m uk-width-1-1@s uk-first-column uk-margin-top">
|
||||
<div *ngIf="community.date != null"><span
|
||||
class="lowOpacityColor">Created</span> {{community.date | date:'dd-MM-yyyy'}}</div>
|
||||
<subscribe *ngIf="communityId != null" [communityId]="communityId" showNumbers=true class=""></subscribe>
|
||||
<div *ngIf=" isRouteEnabled('/participate/share-zenodo')" class="">
|
||||
<a [queryParams]=params routerLinkActive="router-link-active" routerLink="/participate/share-zenodo">
|
||||
<span class="lowOpacityColor">Zenodo communities </span> <span>
|
||||
{{zenodoCommunityIdS.length + ((masterZenodoCommunity) ? 1 : 0)}}</span>{{" "}}
|
||||
<span class="uk-icon"
|
||||
uk-tooltip="title:<div class='uk-margin'>Zenodo is a catch-all repository for OpenAIRE<hr>A zenodo community is created and curated by Zenodo users</div>">
|
||||
<span class="uk-icon"
|
||||
uk-tooltip="title:<div class='uk-margin'>Zenodo is a catch-all repository for OpenAIRE<hr>A zenodo community is created and curated by Zenodo users</div>">
|
||||
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="question"
|
||||
ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle><circle
|
||||
cx="10.44" cy="14.42" r="1.05"></circle><path fill="none" stroke="#000" stroke-width="1.2"
|
||||
d="M8.17,7.79 C8.17,4.75 12.72,4.73 12.72,7.72 C12.72,8.67 11.81,9.15 11.23,9.75 C10.75,10.24 10.51,10.73 10.45,11.4 C10.44,11.53 10.43,11.64 10.43,11.75"></path></svg>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="isRouteEnabled('/curators')" class="uk-width-3-5@m uk-width-1-1@s uk-margin-top">
|
||||
<curators [main]="false" [managers]="community.managers" [communityId]="communityId"></curators>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div *ngIf="isRouteEnabled('/curators')" class="uk-width-3-5@m uk-width-1-1@s uk-margin-top">
|
||||
<curators [main]="false" [managers]="community.managers" [communityId]="communityId"></curators>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-section tm-middle uk-container uk-margin-top uk-padding-remove-top" id="" *ngIf="communityId != null
|
||||
</div>
|
||||
<div class="uk-section tm-middle uk-container uk-margin-top uk-padding-remove-top" id="" *ngIf="communityId != null
|
||||
&& communityId != '' && community != null && communityInfo != null">
|
||||
<ng-container *ngIf=" isRouteEnabled('/organizations')">
|
||||
<div class="uk-container uk-margin-bottom uk-grid">
|
||||
<div class="uk-width-expand uk-padding-remove">
|
||||
<affiliations [fullView]="false" [getAffiliationsFromAPI]="true" [communityFirstPage]="true"></affiliations>
|
||||
</div>
|
||||
<ng-container *ngIf=" isRouteEnabled('/organizations')">
|
||||
<div class="uk-container uk-margin-bottom uk-grid">
|
||||
<div class="uk-width-expand uk-padding-remove">
|
||||
<affiliations [fullView]="false" [getAffiliationsFromAPI]="true" [communityFirstPage]="true"></affiliations>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
|
||||
<div *ngIf="(communityId == null || communityId == '' ) && !communityInfo"
|
||||
class="uk-section tm-middle uk-container uk-margin-large-top " >
|
||||
class="uk-section tm-middle uk-container uk-margin-large-top ">
|
||||
<div class="uk-container uk-margin-bottom uk-grid">
|
||||
<div class="uk-width-expand uk-padding-remove">
|
||||
<article class="uk-article ">
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ export class CommunityComponent {
|
|||
public subOrps;
|
||||
@ViewChild(StatisticsForDashboardComponent) statistics: StatisticsForDashboardComponent = null;
|
||||
public activeTab = "publication";
|
||||
public overview: boolean = true;
|
||||
|
||||
constructor(
|
||||
private element: ElementRef,
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ import { RouterModule } from '@angular/router';
|
|||
import{StatisticsComponent} from './statistics.component';
|
||||
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'
|
||||
// import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: StatisticsComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
|
||||
{ path: '', component: StatisticsComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
]
|
||||
|
|
|
|||
|
|
@ -40,11 +40,14 @@ export class StatisticsComponent {
|
|||
chartCatsList: string[] = availableCharts;
|
||||
allowedCharts: Map<string,string[]> = new Map<string,string[]>();
|
||||
allowedEntities: string[] = [];
|
||||
allowedChartsMode = {showInMonitor:new Map<string,string[]>(), showInDashboard:new Map<string,string[]>()};
|
||||
allowedEntitiesMode = {showInMonitor:[], showInDashboard:[]};
|
||||
|
||||
statisticsSum: StatisticsSummary =null;
|
||||
statisticsDisplay: StatisticsDisplay = null;
|
||||
chartsUrlMap: {};
|
||||
chartsTitleMap: {};
|
||||
chartTitlesMode = {showInMonitor:{}, showInDashboard:{}};
|
||||
chartsInfoMap: {};
|
||||
|
||||
displayedTimeline: string;
|
||||
displayedTimelineUrl: string;
|
||||
|
|
@ -136,7 +139,6 @@ export class StatisticsComponent {
|
|||
.subscribe(
|
||||
res => {
|
||||
this.statisticsDisplay = res;
|
||||
console.log(this.statisticsDisplay)
|
||||
this.createChartUrlMap();
|
||||
this.getCommunityInfo();
|
||||
this.status = this.errorCodes.DONE;
|
||||
|
|
@ -175,30 +177,65 @@ export class StatisticsComponent {
|
|||
initializeDisplayedCharts() {
|
||||
let firstEntity: string;
|
||||
this.entitiesList = Array.from( this.entitiesMap.keys() );
|
||||
|
||||
this.allowedChartsMode[this.currentMode]= this.allowedCharts;
|
||||
this.allowedEntitiesMode[this.currentMode]=this.allowedEntities;
|
||||
let titles= [];
|
||||
// console.log('this.entitiesList is',this.entitiesList);
|
||||
// console.log(`my current mode is: ${this.currentMode}`);
|
||||
for (let entity of this.entitiesList) {
|
||||
if (this.statisticsDisplay.entities[entity] && this.statisticsSum[entity].total && this.communityInfo.entities.filter(x => x['pid'] == entity && x['isEnabled']===true).length ) {
|
||||
this.allowedCharts[entity] = [];
|
||||
this.allowedChartsMode.showInDashboard[entity]=[];
|
||||
this.allowedChartsMode.showInMonitor[entity]=[];
|
||||
for (let chart of this.chartCatsList){
|
||||
if (this.statisticsSum[entity].total &&
|
||||
this.statisticsDisplay.entities[entity].charts.map[chart] &&
|
||||
this.statisticsDisplay.entities[entity].charts.map[chart][this.currentMode] &&
|
||||
this.statisticsDisplay.entities[entity].charts.map[chart]["showInDashboard"] &&
|
||||
this.chartsUrlMap[entity + this.getCamelCaseString(chart)]) {
|
||||
this.allowedCharts[entity].push(entity + this.getCamelCaseString(chart));
|
||||
this.allowedChartsMode.showInDashboard[entity].push(entity + this.getCamelCaseString(chart));
|
||||
if(titles.indexOf("dashboard"+ this.chartsInfoMap[entity + this.getCamelCaseString(chart)].title)==-1){
|
||||
titles.push("dashboard"+this.chartsInfoMap[entity + this.getCamelCaseString(chart)].title);
|
||||
this.chartTitlesMode.showInDashboard[entity + this.getCamelCaseString(chart)]=true;
|
||||
}else{
|
||||
this.chartTitlesMode.showInDashboard[entity + this.getCamelCaseString(chart)]=false;
|
||||
}
|
||||
|
||||
// console.log(`added ${entity} - ${chart} to allowedCharts`);
|
||||
}
|
||||
if (this.statisticsSum[entity].total &&
|
||||
this.statisticsDisplay.entities[entity].charts.map[chart] &&
|
||||
this.statisticsDisplay.entities[entity].charts.map[chart]["showInMonitor"] &&
|
||||
this.chartsUrlMap[entity + this.getCamelCaseString(chart)]) {
|
||||
this.allowedChartsMode.showInMonitor[entity].push(entity + this.getCamelCaseString(chart));
|
||||
if(titles.indexOf("monitor"+this.chartsInfoMap[entity + this.getCamelCaseString(chart)].title)==-1){
|
||||
titles.push("monitor"+this.chartsInfoMap[entity + this.getCamelCaseString(chart)].title);
|
||||
this.chartTitlesMode.showInMonitor[entity + this.getCamelCaseString(chart)]=true;
|
||||
}else{
|
||||
this.chartTitlesMode.showInMonitor[entity + this.getCamelCaseString(chart)]=false;
|
||||
}
|
||||
// console.log(`added ${entity} - ${chart} to allowedCharts`);
|
||||
|
||||
}
|
||||
}
|
||||
if (this.allowedCharts[entity].length) {
|
||||
if (this.allowedChartsMode.showInMonitor[entity].length) {
|
||||
// console.log(`added ${entity} to allowedEntities`);
|
||||
this.allowedEntities.push(entity);
|
||||
this.allowedEntitiesMode.showInMonitor.push(entity);
|
||||
if (!firstEntity){
|
||||
firstEntity = entity;
|
||||
this.onChangeEntity(entity);
|
||||
}
|
||||
}
|
||||
if (this.allowedChartsMode.showInDashboard[entity].length) {
|
||||
// console.log(`added ${entity} to allowedEntities`);
|
||||
this.allowedEntitiesMode.showInDashboard.push(entity);
|
||||
if (!firstEntity){
|
||||
firstEntity = entity;
|
||||
this.onChangeEntity(entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(this.chartTitlesMode)
|
||||
}
|
||||
|
||||
createChartUrlMap() {
|
||||
|
|
@ -225,6 +262,34 @@ export class StatisticsComponent {
|
|||
orpProjectpie: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":[""],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"Other Research products per project","subtitle":"","xaxistitle":"Project"}&w=91%&h=90%`),
|
||||
orpProjecttable: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Other Research products"],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`)
|
||||
};*/
|
||||
|
||||
this.chartsInfoMap = {
|
||||
publicationTimeline : {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&persistent=false&data=com=query&data={"query":"comTimelinePubs","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Publications"],"fieldsheaders":["publications"],"in":[{"f":0,"text":"Yearly"}],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Year"}&w=70%&h=83%`), title:"How many publications are there per year?"},
|
||||
publicationGraph: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comOAPubs","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"","nulls":true}&w=70%&h=80%`), title:"What access rights do the publications have?",},
|
||||
publicationProjectcolumn: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectPubs","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["publications"],"fieldsheaders":["publications"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=70%&h=90%`), title:"How many publications are there per project?",},
|
||||
publicationProjectpie: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectPubs","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":[""],"fieldsheaders":["publications"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=91%&h=90%`), title:"How many publications are there per project?",},
|
||||
publicationProjecttable: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectPubs","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Publications"],"fieldsheaders":["Publications"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`), title:"How many publications are there per project?",},
|
||||
|
||||
|
||||
datasetTimeline: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comTimelineData","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Datasets"],"fieldsheaders":["datasets"],"in":[{"f":0,"text":"Yearly"}],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Year"}&w=70%&h=83%`), title:"How many research data are there per year?"},
|
||||
datasetGraph: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comOAData","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"","nulls":true}&w=70%&h=70%`), title:"What access rights do the research data have?"},
|
||||
datasetProjectcolumn: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectData","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Datasets"],"fieldsheaders":["datasets"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=70%&h=90%`), title:"How many research data are there per project?"},
|
||||
datasetProjectpie: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectData","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":[""],"fieldsheaders":["datasets"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"Research data per project","subtitle":"","xaxistitle":"Project"}&w=91%&h=90%`), title:"How many research data are there per project?"},
|
||||
datasetProjecttable: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectData","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Datasets"],"fieldsheaders":["Datasets"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`), title:"How many research data are there per project?"},
|
||||
|
||||
softwareTimeline: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comTimelineSoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Software"],"fieldsheaders":["software"],"in":[{"f":0,"text":"Yearly"}],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Year"}&w=70%&h=83%`), title:"How many software are there per year?"},
|
||||
softwareGraph: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comOASoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"","nulls":true}&w=70%&h=70%`), title:"What access rights do the software have?"},
|
||||
softwareProjectcolumn: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectSoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Software"],"fieldsheaders":["software"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=70%&h=90%`), title:"How many software are there per project?"},
|
||||
softwareProjectpie: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectSoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":[""],"fieldsheaders":["software"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=91%&h=90%`), title:"How many software are there per project?"},
|
||||
softwareProjecttable: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectSoft","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Software"],"fieldsheaders":["Software"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`), title:"How many software are there per project?"},
|
||||
|
||||
orpTimeline: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comTimelineOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Other Research products"],"fieldsheaders":["Other Research products"],"in":[{"f":0,"text":"Yearly"}],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Year"}&w=70%&h=83%`), title:"How many other products are there per year?"},
|
||||
orpGraph: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comOAOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"","nulls":true}&w=70%&h=70%`), title:"What access rights do the other products have?"},
|
||||
orpProjectcolumn: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Other Research products"],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=70%&h=90%`), title:"How many other products are there per project?"},
|
||||
orpProjectpie: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":[""],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=91%&h=90%`), title:"How many other products are there per project?"},
|
||||
orpProjecttable: {url: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Other Research products"],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`), title:"How many other products are there per project?"}
|
||||
|
||||
};
|
||||
this.chartsUrlMap = {
|
||||
publicationTimeline : this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&persistent=false&data=com=query&data={"query":"comTimelinePubs","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Publications"],"fieldsheaders":["publications"],"in":[{"f":0,"text":"Yearly"}],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Year"}&w=70%&h=83%`),
|
||||
publicationGraph: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}chart.php?com=query&data={"query":"comOAPubs","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"pie","yaxis":1,"c":false}],"xaxis":{"name":"bestlicense","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"order":"d","yaxisheaders":[""],"fieldsheaders":[""],"in":[],"filters":[],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"","nulls":true}&w=70%&h=80%`),
|
||||
|
|
@ -249,31 +314,9 @@ export class StatisticsComponent {
|
|||
orpProjecttable: this.sanitizer.bypassSecurityTrustResourceUrl(`${this.properties.statisticsFrameAPIURL}gtable.php?com=query&data={"query":"comProjectOther","comId":"${this.communityId}","table":"result","fields":[{"fld":"number","agg":"count","type":"bar","yaxis":1,"c":false}],"xaxis":{"name":"year","agg":"avg"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":"-","s":"-","l":"-","ft":"-","wt":"-"},"yaxisheaders":["Other Research products"],"fieldsheaders":["Other Research products"],"in":[],"filters":[{"name":"year","max":"2013","min":"2007","to":-1},{"name":"result_projects-project-funding_lvl0","values":["FP7"],"to":"-1"},{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funding_lvl2","values":["ERC"],"to":"-1"}],"having":[],"incfilters":[],"inchaving":[],"title":"","subtitle":"","xaxistitle":"Project"}&w=90%&h=83%`)
|
||||
};
|
||||
|
||||
this.chartsTitleMap = {
|
||||
publicationTimeline : "How many publications are there per year?",
|
||||
publicationGraph: "What access rights do the publications have?",
|
||||
publicationProjectcolumn: "How many publications are there per project?",
|
||||
publicationProjectpie: "How many publications are there per project?",
|
||||
publicationProjecttable: "How many publications are there per project?",
|
||||
|
||||
datasetTimeline : "How many research data are there per year?",
|
||||
datasetGraph: "What access rights do the research data have?",
|
||||
datasetProjectcolumn: "How many research data are there per project?",
|
||||
datasetProjectpie: "How many research data are there per project?",
|
||||
datasetProjecttable: "How many research data are there per project?",
|
||||
|
||||
softwareTimeline : "How many software are there per year?",
|
||||
softwareGraph: "What access rights do the software have?",
|
||||
softwareProjectcolumn: "How many software are there per project?",
|
||||
softwareProjectpie: "How many software are there per project?",
|
||||
softwareProjecttable: "How many software are there per project?",
|
||||
|
||||
orpTimeline : "How many other products are there per year?",
|
||||
orpGraph: "What access rights do the other products have?",
|
||||
orpProjectcolumn: "How many other products are there per project?",
|
||||
orpProjectpie: "How many other products are there per project?",
|
||||
orpProjecttable: "How many other products are there per project?",
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
|
||||
.iframeContainer{
|
||||
/*position:relative;*/
|
||||
/*overflow:hidden;*/
|
||||
overflow:hidden;
|
||||
/*padding-top:56.25%;*/
|
||||
/*padding-bottom:35%;*/
|
||||
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
/*position: absolute;*/
|
||||
/*top:0;*/
|
||||
/*left:0;*/
|
||||
width:120%;
|
||||
width:100%;
|
||||
height:100%;
|
||||
border:0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue