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

Change reorder of indicators in order to update uikit version

This commit is contained in:
Konstantinos Triantafyllou 2021-12-09 10:15:45 +02:00
parent e2e43c6825
commit 8c0247c4c5
4 changed files with 117 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 2eb06717dd681898ef47da0f5da39a9005df3878
Subproject commit ca430fd89f7654bb71f52383bd52bf58e4c70e5f

25
src/app/topic/indicators.component.html
View File

@ -2,10 +2,8 @@
<div *ngIf="numberSections">
<h6 class="uk-text-bold">Number Indicators</h6>
<ng-template ngFor [ngForOf]="numbers" let-number let-i="index">
<div [id]="'number-' + number._id"
class="uk-grid-match uk-grid-small uk-grid uk-margin-top section"
uk-sortable="group: number" uk-grid>
<div class="tools disable-sortable uk-sortable-nodrag">
<div class="section uk-margin-top uk-padding-small">
<div class="tools">
<div class="actions">
<a [class.uk-disabled]="editing" class="" (click)="createSection(i, 'number')"
title="Create a new section">
@ -28,8 +26,7 @@
<!-- </ng-container>-->
</div>
</div>
<div *ngIf="numberSections.at(i)"
class="uk-width-1-1 uk-margin-medium-bottom disable-sortable uk-sortable-nodrag">
<div *ngIf="numberSections.at(i)" class="uk-margin-medium-bottom">
<div dashboard-input [formInput]="numberSections.at(i).get('title')"
[extraLeft]="false" class="uk-width-1-3@m uk-width-1-1" placeholder="Title"
inputClass="input-borderless uk-h5 uk-margin-remove">
@ -41,6 +38,7 @@
</div>
</div>
</div>
<div [id]="'number-' + number._id" class="uk-grid-match uk-grid-small uk-grid" uk-sortable="group: chart" uk-grid>
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
<div *ngIf="indicator" [id]="indicator._id"
[ngClass]="getNumberClassBySize(indicator.width)">
@ -102,7 +100,8 @@
</div>
</div>
</ng-template>
<div class="disable-sortable uk-sortable-nodrag uk-width-1-1">
</div>
<div class="uk-margin-medium-top">
<div class="uk-grid uk-grid-small" uk-grid>
<div [ngClass]="getNumberClassBySize('small')">
<div class="uk-card uk-card-default uk-card-body clickable" (click)="editNumberIndicatorOpen(number)">
@ -123,10 +122,8 @@
<div *ngIf="chartSections" class="uk-margin-large-top">
<h6 class="uk-text-bold">Chart Indicators</h6>
<ng-template ngFor [ngForOf]="charts" let-chart let-i="index">
<div [id]="'chart-' + chart._id"
class="uk-grid-match section uk-grid-small uk-grid uk-margin-top"
uk-sortable="group: chart" uk-grid>
<div class="tools disable-sortable uk-sortable-nodrag">
<div class="section uk-margin-top uk-padding-small">
<div class="tools">
<div class="actions">
<a [class.uk-disabled]="editing" class="" (click)="createSection(i)"
title="Create a new section">
@ -150,7 +147,7 @@
</div>
</div>
<div *ngIf="chartSections.at(i)"
class="uk-width-1-1 uk-margin-medium-bottom disable-sortable uk-sortable-nodrag">
class="uk-margin-medium-bottom">
<div dashboard-input [formInput]="chartSections.at(i).get('title')"
[extraLeft]="false" class="uk-width-1-3@m uk-width-1-1" placeholder="Title"
inputClass="input-borderless uk-h5 uk-margin-remove">
@ -162,6 +159,7 @@
</div>
</div>
</div>
<div [id]="'chart-' + chart._id" class="uk-grid-match uk-grid-small uk-grid" uk-sortable="group: chart" uk-grid>
<ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
<div *ngIf="indicator" [id]="indicator._id"
[ngClass]="getChartClassBySize(indicator.width)">
@ -234,7 +232,8 @@
</div>
</div>
</ng-template>
<div class="disable-sortable uk-sortable-nodrag uk-width-1-1">
</div>
<div class="uk-margin-medium-top">
<div class="uk-grid uk-grid-small" uk-grid>
<div [ngClass]="getChartClassBySize('small')">
<div class=" uk-card uk-card-default uk-card-body clickable" (click)="editChartIndicatorOpen(chart)">

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 28db142aa54b8bea87ada52dbae2da7c7da8f458
Subproject commit 18d805e05fe839e143f9f1eeb9fd42f4dcea67d0

2
src/assets/dashboard-theme

@ -1 +1 @@
Subproject commit 8f656664973f82d9f6f0228968a77643964da805
Subproject commit 3534471c8c7dcd58d53cb8ad84a92e051ef72dd8