diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/data-grid/data-grid.component.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/data-grid/data-grid.component.ts
index f82830b..c96225c 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/data-grid/data-grid.component.ts
+++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/data-grid/data-grid.component.ts
@@ -21,7 +21,7 @@ export class DataGridComponent implements OnInit {
@Input() dataSource: IDataSource;
@Input() tableClasses: any;
private _columns: string[];
-
+ loading:boolean;
@Input() set columns(value: string[]) {
this._columns = value;
this.columnsChange.emit(value);
@@ -35,8 +35,10 @@ export class DataGridComponent implements OnInit {
constructor() { }
ngOnInit(): void {
+ this.loading = true;
console.log(this.columnDefinitions);
this.dataSource.data$.subscribe(newData => {
+ this.loading=false;
this.latestResult = newData;
});
}
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/directives/data-grid-loader.directive.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/directives/data-grid-loader.directive.ts
new file mode 100644
index 0000000..13badb0
--- /dev/null
+++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/data-grid/directives/data-grid-loader.directive.ts
@@ -0,0 +1,10 @@
+import { Directive } from '@angular/core';
+
+@Directive({
+ selector: '[psDataGridLoader]'
+})
+export class DataGridLoaderDirective {
+
+ constructor() { }
+
+}
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts b/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
index 8218be5..6b98962 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
+++ b/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
@@ -8,4 +8,5 @@ export * from './lib/data-grid/directives/data-grid-cell.directive';
export * from './lib/data-grid/directives/data-grid-col.directive';
export * from './lib/data-grid/directives/data-grid-col-header.directive';
export * from './lib/data-grid/directives/data-grid-header.directive';
-export * from './lib/data-grid/directives/data-grid-footer.directive';
\ No newline at end of file
+export * from './lib/data-grid/directives/data-grid-footer.directive';
+export * from './lib/data-grid/directives/data-grid-loader.directive';
\ No newline at end of file
diff --git a/src/app/pagination-demo/pagination-demo.module.ts b/src/app/pagination-demo/pagination-demo.module.ts
index 4666c97..fa4b050 100644
--- a/src/app/pagination-demo/pagination-demo.module.ts
+++ b/src/app/pagination-demo/pagination-demo.module.ts
@@ -4,11 +4,13 @@ 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 { psbxPaginationModule, CommandModalModule, ConfirmModalModule } from '@poweredsoft/ngx-bootstrap';
+import { psbxPaginationModule, CommandModalModule, ConfirmModalModule,SpinnerModule } from '@poweredsoft/ngx-bootstrap';
import { FormsModule } from '@angular/forms';
import { ModalModule } from 'ngx-bootstrap/modal';
+
+
@NgModule({
declarations: [PaginationDemoComponent],
imports: [
@@ -18,7 +20,8 @@ import { ModalModule } from 'ngx-bootstrap/modal';
DataGridModule,
CommandModalModule,
ConfirmModalModule,
- FormsModule
+ FormsModule,
+ SpinnerModule
]
})
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 1087315..258f613 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
@@ -1,29 +1,42 @@
+
+
+
ID
{{model.id}}
+
Name
- {{model.name}}
+ {{model.name}}
+
Address
{{model.address}}
-
+
+ Actions
+
+
+
+
+
+
+
-
diff --git a/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.ts b/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.ts
index 1646e23..11cacd6 100644
--- a/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.ts
+++ b/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.ts
@@ -11,7 +11,7 @@ import { ConfirmModalService } from '@poweredsoft/ngx-bootstrap';
styleUrls: ['./pagination-demo.component.scss']
})
export class PaginationDemoComponent implements OnInit {
- columns = ['id','name', 'address']
+ columns = ['id','name', 'address','commands']
merchantDataSource: IDataSource;
constructor(private merchantService: MerchantService, private confirmModalService: ConfirmModalService){
this.merchantDataSource = this.createDataSource();
@@ -20,7 +20,7 @@ export class PaginationDemoComponent implements OnInit {
pages:any;
- testService() {
+ removeMerchant(id:string) {
this.confirmModalService.confirm({
message: 'Do you want to delete this merchant?',
yesText: 'yes delete this merchant',
@@ -28,25 +28,23 @@ export class PaginationDemoComponent implements OnInit {
noText: 'no please dont',
noClass: 'light'
}).subscribe(result => {
- console.log(result);
+ if(result){
+ this.merchantDataSource.executeCommandByName('removeMerchant', {
+ id: id
+ }).subscribe(
+ res => {
+ this.merchantDataSource.refresh();
+ },
+ err => {
+ console.log(err);
+ alert('failed');
+ }
+ );
+ }
})
}
- removeMerchant(id: string) {
- this.merchantDataSource.executeCommandByName('removeMerchant', {
- id: id
- }).subscribe(
- res => {
- alert('removed!');
- this.merchantDataSource.refresh();
- },
- err => {
- console.log(err);
- alert('failed');
- }
- );
- }
-
+
createDataSource(): IDataSource {
return this.merchantService.createDataSource();
}
|