diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 4c55fb2..bedb7f0 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4c55fb252cec8c1801bc37a9544c8e09412ff504 +Subproject commit bedb7f013bbca6afbc9508ce753e01078373e059 diff --git a/src/app/shared/monitor/monitor.component.html b/src/app/shared/monitor/monitor.component.html index 1d4823a..bb3a920 100644 --- a/src/app/shared/monitor/monitor.component.html +++ b/src/app/shared/monitor/monitor.component.html @@ -1,5 +1,12 @@
+
+ Active filters: +
+ +
+ Clear All +
@@ -13,98 +20,105 @@
- -
+ +
No {{entities.stakeholder}} yet.
-
-
- Active filters: -
- -
- Clear All -
- -
-
{{number.title}}
- -
-
-
-
{{indicator.name}}
-
- - -- +
+
+
+
+ +
+
{{number.title}}
+ +
+
+
+
{{indicator.name}}
+
+ + -- +
+
+ + + + + +
-
- - - - - -
-
-
-
- - - - - -
-
-

- {{indicator.description}} -

-

- {{indicator.additionalDescription}} -

-
-
-
-
- -
-
-
{{number.title}}
-
-
- -
-
-
-
{{indicator.name}}
-
- - -- -
+
+
+ + + + + +
+
+

+ {{indicator.description}} +

+

+ {{indicator.additionalDescription}} +

- +
+ +
+
+
{{number.title}}
+
+
+ +
+
+
+
{{indicator.name}}
+
+ + -- +
+
+
+
+ +
-
- - -
-
{{chart.title}}
-
{{chart.title}}
+ +
+
+
    +
  • + {{getSectionTitle(tab)}} +
    • +
+
+
{{getSectionTitle(chart)}}
+
{{getSectionDescription(chart)}}
+
{{getSectionTitle(chart)}}
-
+ [class.semiFiltered]="chartsActiveType.get(activeChartSectionIndex + '-' + j).filtersApplied < countSelectedFilters()">
{{indicator.name + " "}} @@ -112,87 +126,92 @@
-
+
-
- - - - Note - - - - - - Embed - - + + + + Note + + + + + + Embed + +
-
-
-
-
- -
-
-

- {{indicator.description}} -

-

- {{indicator.additionalDescription}} -

-
+
+
+
+
+ +
+
+

+ {{indicator.description}} +

+

+ {{indicator.additionalDescription}} +

+
+
-
-
-
-
- -
-
- 
<iframe width="500" height="500" 
 src="{{chartsActiveType.get(i + '-' + j).safeResourceUrl.changingThisBreaksApplicationSecurity}}" 
 allowfullscreen="true" mozallowfullscreen="true">
</iframe>
-
-
- - - -
+
+
+
+ +
+
+ 
<iframe width="500" height="500" 
 src="{{chartsActiveType.get(activeChartSectionIndex + '-' + j).safeResourceUrl.changingThisBreaksApplicationSecurity}}
+                                                    " 
 allowfullscreen="true" mozallowfullscreen="true">
</iframe>
+
+
+ + + +
+
-
- +
@@ -215,40 +234,45 @@

Filters

- Clear All + Clear + All
-
- -
    -
  • - -
    • - -
  • - - +
    + +
      +
    • +
      • - -
    - - * If your filter selection cannot be applied to a chart, that chart will appear grayed-out. - -
    + +
  • + + +
    • +     +
+ + * If your filter selection cannot be applied to a chart, that chart will appear + grayed-out. + +
-
+
  • - + {{periodFilter.selectedFromAndToValues}} + class="uk-margin-small-right uk-width-expand uk-text-truncate">{{periodFilter.selectedFromAndToValues}} - + + {{filter.title}}: + {{(value.name == 'true' || value.name == 'Yes') ? 'Yes' : 'No'}} + + + {{value.name}} + + + +
    • diff --git a/src/app/shared/monitor/monitor.component.ts b/src/app/shared/monitor/monitor.component.ts index 553338e..f3ca2c6 100644 --- a/src/app/shared/monitor/monitor.component.ts +++ b/src/app/shared/monitor/monitor.component.ts @@ -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; + } } diff --git a/src/app/shared/monitor/monitor.module.ts b/src/app/shared/monitor/monitor.module.ts index 3945a1b..74dd7f4 100644 --- a/src/app/shared/monitor/monitor.module.ts +++ b/src/app/shared/monitor/monitor.module.ts @@ -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) { diff --git a/src/assets/common-assets b/src/assets/common-assets index ee22e97..6cef9eb 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ee22e97b114be823b7ab4e6c41a9cbff93b24e3a +Subproject commit 6cef9ebed0db7ecbcca023bae824239106907960 diff --git a/src/assets/extend-theme/less/_import.less b/src/assets/extend-theme/less/_import.less index bbd99c7..6bbc210 100644 --- a/src/assets/extend-theme/less/_import.less +++ b/src/assets/extend-theme/less/_import.less @@ -7,9 +7,15 @@ @import "button"; @import "progress"; -// Layouts +// Layout @import "card"; +// Common +@import "label"; + +// Javascript +@import "offcanvas"; + // Navs @import "navbar"; diff --git a/src/assets/extend-theme/less/label.less b/src/assets/extend-theme/less/label.less new file mode 100644 index 0000000..a054bf7 --- /dev/null +++ b/src/assets/extend-theme/less/label.less @@ -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; + } + } +} diff --git a/src/assets/extend-theme/less/offcanvas.less b/src/assets/extend-theme/less/offcanvas.less new file mode 100644 index 0000000..5d21284 --- /dev/null +++ b/src/assets/extend-theme/less/offcanvas.less @@ -0,0 +1 @@ +@offcanvas-count-background: @irish-global-secondary-color;