Revision 56109
Added by Argiro Kokogiannaki almost 5 years ago
modules/uoa-connect-portal/trunk/src/app/community/community.component.html | ||
---|---|---|
158 | 158 |
</div> |
159 | 159 |
</div> |
160 | 160 |
|
161 |
<div class="uk-section tm-middle uk-container uk-margin-small-top uk-padding-remove-top" id="tm-main">
|
|
162 |
<div class="uk-container uk-margin-bottom uk-grid">
|
|
163 |
<div class="uk-width-expand uk-padding-remove">
|
|
164 |
<article *ngIf="communityInfo" class="uk-article ">
|
|
165 |
<div *ngIf="communityId != null && communityId != '' && community != null">
|
|
161 |
<div class="uk-section tm-middle uk-container uk-margin-small-top uk-padding-remove-top" id="tm-main"> |
|
162 |
<div class="uk-container uk-margin-bottom uk-grid"> |
|
163 |
<div class="uk-width-expand uk-padding-remove"> |
|
164 |
<article *ngIf="communityInfo" class="uk-article "> |
|
165 |
<div *ngIf="communityId != null && communityId != '' && community != null"> |
|
166 | 166 |
|
167 | 167 |
|
168 |
<!-- <div *ngIf="isRouteEnabled('/search/find')" class="uk-margin-top"> |
|
169 |
<div class="uk-text-bold uk-h5">Search research results</div> |
|
170 |
<search-form [setFormCentered]=false [placeholderText]="getSearchPlaceHolder()" link="/search/find"></search-form> |
|
171 |
</div>--> |
|
172 |
<ng-template #stats let-entity="entity" let-entityName="entityName" let-statisticsSum="statisticsSum" |
|
173 |
let-statisticsDisplay="statisticsDisplay" let-allowedEntities="allowedEntities" |
|
174 |
let-allowedCharts="allowedCharts" let-chartsUrlMap="chartsUrlMap" let-chartsTitleMap="chartsTitleMap"> |
|
168 |
<!-- <div *ngIf="isRouteEnabled('/search/find')" class="uk-margin-top"> |
|
169 |
<div class="uk-text-bold uk-h5">Search research results</div> |
|
170 |
<search-form [setFormCentered]=false [placeholderText]="getSearchPlaceHolder()" link="/search/find"></search-form> |
|
171 |
</div>--> |
|
172 |
<ng-template #stats let-entity="entity" let-entityName="entityName" let-statisticsSum="statisticsSum" |
|
173 |
let-statisticsDisplay="statisticsDisplay" let-allowedEntities="allowedEntities" |
|
174 |
let-allowedCharts="allowedCharts" let-chartsInfoMap="chartsInfoMap" |
|
175 |
let-showChartTitle="showChartTitle" |
|
176 |
let-showIn="showIn"> |
|
175 | 177 |
|
176 |
<div *ngIf="
|
|
178 |
<div *ngIf=" |
|
177 | 179 |
statisticsSum && statisticsDisplay && |
178 | 180 |
statisticsSum[entity].total>0" class="uk-grid uk-child-width-1-3"> |
179 |
<div |
|
180 |
class="uk-card portal-card uk-text-right uk-margin-left uk-padding-small" |
|
181 |
*ngIf="statisticsDisplay.entities[entity].numbers.map['total']['showInMonitor']"> |
|
181 |
<div *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][showIn]" class="uk-padding-remove"> |
|
182 |
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small"> |
|
182 | 183 |
<div |
183 | 184 |
class="uk-text-large">{{statisticsSum[entity].total|number}}</div> |
184 | 185 |
<div>Total |
185 | 186 |
{{entityName}}</div> |
186 | 187 |
</div> |
187 |
<div class="uk-card portal-card uk-text-right uk-margin-left uk-padding-small" |
|
188 |
*ngIf="statisticsDisplay.entities[entity].numbers.map['open']['showInMonitor']"> |
|
188 |
</div> |
|
189 |
<div |
|
190 |
*ngIf="statisticsDisplay.entities[entity].numbers.map['project'][showIn]" class="uk-padding-remove"> |
|
191 |
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small"> |
|
189 | 192 |
<div |
193 |
class="uk-text-large">{{statisticsSum[entity].projects|number}} </div> |
|
194 |
<div>Total projects linked to {{entityName}}</div> |
|
195 |
</div> |
|
196 |
</div> |
|
197 |
<div |
|
198 |
*ngIf="statisticsDisplay.entities[entity].numbers.map['open'][showIn]" class="uk-padding-remove"> |
|
199 |
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small"> |
|
200 |
<div |
|
190 | 201 |
class="uk-text-large">{{statisticsSum[entity].open_access|number}} </div> |
191 | 202 |
<div>Open access |
192 | 203 |
{{entityName}}</div> |
193 | 204 |
</div> |
205 |
</div> |
|
206 |
<div *ngIf="statisticsDisplay.entities[entity].numbers.map['closed'][showIn]" class="uk-padding-remove"> |
|
207 |
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small"> |
|
208 |
<div |
|
209 |
class="uk-text-large">{{statisticsSum[entity].closed_access|number}} </div> |
|
210 |
<div>Closed access |
|
211 |
{{entityName}}</div> |
|
212 |
</div> |
|
213 |
</div> |
|
214 |
<div |
|
215 |
*ngIf="statisticsDisplay.entities[entity].numbers.map['embargo'][showIn]" class="uk-padding-remove"> |
|
216 |
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small"> |
|
217 |
<div |
|
218 |
class="uk-text-large">{{statisticsSum[entity].embargo|number}} </div> |
|
219 |
<div>Embargo |
|
220 |
{{entityName}}</div> |
|
221 |
</div> |
|
222 |
</div> |
|
223 |
<div |
|
224 |
*ngIf="statisticsDisplay.entities[entity].numbers.map['restricted'][showIn]" |
|
225 |
class="uk-padding-remove"> |
|
226 |
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small"> |
|
227 |
<div |
|
228 |
class="uk-text-large">{{statisticsSum[entity].restricted|number}} </div> |
|
229 |
<div>Restricted |
|
230 |
{{entityName}}</div> |
|
231 |
</div> |
|
232 |
</div> |
|
194 | 233 |
|
195 |
</div>
|
|
196 |
<div *ngIf=" allowedEntities &&
|
|
234 |
</div> |
|
235 |
<div *ngIf=" allowedEntities && |
|
197 | 236 |
statisticsSum && allowedCharts && statisticsSum[entity] && |
198 | 237 |
allowedCharts[entity] && statisticsSum[entity].total>0 && |
199 |
allowedCharts[entity].length>0" class="uk-position-relative uk-visible-toggle" uk-slider=""> |
|
200 |
<ul class="uk-slider-items " uk-grid> |
|
201 |
<li *ngFor="let chart of allowedCharts[entity]" > |
|
238 |
allowedCharts[entity].length>0"> |
|
239 |
<div *ngIf="showIn == 'showInDashboard'"> |
|
240 |
<div class="uk-position-relative uk-visible-toggle" uk-slider=""> |
|
241 |
<ul class="uk-slider-items " uk-grid> |
|
242 |
<li *ngFor="let chart of allowedCharts[entity]"> |
|
202 | 243 |
|
203 |
<div class=" iframeContainer uk-height-medium uk-margin-top"> |
|
204 |
<div class=" uk-h5 uk-text-muted" > |
|
205 |
{{chartsTitleMap[chart]}}</div> |
|
206 |
<iframe [src]=chartsUrlMap[chart] scrolling="no"></iframe> |
|
244 |
<div class=" iframeContainer uk-height-medium uk-margin-top"> |
|
245 |
<div *ngIf="showChartTitle[chart]" class=" uk-h5 uk-text-muted"> |
|
246 |
{{chartsInfoMap[chart].title}}</div> |
|
247 |
<iframe [src]=chartsInfoMap[chart].url scrolling="no"></iframe> |
|
248 |
</div> |
|
249 |
</li> |
|
250 |
</ul> |
|
251 |
<a *ngIf="(allowedCharts[entity].length > 2)" |
|
252 |
class="uk-position-center-left uk-position-small uk-hidden-hover" href="#" uk-slidenav-previous |
|
253 |
uk-slider-item="previous"></a> |
|
254 |
<a *ngIf="(allowedCharts[entity].length > 2)" |
|
255 |
class="uk-position-center-right uk-position-small uk-hidden-hover" href="#" uk-slidenav-next |
|
256 |
uk-slider-item="next"></a> |
|
257 |
</div> |
|
258 |
<div *ngIf=" allowedEntities && |
|
259 |
statisticsSum && allowedCharts && statisticsSum[entity] && |
|
260 |
allowedCharts[entity] && statisticsSum[entity].total>0 && |
|
261 |
allowedCharts[entity].length>0"> |
|
262 |
<hr class="uk-margin-top"> |
|
263 |
</div> |
|
264 |
</div> |
|
265 |
<div *ngIf="showIn == 'showInMonitor'" class="uk-grid uk-child-width-1-2 "> |
|
266 |
<div *ngFor="let chart of allowedCharts[entity]" class="uk-clearfix uk-margin-bottom"> |
|
267 |
|
|
268 |
<div class=" iframeContainer uk-height-large uk-margin-top"> |
|
269 |
<div *ngIf="showChartTitle[chart]" class=" uk-h5 uk-text-muted"> |
|
270 |
{{chartsInfoMap[chart].title}}</div> |
|
271 |
<iframe [src]=chartsInfoMap[chart].url scrolling="no" class=""></iframe> |
|
207 | 272 |
</div> |
208 |
</li> |
|
209 |
</ul> |
|
210 |
<a *ngIf="(allowedCharts[entity].length > 2)" |
|
211 |
class="uk-position-center-left uk-position-small uk-hidden-hover" href="#" uk-slidenav-previous uk-slider-item="previous"></a> |
|
212 |
<a *ngIf="(allowedCharts[entity].length > 2)" |
|
213 |
class="uk-position-center-right uk-position-small uk-hidden-hover" href="#" uk-slidenav-next uk-slider-item="next"></a> |
|
273 |
|
|
274 |
</div> |
|
275 |
|
|
214 | 276 |
</div> |
215 |
<div *ngIf=" allowedEntities && |
|
216 |
statisticsSum && allowedCharts && statisticsSum[entity] && |
|
217 |
allowedCharts[entity] && statisticsSum[entity].total>0 && |
|
218 |
allowedCharts[entity].length>0" > |
|
219 |
<hr class="uk-margin-top"> |
|
220 |
</div> |
|
277 |
</div> |
|
221 | 278 |
|
222 |
</ng-template> |
|
223 |
<div class="uk-margin-large-top uk-grid customTabs"> |
|
279 |
</ng-template> |
|
280 |
<div class="uk-float-right"> |
|
281 |
<button [class]="'uk-button '+((overview)?'uk-disabled ':' uk-button-default ')" |
|
282 |
(click)="overview=!overview;">Overview |
|
283 |
</button> |
|
284 |
{{" "}} |
|
285 |
<button [class]="'uk-button '+((!overview)?'uk-disabled ':' uk-button-default ')" |
|
286 |
(click)="overview=!overview;">Chart Analysis |
|
287 |
</button> |
|
288 |
</div> |
|
224 | 289 |
|
225 | 290 |
|
226 |
<ul class=" customTabsTitle uk-tab uk-tab-left uk-width-1-5" |
|
227 |
data-uk-tab="{connect: '#resultTabs'"> |
|
228 |
<li *ngIf="isEntityEnabled('publication')" (click)="searchPublications()" class="uk-active"><a |
|
229 |
href="#">publications</a></li> |
|
230 |
<li *ngIf="isEntityEnabled('dataset')" (click)="searchResearchData()"><a href="#">research data</a></li> |
|
231 |
<li *ngIf="isEntityEnabled('software')" (click)="searchSoftware()"><a href="#">software</a></li> |
|
232 |
<li *ngIf="isEntityEnabled('orp')" (click)="searchOrps()"><a href="#">other research products</a></li> |
|
233 |
</ul> |
|
291 |
<div class="uk-margin-top customTabs"> |
|
234 | 292 |
|
235 |
<ul id="resultTabs" class=" customTabsContent uk-switcher uk-width-expand" style="min-height:450px;"> |
|
236 |
<li *ngIf="isEntityEnabled('publication')" class="uk-padding"> |
|
293 |
|
|
294 |
<ul class=" uk-margin-remove" |
|
295 |
data-uk-tab="{connect: '#resultTabs'"> |
|
296 |
<li *ngIf="isEntityEnabled('publication')" (click)="searchPublications()" class="uk-active"><a |
|
297 |
href="#">publications</a></li> |
|
298 |
<li *ngIf="isEntityEnabled('dataset')" (click)="searchResearchData()"><a href="#">research data</a></li> |
|
299 |
<li *ngIf="isEntityEnabled('software')" (click)="searchSoftware()"><a href="#">software</a></li> |
|
300 |
<li *ngIf="isEntityEnabled('orp')" (click)="searchOrps()"><a href="#">other research products</a></li> |
|
301 |
</ul> |
|
302 |
|
|
303 |
<ul id="resultTabs" class=" customTabsContent uk-switcher " style="min-height:450px;"> |
|
304 |
<li *ngIf="isEntityEnabled('publication')" class="uk-padding"> |
|
305 |
<div *ngIf="overview"> |
|
237 | 306 |
<div *ngIf="statistics !=null && activeTab == 'publication'"> |
238 | 307 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'publication', entityName: |
239 | 308 |
'publications' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay, |
240 |
allowedEntities: statistics.allowedEntities, allowedCharts:statistics.allowedCharts, |
|
241 |
chartsUrlMap:statistics.chartsUrlMap, chartsTitleMap:statistics.chartsTitleMap}"></ng-container> |
|
309 |
allowedEntities: statistics.allowedEntitiesMode['showInDashboard'], |
|
310 |
allowedCharts:statistics.allowedChartsMode['showInDashboard'], showChartTitle: statistics.chartTitlesMode['showInDashboard'], |
|
311 |
|
|
312 |
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInDashboard'}"></ng-container> |
|
242 | 313 |
</div> |
243 | 314 |
<results-comp [results]=publicationResults [total]=publicationTotal resultType="publication" |
244 | 315 |
[community]=community [params]=params [showLoading]="showLoading" |
245 | 316 |
[properties]="properties" |
246 | 317 |
class=""></results-comp> |
318 |
</div> |
|
319 |
<div *ngIf="!overview"> |
|
320 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'publication', entityName: |
|
321 |
'publications' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay, |
|
322 |
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'], |
|
323 |
allowedCharts:statistics.allowedChartsMode['showInMonitor'], showChartTitle: statistics.chartTitlesMode['showInMonitor'], |
|
324 |
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}"></ng-container> |
|
247 | 325 |
|
248 |
</li> |
|
249 |
<li *ngIf="isEntityEnabled('dataset')" class="uk-padding"> |
|
326 |
</div> |
|
327 |
|
|
328 |
|
|
329 |
</li> |
|
330 |
<li *ngIf="isEntityEnabled('dataset')" class="uk-padding"> |
|
331 |
<div *ngIf="overview"> |
|
250 | 332 |
<div *ngIf="statistics !=null && activeTab == 'dataset'"> |
251 | 333 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'dataset', entityName: |
252 | 334 |
'research data' , statisticsSum:statistics.statisticsSum, |
253 | 335 |
statisticsDisplay:statistics.statisticsDisplay, |
254 |
allowedEntities: statistics.allowedEntities, allowedCharts:statistics.allowedCharts, chartsUrlMap:statistics.chartsUrlMap, chartsTitleMap:statistics.chartsTitleMap}"></ng-container> |
|
336 |
allowedEntities: statistics.allowedEntitiesMode['showInDashboard'], |
|
337 |
allowedCharts:statistics.allowedChartsMode['showInDashboard'], showChartTitle: statistics.chartTitlesMode['showInDashboard'], |
|
338 |
|
|
339 |
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInDashboard'}"></ng-container> |
|
255 | 340 |
</div> |
256 |
<results-comp [results]=researchDataResults [total]=researchDataTotal resultType="dataset" |
|
257 |
[community]=community [params]=params [showLoading]="showLoading" |
|
258 |
[properties]="properties" class="uk-width-expand"></results-comp> |
|
341 |
<results-comp [results]=publicationResults [total]=publicationTotal resultType="dataset" |
|
342 |
[community]=community [params]=params [showLoading]="showLoading" |
|
343 |
[properties]="properties" |
|
344 |
class=""></results-comp> |
|
345 |
</div> |
|
346 |
<div *ngIf="!overview"> |
|
347 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'dataset', entityName: |
|
348 |
'research data' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay, |
|
349 |
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'], |
|
350 |
allowedCharts:statistics.allowedChartsMode['showInMonitor'], showChartTitle: statistics.chartTitlesMode['showInMonitor'], |
|
351 |
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}"></ng-container> |
|
259 | 352 |
|
260 |
</li> |
|
261 |
<li *ngIf="isEntityEnabled('software')" class="uk-padding"> |
|
262 |
<div *ngIf="statistics !=null && activeTab == 'software'"> |
|
263 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'software', entityName: |
|
264 |
'software' , statisticsSum:statistics.statisticsSum, |
|
265 |
statisticsDisplay:statistics.statisticsDisplay, |
|
266 |
allowedEntities: statistics.allowedEntities, allowedCharts:statistics.allowedCharts, chartsUrlMap:statistics.chartsUrlMap, chartsTitleMap:statistics.chartsTitleMap}"></ng-container> |
|
353 |
</div> |
|
354 |
|
|
355 |
|
|
356 |
</li> |
|
357 |
<li *ngIf="isEntityEnabled('software')" class="uk-padding"> |
|
358 |
<div *ngIf="overview"> |
|
359 |
<div *ngIf="statistics !=null && activeTab == 'software'"> |
|
360 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'publication', entityName: |
|
361 |
'software' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay, |
|
362 |
allowedEntities: statistics.allowedEntitiesMode['showInDashboard'], |
|
363 |
allowedCharts:statistics.allowedChartsMode['showInDashboard'], showChartTitle: statistics.chartTitlesMode['showInDashboard'], |
|
364 |
|
|
365 |
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInDashboard'}"></ng-container> |
|
267 | 366 |
</div> |
268 |
<results-comp [results]=softwareResults [total]=softwareTotal resultType="software" |
|
269 |
[community]=community [params]=params [showLoading]="showLoading" |
|
270 |
[properties]="properties" class="uk-width-expand"></results-comp> |
|
367 |
<results-comp [results]=publicationResults [total]=publicationTotal resultType="software" |
|
368 |
[community]=community [params]=params [showLoading]="showLoading" |
|
369 |
[properties]="properties" |
|
370 |
class=""></results-comp> |
|
371 |
</div> |
|
372 |
<div *ngIf="!overview"> |
|
373 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'software', entityName: |
|
374 |
'software' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay, |
|
375 |
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'], |
|
376 |
allowedCharts:statistics.allowedChartsMode['showInMonitor'], showChartTitle: statistics.chartTitlesMode['showInMonitor'], |
|
377 |
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}"></ng-container> |
|
271 | 378 |
|
272 |
</li> |
|
273 |
<li *ngIf="isEntityEnabled('orp')" class="uk-padding"> |
|
274 |
<div *ngIf="statistics !=null && activeTab == 'orp' "> |
|
379 |
</div> |
|
380 |
|
|
381 |
|
|
382 |
</li> |
|
383 |
<li *ngIf="isEntityEnabled('orp')" class="uk-padding"> |
|
384 |
<div *ngIf="overview"> |
|
385 |
<div *ngIf="statistics !=null && activeTab == 'orp'"> |
|
275 | 386 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'orp', entityName: |
276 | 387 |
'other products' , statisticsSum:statistics.statisticsSum, |
277 | 388 |
statisticsDisplay:statistics.statisticsDisplay, |
278 |
allowedEntities: statistics.allowedEntities, allowedCharts:statistics.allowedCharts, chartsUrlMap:statistics.chartsUrlMap, chartsTitleMap:statistics.chartsTitleMap}"></ng-container> |
|
389 |
allowedEntities: statistics.allowedEntitiesMode['showInDashboard'], |
|
390 |
allowedCharts:statistics.allowedChartsMode['showInDashboard'], showChartTitle: statistics.chartTitlesMode['showInDashboard'], |
|
391 |
|
|
392 |
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInDashboard'}"></ng-container> |
|
279 | 393 |
</div> |
280 |
<results-comp [results]=orpResults [total]=orpTotal resultType="other" [community]=community |
|
281 |
[params]=params [showLoading]="showLoading" [properties]="properties" |
|
282 |
class="uk-width-expand"></results-comp> |
|
394 |
<results-comp [results]=publicationResults [total]=publicationTotal resultType="publication" |
|
395 |
[community]=community [params]=params [showLoading]="showLoading" |
|
396 |
[properties]="properties" |
|
397 |
class=""></results-comp> |
|
398 |
</div> |
|
399 |
<div *ngIf="!overview"> |
|
400 |
<ng-container *ngTemplateOutlet="stats; context: { entity: 'orp', entityName: |
|
401 |
'publications' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay, |
|
402 |
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'], |
|
403 |
allowedCharts:statistics.allowedChartsMode['showInMonitor'], showChartTitle: statistics.chartTitlesMode['showInMonitor'], |
|
404 |
chartsInfoMap:statistics.chartsInfoMap, showIn:'showInMonitor'}"></ng-container> |
|
283 | 405 |
|
284 |
</li> |
|
285 |
</ul> |
|
406 |
</div> |
|
407 |
|
|
408 |
|
|
409 |
</li> |
|
410 |
</ul> |
|
411 |
</div> |
|
412 |
<!-- <hr>--> |
|
413 |
<!--<div *ngIf="statistics && statistics.allowedEntities && countOtherGraphs()>0"> |
|
414 |
<div class="uk-text-bold uk-h5"> |
|
415 |
Other Graphs |
|
286 | 416 |
</div> |
287 |
<!-- <hr>--> |
|
288 |
<!--<div *ngIf="statistics && statistics.allowedEntities && countOtherGraphs()>0"> |
|
289 |
<div class="uk-text-bold uk-h5"> |
|
290 |
Other Graphs |
|
291 |
</div> |
|
292 |
<div *ngIf="statistics && statistics.allowedEntities" class="uk-margin-top uk-grid"> |
|
293 |
<ng-container *ngFor="let entity of statistics.allowedEntities"> |
|
294 |
<ng-container *ngIf="statistics.statisticsSum[entity].total>0 && statistics.allowedCharts[entity].length>0 && activeTab!=entity"> |
|
417 |
<div *ngIf="statistics && statistics.allowedEntities" class="uk-margin-top uk-grid"> |
|
418 |
<ng-container *ngFor="let entity of statistics.allowedEntities"> |
|
419 |
<ng-container *ngIf="statistics.statisticsSum[entity].total>0 && statistics.allowedCharts[entity].length>0 && activeTab!=entity"> |
|
295 | 420 |
|
296 |
<ng-container *ngIf="statistics.allowedCharts[entity] " > |
|
297 |
<div *ngFor="let chart of statistics.allowedCharts[entity]" class="uk-width-1-2@m uk-first-column"> |
|
298 |
<div class="iframeContainer"> |
|
299 |
<iframe [src]=statistics.chartsUrlMap[chart] scrolling="no"></iframe> |
|
300 |
</div> |
|
421 |
<ng-container *ngIf="statistics.allowedCharts[entity] " > |
|
422 |
<div *ngFor="let chart of statistics.allowedCharts[entity]" class="uk-width-1-2@m uk-first-column"> |
|
423 |
<div class="iframeContainer"> |
|
424 |
<iframe [src]=statistics.chartsUrlMap[chart] scrolling="no"></iframe> |
|
301 | 425 |
</div> |
302 |
</ng-container>
|
|
426 |
</div>
|
|
303 | 427 |
</ng-container> |
304 | 428 |
</ng-container> |
305 |
</div> |
|
306 |
</div>--> |
|
429 |
</ng-container> |
|
430 |
</div> |
|
431 |
</div>--> |
|
307 | 432 |
|
308 | 433 |
|
309 |
</div> |
|
310 |
</article> |
|
311 |
</div> |
|
312 |
|
|
434 |
</div> |
|
435 |
</article> |
|
313 | 436 |
</div> |
314 | 437 |
|
315 | 438 |
</div> |
316 |
<statistics-for-dashboard [currentMode]="'showInDashboard'"></statistics-for-dashboard> |
|
317 | 439 |
|
440 |
</div> |
|
441 |
<statistics-for-dashboard [currentMode]="'showInDashboard'"></statistics-for-dashboard> |
|
318 | 442 |
|
319 |
<div class="communityPanelBackground uk-margin-top uk-padding-small"> |
|
320 |
<div class="uk-container uk-margin-top uk-margin-bottom " |
|
321 |
*ngIf="communityId != null && communityId != '' && community != null && communityInfo!=null" > |
|
322 |
<div class="uk-grid"> |
|
323 |
<div class="uk-width-2-5@m uk-width-1-1@s uk-first-column uk-margin-top"> |
|
324 |
<div *ngIf="community.date != null"><span |
|
325 |
class="lowOpacityColor">Created</span> {{community.date | date:'dd-MM-yyyy'}}</div> |
|
326 |
<subscribe *ngIf="communityId != null" [communityId]="communityId" showNumbers=true class=""></subscribe> |
|
327 |
<div *ngIf=" isRouteEnabled('/participate/share-zenodo')" class=""> |
|
328 |
<a [queryParams]=params routerLinkActive="router-link-active" routerLink="/participate/share-zenodo"> |
|
329 |
<span class="lowOpacityColor">Zenodo communities </span> <span> |
|
443 |
|
|
444 |
<div class="communityPanelBackground uk-margin-top uk-padding-small"> |
|
445 |
<div class="uk-container uk-margin-top uk-margin-bottom " |
|
446 |
*ngIf="communityId != null && communityId != '' && community != null && communityInfo!=null"> |
|
447 |
<div class="uk-grid"> |
|
448 |
<div class="uk-width-2-5@m uk-width-1-1@s uk-first-column uk-margin-top"> |
|
449 |
<div *ngIf="community.date != null"><span |
|
450 |
class="lowOpacityColor">Created</span> {{community.date | date:'dd-MM-yyyy'}}</div> |
|
451 |
<subscribe *ngIf="communityId != null" [communityId]="communityId" showNumbers=true class=""></subscribe> |
|
452 |
<div *ngIf=" isRouteEnabled('/participate/share-zenodo')" class=""> |
|
453 |
<a [queryParams]=params routerLinkActive="router-link-active" routerLink="/participate/share-zenodo"> |
|
454 |
<span class="lowOpacityColor">Zenodo communities </span> <span> |
|
330 | 455 |
{{zenodoCommunityIdS.length + ((masterZenodoCommunity) ? 1 : 0)}}</span>{{" "}} |
331 |
<span class="uk-icon"
|
|
332 |
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>">
|
|
456 |
<span class="uk-icon" |
|
457 |
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>"> |
|
333 | 458 |
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="question" |
334 | 459 |
ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle><circle |
335 | 460 |
cx="10.44" cy="14.42" r="1.05"></circle><path fill="none" stroke="#000" stroke-width="1.2" |
336 | 461 |
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> |
337 | 462 |
</span> |
338 |
</a> |
|
339 |
</div> |
|
340 |
</div> |
|
341 |
<div *ngIf="isRouteEnabled('/curators')" class="uk-width-3-5@m uk-width-1-1@s uk-margin-top"> |
|
342 |
<curators [main]="false" [managers]="community.managers" [communityId]="communityId"></curators> |
|
463 |
</a> |
|
343 | 464 |
</div> |
465 |
</div> |
|
466 |
<div *ngIf="isRouteEnabled('/curators')" class="uk-width-3-5@m uk-width-1-1@s uk-margin-top"> |
|
467 |
<curators [main]="false" [managers]="community.managers" [communityId]="communityId"></curators> |
|
468 |
</div> |
|
344 | 469 |
|
345 |
</div> |
|
346 | 470 |
</div> |
347 | 471 |
</div> |
348 |
<div class="uk-section tm-middle uk-container uk-margin-top uk-padding-remove-top" id="" *ngIf="communityId != null |
|
472 |
</div> |
|
473 |
<div class="uk-section tm-middle uk-container uk-margin-top uk-padding-remove-top" id="" *ngIf="communityId != null |
|
349 | 474 |
&& communityId != '' && community != null && communityInfo != null"> |
350 |
<ng-container *ngIf=" isRouteEnabled('/organizations')"> |
|
351 |
<div class="uk-container uk-margin-bottom uk-grid"> |
|
352 |
<div class="uk-width-expand uk-padding-remove"> |
|
353 |
<affiliations [fullView]="false" [getAffiliationsFromAPI]="true" [communityFirstPage]="true"></affiliations> |
|
354 |
</div> |
|
475 |
<ng-container *ngIf=" isRouteEnabled('/organizations')"> |
|
476 |
<div class="uk-container uk-margin-bottom uk-grid"> |
|
477 |
<div class="uk-width-expand uk-padding-remove"> |
|
478 |
<affiliations [fullView]="false" [getAffiliationsFromAPI]="true" [communityFirstPage]="true"></affiliations> |
|
355 | 479 |
</div> |
356 |
</ng-container> |
|
357 |
</div> |
|
480 |
</div> |
|
481 |
</ng-container> |
|
482 |
</div> |
|
358 | 483 |
|
359 | 484 |
<div *ngIf="(communityId == null || communityId == '' ) && !communityInfo" |
360 |
class="uk-section tm-middle uk-container uk-margin-large-top " >
|
|
485 |
class="uk-section tm-middle uk-container uk-margin-large-top "> |
|
361 | 486 |
<div class="uk-container uk-margin-bottom uk-grid"> |
362 | 487 |
<div class="uk-width-expand uk-padding-remove"> |
363 | 488 |
<article class="uk-article "> |
modules/uoa-connect-portal/trunk/src/app/community/community.component.ts | ||
---|---|---|
61 | 61 |
public subOrps; |
62 | 62 |
@ViewChild(StatisticsForDashboardComponent) statistics: StatisticsForDashboardComponent = null; |
63 | 63 |
public activeTab = "publication"; |
64 |
public overview: boolean = true; |
|
64 | 65 |
|
65 | 66 |
constructor( |
66 | 67 |
private element: ElementRef, |
modules/uoa-connect-portal/trunk/src/app/statistics/statistics.component.ts | ||
---|---|---|
40 | 40 |
chartCatsList: string[] = availableCharts; |
41 | 41 |
allowedCharts: Map<string,string[]> = new Map<string,string[]>(); |
42 | 42 |
allowedEntities: string[] = []; |
43 |
allowedChartsMode = {showInMonitor:new Map<string,string[]>(), showInDashboard:new Map<string,string[]>()}; |
|
44 |
allowedEntitiesMode = {showInMonitor:[], showInDashboard:[]}; |
|
43 | 45 |
|
44 | 46 |
statisticsSum: StatisticsSummary =null; |
45 | 47 |
statisticsDisplay: StatisticsDisplay = null; |
46 | 48 |
chartsUrlMap: {}; |
47 |
chartsTitleMap: {}; |
|
49 |
chartTitlesMode = {showInMonitor:{}, showInDashboard:{}}; |
|
50 |
chartsInfoMap: {}; |
|
48 | 51 |
|
49 | 52 |
displayedTimeline: string; |
50 | 53 |
displayedTimelineUrl: string; |
... | ... | |
136 | 139 |
.subscribe( |
137 | 140 |
res => { |
138 | 141 |
this.statisticsDisplay = res; |
139 |
console.log(this.statisticsDisplay) |
|
140 | 142 |
this.createChartUrlMap(); |
141 | 143 |
this.getCommunityInfo(); |
142 | 144 |
this.status = this.errorCodes.DONE; |
... | ... | |
175 | 177 |
initializeDisplayedCharts() { |
176 | 178 |
let firstEntity: string; |
177 | 179 |
this.entitiesList = Array.from( this.entitiesMap.keys() ); |
180 |
|
|
181 |
this.allowedChartsMode[this.currentMode]= this.allowedCharts; |
|
182 |
this.allowedEntitiesMode[this.currentMode]=this.allowedEntities; |
|
183 |
let titles= []; |
|
178 | 184 |
// console.log('this.entitiesList is',this.entitiesList); |
179 | 185 |
// console.log(`my current mode is: ${this.currentMode}`); |
180 | 186 |
for (let entity of this.entitiesList) { |
181 | 187 |
if (this.statisticsDisplay.entities[entity] && this.statisticsSum[entity].total && this.communityInfo.entities.filter(x => x['pid'] == entity && x['isEnabled']===true).length ) { |
182 |
this.allowedCharts[entity] = []; |
|
188 |
this.allowedChartsMode.showInDashboard[entity]=[]; |
|
189 |
this.allowedChartsMode.showInMonitor[entity]=[]; |
|
183 | 190 |
for (let chart of this.chartCatsList){ |
184 | 191 |
if (this.statisticsSum[entity].total && |
185 | 192 |
this.statisticsDisplay.entities[entity].charts.map[chart] && |
186 |
this.statisticsDisplay.entities[entity].charts.map[chart][this.currentMode] &&
|
|
193 |
this.statisticsDisplay.entities[entity].charts.map[chart]["showInDashboard"] &&
|
|
187 | 194 |
this.chartsUrlMap[entity + this.getCamelCaseString(chart)]) { |
188 |
this.allowedCharts[entity].push(entity + this.getCamelCaseString(chart)); |
|
195 |
this.allowedChartsMode.showInDashboard[entity].push(entity + this.getCamelCaseString(chart)); |
|
196 |
if(titles.indexOf("dashboard"+ this.chartsInfoMap[entity + this.getCamelCaseString(chart)].title)==-1){ |
|
197 |
titles.push("dashboard"+this.chartsInfoMap[entity + this.getCamelCaseString(chart)].title); |
|
198 |
this.chartTitlesMode.showInDashboard[entity + this.getCamelCaseString(chart)]=true; |
|
199 |
}else{ |
|
200 |
this.chartTitlesMode.showInDashboard[entity + this.getCamelCaseString(chart)]=false; |
|
201 |
} |
|
202 |
|
|
189 | 203 |
// console.log(`added ${entity} - ${chart} to allowedCharts`); |
190 | 204 |
} |
205 |
if (this.statisticsSum[entity].total && |
|
206 |
this.statisticsDisplay.entities[entity].charts.map[chart] && |
|
207 |
this.statisticsDisplay.entities[entity].charts.map[chart]["showInMonitor"] && |
|
208 |
this.chartsUrlMap[entity + this.getCamelCaseString(chart)]) { |
|
209 |
this.allowedChartsMode.showInMonitor[entity].push(entity + this.getCamelCaseString(chart)); |
|
210 |
if(titles.indexOf("monitor"+this.chartsInfoMap[entity + this.getCamelCaseString(chart)].title)==-1){ |
|
211 |
titles.push("monitor"+this.chartsInfoMap[entity + this.getCamelCaseString(chart)].title); |
|
212 |
this.chartTitlesMode.showInMonitor[entity + this.getCamelCaseString(chart)]=true; |
|
213 |
}else{ |
|
214 |
this.chartTitlesMode.showInMonitor[entity + this.getCamelCaseString(chart)]=false; |
|
215 |
} |
|
216 |
// console.log(`added ${entity} - ${chart} to allowedCharts`); |
|
217 |
|
|
218 |
} |
|
191 | 219 |
} |
192 |
if (this.allowedCharts[entity].length) { |
|
220 |
if (this.allowedChartsMode.showInMonitor[entity].length) {
|
|
193 | 221 |
// console.log(`added ${entity} to allowedEntities`); |
194 |
this.allowedEntities.push(entity); |
|
222 |
this.allowedEntitiesMode.showInMonitor.push(entity);
|
|
195 | 223 |
if (!firstEntity){ |
196 | 224 |
firstEntity = entity; |
197 | 225 |
this.onChangeEntity(entity); |
198 | 226 |
} |
199 | 227 |
} |
228 |
if (this.allowedChartsMode.showInDashboard[entity].length) { |
|
229 |
// console.log(`added ${entity} to allowedEntities`); |
|
230 |
this.allowedEntitiesMode.showInDashboard.push(entity); |
|
231 |
if (!firstEntity){ |
|
232 |
firstEntity = entity; |
|
233 |
this.onChangeEntity(entity); |
|
234 |
} |
|
235 |
} |
|
200 | 236 |
} |
201 | 237 |
} |
238 |
console.log(this.chartTitlesMode) |
|
202 | 239 |
} |
203 | 240 |
|
204 | 241 |
createChartUrlMap() { |
... | ... | |
225 | 262 |
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%`), |
226 | 263 |
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%`) |
227 | 264 |
};*/ |
265 |
|
|
266 |
this.chartsInfoMap = { |
|
267 |
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?"}, |
|
268 |
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?",}, |
|
269 |
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?",}, |
|
270 |
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?",}, |
|
271 |
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?",}, |
|
272 |
|
|
273 |
|
|
274 |
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?"}, |
|
275 |
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?"}, |
|
276 |
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?"}, |
|
277 |
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?"}, |
|
278 |
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?"}, |
|
279 |
|
|
280 |
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?"}, |
|
281 |
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?"}, |
|
282 |
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?"}, |
|
283 |
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?"}, |
|
284 |
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?"}, |
|
285 |
|
|
286 |
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?"}, |
|
287 |
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?"}, |
|
288 |
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?"}, |
|
289 |
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?"}, |
|
290 |
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?"} |
|
291 |
|
|
292 |
}; |
|
228 | 293 |
this.chartsUrlMap = { |
229 | 294 |
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%`), |
230 | 295 |
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 | 314 |
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%`) |
250 | 315 |
}; |
251 | 316 |
|
252 |
this.chartsTitleMap = { |
|
253 |
publicationTimeline : "How many publications are there per year?", |
|
254 |
publicationGraph: "What access rights do the publications have?", |
|
255 |
publicationProjectcolumn: "How many publications are there per project?", |
|
256 |
publicationProjectpie: "How many publications are there per project?", |
|
257 |
publicationProjecttable: "How many publications are there per project?", |
|
258 | 317 |
|
259 |
datasetTimeline : "How many research data are there per year?", |
|
260 |
datasetGraph: "What access rights do the research data have?", |
|
261 |
datasetProjectcolumn: "How many research data are there per project?", |
|
262 |
datasetProjectpie: "How many research data are there per project?", |
|
263 |
datasetProjecttable: "How many research data are there per project?", |
|
264 | 318 |
|
265 |
softwareTimeline : "How many software are there per year?", |
|
266 |
softwareGraph: "What access rights do the software have?", |
|
267 |
softwareProjectcolumn: "How many software are there per project?", |
|
268 |
softwareProjectpie: "How many software are there per project?", |
|
269 |
softwareProjecttable: "How many software are there per project?", |
|
270 | 319 |
|
271 |
orpTimeline : "How many other products are there per year?", |
|
272 |
orpGraph: "What access rights do the other products have?", |
|
273 |
orpProjectcolumn: "How many other products are there per project?", |
|
274 |
orpProjectpie: "How many other products are there per project?", |
|
275 |
orpProjecttable: "How many other products are there per project?", |
|
276 |
}; |
|
277 | 320 |
} |
278 | 321 |
|
279 | 322 |
|
modules/uoa-connect-portal/trunk/src/app/statistics/statistics-routing.module.ts | ||
---|---|---|
4 | 4 |
import{StatisticsComponent} from './statistics.component'; |
5 | 5 |
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; |
6 | 6 |
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; |
7 |
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard' |
|
7 |
// import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'
|
|
8 | 8 |
|
9 | 9 |
@NgModule({ |
10 | 10 |
imports: [ |
11 | 11 |
RouterModule.forChild([ |
12 |
{ path: '', component: StatisticsComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
|
|
12 |
{ path: '', component: StatisticsComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } |
|
13 | 13 |
|
14 | 14 |
]) |
15 | 15 |
] |
modules/uoa-connect-portal/trunk/src/app/app.component.ts | ||
---|---|---|
297 | 297 |
new MenuItem("","Projects","","/search/find/projects/",false,["project"],["/search/find/projects"],this.properties.environment!="development"?{}:{communityId:community.communityId}), |
298 | 298 |
new MenuItem("","Content Providers","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],this.properties.environment!="development"?{}:{communityId:community.communityId}), |
299 | 299 |
]}, |
300 |
{ |
|
300 |
/*{
|
|
301 | 301 |
rootItem: new MenuItem("monitor","Monitor","","/monitor",false,[],["/monitor"],this.properties.environment!="development"?{}:{communityId:community.communityId}), |
302 | 302 |
items: [] |
303 |
}, |
|
303 |
},*/
|
|
304 | 304 |
{ |
305 | 305 |
rootItem: new MenuItem("share","Share","","",false,[],["/participate/deposit-publications","/participate/deposit-datasets","/participate/share-zenodo"],this.properties.environment!="development"?{}:{communityId:community.communityId}), |
306 | 306 |
items: [ |
modules/uoa-connect-portal/trunk/src/assets/connect-custom.css | ||
---|---|---|
94 | 94 |
|
95 | 95 |
.iframeContainer{ |
96 | 96 |
/*position:relative;*/ |
97 |
/*overflow:hidden;*/
|
|
97 |
overflow:hidden;
|
|
98 | 98 |
/*padding-top:56.25%;*/ |
99 | 99 |
/*padding-bottom:35%;*/ |
100 | 100 |
|
... | ... | |
104 | 104 |
/*position: absolute;*/ |
105 | 105 |
/*top:0;*/ |
106 | 106 |
/*left:0;*/ |
107 |
width:120%;
|
|
107 |
width:100%;
|
|
108 | 108 |
height:100%; |
109 | 109 |
border:0; |
110 | 110 |
} |
Also available in: Unified diff
[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