fix wrong name for select/filter/sorting

This commit is contained in:
Yubing325
2020-07-08 11:54:32 -05:00
parent bc4bd55efc
commit 5d0cb30a48
32 changed files with 61 additions and 112 deletions
@@ -23,12 +23,8 @@
<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>
<!-- <button class="btn-danger btn" psbxExecuteCommand [dataSource]="merchantDataSource" [command]="removeMerchant"
[model]="model" [confirm]="true" [confirmMessage]="do you wish to delete the merchant `' + model.name + '`" [refresh]="false">Delete</button> -->
</ng-container>
</ng-container>
<ng-container *psDataGridFooter>
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
import { GridFilterDemoRoutingModule } from './grid-filter-demo-routing.module';
import { GridFilterDemoComponent } from './grid-filter-demo/grid-filter-demo.component';
import { GridFilterModule, psbxPaginationModule, CommandModalModule, ConfirmModalModule, SpinnerModule, GridSortingModule } from '@poweredsoft/ngx-bootstrap';
import { DataSourceFilterModule, psbxPaginationModule, CommandModalModule, ConfirmModalModule, SpinnerModule, DataSourceSortingModule } from '@poweredsoft/ngx-bootstrap';
import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
import { FormsModule } from '@angular/forms';
@@ -12,14 +12,14 @@ import { FormsModule } from '@angular/forms';
imports: [
CommonModule,
GridFilterDemoRoutingModule,
GridFilterModule,
DataSourceFilterModule,
psbxPaginationModule,
DataGridModule,
CommandModalModule,
ConfirmModalModule,
FormsModule,
SpinnerModule,
GridSortingModule
DataSourceSortingModule
]
})
export class GridFilterDemoModule { }
@@ -43,8 +43,8 @@
<ng-container psDataGridCol="openDate">
<ng-container *psDataGridColHeader>Open Date</ng-container>
<ng-container *psDataGridCell="let model">{{model.openDate}}</ng-container>
<psbx-datetime-filter *psDataGridCellFilter [dataSource]="merchantDataSource" path="openDate">
</psbx-datetime-filter>
<psbx-ds-datetime-filter *psDataGridCellFilter [dataSource]="merchantDataSource" path="openDate">
</psbx-ds-datetime-filter>
<psbx-ds-sorting *psDataGridColSort [dataSource]="merchantDataSource" path="openDate"></psbx-ds-sorting>
</ng-container>
@@ -4,7 +4,7 @@ import { NgSelectDemoComponent } from './ng-select-demo/ng-select-demo.component
import { NgSelectDemoRoutingModule } from './ng-select-demo-routing.module';
import { NgSelectModule } from '@ng-select/ng-select';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { PsNgSelectorsModule } from '@poweredsoft/ng-select';
import { PsNgSelectModule } from '@poweredsoft/ng-select';
@@ -17,7 +17,7 @@ import { PsNgSelectorsModule } from '@poweredsoft/ng-select';
FormsModule,
ReactiveFormsModule,
NgSelectDemoRoutingModule,
PsNgSelectorsModule
PsNgSelectModule
]
})
export class NgSelectDemoModule { }