diff --git a/src/app/app.component.html b/src/app/app.component.html index 5e7a84f..ca20eef 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -17,7 +17,7 @@ > diff --git a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts index 9a7762d..b8811dc 100644 --- a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts +++ b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts @@ -269,17 +269,17 @@ export class EditStakeholderComponent implements OnDestroy { this.removePhoto(); this.subscriptions.push(this.stakeholderService.buildStakeholder(this.properties.monitorServiceAPIURL, this.stakeholderFb.value).subscribe(stakeholder => { - UIkit.notification(stakeholder.name + '\'s has been successfully created', { + UIkit.notification(stakeholder.name + '\'s has been successfully created', { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); callback(stakeholder); }, error => { UIkit.notification('An error has occurred. Please try again later', { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); if (errorCallback) { errorCallback(error) @@ -292,17 +292,17 @@ export class EditStakeholderComponent implements OnDestroy { this.stakeholderFb.get('index_name').enable(); this.stakeholderFb.get('index_shortName').enable(); this.subscriptions.push(this.stakeholderService.saveElement(this.properties.monitorServiceAPIURL, this.stakeholderFb.value).subscribe(stakeholder => { - UIkit.notification(stakeholder.name + '\'s has been successfully saved', { + UIkit.notification(stakeholder.name + '\'s has been successfully saved', { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); callback(stakeholder); }, error => { UIkit.notification('An error has occurred. Please try again later', { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); })); } diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts index afbed06..14863b6 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -203,10 +203,10 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { this.index = (this.stakeholder) ? this.stakeholders.findIndex(value => value._id === this.stakeholder._id) : -1; } this.subscriptions.push(this.stakeholderService.deleteElement(this.properties.monitorServiceAPIURL, [this.stakeholder._id]).subscribe(() => { - UIkit.notification(this.stakeholder.name+ ' has been successfully deleted', { + UIkit.notification(this.stakeholder.name+ ' has been successfully deleted', { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); if (!this.stakeholder.defaultId) { this.defaultStakeholders.splice(this.index, 1); @@ -216,8 +216,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { }, error => { UIkit.notification('An error has occurred. Please try again later', { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); })); } @@ -228,16 +228,16 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { ]; this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => { stakeholder.visibility = visibility; - UIkit.notification(stakeholder.name+ '\'s status has been successfully changed to ' + stakeholder.visibility.toLowerCase(), { + UIkit.notification(stakeholder.name+ '\'s status has been successfully changed to ' + stakeholder.visibility.toLowerCase(), { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); }, error => { UIkit.notification('An error has occurred. Please try again later', { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); })); } diff --git a/src/app/monitor/monitor.component.css b/src/app/monitor/monitor.component.css index e69de29..3ff2230 100644 --- a/src/app/monitor/monitor.component.css +++ b/src/app/monitor/monitor.component.css @@ -0,0 +1,3 @@ +.uk-card { + min-height: 270px; +} diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 4b1680a..d055591 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -76,8 +76,8 @@
-
-
+
+

@@ -91,15 +91,14 @@

-
0) || (activeCategory && activeCategory.description && activeCategory.description.length > 0) || (activeTopic && activeTopic.description && activeTopic.description.length > 0))" - class="uk-text-center"> + class="uk-text-center">
{{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description : @@ -107,65 +106,60 @@
-
-
+ (activeSubCategory.charts.length == 0 || (activeSubCategory.charts.length == 1 && countIndicatorsToShow(activeSubCategory.charts[0].indicators) == 0)) + ) || !activeTopic || !activeCategory || !activeSubCategory)" [ngIfElse]="content"> +

No indicators available yet. Stay tuned!

-
-
- -

{{number.title}}

- -
-
-
-
Filtered: - {{indicator.indicatorPaths[0].filtersApplied}} - out of - {{countSelectedFilters()}}
-
{{indicator.name}}
-

- {{numberResults.get(i + '-' + j) | number}} -

- + + +
+ +
{{number.title}}
+ +
+
+
+
Filtered: + {{indicator.indicatorPaths[0].filtersApplied}} + out of + {{countSelectedFilters()}}
+
{{indicator.name}}
+

+ {{numberResults.get(i + '-' + j) | number}} +

+ +
-
+ - -
-
-
- -

{{chart.title}}

- -
-
+
+
+
+
{{chart.title}}
+ +
+ [class.semiFiltered]="chartsActiveType.get(i + '-' + j).filtersApplied < countSelectedFilters()">

{{indicator.name + " "}}
@@ -191,29 +185,30 @@ [src]="chartsActiveType.get(i + '-' + j).safeResourceUrl" [class]="' uk-width-1-1 uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"> - +

-
- + +
-
-
- -
- - Powered by OpenAIRE Research Graph - +
+ +
+ + Powered by OpenAIRE Research Graph + . Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}} +
+ +
+ Send us your feedback. +
- -
- Send us your feedback. -
-
+
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 3feb7fd..0c71936 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -12,7 +12,7 @@ import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; import { Category, Indicator, - IndicatorPath, + IndicatorPath, IndicatorSize, Stakeholder, SubCategory, Topic, @@ -525,4 +525,24 @@ export class MonitorComponent implements OnInit, OnDestroy { mailMe() { window.location.href = this.mailText; } + + public getNumberClassBySize(size: IndicatorSize) { + if(size === 'small') { + return 'uk-width-1-4@xl uk-width-1-3@l uk-width-1-2@m uk-width-1-1'; + } else if(size === 'medium') { + return 'uk-width-1-3@l uk-width-1-2@m uk-width-1-1'; + } else { + return 'uk-width-1-2@l uk-width-1-1@m uk-width-1-1'; + } + } + + public getChartClassBySize(size: IndicatorSize) { + if(size === 'small') { + return 'uk-width-1-3@xl uk-width-1-2@m uk-width-1-1'; + } else if(size === 'medium') { + return 'uk-width-1-2@l uk-width-1-1'; + } else { + return 'uk-width-1-1'; + } + } } diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index 358410c..76cf167 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -43,9 +43,7 @@
@@ -81,20 +79,21 @@

{{numberResults.get(i + '-' + j) | number}}

- +
-
-
-
- Create a new number Indicator -
-
- +
+
+
+
+ Create a new number Indicator +
+
+ +
@@ -147,9 +146,7 @@
@@ -185,31 +182,33 @@
+ (indicator.height?indicator.height.toLowerCase():'medium')" + [src]="indicator.indicatorPaths[0].url">
- +
-
-
-
- Create a custom indicator -
-
- Use our advance tool to create a custom Indicator that suit the needs of your funding - KPI's. -
-
- +
+
+
+
+ Create a custom indicator +
+
+ Use our advance tool to create a custom Indicator that suit the needs of your funding + KPI's. +
+
+ +
@@ -267,7 +266,8 @@ [class.uk-text-danger]="numberIndicatorPaths.at(i).get('result').invalid && numberIndicatorPaths.at(i).get('result').errors.required"> JSON Path -
+
This JSON path is not valid or the result has not been calculated yet. Please press calculate on box below to see the result. @@ -302,9 +302,11 @@
- {{numberIndicatorPaths.at(i).get('result').value | number}} + {{numberIndicatorPaths.at(i).get('result').value | number}} -
+
@@ -331,7 +333,7 @@
-
diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts index 1f4dd4c..47e6ced 100644 --- a/src/app/topic/indicators.component.ts +++ b/src/app/topic/indicators.component.ts @@ -11,7 +11,7 @@ import { } from "@angular/core"; import { Indicator, - IndicatorPath, + IndicatorPath, IndicatorSize, IndicatorType, Section, Stakeholder, @@ -408,6 +408,26 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV return this.chartIndicatorFb.get('indicatorPaths') as FormArray; } + public getNumberClassBySize(size: IndicatorSize) { + if(size === 'small') { + return 'uk-width-1-4@xl uk-width-1-3@l uk-width-1-2@m uk-width-1-1'; + } else if(size === 'medium') { + return 'uk-width-1-3@l uk-width-1-2@m uk-width-1-1'; + } else { + return 'uk-width-1-2@l uk-width-1-1@m uk-width-1-1'; + } + } + + public getChartClassBySize(size: IndicatorSize) { + if(size === 'small') { + return 'uk-width-1-3@xl uk-width-1-2@m uk-width-1-1'; + } else if(size === 'medium') { + return 'uk-width-1-2@l uk-width-1-1'; + } else { + return 'uk-width-1-1'; + } + } + public addJsonPath(index: number) { if (index == 0 && this.getJsonPath(index).getRawValue()[index].indexOf(",") != -1) { //if in the first path there are more than one paaths comma separated, split them and autogenerate the forms @@ -792,18 +812,18 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV this.filterNumbers(); this.numberIndicatorFb = null; } - UIkit.notification('Indicator has been successfully saved', { + UIkit.notification('Indicator has been successfully saved', { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; }, error => { this.chartIndicatorFb = null; UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; })); @@ -894,17 +914,17 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV this.numbers.find(section => section._id === this.section._id).indicators.splice(this.index, 1); this.filterNumbers(); } - UIkit.notification('Indicator has been successfully deleted', { + UIkit.notification('Indicator has been successfully deleted', { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; }, error => { UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; })); @@ -922,17 +942,17 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV ]; this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => { indicator.visibility = visibility; - UIkit.notification('Indicator has been successfully changed to ' + indicator.visibility.toLowerCase(), { + UIkit.notification('Indicator has been successfully changed to ' + indicator.visibility.toLowerCase(), { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; }, error => { UIkit.notification('An error has been occurred. Try again later', { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; })); @@ -950,17 +970,17 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV ]; this.stakeholderService.toggleAccess(this.properties.monitorServiceAPIURL, path).subscribe(visibility => { indicator.visibility = visibility; - UIkit.notification('Indicator has been successfully changed to ' + (visibility?'public':'private'), { + UIkit.notification('Indicator has been successfully changed to ' + (visibility?'public':'private'), { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; }, error => { UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; }); @@ -983,17 +1003,17 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV this.filterNumbers(); } this.initReorder(); - UIkit.notification('Section has been successfully saved', { + UIkit.notification('Section has been successfully saved', { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; }, error => { UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; })); @@ -1025,17 +1045,17 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV this.filterNumbers(); } this.initReorder(); - UIkit.notification('Section has been successfully created', { + UIkit.notification('Section has been successfully created', { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; }, error => { UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; })); @@ -1096,17 +1116,17 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV this.filterNumbers(); } this.initReorder(); - UIkit.notification('Section has been successfully deleted', { + UIkit.notification('Section has been successfully deleted', { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; }, error => { UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); this.editing = false; })); diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 4084c77..e663e2d 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -54,7 +54,7 @@
  • - + Create new topic diff --git a/src/app/topic/topic.component.ts b/src/app/topic/topic.component.ts index 5074755..23e4f90 100644 --- a/src/app/topic/topic.component.ts +++ b/src/app/topic/topic.component.ts @@ -474,8 +474,8 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { callback(saveElement); UIkit.notification(message, { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); if (redirect) { this.router.navigate(['../' + saveElement.alias], { @@ -485,8 +485,8 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { }, error => { UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); })); } @@ -497,8 +497,8 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { this.stakeholderService.setStakeholder(this.stakeholder); UIkit.notification(message, { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); if (redirect) { this.back(); @@ -506,8 +506,8 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { }, error => { UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); })); } @@ -526,16 +526,16 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => { element.visibility = visibility; this.stakeholderService.setStakeholder(this.stakeholder); - UIkit.notification(StringUtils.capitalize(this.type) + ' has been successfully changed to ' + element.visibility.toLowerCase(), { + UIkit.notification(StringUtils.capitalize(this.type) + ' has been successfully changed to ' + element.visibility.toLowerCase(), { status: 'success', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); }, error => { UIkit.notification(error.error.message, { status: 'danger', - timeout: 3000, - pos: 'top-left' + timeout: 6000, + pos: 'bottom-right' }); })); } diff --git a/src/app/utils/indicator-utils.ts b/src/app/utils/indicator-utils.ts index b6ae2ed..9d40c6b 100644 --- a/src/app/utils/indicator-utils.ts +++ b/src/app/utils/indicator-utils.ts @@ -171,7 +171,7 @@ export class IndicatorUtils { basicChartTypes:IndicatorPathType[] =["pie", "line", "column", "bar"]; defaultChartType:IndicatorPathType = "other"; indicatorSizes: Option[] = [ - {value: 'small', label: 'Small'}, + {value: 'small', label: 'Small(Enabled only for large screens)'}, {value: 'medium', label: 'Medium'}, {value: 'large', label: 'Large'} ]; diff --git a/src/assets/dashboard-theme/structure.css b/src/assets/dashboard-theme/structure.css index 0b591bc..e8095a4 100644 --- a/src/assets/dashboard-theme/structure.css +++ b/src/assets/dashboard-theme/structure.css @@ -50,9 +50,14 @@ padding: 5px 0; } -#sidebar_main .menu_section ul:not(.uk-dropdown-nav) > li > a, #sidebar_main .special_section ul:not(.uk-dropdown-nav) > li > a { - display: block; +#sidebar_main .menu_section ul:not(.uk-dropdown-nav) > li > *, +#sidebar_main .special_section ul:not(.uk-dropdown-nav) > li > a { font-size: var(--sidebar-font-size); +} + +#sidebar_main .menu_section ul:not(.uk-dropdown-nav) > li > a, +#sidebar_main .special_section ul:not(.uk-dropdown-nav) > li > a { + display: block; color: rgba(var(--text-color-rgb), 0.5); } @@ -85,7 +90,8 @@ transition-property: left; } -.sidebar_main_swipe #page_content, .sidebar_main_swipe openaire-user > user > *, +.sidebar_main_swipe #page_content, +.sidebar_main_swipe openaire-user > user > *, .sidebar_main_swipe openaire-error > * { padding-left: var(--sidebar-width); padding-top: var(--header-height); @@ -96,6 +102,10 @@ -o-transition: 0.5s; } +.sidebar_main_swipe #page_content .message { + padding-left: var(--sidebar-width); +} + .sidebar_main_swipe bottom > * { padding-left: var(--sidebar-width); transition: 0.5s; @@ -124,6 +134,7 @@ /*Sidebar mini*/ .sidebar_main_swipe.sidebar_mini #page_content, +.sidebar_main_swipe.sidebar_mini #page_content .message, .sidebar_main_swipe.sidebar_mini openaire-user > user > *, .sidebar_main_swipe.sidebar_mini openaire-error > *, .sidebar_main_swipe.sidebar_mini bottom > * { @@ -144,8 +155,16 @@ } #page_content { - min-height: calc(100vh - var(--header-height)); + min-height: calc(70vh - var(--header-height)); background-color: var(--background-color); + position: relative; +} + +#page_content .message { + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + position: absolute; } #page_content_header { diff --git a/src/assets/dashboard-theme/tabs-pills.css b/src/assets/dashboard-theme/tabs-pills.css index fa2a432..85edf02 100644 --- a/src/assets/dashboard-theme/tabs-pills.css +++ b/src/assets/dashboard-theme/tabs-pills.css @@ -14,7 +14,7 @@ .uk-subnav-pill > * > :first-child { text-transform: none; - font-size: 13px; + font-size: var(--sidebar-font-size); color: var(--text-color); } @@ -35,11 +35,14 @@ .uk-tab > li > a { color: rgb(var(--text-color-rgb), 0.5) !important; - font-size: var(--small-font-size); font-family: "Open Sans", sans-serif !important; text-transform: capitalize; } +.uk-tab > li > * { + font-size: var(--small-font-size); +} + .uk-tab > li:hover > a { color: var(--secondary-color) !important; }