From 051be690588cf9b1a1ba860b5a87889e06e712b1 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Fri, 29 Oct 2021 16:56:44 +0300 Subject: [PATCH] Add print button in dashboard's page --- src/app/monitor/monitor.component.html | 18 ++++++++++++------ src/app/monitor/monitor.component.ts | 2 +- src/app/monitor/monitor.module.ts | 8 +++++++- src/app/openaireLibrary | 2 +- src/assets/new.css | 7 +------ 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index de5876e..c784a33 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -43,9 +43,10 @@
    '"> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index cbec19c..73c9d78 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -581,7 +581,7 @@ export class MonitorComponent implements OnInit, OnDestroy { } } - public printData() { + public printReport() { window.print(); } } diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts index 1583505..c63cab1 100644 --- a/src/app/monitor/monitor.module.ts +++ b/src/app/monitor/monitor.module.ts @@ -21,12 +21,15 @@ import {BottomModule} from "../openaireLibrary/sharedComponents/bottom.module"; import {RangeFilterModule} from "../openaireLibrary/utils/rangeFilter/rangeFilter.module"; import {SearchFilterModule} from "../openaireLibrary/searchPages/searchUtils/searchFilter.module"; import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; +import {IconsService} from '../openaireLibrary/utils/icons/icons.service'; +import {IconsModule} from '../openaireLibrary/utils/icons/icons.module'; +import {print} from "../openaireLibrary/utils/icons/icons"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, InputModule, - UserMiniModule, ClickModule, BottomModule, RangeFilterModule, SearchFilterModule, PageContentModule + UserMiniModule, ClickModule, BottomModule, RangeFilterModule, SearchFilterModule, PageContentModule, IconsModule ], declarations: [ MonitorComponent @@ -41,4 +44,7 @@ import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/p ] }) export class MonitorModule { + constructor(private iconsService: IconsService) { + this.iconsService.registerIcons([print]); + } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5c7430a..afcd7fc 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5c7430ae7cde032c1b6b4d9bd990f761cd6b73e3 +Subproject commit afcd7fc3c3621a9f65663076c34216a7a45f4b25 diff --git a/src/assets/new.css b/src/assets/new.css index 8ac196e..3c7188c 100644 --- a/src/assets/new.css +++ b/src/assets/new.css @@ -246,9 +246,4 @@ .landing .uk-dropdown, new-search-page .uk-dropdown, search-all .uk-dropdown { padding: 25px; -} - -.printBtn { - display: block; - margin: auto; -} +} \ No newline at end of file