MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 21 Wiki Activity

Remove padding from edit-stakeholder. Fix margins in monitor page. Update libraries

This commit is contained in:
Konstantinos Triantafyllou 2022-03-28 01:36:58 +03:00
parent 6fab4e6fea
commit 3d4335c89f
7 changed files with 135 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/general/edit-stakeholder/edit-stakeholder.component.ts
View File

@ -3,7 +3,7 @@ import {Stakeholder} from "../../openaireLibrary/monitor/entities/stakeholder";
import {FormBuilder, FormGroup, Validators} from "@angular/forms";
import {StakeholderUtils} from "../../utils/indicator-utils";
import {Option} from "../../openaireLibrary/sharedComponents/input/input.component";
import {Subscriber, Subscription} from "rxjs";
import {Subscription} from "rxjs";
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
import {properties} from "../../../environments/environment";
import {StakeholderService} from "../../openaireLibrary/monitor/services/stakeholder.service";
@ -20,12 +20,9 @@ declare var UIkit;
@Component({
selector: 'edit-stakeholder',
template: `
<div [ngStyle]="{'max-height': maxHeight}"
[class.uk-padding-small]="!paddingLarge" [class.uk-padding-large]="paddingLarge"
class="uk-overflow-auto uk-padding-remove-bottom uk-padding-remove-horizontal">
<div [ngStyle]="{'max-height': maxHeight}" class="uk-overflow-auto">
<form *ngIf="stakeholderFb" [formGroup]="stakeholderFb">
<div class="uk-grid" [class.uk-margin-small-bottom]="!paddingLarge"
[class.uk-margin-large-bottom]="paddingLarge" uk-grid uk-height-match=".uk-form-hint">
<div class="uk-grid uk-margin-bottom" uk-grid>
<div class="uk-width-1-2@m">
<div class="uk-text-bold uk-form-label uk-margin-small-bottom">Name</div>
<div dashboard-input id="name" [formInput]="stakeholderFb.get('name')"
@ -126,9 +123,8 @@ export class EditStakeholderComponent implements OnDestroy {
@Input()
public maxHeight = 'none';
@Input()
public paddingLarge: boolean = false;
@Input()
public disableAlias: boolean = false;
public test: string;
public stakeholderFb: FormGroup;
public secure: boolean = false;
public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
@ -250,8 +246,7 @@ export class EditStakeholderComponent implements OnDestroy {
this.stakeholderFb.get('type').enable();
}, 0);
}
}
));
}));
}
public get isAdmin() {

3
src/app/general/general.component.html
View File

@ -24,8 +24,7 @@
<div *ngIf="stakeholder">
<div class="uk-position-relative" style="min-height: 60vh">
<div [class.hidden]="loading">
<edit-stakeholder #editStakeholderComponent [disableAlias]="true"
[paddingLarge]="true" ></edit-stakeholder>
<edit-stakeholder #editStakeholderComponent [disableAlias]="true"></edit-stakeholder>
</div>
<div *ngIf="loading" class="uk-position-center">
<loading *ngIf="loading"></loading>

12
src/app/monitor/monitor.component.html
View File

@ -46,7 +46,7 @@
<h1 class="uk-h4 uk-margin-remove">{{stakeholder.name}}</h1>
</div>
</div>
<div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-margin">
<div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-margin-top">
<ul class="uk-tab">
<ng-template ngFor [ngForOf]="activeTopic.categories" let-category>
<li *ngIf="isPublicOrIsMember(category.visibility)"
@ -77,7 +77,7 @@
</div>-->
</div>
<div inner>
<div *ngIf="activeCategory && countSubCategoriesToShow(activeCategory) > 1" class="uk-flex uk-flex-right uk-margin-bottom">
<div *ngIf="activeCategory && countSubCategoriesToShow(activeCategory) > 1" class="uk-flex uk-flex-right">
<ul class="uk-subnav uk-subnav-pill-alt">
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory let-i="index">
<li *ngIf="isPublicOrIsMember(subCategory.visibility)"
@ -90,7 +90,6 @@
</ng-template>
</ul>
</div>
<div [class.uk-padding]="!isSmallScreen">
<div *ngIf="privateStakeholder" class="message">
<div class="uk-text-center">
<h3 class="uk-flex uk-flex-middle">
@ -99,7 +98,7 @@
</h3>
</div>
</div>
<div *ngIf="!privateStakeholder && stakeholder">
<div *ngIf="!privateStakeholder && stakeholder" class="uk-section">
<div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.charts) == 0))
&& ((activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0) ||
(activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
@ -157,10 +156,10 @@
</ng-template>
</div>
</ng-container>
<div [class.uk-margin-large-top]="activeSubCategory.numbers.length > 0">
<div [class.uk-margin-large-top]="countSectionsWithIndicatorsToShow(activeSubCategory.numbers) > 0">
<ng-container *ngFor="let chart of activeSubCategory.charts; let i = index;">
<div *ngIf="countIndicatorsToShow(chart.indicators) > 0"
class="uk-grid uk-grid-column-small uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid uk-height-match="target: .uk-card">
class="uk-grid uk-grid-column-medium uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid uk-height-match="target: .uk-card">
<h5 *ngIf="chart.title" class="uk-width-1-1 uk-margin-bottom">{{chart.title}}</h5>
<ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
<div *ngIf="isPublicOrIsMember(indicator.visibility) && chartsActiveType.get(i + '-' + j)"
@ -232,7 +231,6 @@
</ng-template>
</div>
</div>
</div>
</div>
<!--(click)="filterToggle= !filterToggle"
[style.display]="(filterToggle?'none':'inherit')"-->

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 3fd632a2b754a336615b8a776bea95ee9808e93c
Subproject commit dc0544d0d8f54071cb7c9bffec36de19b0bccd68

2
src/assets/dashboard-theme

@ -1 +1 @@
Subproject commit d4d37fc52dd45a0cb9917403d5ce37732cab164e
Subproject commit 27598ac7359cb13b5017ee1f97b7bd2c743659ae

3
src/assets/monitor-dashboard-custom.css
View File

@ -1,6 +1,7 @@
.stakeholderPage {
/* Structure */
--structure-page-content-background-color: #EDF1FA;
--structure-page-content-background-color: #F3F3F3;
--structure-page-content-background-color-rgb: 243, 243, 243;
/* Navbar */
--navbar-background-image: url("~src/assets/banner.jpg");

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 9f07792c4368f8b1e4d41ca7cd8e47f257a25885
Subproject commit 60b581dc8e8aa393cd3b7e604375132e015acaf8