Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-4013: Fixed dashboard in Firefox

Browse Source
This commit is contained in:
Adina Țeudan 2022-05-11 15:53:03 +03:00
parent b174370216
commit a9e5dbde3f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.scss
View File

@ -25,6 +25,10 @@
}
}
.donut-chart {
flex-shrink: 0;
}
.text-container {
position: absolute;
display: flex;

12
apps/red-ui/src/app/services/dossier-templates/dashboard-stats.service.ts
View File

@ -6,6 +6,16 @@ import { Observable } from 'rxjs';
import { map, switchMap, tap } from 'rxjs/operators';
import { DossierStatesService } from '@services/entity-services/dossier-states.service';
const templatesSorter = (a: DashboardStats, b: DashboardStats) => {
if (a.numberOfActiveDossiers > 0 && b.numberOfActiveDossiers === 0) {
return -1;
} else if (a.numberOfActiveDossiers === 0 && b.numberOfActiveDossiers > 0) {
return 1;
} else {
return 0;
}
};
@Injectable({
providedIn: 'root',
})
@ -22,7 +32,7 @@ export class DashboardStatsService extends EntitiesService<DashboardStats, IDash
return this.getAll(this._defaultModelPath).pipe(
mapEach(entity => new DashboardStats(entity)),
switchMap(entities => this._dossierStatesService.loadAllForAllTemplates().pipe(map(() => entities))),
tap(entities => entities.sort((a, b) => (a.numberOfActiveDossiers > 0 && b.numberOfActiveDossiers === 0 ? -1 : 1))),
tap(entities => entities.sort(templatesSorter)),
tap(entities => this.setEntities(entities)),
);
}