datetime temp commit

src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.ts

@@ -1,23 +1,28 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { IDataSource } from '@poweredsoft/data';
 import { IMerchant } from 'src/app/data/services/IMerchant';
 import { MerchantService } from 'src/app/data/services/merchant.service';
 import { BsModalRef } from 'ngx-bootstrap/modal';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'ps-command-modal-demo',
   templateUrl: './command-modal-demo.component.html',
   styleUrls: ['./command-modal-demo.component.scss']
 })
-export class CommandModalDemoComponent implements OnInit {
+export class CommandModalDemoComponent implements OnInit,OnDestroy {
 
   columns = ['id','name', 'address', 'commands'];
   pages:any;
   merchantDataSource: IDataSource<IMerchant>;  
+  private _dataSubscription: Subscription;
   constructor(private  merchantService: MerchantService){
     this.merchantDataSource = this.createDataSource();
 
   }
+  ngOnDestroy(): void {
+    this._dataSubscription.unsubscribe();
+  }
 
   newMerchant(name: string) {
     this.merchantDataSource.executeCommandByName('addMerchant', {

src/app/data-grid-demo/data-grid-demo-home/data-grid-demo-home.component.ts

@@ -1,22 +1,27 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { DataSource, IDataSource, IQueryExecutionResult, IQueryExecutionGroupResult } from '@poweredsoft/data';
 import { IMerchant } from 'src/app/data/services/IMerchant';
 import { MerchantService } from 'src/app/data/services/merchant.service';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'ps-data-grid-demo-home',
   templateUrl: './data-grid-demo-home.component.html',
   styleUrls: ['./data-grid-demo-home.component.scss']
 })
-export class DataGridDemoHomeComponent implements OnInit {
+export class DataGridDemoHomeComponent implements OnInit, OnDestroy {
 
   title = 'cdkDemo';
   columns = ['id','name', 'address', 'commands']
   merchantDataSource: IDataSource<IMerchant>;  
+  private _dataSubscription: Subscription;
   constructor(private  merchantService: MerchantService){
     this.merchantDataSource = this.createDataSource();
 
   }
+  ngOnDestroy(): void {
+    this._dataSubscription.unsubscribe();
+  }
 
   
 

src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.ts

@@ -1,16 +1,18 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { IDataSource } from '@poweredsoft/data';
 import { IMerchant } from 'src/app/data/services/IMerchant';
 import { MerchantService } from 'src/app/data/services/merchant.service';
 import { FormGroup, FormControl, FormBuilder, Validators } from '@angular/forms';
 import { IModelFormCreateEvent } from 'projects/poweredsoft/ngx-bootstrap/src/public-api';
+import { Subscription } from 'rxjs';
+import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
 
 @Component({
   selector: 'ps-form-group-modal-demo',
   templateUrl: './form-group-modal-demo.component.html',
   styleUrls: ['./form-group-modal-demo.component.scss']
 })
-export class FormGroupModalDemoComponent implements OnInit {
+export class FormGroupModalDemoComponent implements OnInit,OnDestroy {
  
   createDataSource(): IDataSource<IMerchant> {
     return this.merchantService.createDataSource();
@@ -18,10 +20,14 @@ export class FormGroupModalDemoComponent implements OnInit {
 
   pages:any;
   merchantDataSource: IDataSource<IMerchant>;
+  private _dataSubscription: Subscription;
   columns = ['id','name', 'address', 'actions'];
   constructor(private merchantService: MerchantService, private fb: FormBuilder) {
     this.merchantDataSource = this.createDataSource();
    }
+  ngOnDestroy(): void {
+    this._dataSubscription.unsubscribe();
+  }
 
   ngOnInit(): void {
     this.merchantDataSource.refresh();

src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.ts

@@ -15,7 +15,6 @@ export class GridFilterDemoComponent implements OnInit {
   merchantDataSource: IDataSource<IMerchant>;  
   constructor(private  merchantService: MerchantService){
     this.merchantDataSource = this.createDataSource();
-    console.log(this.merchantDataSource);    
   }
 
   pages:any;

src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.ts

@@ -1,22 +1,27 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { IDataSource } from '@poweredsoft/data';
 import { IMerchant } from 'src/app/data/services/IMerchant';
 import { MerchantService } from 'src/app/data/services/merchant.service';
 import { FormBuilder, Validators } from '@angular/forms';
 import { ConfirmModalService } from '@poweredsoft/ngx-bootstrap';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'ps-pagination',
   templateUrl: './pagination-demo.component.html',
   styleUrls: ['./pagination-demo.component.scss']
 })
-export class PaginationDemoComponent implements OnInit {
+export class PaginationDemoComponent implements OnInit, OnDestroy {
   columns = ['id','name', 'address','commands']
   merchantDataSource: IDataSource<IMerchant>;  
+  private _dataSubscription: Subscription;
   constructor(private  merchantService: MerchantService, private confirmModalService: ConfirmModalService){
     this.merchantDataSource = this.createDataSource();
 
   }
+  ngOnDestroy(): void {
+    this._dataSubscription.unsubscribe();
+  }
 
   pages:any;