arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(avrop): Fixed issue with filtering and paginating. (TV-714)

Browse Source 
Squashed commit of the following:

commit 74e3471f042b67308db3a7639cd475c7ae10402b
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Oct 1 09:23:48 2021 +0200

    readded page-check for pagination

commit 99e7e1c2f7a6435a795892242cdb4356e15b3987
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Oct 1 09:09:46 2021 +0200

    Changed params handling inside avrop
This commit is contained in:
Erik Tiekstra
2021-10-01 15:28:53 +02:00
parent 002e26c088
commit 93556d4885
7 changed files with 121 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-filters/avrop-filters.component.html
View File

@@ -1,4 +1,4 @@
<div class="avrop-filters" *ngIf="filtersAreLoading$ | async; else loadingRef">
<div class="avrop-filters" *ngIf="(filtersAreLoading$ | async) === false; else loadingRef">
<div class="avrop-filters__filter-wrapper" *ngIf="availableTjanster$ | async as availableTjanster">
<msfa-multiselect
[multiselectTitle]="'Tjänster'"

2
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-filters/avrop-filters.component.ts
View File

@@ -24,7 +24,7 @@ export class AvropFiltersComponent {
this.availableKommuner$,
this.availableTjanster$,
this.availableUtforandeVerksamheter$,
]).pipe(map(([kommuner, tjanster, uv]) => !!(kommuner && tjanster && uv)));
]).pipe(map(([kommuner, tjanster, uv]) => !(kommuner && tjanster && uv)));
constructor(private avropService: AvropService) {}

4
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.component.html
View File

@@ -1,5 +1,5 @@
<digi-ng-skeleton-base *ngIf="avropLoading" [afCount]="3" afText="Laddar nya deltagare"></digi-ng-skeleton-base>
<div *ngIf="availableAvrop?.length" class="avrop-list">
<div class="avrop-list">
<msfa-loader *ngIf="avropLoading" type="absolute"></msfa-loader>
<ul class="avrop-list__list">
<li *ngFor="let avrop of avropRows">
<msfa-avrop-row

3
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.component.scss
View File

@@ -1,6 +1,9 @@
@import 'mixins/list';
.avrop-list {
position: relative;
z-index: 0;
&__list {
@include msfa__reset-list;
display: flex;

3
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-list/avrop-list.module.ts
View File

@@ -1,13 +1,14 @@
import { DigiNgSkeletonBaseModule } from '@af/digi-ng/_skeleton/skeleton-base';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { AvropRowModule } from '../avrop-row/avrop-row.module';
import { AvropListComponent } from './avrop-list.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [AvropListComponent],
imports: [CommonModule, AvropRowModule, DigiNgSkeletonBaseModule],
imports: [CommonModule, AvropRowModule, LoaderModule, DigiNgSkeletonBaseModule],
exports: [AvropListComponent],
})
export class AvropListModule {}