Merge pull request #183 from Gid733/master

Added sorting & pagesize saving

Author: renemadsen

eform-client/package.json

@@ -82,11 +82,11 @@
     "ts-node": "5.0.1",
     "tslint": "5.9.1",
     "typescript": "2.7.2",
-    "wdio-chromedriver-service": "0.1.3",
+    "wdio-chromedriver-service": "0.1.5",
     "wdio-dot-reporter": "0.0.10",
-    "wdio-mocha-framework": "0.6.3",
-    "wdio-selenium-standalone-service": "0.0.10",
+    "wdio-mocha-framework": "0.6.4",
+    "wdio-selenium-standalone-service": "0.0.11",
     "wdio-spec-reporter": "0.1.5",
-    "webdriverio": "4.14.0"
+    "webdriverio": "4.14.1"
   }
 }

eform-client/src/app/common/enums/application-pages-settings.const.ts

@@ -0,0 +1,70 @@
+import {ApplicationPages} from 'src/app/common/enums/application-pages.enum';
+import {
+  ApplicationPageModel,
+  PageSettingsModel
+} from 'src/app/common/models/settings/application-page-settings.model';
+
+export const ApplicationPagesSettings = [
+  new ApplicationPageModel({
+      name: ApplicationPages[ApplicationPages.Eforms],
+      index: ApplicationPages.Eforms,
+      settings: new PageSettingsModel({
+        pageSize: 1000000,
+        sort: 'id',
+        isSortDsc: false
+      })
+    }
+  ),
+  new ApplicationPageModel({
+      name: ApplicationPages[ApplicationPages.DeviceUsers],
+      index: ApplicationPages.DeviceUsers,
+      settings: new PageSettingsModel({
+        pageSize: 10
+      })
+    }
+  ),
+  new ApplicationPageModel({
+      name: ApplicationPages[ApplicationPages.Cases],
+      index: ApplicationPages.Cases,
+      settings: new PageSettingsModel({
+        pageSize: 10
+      })
+    }
+  ),
+  new ApplicationPageModel({
+      name: ApplicationPages[ApplicationPages.AccountManagementUsers],
+      index: ApplicationPages.AccountManagementUsers,
+      settings: new PageSettingsModel({
+        pageSize: 10
+      })
+    }
+  ),
+  new ApplicationPageModel({
+      name: ApplicationPages[ApplicationPages.Security],
+      index: ApplicationPages.Security,
+      settings: new PageSettingsModel({
+        pageSize: 10
+      })
+    }
+  ),
+  new ApplicationPageModel({
+      name: ApplicationPages[ApplicationPages.EntitySearch],
+      index: ApplicationPages.EntitySearch,
+      settings: new PageSettingsModel({
+        pageSize: 10,
+        sort: 'id',
+        isSortDsc: false
+      })
+    }
+  ),
+  new ApplicationPageModel({
+      name: ApplicationPages[ApplicationPages.EntitySelect],
+      index: ApplicationPages.EntitySelect,
+      settings: new PageSettingsModel({
+        pageSize: 10,
+        sort: 'id',
+        isSortDsc: false
+      })
+    }
+  )
+];

eform-client/src/app/common/enums/application-pages.enum.ts

@@ -0,0 +1,9 @@
+export enum ApplicationPages {
+  Eforms = 0,
+  DeviceUsers,
+  Cases,
+  AccountManagementUsers,
+  Security,
+  EntitySearch,
+  EntitySelect
+}

eform-client/src/app/common/enums/index.ts

@@ -0,0 +1,2 @@
+export * from './application-pages-settings.const';
+export * from './application-pages.enum';

eform-client/src/app/common/models/settings/application-page-settings.model.ts

@@ -0,0 +1,26 @@
+export class ApplicationPageModel {
+  name: string;
+  settings: PageSettingsModel = new PageSettingsModel();
+
+  constructor(data?: any) {
+    if (data) {
+      this.name = data.name;
+      this.settings = data.settings;
+    }
+  }
+}
+
+export class PageSettingsModel {
+  pageSize: number;
+  sort: string;
+  isSortDsc: boolean;
+  additional: Array<{key: string, value: string}> = [];
+
+  constructor(data?: any) {
+    if (data) {
+      this.pageSize = data.pageSize;
+      this.sort = data.sort;
+      this.isSortDsc = data.isSortDsc;
+    }
+  }
+}

eform-client/src/app/common/models/settings/index.ts

@@ -3,3 +3,4 @@ export * from './admin-settings.model';
 export * from './login-page-settings.model';
 export * from './header-settings.model';
 export * from './user-settings.model';
+export * from './application-page-settings.model';

eform-client/src/app/common/modules/eform-shared/components/eform-page-size/eform-page-size.component.html

@@ -0,0 +1,8 @@
+<ng-select
+  [items]="pageSizes"
+  (ngModelChange)="updateCurrentPageSettings($event)"
+  [clearable]="false"
+  [(ngModel)]="pageSize"
+  dropdownPosition="top"
+  [placeholder]="'Display' | translate">
+</ng-select>

eform-client/src/app/common/modules/eform-shared/components/eform-page-size/eform-page-size.component.ts

@@ -0,0 +1,18 @@
+import {Component, EventEmitter, Input, Output} from '@angular/core';
+
+@Component({
+  selector: 'eform-page-size',
+  templateUrl: './eform-page-size.component.html'
+})
+export class EformPageSizeComponent {
+  @Input() pageSize: number;
+  @Output() onPageSizeChanged: EventEmitter<number> = new EventEmitter<number>();
+  pageSizes = [5, 10, 100, 1000, 100000];
+
+  constructor() {
+  }
+
+  updateCurrentPageSettings(e: any) {
+    this.onPageSizeChanged.emit(e);
+  }
+}

eform-client/src/app/common/modules/eform-shared/components/index.ts

@@ -1,3 +1,4 @@
 export * from './eform-page-subheader/eform-page-subheader.component';
 export * from './eform-pagination/eform-pagination.component';
 export * from './eform-spinner/eform-spinner.component';
+export * from './eform-page-size/eform-page-size.component';

eform-client/src/app/common/modules/eform-shared/eform-shared.module.ts

@@ -1,23 +1,34 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+import {NgSelectModule} from '@ng-select/ng-select';
 import {TranslateModule} from '@ngx-translate/core';
 
-import {EformPageSubheaderComponent, EformPaginationComponent, EformSpinnerComponent} from './components';
+import {
+  EformPageSubheaderComponent,
+  EformPaginationComponent,
+  EformSpinnerComponent,
+  EformPageSizeComponent
+} from './components';
 
 @NgModule({
   imports: [
     CommonModule,
-    TranslateModule
+    TranslateModule,
+    NgSelectModule,
+    FormsModule
   ],
   declarations: [
     EformPageSubheaderComponent,
     EformPaginationComponent,
-    EformSpinnerComponent
+    EformSpinnerComponent,
+    EformPageSizeComponent
   ],
   exports: [
     EformPageSubheaderComponent,
     EformPaginationComponent,
-    EformSpinnerComponent
+    EformSpinnerComponent,
+    EformPageSizeComponent
   ]
 })
 export class EformSharedModule {