diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index bfc80e9..c81c5e2 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,5 +1,5 @@ import {NgModule} from '@angular/core'; -import {PreloadAllModules, RouterModule, Routes} from '@angular/router'; +import {NoPreloading, PreloadAllModules, RouterModule, Routes} from '@angular/router'; import {OpenaireErrorPageComponent} from './error/errorPage.component'; import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard"; import {AdminDashboardGuard} from "./utils/adminDashboard.guard"; @@ -62,9 +62,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [RouterModule.forRoot(routes, { - preloadingStrategy: PreloadAllModules - })], + imports: [RouterModule.forRoot(routes)], exports: [RouterModule] }) export class AppRoutingModule { diff --git a/src/app/app.component.html b/src/app/app.component.html index b420138..7955cc3 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,7 +2,7 @@
-
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index e759cd4..9e749c1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -81,9 +81,9 @@ export class AppComponent implements OnInit, OnDestroy { @HostListener('window:resize', ['$event']) onResize(event) { - if (this.layoutService.isSmallScreen && event.target.innerWidth > 1219) { + if (this.layoutService.isSmallScreen && event.target.innerWidth > 640) { this.layoutService.setSmallScreen(false); - } else if (!this.layoutService.isSmallScreen && event.target.innerWidth < 1219) { + } else if (!this.layoutService.isSmallScreen && event.target.innerWidth <= 640) { this.layoutService.setSmallScreen(true); this.layoutService.setOpen(false); } @@ -112,8 +112,8 @@ export class AppComponent implements OnInit, OnDestroy { this.route.queryParams.subscribe(params => { this.isViewPublic = (params['view'] == 'public'); }); - this.layoutService.setSmallScreen((this.innerWidth && this.innerWidth < 1219)); - this.layoutService.setOpen(!(this.innerWidth && this.innerWidth < 1219)); + this.layoutService.setSmallScreen((this.innerWidth && this.innerWidth <= 640)); + this.layoutService.setOpen(!(this.innerWidth && this.innerWidth <= 640)); this.subscriptions.push(this.params.subscribe(params => { if (this.paramsResolved) { this.loading = true; @@ -158,7 +158,7 @@ export class AppComponent implements OnInit, OnDestroy { } else { LinksResolver.resetProperties(); this.stakeholderService.setStakeholder(null); - this.layoutService.setOpen(!(this.innerWidth && this.innerWidth < 1219)); + this.layoutService.setOpen(!(this.innerWidth && this.innerWidth <= 640)); this.stakeholder = null; this.buildMenu(); this.loading = false; @@ -387,8 +387,8 @@ export class AppComponent implements OnInit, OnDestroy { this.specialSideBarMenuItem = null; if (Session.isPortalAdministrator(this.user)) { this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'})); - this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'})); - this.adminMenuItems.push(new MenuItem("stakeholders", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'})); + this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, 'admin/admin-tools')); + this.adminMenuItems.push(new MenuItem("stakeholders", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, 'admin/monitor/admin-tools')); } } } diff --git a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts index 9ddb956..4516bf1 100644 --- a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts +++ b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts @@ -71,7 +71,7 @@ declare var UIkit;
@@ -81,7 +81,7 @@ declare var UIkit;
-
{{uploadError}}
+
{{uploadError}}
+
+
+
+
+ Admin Dashboard - Manage profiles +
+
+
@@ -16,9 +22,9 @@
-
+
-
+

Profile Templates

@@ -34,7 +40,7 @@ No profiles to manage yet
-
+

Profiles

diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts index 98dece4..6da9d98 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -33,6 +33,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { public stakeholder: Stakeholder; public index: number; public user = null; + public stickyPageHeader: boolean = false; public tab: Tab = 'all'; /** * Filtered Stakeholders @@ -66,13 +67,6 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.subscriptions.push(this.route.fragment.subscribe((fragment: Tab) => { - if (this.isTab(fragment)) { - this.tab = fragment; - } else { - this.tab = 'all'; - } - })); this.buildFilters(); this.properties = properties; this.title.setTitle('Manage profiles'); diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 244326f..e11b093 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -168,9 +168,9 @@ -
- I frames preview is disabled +
+
Sign in to apply filters.
-
    +
    • diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index b5fcc6f..a11bbbe 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -116,7 +116,6 @@ export class MonitorComponent implements OnInit, OnDestroy { let subscription: Subscription; this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; - this.subscriptions.push(this.route.params.subscribe(params => { this.loading = true; this.activeTopic = null; diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts index 91d526a..798f77e 100644 --- a/src/app/monitor/monitor.module.ts +++ b/src/app/monitor/monitor.module.ts @@ -23,7 +23,7 @@ import {SearchFilterModule} from "../openaireLibrary/searchPages/searchUtils/sea 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 {done, filters, incognito} from "../openaireLibrary/utils/icons/icons"; +import {filters, incognito} from "../openaireLibrary/utils/icons/icons"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; @NgModule({ diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index c818716..41d5926 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit c8187161905d88e4def274a3cd942a262e4d21e8 +Subproject commit 41d5926be3265f11808c954d5e4efe9737a1f8d3 diff --git a/src/app/topic/indicators.component.css b/src/app/topic/indicators.component.css index d3b58d5..598ec16 100644 --- a/src/app/topic/indicators.component.css +++ b/src/app/topic/indicators.component.css @@ -2,17 +2,76 @@ min-height: 270px; } -div[id*="number-"] .uk-card-body { - padding-top: 60px; -} - -div[id*="chart-"] .uk-card-body { - padding-top: 75px; -} - .number-preview { - border: 1px solid #D1D1D1; - border-radius: 4px; + border: 1px solid var(--muted-color); + background: transparent; + border-radius: 6px; min-width: 100px; min-height: 70px; } + +.refresh-indicator { + background-color: rgba(0, 0, 0, 0.50); + border-radius: 6px; + position: absolute; + color: var(--light-color); + z-index: 1; +} + +.section { + padding: 60px 45px; + border-radius: 6px; + border: 1px solid var(--muted-color); + position: relative; + background: var(--light-color); + border-left: 5px var(--primary-color) solid; +} + +.section .tools { + position: absolute; + top: 0; + left: 50%; + transform: translate(-50%, -100%); + width: 50px; + max-width: 50px; + padding: 5px 0 5px 10px; + background-image: var(--dashboard-primary-image); + color: var(--light-color); + -webkit-clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%); + clip-path: polygon(20% 5%, 80% 5%, 100% 100%, 0% 100%); + display: none; +} + +.section:hover .tools { + display: block; +} + +.section:hover .tools a { + color: currentColor; +} + + +/* New section*/ +.new-section { + border: #707070 dashed 1px; + border-radius: 2px; + background-color: white; + min-height: 200px; + position: relative; + box-shadow: 0 2px 6px #00000038; +} + +.new-section .tools { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.new-section .tools .md-btn .material-icons { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + margin: 0; +} diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index fc5bc47..2b3f4b7 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -1,256 +1,218 @@
      -
      Number Indicators
      - -
      -
      -
      - - - - - - - - - - - - - - - - - +
      Number Indicators
      +
      +
      +
      +
      +
      + + + + + + + + + + + + + + + + +
      -
      -
      -
      -
      - +
      +
      +
      +
      + +
      +
      +
      + + + + +
      + +
      +
      +
      +

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

      +
      + {{indicator.name ? indicator.name : 'No title available'}} +
      +
      +
      +
      +       +
      +
      +
      +
      -
      - -
      -
      -
      - -
      - -
      +
      +
      + +
      +
      +
      +
      +
      Chart Indicators
      +
      +
      +
      +
      +
      + + + + + + + + + + + + + + + + +
      +
      +
      +
      +
      +
      + +
      +
      +
      + + + + +
      -
      - {{indicator.name ? indicator.name : 'No title available'}} +
      + {{indicator.name}} +
      + +
      + +
      +
      +
      -

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

      -
      -
      -

      - - {{indicator.description}} - -
      - - {{indicator.additionalDescription}} - -

      -
      -
      -
      -       -
      -
      -
      -
      -
      -
      - Create a new number Indicator -
      -
      - + +
      +
      +
      +
      +
      +
      + Create a custom indicator +
      +
      + Use our advance tool to create a custom Indicator that suit the needs of your funding + KPI's. +
      +
      + +
      - - -
      -
      -
      Chart Indicators
      - -
      -
      -
      - - - - - - - - - - - - - - - - - -
      -
      -
      -
      -
      - -
      -
      -
      -
      - -
      -
      - -
      - - -
      -
      -
      - {{indicator.name}} -
      - -
      I frames - preview is disabled -
      -
      - -
      - -
      -
      -
      -

      - - {{indicator.description}} - -
      - - {{indicator.additionalDescription}} - -

      -
      -
      -
      -
      -       -
      -
      -
      -
      -
      -
      - Create a custom indicator -
      -
      - Use our advance tool to create a custom Indicator that suit the needs of your funding - KPI's. -
      -
      - -
      -
      -
      -
      -
      +
      +
      - - +
      -
      -
      +
      +
      -
      +
      -
      +
      -
      +
      -
      +
      -
      -
      +
      +
      {{urlParameterizedMessage}}
      -
      - -
      +
      + +
      -
      +
      - There are schema enhancements that can be applied in this query. Apply now
      -
      +
      -
      +
      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.
      -
      +
      -
      -
      - - - - - - -
      -
      +
      + + + + + +
      -
      -
      - - + + {{numberIndicatorPaths.at(i).get('result').value | number}} - + --
      -
      @@ -374,7 +312,7 @@
      Calculate Calculating... -
      +
      @@ -386,48 +324,38 @@
      -
      -
      -
      +
      +
      -
      +
      -
      +
      -
      +
      -
      +
      -
      -
      -
      {{urlParameterizedMessage}}
      -
      -
      - -
      -
      + [formGroupName]="i" class="uk-grid" uk-grid> +
      +
      +
      {{urlParameterizedMessage}}
      +
      +
      + +
      +
      There are schema enchancements that can be applied in this query.
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      -
      +
      Click to refresh the graph view -
      +