acknowledge string filter

- display correct number of show entries
- all bulk actions should only apply to filtered data
- fix user group filter

client/src/app/core/services/filter-list.service.ts

@@ -67,7 +67,7 @@ export abstract class FilterListService<M extends BaseModel, V extends BaseViewM
     }
 
     /**
-     * @returns the amount of items that pass the current filters
+     * @returns the amount of items that pass the filter service's filters
      */
     public get filteredCount(): number {
         return this.filteredData ? this.filteredData.length : 0;

client/src/app/shared/components/os-sort-filter-bar/os-sort-filter-bar.component.html

@@ -1,6 +1,6 @@
 <div class="custom-table-header flex-spaced on-transition-fade">
     <div class="filter-count" *ngIf="filterService">
-        <span>{{ filterService.filteredCount }}&nbsp;</span><span translate>of</span>
+        <span>{{ displayedCount }}&nbsp;</span><span translate>of</span>
         <span>&nbsp;{{ filterService.totalCount }}</span>
     </div>
     <div class="current-filters" *ngIf="filterService && filterService.activeFilterCount">

client/src/app/shared/components/os-sort-filter-bar/os-sort-filter-bar.component.ts

@@ -19,7 +19,7 @@ import { ViewportService } from '../../../core/services/viewport.service';
  *
  * ```html
  * <os-sort-filter-bar [sortService]="sortService" [filterService]="filterService"
- * (searchFieldChange)="searchFilter($event)">
+ * (searchFieldChange)="searchFilter($event)" [filterCount]="filteredCount">
  * </os-sort-filter-bar>
  * ```
  */
@@ -35,6 +35,12 @@ export class OsSortFilterBarComponent<V extends BaseViewModel> {
     @Input()
     public sortService: SortListService<V>;
 
+    /** Optional number to overwrite the display of the filtered data count, if any additional filters
+     * (e.g. the angular search bar) are applied on top of these filters
+     */
+    @Input()
+    public filterCount: number;
+
     /**
      * The currently active filter service for the list view. It is supposed to
      * be a FilterListService extendingFilterListService.
@@ -61,6 +67,18 @@ export class OsSortFilterBarComponent<V extends BaseViewModel> {
      */
     public isSearchBar = false;
 
+    /**
+     * Return the amount of data passing filters. Priorizes the override in {@link filterCount} over
+     * the information from the filterService
+     */
+    public get displayedCount(): number {
+        if (this.filterCount === undefined || this.filterCount === null) {
+            return this.filterService.filterCount;
+        } else {
+            return this.filterCount;
+        }
+    }
+
     /**
      * Constructor. Also creates a filtermenu component and a bottomSheet
      * @param translate

client/src/app/site/agenda/components/agenda-list/agenda-list.component.html

@@ -13,8 +13,7 @@
     </div>
 </os-head-bar>
 <mat-drawer-container class="on-transition-fade">
-    <os-sort-filter-bar [filterService]="filterService" (searchFieldChange)="searchFilter($event)"></os-sort-filter-bar>
+    <os-sort-filter-bar [filterCount]="filteredCount" [filterService]="filterService" (searchFieldChange)="searchFilter($event)"></os-sort-filter-bar>
-
     <mat-table class="os-listview-table on-transition-fade" [dataSource]="dataSource" matSort>
         <!-- selector column -->
         <ng-container matColumnDef="selector">

client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts

@@ -225,6 +225,6 @@ export class AgendaListComponent extends ListViewBaseComponent<ViewItem> impleme
      * Export all items as CSV
      */
     public csvExportItemList(): void {
-        this.csvExport.exportItemList(this.dataSource.data);
+        this.csvExport.exportItemList(this.dataSource.filteredData);
     }
 }

client/src/app/site/assignments/assignment-list/assignment-list.component.html

@@ -16,7 +16,7 @@
 </os-head-bar>
 
 <mat-drawer-container class="on-transition-fade">
-        <os-sort-filter-bar [filterService]="filterService" [sortService]="sortService"
+        <os-sort-filter-bar [filterCount]="filteredCount" [filterService]="filterService" [sortService]="sortService"
             (searchFieldChange)="searchFilter($event)">
         </os-sort-filter-bar>
 <mat-table class="os-listview-table on-transition-fade" [dataSource]="dataSource" matSort>

client/src/app/site/base/list-view-base.ts

@@ -46,6 +46,13 @@ export abstract class ListViewBaseComponent<V extends BaseViewModel> extends Bas
     @ViewChild(MatSort)
     protected sort: MatSort;
 
+    /**
+     * @returns the amount of currently dispalyed items (only showing items that pass all filters)
+     */
+    public get filteredCount(): number {
+        return this.dataSource.filteredData.length;
+    }
+
     /**
      * Constructor for list view bases
      * @param titleService the title serivce
@@ -132,7 +139,7 @@ export abstract class ListViewBaseComponent<V extends BaseViewModel> extends Bas
      * Select all files in the current data source
      */
     public selectAll(): void {
-        this.selectedRows = this.dataSource.data;
+        this.selectedRows = this.dataSource.filteredData;
     }
 
     public deselectAll(): void {
@@ -175,7 +182,7 @@ export abstract class ListViewBaseComponent<V extends BaseViewModel> extends Bas
     protected checkSelection(): void {
         const newSelection = [];
         this.selectedRows.forEach(selectedrow => {
-            const newrow = this.dataSource.data.find(item => item.id === selectedrow.id);
+            const newrow = this.dataSource.filteredData.find(item => item.id === selectedrow.id);
             if (newrow) {
                 newSelection.push(newrow);
             }

client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html

@@ -49,7 +49,7 @@
 </os-head-bar>
 
 <mat-drawer-container class="on-transition-fade">
-<os-sort-filter-bar [sortService]="sortService" [filterService]="filterService"
+<os-sort-filter-bar [filterCount]="filteredCount" [sortService]="sortService" [filterService]="filterService"
     (searchFieldChange)="searchFilter($event)">
 </os-sort-filter-bar>
 <mat-table class="os-listview-table on-transition-fade" [dataSource]="dataSource" matSort>

client/src/app/site/motions/components/motion-list/motion-list.component.html

@@ -18,6 +18,7 @@
 
 <mat-drawer-container class="on-transition-fade">
     <os-sort-filter-bar
+        [filterCount]="filteredCount"
         [filterService]="filterService"
         [sortService]="sortService"
         (searchFieldChange)="searchFilter($event)"

client/src/app/site/motions/components/motion-list/motion-list.component.ts

@@ -205,14 +205,18 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion> imple
             if (result && result.format) {
                 if (result.format === 'pdf') {
                     this.pdfExport.exportMotionCatalog(
-                        this.dataSource.data,
+                        this.dataSource.filteredData,
                         result.lnMode,
                         result.crMode,
                         result.content,
                         result.metaInfo
                     );
                 } else if (result.format === 'csv') {
-                    this.motionCsvExport.exportMotionList(this.dataSource.data, result.content, result.metaInfo);
+                    this.motionCsvExport.exportMotionList(
+                        this.dataSource.filteredData,
+                        result.content,
+                        result.metaInfo
+                    );
                 }
             }
         });

client/src/app/site/users/components/user-list/user-list.component.html

@@ -16,6 +16,7 @@
 
 <mat-drawer-container class="on-transition-fade">
     <os-sort-filter-bar
+        [filterCount]="filteredCount"
         [sortService]="sortService"
         [filterService]="filterService"
         (searchFieldChange)="searchFilter($event)"

client/src/app/site/users/components/user-list/user-list.component.ts

@@ -132,7 +132,7 @@ export class UserListComponent extends ListViewBaseComponent<ViewUser> implement
      */
     public csvExportUserList(): void {
         this.csvExport.export(
-            this.dataSource.data,
+            this.dataSource.filteredData,
             [
                 { property: 'title' },
                 { property: 'first_name', label: 'Given name' },

client/src/app/site/users/services/user-filter-list.service.ts

@@ -15,7 +15,7 @@ export class UserFilterListService extends FilterListService<User, ViewUser> {
 
     private userGroupFilterOptions = {
         isActive: false,
-        property: 'group',
+        property: 'groups_id',
         label: 'User Group',
         options: []
     };
@@ -60,12 +60,16 @@ export class UserFilterListService extends FilterListService<User, ViewUser> {
         this.subscribeGroups();
     }
 
+    /**
+     * Updates the filter according to existing groups.
+     * TODO: Users with only the 'standard' group set appear in the model as items without groups_id. 'Standard'  filter is broken
+     */
     public subscribeGroups(): void {
         this.groupRepo.getViewModelListObservable().subscribe(groups => {
             const groupOptions = [];
             groups.forEach(group => {
                 groupOptions.push({
-                    condition: group.name,
+                    condition: group.id,
                     label: group.name,
                     isActive: false
                 });