MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

Make subcategories uppercase and add powered by monitor in footer

This commit is contained in:
Konstantinos Triantafyllou 2022-12-12 19:02:37 +02:00
parent 0ed68b21fa
commit 61e7c6249b
7 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/monitor/monitor.component.html
View File

@ -50,7 +50,7 @@
[class.uk-active]="subCategory.alias === activeSubCategory.alias">
<a [routerLink]="['/', stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
[queryParams]="queryParams">
<span class="title">{{subCategory.name}}</span>
<span class="uk-text-uppercase">{{subCategory.name}}</span>
</a>
</li>
</ng-template>
@ -91,7 +91,7 @@
</div>
</ng-template>
<ng-template #content>
<div class="uk-margin-large-bottom">
<div *ngIf="countSectionsWithIndicatorsToShow(activeSubCategory.numbers) > 0" class="uk-margin-large-bottom">
<ng-container *ngFor="let number of activeSubCategory.numbers; let i = index;">
<div *ngIf="countIndicatorsToShow(number.indicators) > 0" class="uk-grid uk-margin-medium-bottom" uk-grid
uk-height-match="target: .uk-card">
@ -101,7 +101,7 @@
<div class="uk-card uk-card-default uk-padding-small number-card uk-position-relative"
[class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
<div *ngIf="!showDescriptionOverlay[j]">
<div class="uk-text-xsmall uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
<div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
<div class="number uk-text-small uk-text-bold">
<span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
<span *ngIf="!numberResults.get(i + '-' + j)">--</span>
@ -229,12 +229,13 @@
<div class="uk-margin-small-top uk-margin-small-bottom uk-text-small uk-flex hideInfo">
<!-- Last Stats Date-->
<div class="uk-width-2-3@m uk-width-1-2">
<icon name="graph" customClass="text-graph"></icon>
<span class="uk-margin-small-left uk-text-baseline uk-text-meta">Powered by </span>
<a href="https://graph.openaire.eu" class="text-graph">OpenAIRE Research Graph</a>
<span *ngIf="statsUpdateDate" class="uk-text-baseline uk-text-meta">
. Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}}
</span>
<span class="uk-text-baseline uk-text-meta">Powered by </span>
<a [href]="monitorLink" target="_blank"><img class="uk-margin-small-left" width="60" src="assets/common-assets/logo-services/monitor/small.svg"></a>
<span class="uk-margin-small-left">and</span>
<icon class="uk-margin-small-left" name="graph" customClass="text-graph"></icon>
<a href="https://graph.openaire.eu" target="_blank" class="text-graph uk-margin-xsmall-left">OpenAIRE Research Graph</a>
<span *ngIf="statsUpdateDate" class="uk-text-baseline uk-text-meta"> . Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}}
</span>
</div>
<!--Feedback-->
<div class="uk-width-expand uk-text-right">

5
src/app/monitor/monitor.component.ts
View File

@ -79,7 +79,6 @@ export class MonitorComponent implements OnInit, OnDestroy {
public keyword: UntypedFormControl;
public statsUpdateDate: Date;
public showDescriptionOverlay: boolean[] = [];
public isFullscreen: boolean = false;
@HostListener('fullscreenchange', ['$event'])
@HostListener('webkitfullscreenchange', ['$event'])
@ -225,6 +224,10 @@ export class MonitorComponent implements OnInit, OnDestroy {
}));
}
get monitorLink() {
return "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu';
}
private handleQueryParams(queryParams, params) {
this.queryParams = Object.assign({}, queryParams);
this.initializeFilters();

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 6ca864d376596ff2541fbfff9e0c7eaad1b8d9ea
Subproject commit 06f2f586a88a1766f183356b6497c0fc66436f36

2
src/app/topic/indicators.component.html
View File

@ -66,7 +66,7 @@
</ul>
</div>
</div>
<div class="uk-text-xsmall uk-margin-xsmall-bottom">{{indicator.name}}</div>
<div class="uk-text-small uk-margin-xsmall-bottom">{{indicator.name}}</div>
<div class="number uk-text-small uk-text-bold">
<span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
<span *ngIf="!numberResults.get(i + '-' + j)">--</span>

4
src/app/topic/topic.component.html
View File

@ -205,7 +205,7 @@
<ng-template ngFor [ngForOf]=" stakeholder.topics[topicIndex].categories[categoryIndex].subCategories" let-subCategory let-i="index">
<li class="uk-visible-toggle uk-flex" [class.uk-active]="subCategoryIndex === i" transition-group-item>
<a (click)="chooseSubcategory(i)">
<span> {{subCategory.name}}</span>
<span class="uk-text-uppercase">{{subCategory.name}}</span>
</a>
<span class="uk-flex uk-flex-column uk-flex-center uk-margin-small-left"
[class.uk-invisible-hover]="subCategoryIndex !== i"
@ -277,7 +277,7 @@
<li *ngIf="isCurator">
<a (click)="editSubCategoryOpen(); $event.preventDefault()" class="uk-flex uk-flex-middle">
<icon name="add" [flex]="true"></icon>
<span>Create new subcategory</span>
<span class="uk-text-uppercase">Create new subcategory</span>
</a>
</li>
</ul>

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 3ce4f7183dae624731ff54fc181527296f6f3d49
Subproject commit d772dbd4b2f2d8af9e26d98eed7417f2fbf15c3a

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 201ff990c0b2532951a796b10799ab95cb40c0b0
Subproject commit 2882ccde4eb93bd01b4cdb480790cc04b394794d