From 3b094da655b3011a78547b5d4a3b81189834be17 Mon Sep 17 00:00:00 2001 From: Konstantinos Triantafyllou Date: Sun, 1 Nov 2020 15:41:56 +0000 Subject: [PATCH] [Monitor Dashboard]: 1. Finish manage stakeholders. 2. Remove logos. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59732 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app.component.ts | 20 +- src/app/general/general.component.html | 4 +- src/app/general/general.module.ts | 4 +- .../manageStakeholders.component.css | 21 ++ .../manageStakeholders.component.html | 197 ++++++------ .../manageStakeholders.component.ts | 33 +- .../manageStakeholders.module.ts | 8 +- src/app/monitor/monitor.component.html | 64 ++-- src/app/monitor/monitor.module.ts | 3 +- src/app/topic/topic.component.html | 74 +++-- src/app/topic/topic.module.ts | 3 +- src/app/users/users.component.html | 8 +- src/app/users/users.module.ts | 3 +- src/assets/dashboard-theme/card.css | 11 + src/assets/dashboard-theme/dropdowns.css | 18 +- src/assets/dashboard-theme/structure.css | 26 +- src/assets/dashboard-theme/tabs-pills.css | 6 +- src/assets/dashboard-theme/text.css | 11 +- src/assets/dashboard-theme/variables.css | 6 +- src/assets/logo-large-monitor.png | Bin 221210 -> 0 bytes src/assets/logo-small-monitor.png | Bin 8018 -> 0 bytes src/assets/new.css | 304 +++++++++--------- 22 files changed, 447 insertions(+), 377 deletions(-) create mode 100644 src/app/manageStakeholders/manageStakeholders.component.css delete mode 100644 src/assets/logo-large-monitor.png delete mode 100644 src/assets/logo-small-monitor.png diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f6e9813..8161d57 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -20,7 +20,7 @@ import {properties} from "../environments/environment"; templateUrl: './app.component.html' }) export class AppComponent implements OnInit, OnDestroy { - properties: EnvProperties = properties; + properties: EnvProperties = properties; user: User; params: BehaviorSubject = new BehaviorSubject(null); hasSidebar: boolean = false; @@ -40,9 +40,9 @@ export class AppComponent implements OnInit, OnDestroy { logoSmallUrl: null, position: 'center', badge: false, - stickyAnimation : false + stickyAnimation: false }; - + userMenuItems: MenuItem[] = [new MenuItem("", "My profile", "", "", false, [], [], {})]; adminMenuItems: MenuItem[] = []; stakeholder: Stakeholder = null; @@ -104,7 +104,7 @@ export class AppComponent implements OnInit, OnDestroy { }); this.layoutService.setOpen(false); this.subscriptions.push(this.params.subscribe(params => { - if(this.paramsResolved) { + if (this.paramsResolved) { this.loading = true; this.layoutService.setSmallScreen((this.innerWidth && this.innerWidth < 1219)); this.layoutService.setOpen(!(this.innerWidth && this.innerWidth < 1219)); @@ -319,6 +319,18 @@ export class AppComponent implements OnInit, OnDestroy { return this.user && (Session.isPortalAdministrator(this.user) || Session.isCommunityCurator(this.user) || Session.isMonitorCurator(this.user) || (this.stakeholder && Session.isManager(this.stakeholder.type, this.stakeholder.alias, this.user))); } + private resolvePageInner() { + if(document !== undefined) { + let header = document.getElementById('pager_header_content'); + let inner = document.getElementById('page_content_inner'); + if(header) { + inner.setAttribute('style', '{margin-top:' + header.offsetHeight+ '}'); + } else { + inner.setAttribute('style', '{margin-top:' + 0 + '}'); + } + } + } + public isPublicOrIsMember(visibility: Visibility): boolean { if (visibility == "PRIVATE") { return false; diff --git a/src/app/general/general.component.html b/src/app/general/general.component.html index 90e355b..1bedb02 100644 --- a/src/app/general/general.component.html +++ b/src/app/general/general.component.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/src/app/general/general.module.ts b/src/app/general/general.module.ts index f9150a9..672bc90 100644 --- a/src/app/general/general.module.ts +++ b/src/app/general/general.module.ts @@ -10,6 +10,7 @@ import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module import {ReactiveFormsModule} from "@angular/forms"; import {AdminDashboardGuard} from "../utils/adminDashboard.guard"; import {EditStakeholderModule} from "./edit-stakeholder/edit-stakeholder.module"; +import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; @NgModule({ declarations: [GeneralComponent], @@ -21,7 +22,8 @@ import {EditStakeholderModule} from "./edit-stakeholder/edit-stakeholder.module" LoadingModule, AlertModalModule, ReactiveFormsModule, - EditStakeholderModule + EditStakeholderModule, + PageContentModule ], providers: [ AdminDashboardGuard, PreviousRouteRecorder, diff --git a/src/app/manageStakeholders/manageStakeholders.component.css b/src/app/manageStakeholders/manageStakeholders.component.css new file mode 100644 index 0000000..d658426 --- /dev/null +++ b/src/app/manageStakeholders/manageStakeholders.component.css @@ -0,0 +1,21 @@ +.uk-card { + min-height: 270px; +} + +.uk-card-body { + padding-top: 75px; +} + +.uk-card-default .name { + margin-left: auto; + margin-right: auto; +} + +.uk-card-default .uk-card-title .logo { + display: inline-block; + max-width: 80%; +} + +.uk-card-default .uk-card-title .logo > img { + max-height: 60px; +} diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html index 6404a3d..600ced7 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ b/src/app/manageStakeholders/manageStakeholders.component.html @@ -1,14 +1,13 @@ -
-
- -
+
+
+ +
- search -
+
-
-
Profile Templates
-
- - - - -
- + +
+
+
+
Profile Templates
+
+ + + +
+ +
+
-
-
-
-
Profiles
-
- - - - -
- +
Profiles
+
+ + + +
+ +
+
-
- -
-
-
-
-
- -
-
-
- -
- {{stakeholder.name}} -
- +
+ + + +
+ +
+ {{stakeholder.name}} +
+ +
- +
-
-
-
-
- {{text}} -
-
- -
-
+
+
+ {{text}} +
+
+ + +
@@ -133,6 +136,6 @@ id="edit_modal" [large]="true" (alertOutput)="editStakeholderComponent.save(callback)" [okDisabled]="editStakeholderComponent.disabled"> - + diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts index 0b8bda4..a8eb653 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -17,7 +17,8 @@ declare var UIkit; @Component({ selector: 'home', - templateUrl: "./manageStakeholders.component.html" + templateUrl: "./manageStakeholders.component.html", + styleUrls: ['manageStakeholders.component.css'] }) export class ManageStakeholdersComponent implements OnInit, OnDestroy { @@ -52,8 +53,9 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { @ViewChild('editStakeholderModal') editStakeholderModal: AlertModal; @ViewChild('deleteStakeholderModal') deleteStakeholderModal: AlertModal; @ViewChild('editStakeholderComponent') editStakeholderComponent: EditStakeholderComponent; - - tab:"all" | "templates" | "profiles" = "all"; + + tab: "all" | "templates" | "profiles" = "all"; + constructor(private stakeholderService: StakeholderService, private userManagementService: UserManagementService, private propertiesService: EnvironmentSpecificService, @@ -100,7 +102,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { hide(element: any) { UIkit.dropdown(element).hide(); } - + private buildFilters() { this.filters = this.fb.group({ @@ -115,7 +117,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { this.onKeywordChange(value); })); } - + onStatusChange(value) { this.displayDefaultStakeholders = this.filterStatus(this.defaultStakeholders, value); this.displayStakeholders = this.filterStatus(this.stakeholders, value); @@ -125,7 +127,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { this.displayDefaultStakeholders = this.filterByKeyword(this.defaultStakeholders, value); this.displayStakeholders = this.filterByKeyword(this.stakeholders, value); } - + private filterStatus(stakeholders: Stakeholder[], value): Stakeholder[] { if (value === 'all') { return stakeholders; @@ -138,8 +140,10 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { if (value === null || value === '') { return stakeholders; } else { - return stakeholders.filter(stakeholder => ( - stakeholder.index_id && stakeholder.index_id.toLowerCase().includes(value.toLowerCase())) || + return stakeholders.filter(stakeholder => + stakeholder.name && stakeholder.name.toLowerCase().includes(value.toLowerCase()) || + stakeholder.type && stakeholder.type.toLowerCase().includes(value.toLowerCase()) || + stakeholder.index_id && stakeholder.index_id.toLowerCase().includes(value.toLowerCase()) || stakeholder.index_shortName && stakeholder.index_shortName.toLowerCase().includes(value.toLowerCase()) || stakeholder.index_name && stakeholder.index_name.toLowerCase().includes(value.toLowerCase()) ); @@ -207,7 +211,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { } }); } - changeStakeholderStatus(stakeholder: Stakeholder, visibility:Visibility) { + + changeStakeholderStatus(stakeholder: Stakeholder, visibility: Visibility) { let path = [ stakeholder._id ]; @@ -215,6 +220,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { stakeholder.isActive = isActive; }); } + toggleStakeholderStatus(stakeholder: Stakeholder) { let path = [ stakeholder._id @@ -232,19 +238,24 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { stakeholder.isPublic = isPublic; }); } + public isManager(): boolean { return this.isCurator() || (Session.isKindOfMonitorManager(this.user)); } - public isProfileManager(stakeholder:Stakeholder): boolean { + + public isProfileManager(stakeholder: Stakeholder): boolean { return this.isCurator() || (Session.isManager(stakeholder.type, stakeholder.alias, this.user)); } + public isCurator(): boolean { return this.isAdmin() || Session.isCommunityCurator(this.user) || Session.isMonitorCurator(this.user); } + public isAdmin(): boolean { return Session.isPortalAdministrator(this.user); } - changeTab(tab:"all" | "templates" | "profiles"){ + + changeTab(tab: "all" | "templates" | "profiles") { this.tab = tab; } } diff --git a/src/app/manageStakeholders/manageStakeholders.module.ts b/src/app/manageStakeholders/manageStakeholders.module.ts index 76f9d77..071f49f 100644 --- a/src/app/manageStakeholders/manageStakeholders.module.ts +++ b/src/app/manageStakeholders/manageStakeholders.module.ts @@ -11,8 +11,9 @@ import {ReactiveFormsModule} from "@angular/forms"; import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholder.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; -import {bullet} from "../openaireLibrary/utils/icons/icons"; +import {add, bullet, earth, group, lock, search} from "../openaireLibrary/utils/icons/icons"; import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard"; +import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; @NgModule({ declarations: [ManageStakeholdersComponent], @@ -25,7 +26,8 @@ import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard"; AlertModalModule, ReactiveFormsModule, EditStakeholderModule, - IconsModule + IconsModule, + PageContentModule ], providers: [ LoginGuard, PreviousRouteRecorder, @@ -34,6 +36,6 @@ import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard"; }) export class ManageStakeholdersModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([bullet]); + this.iconsService.registerIcons([bullet, search, earth, group, lock, add]); } } diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 8bd0618..830b5e2 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -40,43 +40,41 @@ -
-
-
- + +
+ Filters: +
-
+
diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts index 0b7e45f..c54d098 100644 --- a/src/app/monitor/monitor.module.ts +++ b/src/app/monitor/monitor.module.ts @@ -21,12 +21,13 @@ import {ClickModule} from "../openaireLibrary/utils/click/click.module"; 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"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, InputModule, - UserMiniModule, ClickModule, BottomModule, RangeFilterModule, SearchFilterModule + UserMiniModule, ClickModule, BottomModule, RangeFilterModule, SearchFilterModule, PageContentModule ], declarations: [ MonitorComponent diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index c830b37..a3b5fe9 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -69,24 +69,23 @@
-
-
-
-