Walkover-Web-Solution · dilpreetsinghofficial · May 29, 2020 · May 29, 2020 · May 29, 2020 · May 29, 2020
diff --git a/apps/web-giddh-admin/src/app/header/header.component.ts b/apps/web-giddh-admin/src/app/header/header.component.ts
@@ -60,6 +60,8 @@ export class HeaderComponent implements OnInit {
 
     public clearData() {
         this.generalService.clearUserSession();
+        // To clear all stored local storage filter
+        this.generalService.clearCacheStoredFilter();
     }
 
     public getCompaniesList() {

diff --git a/apps/web-giddh-admin/src/app/licence-key/licence-key-component/licence-key.component.html b/apps/web-giddh-admin/src/app/licence-key/licence-key-component/licence-key.component.html
@@ -140,7 +140,7 @@ <h3>No records found.</h3>
         </div>
         <div class="paginationWrapper">
             <div *ngIf="LicenceKeyRes && LicenceKeyRes.totalItems > 50">
-                <pagination [totalItems]="LicenceKeyRes.totalItems" [maxSize]="5" class="pagination-sm" [boundaryLinks]="true" [itemsPerPage]="50" [rotate]="false" previousText="&#9668;" nextText="&#9658;" (pageChanged)="pageChanged($event)"></pagination>
+                <pagination [totalItems]="LicenceKeyRes.totalItems" [maxSize]="5" class="pagination-sm" [(ngModel)]="getAllLicenceKeyRequest.page" [boundaryLinks]="true" [itemsPerPage]="50" [rotate]="false" previousText="&#9668;" nextText="&#9658;" (pageChanged)="pageChanged($event)"></pagination>
             </div>
         </div>
     </div>

diff --git a/apps/web-giddh-admin/src/app/licence-key/licence-key-component/licence-key.component.ts b/apps/web-giddh-admin/src/app/licence-key/licence-key-component/licence-key.component.ts
@@ -1,14 +1,14 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { LicenceService } from '../../services/licence.service';
 import { SubscriberList, PAGINATION_COUNT } from '../../modules/modules/api-modules/subscription';
-import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
 import { GeneralService } from '../../services/general.service';
 import { Router } from '@angular/router';
 import { FavouriteColumnPageTypeEnum } from '../../actions/general/general.const';
 import { ColumnFilterService } from '../../services/column-filter.service';
 import { ToasterService } from '../../services/toaster.service';
 import { cloneDeep } from '../../lodash-optimized';
 import { LicenseFieldFilterColumnNames } from '../../models/company';
+import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { BsDropdownDirective } from 'ngx-bootstrap/dropdown';
 
 @Component({
@@ -47,9 +47,11 @@ export class LicenceKeyComponent implements OnInit {
         this.generalService.setCurrentPageTitle("License Keys");
         this.getAllLicenceKeyRequest.count = PAGINATION_COUNT;
         this.getAllLicenceKeyRequest.page = 1;
-        this.getAllLicenceKey();
+
         /** To get dynamic column filter  */
         this.getColumnFilter();
+        /** To check local storage filter available */
+        this.checkLocalStorageFilter();
     }
 
     /**
@@ -58,6 +60,8 @@ export class LicenceKeyComponent implements OnInit {
      * @memberof LicenceKeyComponent
      */
     public getAllLicenceKey() {
+
+        localStorage.setItem("licensePaginationFilter", JSON.stringify(this.getAllLicenceKeyRequest));
         this.licenseService.getAllLicenseKeys(this.getAllLicenceKeyRequest).subscribe(res => {
             if (res.status === 'success') {
                 this.LicenceKeyRes = res.body;
@@ -261,4 +265,21 @@ export class LicenceKeyComponent implements OnInit {
             }
         });
     }
+
+    /**
+    *To check local storage filter available
+    *
+    * @memberof UserListComponent
+    */
+    public checkLocalStorageFilter() {
+
+        let licensePaginationFilter = localStorage.getItem("licensePaginationFilter");
+        if (licensePaginationFilter) {
+            let retrievedLicensePaginationFilterObject = JSON.parse(licensePaginationFilter);
+            this.getAllLicenceKeyRequest = retrievedLicensePaginationFilterObject;
+            this.getAllLicenceKey();
+        } else {
+            this.getAllLicenceKey();
+        }
+    }
 }
diff --git a/apps/web-giddh-admin/src/app/licence-key/licence-key.module.ts b/apps/web-giddh-admin/src/app/licence-key/licence-key.module.ts
@@ -2,14 +2,14 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
-import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
-import { PaginationModule } from 'ngx-bootstrap/pagination';
-import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
 import { LicenceKeyRoutingModule } from './licence-key-routing.module';
 import { LicenceKeyComponent } from './licence-key-component/licence-key.component';
 import { GenerateKeyComponent } from './components/generate-key/generate-key.component';
 import { ShSelectModule } from '../theme/ng-virtual-select/sh-select.module';
+import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
+import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
+import { PaginationModule } from 'ngx-bootstrap/pagination';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
 
 @NgModule({
     declarations: [LicenceKeyComponent, GenerateKeyComponent],

diff --git a/apps/web-giddh-admin/src/app/login/login.module.ts b/apps/web-giddh-admin/src/app/login/login.module.ts
@@ -2,10 +2,10 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
-import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
 
 import { LoginComponent } from './login.component'
 import { LoginRoutingModule } from './login-routing.module';
+import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
 
 
 

diff --git a/apps/web-giddh-admin/src/app/plans/components/create-plans/create-plans.component.html b/apps/web-giddh-admin/src/app/plans/components/create-plans/create-plans.component.html
@@ -1,52 +1,138 @@
-<div class="bg-box" [ngClass]="rightToggle ? 'in': 'out'"></div>
-<div class="rightSlide kot-repring-sidebar" [ngClass]="rightToggle ? 'in': 'out'">
-    <div class="top-right-head">
-        <p class="bold text-18 text-white mb-0">Create Plan</p>
-        <a href="javascript:;" (click)="closePopup()" class="close"><i class="icon-cross"></i></a>
-    </div>
-    <div class="clearfix pr-2 pl-2 pt-2">
-        <form name="form" #createPlanForm="ngForm" novalidate="" autocomplete="off">
-            <div class="form-group">
-                <label>Plan name</label>
-                <input type="text" class="form-control" #planName name="name" [(ngModel)]="createPlanRequest.name" required (blur)="validatePlanName()">
-            </div>
-            <div class="form-group">
-                <label>Number of companies allowed</label>
-                <input type="number" class="form-control" (blur)="validateMinValue()" name="companiesLimit" [(ngModel)]="createPlanRequest.companiesLimit" required>
-            </div>
-            <div class="form-group">
-                <label>Number of transactions</label>
-                <input type="number" class="form-control" (blur)="validateMinValue()" name="transactionLimit" [(ngModel)]="createPlanRequest.transactionLimit" required>
-            </div>
-            <div class="form-group">
-                <label>Subscription price</label>
-                <input type="number" class="form-control" name="amount" [(ngModel)]="createPlanRequest.amount" required>
-            </div>
-            <div class="form-group">
-                <label>Country</label>   
-                <sh-select [multiple]="true" placeholder="Select Countries" name="countries" autocomplete="false" id="countries" [(ngModel)]="createPlanRequest.countries" [options]="countries" [isFilterEnabled]="true" [ItemHeight]="33"></sh-select>
-            </div>
-            <!-- <div class="form-group">
-                <label>Currency</label>
-                <sh-select placeholder="Select Currency" name="currency" autocomplete="false" id="currency" [(ngModel)]="createPlanRequest.currency" [options]="currencies" [isFilterEnabled]="true" [ItemHeight]="33"></sh-select>
-            </div> -->
-            <div class="form-group">
-                <label>Duration</label>
-                <input type="number" class="form-control" (blur)="validateMinValue()" name="duration" [(ngModel)]="createPlanRequest.duration" required>
-            </div>
-            <div class="form-group">
-                <label>Duration unit</label>
-                <sh-select placeholder="Select Duration Unit" name="durationUnit" autocomplete="false" id="durationUnit" [(ngModel)]="createPlanRequest.durationUnit" [options]="durationUnits" [isFilterEnabled]="true" [ItemHeight]="33"></sh-select>   
-            </div>
-            <div class="form-group">
-                <label>Rate per extra transaction</label>
-                <input type="number" class="form-control" (blur)="validateMinValue()" name="ratePerExtraTransaction" [(ngModel)]="createPlanRequest.ratePerExtraTransaction" required>
-            </div>
-            <div class="form-group">
-              <input type="checkbox" name="isCommonPlan" [(ngModel)]="createPlanRequest.isCommonPlan" value="1">
-              <label class="mr-1">Is Common Plan</label>
-            </div>
-            <input type="button" value="Create" class="btn-blue btn" (click)="createPlan()" [disabled]="createPlanForm.invalid || isLoading">
-        </form>
-    </div>
-</div>
+<div class="bg-box" [ngClass]="rightToggle ? 'in' : 'out'"></div>
+<div
+  class="rightSlide kot-repring-sidebar"
+  [ngClass]="rightToggle ? 'in' : 'out'"
+>
+  <div class="top-right-head">
+    <p class="bold text-18 text-white mb-0">Create Plan</p>
+    <a href="javascript:;" (click)="closePopup()" class="close"
+      ><i class="icon-cross"></i
+    ></a>
+  </div>
+  <div class="clearfix pr-2 pl-2 pt-2">
+    <form name="form" #createPlanForm="ngForm" novalidate="" autocomplete="off">
+      <div class="form-group">
+        <label>Plan name</label>
+        <input
+          type="text"
+          class="form-control"
+          #planName
+          name="name"
+          [(ngModel)]="createPlanRequest.name"
+          required
+          (blur)="validatePlanName()"
+        />
+      </div>
+      <div class="form-group">
+        <label>Number of companies allowed</label>
+        <input
+          type="number"
+          class="form-control"
+          (blur)="validateMinValue()"
+          name="companiesLimit"
+          [(ngModel)]="createPlanRequest.companiesLimit"
+          required
+        />
+      </div>
+      <div class="form-group">
+        <label>Number of transactions</label>
+        <input
+          type="number"
+          class="form-control"
+          (blur)="validateMinValue()"
+          name="transactionLimit"
+          [(ngModel)]="createPlanRequest.transactionLimit"
+          required
+        />
+      </div>
+      <div class="form-group">
+        <label>Subscription price</label>
+        <input
+          type="number"
+          class="form-control"
+          name="amount"
+          [(ngModel)]="createPlanRequest.amount"
+          required
+        />
+      </div>
+      <div class="form-group">
+        <label>Country</label>
+        <sh-select
+          [multiple]="true"
+          placeholder="Select Countries"
+          name="countries"
+          autocomplete="false"
+          id="countries"
+          [(ngModel)]="createPlanRequest.countries"
+          [options]="countries"
+          [isFilterEnabled]="true"
+          [ItemHeight]="33"
+        ></sh-select>
+      </div>
+      <div class="form-group">
+        <label>Currency</label>
+        <sh-select
+          placeholder="Select Currency"
+          name="currency"
+          autocomplete="false"
+          id="currency"
+          [(ngModel)]="createPlanRequest.currency"
+          [options]="currencies"
+          [isFilterEnabled]="true"
+          [ItemHeight]="33"
+        ></sh-select>
+      </div>
+      <div class="form-group">
+        <label>Duration</label>
+        <input
+          type="number"
+          class="form-control"
+          (blur)="validateMinValue()"
+          name="duration"
+          [(ngModel)]="createPlanRequest.duration"
+          required
+        />
+      </div>
+      <div class="form-group">
+        <label>Duration unit</label>
+        <sh-select
+          placeholder="Select Duration Unit"
+          name="durationUnit"
+          autocomplete="false"
+          id="durationUnit"
+          [(ngModel)]="createPlanRequest.durationUnit"
+          [options]="durationUnits"
+          [isFilterEnabled]="true"
+          [ItemHeight]="33"
+        ></sh-select>
+      </div>
+      <div class="form-group">
+        <label>Rate per extra transaction</label>
+        <input
+          type="number"
+          class="form-control"
+          (blur)="validateMinValue()"
+          name="ratePerExtraTransaction"
+          [(ngModel)]="createPlanRequest.ratePerExtraTransaction"
+          required
+        />
+      </div>
+      <div class="form-group">
+        <input
+          type="checkbox"
+          name="isCommonPlan"
+          [(ngModel)]="createPlanRequest.isCommonPlan"
+          value="1"
+        />
+        <label class="mr-1">Is Common Plan</label>
+      </div>
+      <input
+        type="button"
+        value="Create"
+        class="btn-blue btn"
+        (click)="createPlan()"
+        [disabled]="createPlanForm.invalid || isLoading"
+      />
+    </form>
+  </div>
+</div>
diff --git a/apps/web-giddh-admin/src/app/plans/plans-component/plans.component.html b/apps/web-giddh-admin/src/app/plans/plans-component/plans.component.html
@@ -74,14 +74,14 @@
             <thead>
                 <tr (clickOutside)="inlineSearch = null">
                     <th class="table-search" *ngIf="showFieldFilter.planName">
-                        <div [hidden]="inlineSearch == 'planName'">
+                        <div [hidden]="inlineSearch == 'planName' || getAllPlansPostRequest.planName">
                             <div class="d-flex align-items-center justify-content-between">
                                 <span>Plan Name</span>
                                 <i class="fa fa-search pull-right" (click)="focusOnColumnSearch('planName')"></i>
                             </div>
                         </div>
-                        <div class="input-container" [hidden]="inlineSearch !== 'planName'">
-                            <input type="text" placeholder="Plan Name" class="form-control w100" #planNameField name="planName" [(ngModel)]="getAllPlansPostRequest.planName" (keypress)="columnSearch()" (keydown)="columnSearch()" />
+                        <div class="input-container" [hidden]="inlineSearch !== 'planName' && !getAllPlansPostRequest.planName">
+                            <input type="text" placeholder="Plan Name" class="form-control w100" #planNameField name="planName" [(ngModel)]="getAllPlansPostRequest.planName" (ngModelChange)="searchViaPlanName$.next($event)" />
                         </div>
                     </th>
                     <th *ngIf="showFieldFilter.createdOn">
@@ -95,7 +95,7 @@
                     <th *ngIf="showFieldFilter.totalAmount" (click)="sortBy('TOTAL_AMOUNT')">Total Amount
                         <i [ngClass]="{'fa pull-right': 1 === 1, 'icon-icon-sort-up': getAllPlansRequest.sortType === 'desc' && getAllPlansRequest.sortBy === 'TOTAL_AMOUNT', 'icon-icon-sort-down': (getAllPlansRequest.sortType === 'asc' && getAllPlansRequest.sortBy === 'TOTAL_AMOUNT') || getAllPlansRequest.sortBy !== 'TOTAL_AMOUNT'}"></i>
                     </th>
-                    <th *ngIf="showFieldFilter.expiry" (click)="sortBy('EXPIRY')">Expiry in next 30 days
+                    <th class="min-width-210" *ngIf="showFieldFilter.expiry" (click)="sortBy('EXPIRY')">Expiry in next 30 days
                         <i [ngClass]="{'fa pull-right': 1 === 1, 'icon-icon-sort-up': getAllPlansRequest.sortType === 'desc' && getAllPlansRequest.sortBy === 'EXPIRY', 'icon-icon-sort-down': (getAllPlansRequest.sortType === 'asc' && getAllPlansRequest.sortBy === 'EXPIRY') || getAllPlansRequest.sortBy !== 'EXPIRY'}"></i>
                     </th>
 
@@ -135,55 +135,57 @@
     </tbody>
     <tbody *ngIf="!plansData || !plansDataResults || plansDataResults.length === 0">
         <tr>
-            <td colspan="7" align="center"><h3>No records found.</h3></td>
+            <td colspan="7" align="center">
+                <h3>No records found.</h3>
+            </td>
         </tr>
     </tbody>
     </table>
 </div>
 
 <div class="paginationWrapper">
     <div *ngIf="plansData && plansData.totalItems > PAGINATION_COUNT">
-        <pagination [totalItems]="plansData.totalItems" [maxSize]="5" class="pagination-sm" [boundaryLinks]="true" [itemsPerPage]="PAGINATION_COUNT" [rotate]="false" previousText="&#9668;" nextText="&#9658;" (pageChanged)="pageChanged($event)"></pagination>
+        <pagination [totalItems]="plansData.totalItems" [maxSize]="5" class="pagination-sm" [boundaryLinks]="true" [(ngModel)]="getAllPlansRequest.page" [itemsPerPage]="PAGINATION_COUNT" [rotate]="false" previousText="&#9668;" nextText="&#9658;" (pageChanged)="pageChanged($event)"></pagination>
     </div>
 </div>
 
 <div class="page-footer">
     <div class="row">
         <div class="col-md-1 col-sm-3 wrap-row">
             <div class="userNumber">
-                <h4>{{planStats?.commonPlans}}</h4>
+                <h4>{{planStates?.commonPlans}}</h4>
             </div>
             <div class="aboutUser">
                 <p>Common Plans</p>
             </div>
         </div>
         <div class="col-md-1 col-sm-3 wrap-row">
             <div class="userNumber">
-                <h4>{{planStats?.adminPlans}}</h4>
+                <h4>{{planStates?.adminPlans}}</h4>
             </div>
             <div class="aboutUser">
                 <p>Admin Plans</p>
             </div>
         </div>
         <div class="col-md-1 col-sm-3 wrap-row">
             <div class="userNumber">
-                <h4>{{planStats?.totalPlans}}</h4>
+                <h4>{{planStates?.totalPlans}}</h4>
             </div>
             <div class="aboutUser">
                 <p>Total Plans</p>
             </div>
         </div>
         <div class="col-md-1 col-sm-3 wrap-row">
             <div class="userNumber">
-                <h4>{{planStats?.paidPlans}}</h4>
+                <h4>{{planStates?.paidPlans}}</h4>
             </div>
             <div class="aboutUser">
                 <p>Paid Plans</p>
             </div>
         </div>
         <div class="col-md-1 col-sm-3 wrap-row">
             <div class="userNumber">
-                <h4>{{planStats?.trialPlans}}</h4>
+                <h4>{{planStates?.trialPlans}}</h4>
             </div>
             <div class="aboutUser">
                 <p>Trial Plans</p>