From a0445f2474f76f5cd35180ab5dfcc315e4370355 Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Thu, 9 Jul 2020 16:24:52 -0500
Subject: [PATCH] main test done

---
 .../form-group-modal-demo.component.html      | 30 ++++++++++++---
 .../grid-filter-demo.component.html           | 16 ++++++--
 .../ng-select-demo.component.ts               |  2 +-
 .../pagination-demo/pagination-demo.module.ts |  5 ++-
 .../pagination/pagination-demo.component.html | 37 ++++++++++++-------
 5 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html b/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
index a456f88..a08fc2d 100644
--- a/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
+++ b/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
@@ -4,7 +4,7 @@
     <ng-container *psDataGridHeader>
             <button class="btn-success btn" psbxFormGroupCommandModal commandTitle="Adding a new merchant"
              commandText="Add" [dataSource]="merchantDataSource" command="addMerchant" 
-             (formCreate)="onFormCreate($event)" [template]="theModal">Create a new</button>   
+             (formCreate)="onFormCreate($event)" [template]="theModal">Create New Records</button>   
     </ng-container>
     <ng-container psDataGridCol="id">
         <div *psDataGridColHeader>ID</div>
@@ -19,12 +19,32 @@
         <div *psDataGridCell="let model">{{model.address}}</div>
     </ng-container>
     <ng-container psDataGridCol="actions">
+    
         <ng-container *psDataGridColHeader>Actions</ng-container>
         <ng-container *psDataGridCell="let model">
-            <button class="btn-success btn" psbxFormGroupCommandModal [commandTitle]="'Change ' + model.name + ' name'" commandText="Update"
-            [dataSource]="merchantDataSource" command="changeMerchant" (formCreate)="onFormCreate($event)" [model]="model" [template]="theModal">Change</button>
-            <!-- <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
-            [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Delete!</button> -->
+            <div class="btn-group">
+            <button class="btn-success btn" psbxFormGroupCommandModal 
+            [commandTitle]="'Change ' + model.name + ' name'" 
+            commandText="Update"
+            [dataSource]="merchantDataSource" 
+            command="changeMerchant" 
+            (formCreate)="onFormCreate($event)" 
+            [model]="model" 
+            [template]="theModal">Change</button>
+            
+            <button class="btn-danger btn" 
+            psbxCommand 
+            [dataSource]="merchantDataSource" 
+            command="removeMerchant" 
+            [model]="model" 
+            [confirm]="true"
+            yesClass="warning"
+            noClass = "secondary"
+            noText = "Cancel Delete"
+            yesText = "Delete It"
+            confirmMessage="Are you sure you want to delete this merchant?"
+            >RemoveIt</button>
+            </div>
         </ng-container>
     </ng-container>
     <ng-container *psDataGridFooter>
diff --git a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
index 31d3811..34ca93a 100644
--- a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
+++ b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
@@ -55,10 +55,18 @@
                 <button class="btn-info btn" psbxCommandModal [commandTitle]="'Change ' + model.name + ' name'"
                 commandText="Update" [dataSource]="merchantDataSource" command="changeMerchant" [model]="model"
                 [template]="theModal">Change</button>
-            <!-- <button class="btn-danger btn" psbxConfirmModal
-                [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
-                [dataSource]="merchantDataSource" command="removeMerchant" [model]="model">Remove</button> -->
-            </div>
+                <button class="btn-danger btn" 
+                psbxCommand 
+                [dataSource]="merchantDataSource" 
+                command="removeMerchant" 
+                [model]="model" 
+                [confirm]="true"
+                yesClass="warning"
+                noClass = "secondary"
+                noText = "Cancel Delete"
+                yesText = "Delete It"
+                confirmMessage="Are you sure you want to delete this merchant?"
+                >RemoveIt</button></div>
             
         </ng-container>
     </ng-container>
diff --git a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts
index c0e511b..ba2add8 100644
--- a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts
+++ b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts
@@ -34,7 +34,7 @@ export class NgSelectDemoComponent implements OnInit {
     this.merchantDataSource3 = merchantService.createDataSource(); 
     this.merchantDataSource4 = merchantService.createDataSource(); 
     this.myForm = fb.group({
-      'merchantId': [null, null]
+      'merchantId': [null]
     })
   }
 
diff --git a/src/app/pagination-demo/pagination-demo.module.ts b/src/app/pagination-demo/pagination-demo.module.ts
index 4f1c717..90736d9 100644
--- a/src/app/pagination-demo/pagination-demo.module.ts
+++ b/src/app/pagination-demo/pagination-demo.module.ts
@@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
 import { PaginationDemoRoutingModule } from './pagination-demo-routing.module';
 import { PaginationDemoComponent } from './pagination-demo/pagination/pagination-demo.component';
 import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
-import { PaginationModule, CommandModalModule, ConfirmModalModule,SpinnerModule } from '@poweredsoft/ngx-bootstrap';
+import { PaginationModule, CommandModalModule, ConfirmModalModule,SpinnerModule, CommandModule } from '@poweredsoft/ngx-bootstrap';
 import { FormsModule } from '@angular/forms';
 import { ModalModule } from 'ngx-bootstrap/modal';
 
@@ -21,7 +21,8 @@ import { ModalModule } from 'ngx-bootstrap/modal';
     CommandModalModule,
     ConfirmModalModule,
     FormsModule,
-    SpinnerModule
+    SpinnerModule,
+    CommandModule
        
   ]
 })
diff --git a/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.html b/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.html
index e6672e0..73d1713 100644
--- a/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.html
+++ b/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.html
@@ -16,18 +16,6 @@
     <ng-container psDataGridCol="id">
         <div *psDataGridColHeader>ID</div>
         <div *psDataGridCell="let model">{{model.id}}</div>
-
-        <!-- <psfa-ds-sort-icon *psDataGridColSort [sortPath]="id" [dataSource]="merchantDataSource">
-
-        </psfa-ds-sort-icon>  -->
-
-        <!-- <psbx-ds-text-filter *psDataGridCellFilter [dataSource]="merchantDataSource"></psbx-ds-text-filter>
-        <psdb-ds-date-filter *psDataGridCellFilter></psdb-ds-date-filter>
-        <psdb-ds-date-range-filter *psDataGridCellFilter></psdb-ds-date-range-filter>
-        <psbx-ds-number-filter *psDataGridCellFilter></psbx-ds-number-filter>
-        <psbx-ds-multi-select-filter [dataSource]="merchantDataSource" [selectDataSource]="selectDataSource" [valueField]="id">
-            <ng-container *psSelectOption="let option">{{ option.name }}</ng-container>
-        </psbx-ds-multi-select-filter> -->
     </ng-container>
 
     <ng-container psDataGridCol="name">
@@ -42,8 +30,29 @@
     <ng-container psDataGridCol="commands">
         <ng-container *psDataGridColHeader>Actions</ng-container>
         <ng-container *psDataGridCell="let model">
-            <!-- <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
-            [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Remove</button> -->
+            <div class="btn-group">
+                <button class="btn-warning btn" psbxCommandModal 
+                commandTitle="Update {{model.name}}" 
+                commandText="Save"
+                [dataSource]="merchantDataSource" 
+                command="changeMerchant"
+                [model]="model"  
+                [template]="theModal">Update</button>
+
+                <button class="btn-danger btn" 
+                psbxCommand 
+                [dataSource]="merchantDataSource" 
+                command="removeMerchant" 
+                [model]="model" 
+                [confirm]="true"
+                yesClass="warning"
+                noClass = "secondary"
+                noText = "Cancel Delete"
+                yesText = "Delete It"
+                confirmMessage="Are you sure you want to delete this merchant?"
+                >Remove</button>
+            </div>
+
         </ng-container>
     </ng-container>