MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

[master]: 1. Change style of labels in irish. 2. Add tabs for sections in monitor page.

This commit is contained in:
Konstantinos Triantafyllou 2024-02-02 12:06:06 +02:00
parent 308c5f6e98
commit 3de3882cba
8 changed files with 246 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 4c55fb252cec8c1801bc37a9544c8e09412ff504
Subproject commit bedb7f013bbca6afbc9508ce753e01078373e059

103
src/app/shared/monitor/monitor.component.html
View File

@ -1,5 +1,12 @@
<div page-content [border]="isMobile">
<div class="uk-margin-top" actions>
<div class="uk-margin-bottom uk-flex uk-flex-middle">
<span *ngIf="countSelectedFilters() > 0" class="uk-text-meta uk-margin-small-right"> Active filters:</span>
<div class="uk-width-expand">
<ng-container *ngTemplateOutlet="selected_filters_pills"></ng-container>
</div>
<a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-small-left" (click)="clearAll()"> Clear All </a>
</div>
<div *ngIf="activeCategory && countSubCategoriesToShow(activeCategory) > 0" [class.uk-margin-bottom]="isMobile">
<slider-tabs *ngIf="stakeholder && !loading && activeTopic" [border]="!isMobile" [type]="'dynamic'">
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
@ -17,16 +24,13 @@
<div *ngIf="!activeSubCategory && !loading" class="message">
No {{entities.stakeholder}} yet.
</div>
<div *ngIf="activeSubCategory" class="uk-section">
<div *ngIf="countSelectedFilters() > 0" class="uk-margin-bottom uk-flex uk-flex-center uk-grid-small" uk-grid>
<span class="uk-width-auto uk-text-meta"> Active filters:</span>
<div class="uk-width-expand">
<ng-container *ngTemplateOutlet="selected_filters_pills"></ng-container>
</div>
<a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-left uk-width-auto" (click)="clearAll()"> Clear All </a>
<div *ngIf="activeSubCategory" class="uk-section-small">
<div *ngIf="activeSubCategory.description" [innerHTML]="activeSubCategory.description" class="uk-margin-medium-bottom">
</div>
<div [class.uk-margin-large-bottom]="activeSubCategory.numbers.length > 0 && !tabs">
<ng-container *ngFor="let number of activeSubCategory.numbers; let i = index;">
<div *ngIf="!isMobile" class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom" uk-grid uk-height-match="target: .uk-card">
<div *ngIf="!isMobile" class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom" uk-grid
uk-height-match="target: .uk-card">
<h5 *ngIf="number.title" class="uk-width-1-1 uk-margin-bottom">{{number.title}}</h5>
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
<div *ngIf="hasPermission(indicator.visibility)"
@ -50,7 +54,9 @@
</a>
</div>
</div>
<div *ngIf="indicator.overlay && (indicator.description || indicator.additionalDescription)" click-outside-or-esc class="uk-overflow-auto" (clickOutside)="closeOverlay($event, indicator)">
<div *ngIf="indicator.overlay && (indicator.description || indicator.additionalDescription)"
click-outside-or-esc class="uk-overflow-auto"
(clickOutside)="closeOverlay($event, indicator)">
<div class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right">
<a class="uk-display-inline-block uk-button uk-button-link"
(click)="changeOverlay($event, indicator, false)">
@ -77,7 +83,8 @@
<div class="uk-card uk-card-default uk-padding-small number-card">
<div class="uk-grid uk-grid-small uk-child-width-1-1" uk-grid>
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
<div *ngIf="hasPermission(indicator.visibility)" [ngClass]="getNumberClassBySize(indicator.width)">
<div *ngIf="hasPermission(indicator.visibility)"
[ngClass]="getNumberClassBySize(indicator.width)">
<div [class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
<div *ngIf="!indicator.overlay">
<div
@ -95,16 +102,23 @@
</div>
</div>
</ng-container>
<ng-container *ngFor="let chart of activeSubCategory.charts; let i = index;">
<div class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid
uk-height-match="target: .uk-card">
<h5 *ngIf="chart.title && !isMobile" class="uk-width-1-1 uk-margin-bottom">{{chart.title}}</h5>
<h6 *ngIf="chart.title && isMobile" class="uk-width-1-1">{{chart.title}}</h6>
</div>
<div [class.section-container]="tabs">
<ul *ngIf="tabs" class="tabs">
<li *ngFor="let tab of activeSubCategory.charts; let i = index;" [class.uk-active]="i === activeChartSectionIndex"
(click)="changeSection(i)" class="uk-text-truncate" [attr.uk-tooltip]="getSectionTitle(tab)">
{{getSectionTitle(tab)}}
</li>
</ul>
<div *ngIf="chart" class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid uk-height-match="target: .uk-card">
<h5 *ngIf="chart.title && !isMobile && !tabs" class="uk-width-1-1 uk-margin-bottom">{{getSectionTitle(chart)}}</h5>
<div *ngIf="getSectionDescription(chart)" class="uk-width-1-1 uk-margin-bottom">{{getSectionDescription(chart)}}</div>
<h6 *ngIf="chart.title && isMobile && !tabs" class="uk-width-1-1">{{getSectionTitle(chart)}}</h6>
<ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
<div *ngIf="hasPermission(indicator.visibility) && chartsActiveType.get(i + '-' + j)"
<div *ngIf="hasPermission(indicator.visibility) && chartsActiveType.get(activeChartSectionIndex + '-' + j)"
[ngClass]="getChartClassBySize(indicator.width)">
<div class="uk-card uk-card-default uk-position-relative"
[class.semiFiltered]="chartsActiveType.get(i + '-' + j).filtersApplied < countSelectedFilters()">
[class.semiFiltered]="chartsActiveType.get(activeChartSectionIndex + '-' + j).filtersApplied < countSelectedFilters()">
<div class="uk-card-body uk-text-center uk-margin-small-bottom">
<h6 class="uk-margin-bottom chartTitle uk-flex uk-flex-bottom">
{{indicator.name + " "}}
@ -112,23 +126,23 @@
<div *ngIf="indicator.indicatorPaths.length > 1" class="uk-button-group">
<button *ngFor="let indicatorPath of indicator.indicatorPaths;"
class="uk-button"
(click)="setActiveChart(i, j, indicatorPath.type)"
[class.uk-button-secondary]="chartsActiveType.get(i + '-' + j).url === indicatorPath.url">
(click)="setActiveChart(activeChartSectionIndex, j, indicatorPath.type)"
[class.uk-button-secondary]="chartsActiveType.get(activeChartSectionIndex + '-' + j).url === indicatorPath.url">
{{indicatorPath.type}}
</button>
</div>
<iframe [class.uk-blend-multiply]="!isFullscreen"
*ngIf=" !properties.disableFrameLoad && chartsActiveType.get(i + '-' + j).source !== 'image'"
[src]="chartsActiveType.get(i + '-' + j).safeResourceUrl"
*ngIf=" !properties.disableFrameLoad && chartsActiveType.get(activeChartSectionIndex + '-' + j).source !== 'image'"
[src]="chartsActiveType.get(activeChartSectionIndex + '-' + j).safeResourceUrl"
class="uk-width-1-1" allowfullscreen="true" mozallowfullscreen="true"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
<div *ngIf="properties.disableFrameLoad && chartsActiveType.get(i + '-' + j).source !== 'image'">
<div *ngIf="properties.disableFrameLoad && chartsActiveType.get(activeChartSectionIndex + '-' + j).source !== 'image'">
<img class="uk-width-1-1 uk-blend-multiply"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"
src="assets/chart-placeholder.png">
</div>
<img *ngIf="chartsActiveType.get(i + '-' + j).source === 'image'"
[src]="chartsActiveType.get(i + '-' + j).safeResourceUrl"
<img *ngIf="chartsActiveType.get(activeChartSectionIndex + '-' + j).source === 'image'"
[src]="chartsActiveType.get(activeChartSectionIndex + '-' + j).safeResourceUrl"
class="uk-width-1-1 uk-blend-multiply"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
</div>
@ -149,12 +163,14 @@
</span>
</a>
</div>
<div *ngIf="indicator.overlay" class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
<div *ngIf="indicator.overlay"
class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
<div *ngIf="indicator.overlay == 'description'" class="inner" click-outside-or-esc
(clickOutside)="closeOverlay($event, indicator)">
<div class="uk-padding-small">
<div class="uk-flex uk-flex-right">
<button class="uk-close uk-icon" (click)="changeOverlay($event, indicator, false)">
<button class="uk-close uk-icon"
(click)="changeOverlay($event, indicator, false)">
<icon name="close" ratio="1"></icon>
</button>
</div>
@ -172,15 +188,18 @@
(clickOutside)="closeOverlay($event, indicator)">
<div class="uk-padding-small">
<div class="uk-flex uk-flex-right">
<button class="uk-close uk-icon" (click)="changeOverlay($event, indicator, false)">
<button class="uk-close uk-icon"
(click)="changeOverlay($event, indicator, false)">
<icon name="close" ratio="1"></icon>
</button>
</div>
<div class="clipboard-wrapper uk-margin-top uk-margin-bottom">
<pre id="embed_content_id" class="uk-padding-small"><code>&lt;iframe width="500" height="500" <br> src="{{chartsActiveType.get(i + '-' + j).safeResourceUrl.changingThisBreaksApplicationSecurity}}" <br> allowfullscreen="true" mozallowfullscreen="true"&gt;<br>&lt;/iframe&gt;</code></pre>
<pre id="embed_content_id" class="uk-padding-small"><code>&lt;iframe width="500" height="500" <br> src="{{chartsActiveType.get(activeChartSectionIndex + '-' + j).safeResourceUrl.changingThisBreaksApplicationSecurity}}
" <br> allowfullscreen="true" mozallowfullscreen="true"&gt;<br>&lt;/iframe&gt;</code></pre>
</div>
<div class="uk-flex uk-flex-right">
<a class="uk-link-reset copy clipboard_btn" data-clipboard-target="#embed_content_id" title="Copy code">
<a class="uk-link-reset copy clipboard_btn"
data-clipboard-target="#embed_content_id" title="Copy code">
<icon [flex]="true" name="content_copy"></icon>
</a>
</div>
@ -192,7 +211,7 @@
<div class="printGap uk-hidden"></div>
</ng-template>
</div>
</ng-container>
</div>
</div>
</div>
</div>
@ -215,7 +234,8 @@
<div>
<div class="uk-flex uk-flex-middle uk-margin-bottom">
<h4 class="uk-margin-remove-bottom">Filters</h4>
<a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-left" (click)="clearAll()"> Clear All </a>
<a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-left" (click)="clearAll()"> Clear
All </a>
</div>
<div>
<ng-container *ngTemplateOutlet="selected_filters_pills"></ng-container>
@ -227,14 +247,18 @@
</li>
<ng-container *ngFor="let filter of filters ">
<li *ngIf="filter.values.length >0">
<a *ngIf="filter.filterId == 'fos'" class="uk-float-right" href="https://explore.openaire.eu/fields-of-science" target="_blank" uk-tooltip="title:More information about Fields of Science"><span uk-icon="info"></span></a>
<a *ngIf="filter.filterId == 'fos'" class="uk-float-right"
href="https://explore.openaire.eu/fields-of-science" target="_blank"
uk-tooltip="title:More information about Fields of Science"><span uk-icon="info"></span></a>
<search-filter [filter]="filter" [showResultCount]=false
(onFilterChange)="filterChanged($event)"></search-filter>
</li>
</ng-container>
</ul>
<i *ngIf="user || countSelectedFilters() > 0 " class="uk-margin-medium-top uk-text-small uk-display-block">
<sup>*</sup> If your filter selection cannot be applied to a chart, that chart will appear grayed-out.
<i *ngIf="user || countSelectedFilters() > 0 "
class="uk-margin-medium-top uk-text-small uk-display-block">
<sup>*</sup> If your filter selection cannot be applied to a chart, that chart will appear
grayed-out.
</i>
</div>
</div>
@ -243,10 +267,10 @@
<ng-template #selected_filters_pills>
<div class="uk-slider filters-slider" uk-slider="finite: true">
<div [class.uk-invisible]="list.children.length === 0" class="uk-position-relative">
<div class="uk-slider-container" style="height: 40px">
<div class="uk-slider-container" style="height: 30px">
<ul #list class="uk-slider-items uk-grid uk-grid-small uk-margin-small-right uk-flex-nowrap">
<li *ngIf="periodFilter.selectedFromAndToValues.length > 0">
<span class="uk-label uk-label-primary uk-flex uk-flex-middle">
<span class="uk-label uk-label-small uk-label-secondary uk-flex uk-flex-middle">
<span
class="uk-margin-small-right uk-width-expand uk-text-truncate">{{periodFilter.selectedFromAndToValues}}</span>
<button [class.uk-disabled]="loading" (click)="clearPeriodFilter()" class="uk-close uk-icon"
@ -260,12 +284,13 @@
<ng-container *ngFor="let value of filter.values; let i = index;">
<ng-container *ngIf="value.selected">
<li>
<span class="uk-label uk-label-primary uk-flex uk-flex-middle">
<span class="uk-label uk-label-small uk-label-secondary uk-flex uk-flex-middle">
<span class="uk-margin-small-right uk-width-expand uk-text-truncate">
<ng-container *ngIf="filter.type && (filter.type == 'boolean' || filter.type == 'triplet') else noboolean">
<ng-container
*ngIf="filter.type && (filter.type == 'boolean' || filter.type == 'triplet') else noboolean">
{{filter.title}}:
{{(value.name=='true'||value.name=='Yes')?'Yes':'No'}}
{{(value.name == 'true' || value.name == 'Yes') ? 'Yes' : 'No'}}
</ng-container>
<ng-template #noboolean>
{{value.name}}

27
src/app/shared/monitor/monitor.component.ts
View File

@ -7,7 +7,7 @@ import {LayoutService} from "../../openaireLibrary/dashboard/sharedComponents/si
import {StatisticsService} from "../../openaireLibrary/monitor-admin/utils/services/statistics.service";
import {StakeholderService} from "../../openaireLibrary/monitor/services/stakeholder.service";
import {UserManagementService} from "../../openaireLibrary/services/user-management.service";
import {IndicatorPath, Visibility} from "../../openaireLibrary/monitor/entities/stakeholder";
import {IndicatorPath, Section, Visibility} from "../../openaireLibrary/monitor/entities/stakeholder";
import {ActivatedRoute, Router} from "@angular/router";
import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service";
import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service";
@ -22,6 +22,7 @@ import {SearchFields} from "../../openaireLibrary/utils/properties/searchFields"
templateUrl: 'monitor.component.html'
})
export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
activeChartSectionIndex: number = 0;
constructor(protected _route: ActivatedRoute,
protected _router: Router,
@ -85,9 +86,6 @@ export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
hasPermission(visibility: Visibility): boolean {
return true;
}
logIn() {
this.userManagementService.login();
}
postProcessingFosFilters(refineFilters:Filter[]){
let filters:Filter[] = [];
@ -128,4 +126,25 @@ export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
filters.push(publiclyFunded)
return filters;
}
get tabs() {
return this.activeSubCategory.charts.length > 1;
}
get chart(): Section {
return this.activeSubCategory.charts[this.activeChartSectionIndex];
}
changeSection(index: number) {
this.activeChartSectionIndex = index;
this.cdr.detectChanges();
}
getSectionTitle(section: Section) {
return section?.title?section.title.split('::')[0]:null;
}
getSectionDescription(section: Section) {
return section?.title?section.title.split('::')[1]:null;
}
}

1
src/app/shared/monitor/monitor.module.ts
View File

@ -22,7 +22,6 @@ import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module"
{path: ':topic/:category/:subCategory', component: MonitorComponent}
]), PageContentModule, SliderTabsModule, NumberRoundModule, IconsModule, ClickModule, RangeFilterModule, SearchFilterModule, SliderUtilsModule, LoadingModule],
declarations: [MonitorComponent],
exports: [MonitorComponent]
})
export class MonitorModule {
constructor(private iconsService: IconsService) {

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit ee22e97b114be823b7ab4e6c41a9cbff93b24e3a
Subproject commit 6cef9ebed0db7ecbcca023bae824239106907960

8
src/assets/extend-theme/less/_import.less vendored
View File

@ -7,9 +7,15 @@
@import "button";
@import "progress";
// Layouts
// Layout
@import "card";
// Common
@import "label";
// Javascript
@import "offcanvas";
// Navs
@import "navbar";

11
src/assets/extend-theme/less/label.less Normal file
View File

@ -0,0 +1,11 @@
@label-secondary-background: @irish-global-secondary-color;
@label-secondary-color: @global-inverse-color;
@label-secondary-border: @irish-global-secondary-color;
.hook-label-misc() {
.uk-label-secondary {
& .uk-close {
color: inherit !important;
}
}
}

1
src/assets/extend-theme/less/offcanvas.less Normal file
View File

@ -0,0 +1 @@
@offcanvas-count-background: @irish-global-secondary-color;