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

Round numbers in monitor and admin indicators

This commit is contained in:
Konstantinos Triantafyllou 2022-12-21 13:40:47 +02:00
parent 670dfe6e0a
commit 8077d58cd7
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@
<div *ngIf="!showDescriptionOverlay[j]">
<div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
<div class="number uk-text-small uk-text-bold">
<span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
<span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | numberRound}}</span>
<span *ngIf="!numberResults.get(i + '-' + j)">--</span>
</div>
<div *ngIf="indicator.description || indicator.additionalDescription"

3
src/app/monitor/monitor.module.ts
View File

@ -25,13 +25,14 @@ import {IconsService} from '../openaireLibrary/utils/icons/icons.service';
import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
import {filters, graph, incognito} from "../openaireLibrary/utils/icons/icons";
import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
import {NumberRoundModule} from "../openaireLibrary/utils/pipes/number-round.module";
@NgModule({
imports: [
CommonModule, FormsModule, RouterModule, ErrorMessagesModule,
HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, InputModule,
UserMiniModule, ClickModule, BottomModule, RangeFilterModule, SearchFilterModule, PageContentModule, IconsModule,
LogoUrlPipeModule
LogoUrlPipeModule, NumberRoundModule
],
declarations: [
MonitorComponent

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 10130d368a1e3c72e6785fe2291234529040bf84
Subproject commit 328198b6a56c3f3ecb38c7928073914a9609ddc0

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

@ -68,7 +68,7 @@
</div>
<div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
<div class="number uk-text-small uk-text-bold">
<span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
<span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | numberRound}}</span>
<span *ngIf="!numberResults.get(i + '-' + j)">--</span>
</div>
</div>

3
src/app/topic/topic.module.ts
View File

@ -20,11 +20,12 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
import {NotifyFormModule} from "../openaireLibrary/notifications/notify-form/notify-form.module";
import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
import {TransitionGroupModule} from "../openaireLibrary/utils/transition-group/transition-group.module";
import {NumberRoundModule} from "../openaireLibrary/utils/pipes/number-round.module";
@NgModule({
imports: [
CommonModule, TopicRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule,
ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule, NotifyFormModule, LogoUrlPipeModule, TransitionGroupModule
ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule, NotifyFormModule, LogoUrlPipeModule, TransitionGroupModule, NumberRoundModule
],
declarations: [
TopicComponent, IndicatorsComponent

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 2882ccde4eb93bd01b4cdb480790cc04b394794d
Subproject commit be12d2637a68e4d17b3a45befe40af2ee8431b6a