From 49a647c88ebe2a498bbbf666aa4cd90b08fb03a5 Mon Sep 17 00:00:00 2001 From: Yubing325 <35515298+Yubing325@users.noreply.github.com> Date: Mon, 15 Jun 2020 11:42:04 -0500 Subject: [PATCH] test confirm --- .../lib/command-modal/command-modal.module.ts | 3 +- .../directives/command-modal.directive.ts | 7 - .../directives/input-validator.directive.ts | 19 +++ .../confirm-modal.component.html | 6 + .../confirm-modal.component.scss | 0 .../confirm-modal/confirm-modal.component.ts | 50 +++++++ .../lib/confirm-modal/confirm-modal.module.ts | 18 +++ .../confirm-modal/confirm-modal.service.ts | 40 ++++++ .../form-group-command-modal.directive.ts | 128 +++++++++++------- .../form-group-command-modal.component.html | 2 +- .../form-group-command-modal.component.ts | 7 +- .../data-source-pagination.component.html | 3 +- .../data-source-pagination.component.ts | 27 ++-- .../lib/pagination/psbxPagination.module.ts | 2 + .../ngx-bootstrap/src/public-api.ts | 4 +- .../data-grid/data-grid.component.ts | 3 - .../command-modal-demo.component.html | 6 +- .../form-group-modal-demo.component.html | 13 +- .../form-group-modal-demo.component.ts | 18 +-- .../pagination-demo/pagination-demo.module.ts | 7 +- .../pagination/pagination-demo.component.html | 13 +- .../pagination/pagination-demo.component.ts | 18 ++- 22 files changed, 285 insertions(+), 109 deletions(-) create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/input-validator.directive.ts create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.html create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.scss create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.ts create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.module.ts create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.service.ts diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal.module.ts index 88852c8..410c684 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal.module.ts +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal.module.ts @@ -3,13 +3,14 @@ import { CommonModule } from '@angular/common'; import { ModalModule } from 'ngx-bootstrap/modal'; import { CommandModalDirective } from './directives/command-modal.directive'; import { CommandModalComponent } from './command-modal/command-modal.component'; +import { InputValidatorDirective } from './directives/input-validator.directive'; @NgModule({ imports: [ CommonModule, ModalModule.forRoot() ], - declarations: [CommandModalDirective, CommandModalComponent], + declarations: [CommandModalDirective, CommandModalComponent, InputValidatorDirective], exports: [CommandModalDirective] }) export class CommandModalModule { } diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/command-modal.directive.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/command-modal.directive.ts index 4fccfe5..c7c7418 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/command-modal.directive.ts +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/command-modal.directive.ts @@ -20,7 +20,6 @@ export class CommandModalDirective { @Input() commandText: string; @Input() cancelText: string; @Input() animated: boolean; - @Input() isConfirmModal: boolean; @HostListener('click') wasClicked() { @@ -38,12 +37,6 @@ export class CommandModalDirective { commandText: this.commandText || 'OK', cancelText: this.cancelText || 'Cancel' }; - if(this.isConfirmModal){ - this.modalService.show(CommandModalComponent, { - animated: this.animated === undefined ? true : this.animated, - initialState - }); - } this.modalService.show(CommandModalComponent, { animated: this.animated === undefined ? true : this.animated, initialState diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/input-validator.directive.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/input-validator.directive.ts new file mode 100644 index 0000000..8fb46d8 --- /dev/null +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/input-validator.directive.ts @@ -0,0 +1,19 @@ +import { Directive } from '@angular/core'; +import { Validator, AbstractControl, ValidationErrors, NG_VALIDATORS } from '@angular/forms'; + +@Directive({ + selector: '[psbxInputValidator]', + providers: [{ provide: NG_VALIDATORS, useExisting: InputValidatorDirective, multi: true }] +}) +export class InputValidatorDirective implements Validator{ + + constructor() { } + + validate(control: AbstractControl): ValidationErrors { + throw new Error("Method not implemented."); + } + registerOnValidatorChange?(fn: () => void): void { + throw new Error("Method not implemented."); + } + +} diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.html new file mode 100644 index 0000000..52e165d --- /dev/null +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.html @@ -0,0 +1,6 @@ +
+

{{ message }}

+ +   + +
\ No newline at end of file diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.ts new file mode 100644 index 0000000..288bb69 --- /dev/null +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component.ts @@ -0,0 +1,50 @@ +import { Component, OnInit, TemplateRef } from '@angular/core'; +import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; +import { ConfirmModalService } from '../../confirm-modal.service'; +import { Observer } from 'rxjs'; + + +@Component({ + selector: 'psbx-confirm-modal', + templateUrl: './confirm-modal.component.html', + styleUrls: ['./confirm-modal.component.scss'] +}) +export class ConfirmModalComponent implements OnInit { + + + yesText: string; + noText: string; + message: string; + yesClass: string; + noClass: string; + observer: Observer; + + constructor(private modelRef: BsModalRef, private actionService: ConfirmModalService) { + + } + + ngOnInit(): void { + + } + + get yesButtonClass() { + return `btn btn-sm btn-${this.yesClass}` + } + + get noButtonClass() { + return `btn btn-sm btn-${this.noClass}` + } + + confirm(): void { + this.modelRef.hide(); + this.observer.next(true); + this.observer.complete(); + } + + decline(): void { + this.modelRef.hide(); + this.observer.next(false); + this.observer.complete(); + } + +} diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.module.ts new file mode 100644 index 0000000..8ba865b --- /dev/null +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { ConfirmModalComponent } from './confirm-modal-components/confirm-modal/confirm-modal.component'; +import { ModalModule } from 'ngx-bootstrap/modal'; +import { ConfirmModalService } from './confirm-modal.service'; + + + +@NgModule({ + declarations: [ConfirmModalComponent], + imports: [ + CommonModule, + ModalModule.forRoot(), + + ], + providers: [ConfirmModalService] +}) +export class ConfirmModalModule { } diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.service.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.service.ts new file mode 100644 index 0000000..206e1d1 --- /dev/null +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.service.ts @@ -0,0 +1,40 @@ +import { Injectable } from '@angular/core'; +import { BsModalService } from 'ngx-bootstrap/modal'; +import { ConfirmModalComponent } from './confirm-modal-components/confirm-modal/confirm-modal.component'; +import { Observable, Observer } from 'rxjs'; + +export interface IConfirmModalOptions +{ + yesClass?: string; + noClass?: string; + message: string; + yesText?: string; + noText?: string; +} + +@Injectable() +export class ConfirmModalService { + + constructor(private modalService: BsModalService) { } + + confirm(options: IConfirmModalOptions) : Observable { + return Observable.create((o: Observer) => { + + + const initialState = { + message: options.message, + yesText: options.yesText || 'yes', + noText: options.noText || 'no', + yesClass: options.yesClass || 'primary', + noClass: options.noClass || 'light', + observer: o + }; + + const modal = this.modalService.show(ConfirmModalComponent, { + initialState: initialState, + animated: true, + keyboard: false + }); + }); + } +} diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/directives/form-group-command-modal.directive.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/directives/form-group-command-modal.directive.ts index a998d50..c037cd1 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/directives/form-group-command-modal.directive.ts +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/directives/form-group-command-modal.directive.ts @@ -3,6 +3,7 @@ import { IDataSource } from '@poweredsoft/data'; import { BsModalService } from 'ngx-bootstrap/modal'; import { FormGroupCommandModalComponent } from '../form-group-command-modal/form-group-command-modal.component'; import { FormGroup } from '@angular/forms'; +import { ConfirmModalComponent } from '../../confirm-modal/confirm-modal-components/confirm-modal/confirm-modal.component'; export interface IModelFormCreateEvent { @@ -28,7 +29,7 @@ export class FormGroupCommandModalDirective { @Input() refreshOnSuccess: boolean; @Input() commandText: string; @Input() cancelText: string; - + @Input() isConfirmModal:boolean; @Output() formCreate: EventEmitter = new EventEmitter(); constructor(private modalService: BsModalService) { } @@ -39,7 +40,6 @@ export class FormGroupCommandModalDirective { command: this.command, model: this.model }).subscribe(commandModel => { - debugger; const event = { commandName: this.command, viewModel: this.model, @@ -47,60 +47,96 @@ export class FormGroupCommandModalDirective { shouldSetCommandModel: true } - this.formCreate.emit(event); + if(this.isConfirmModal){ - if (event.formGroup == null) - throw new Error('form group should be set, after form createEvent'); - - if (event.shouldSetCommandModel) - event.formGroup.patchValue(commandModel); - - const initialState = { - dataSource: this.dataSource, - command: this.command, - template: this.template, - title: this.commandTitle, - refreshOnSuccess: this.refreshOnSuccess === undefined ? true : this.refreshOnSuccess, - commandText: this.commandText || 'OK', - cancelText: this.cancelText || 'Cancel', - modelForm: event.formGroup - }; + const initialState = { + dataSource: this.dataSource, + command: this.command, + template: this.template, + title: this.commandTitle, + refreshOnSuccess: this.refreshOnSuccess === undefined ? true : this.refreshOnSuccess, + commandText: this.commandText || 'OK', + cancelText: this.cancelText || 'Cancel', + commandModel:commandModel + }; - this.modalService.show(FormGroupCommandModalComponent, { - animated: this.animated === undefined ? true : this.animated, - initialState - }); + this.modalService.show(ConfirmModalComponent, { + animated: this.animated === undefined ? true : this.animated, + initialState + }); + }else{ + this.formCreate.emit(event); + if (event.formGroup == null) + throw new Error('form group should be set, after form createEvent'); + + if (event.shouldSetCommandModel) + event.formGroup.patchValue(commandModel); + + const initialState = { + dataSource: this.dataSource, + command: this.command, + template: this.template, + title: this.commandTitle, + refreshOnSuccess: this.refreshOnSuccess === undefined ? true : this.refreshOnSuccess, + commandText: this.commandText || 'OK', + cancelText: this.cancelText || 'Cancel', + modelForm: event.formGroup, + commandModel:commandModel + }; + + this.modalService.show(FormGroupCommandModalComponent, { + animated: this.animated === undefined ? true : this.animated, + initialState + }); + } }, error => { }); } - // @Input() - // set psbxFormGroupCommandModal(element:HTMLBaseElement){ - // element.addEventListener('click',()=>{ - // this.dataSource.resolveCommandModelByName({ - // command: this.command, - // model: this.model - // }).subscribe(commandModel => { - // const initialState = { - // dataSource: this.dataSource, - // command: this.command, - // commandModel: commandModel, - // template: this.template, - // title: this.commandTitle, - // refreshOnSuccess: this.refreshOnSuccess === undefined ? true : this.refreshOnSuccess, - // commandText: this.commandText || 'OK', - // cancelText: this.cancelText || 'Cancel' - // }; - // this.modalService.show(FormGroupCommandModalComponent, { - // animated: this.animated === undefined ? true : this.animated, - // initialState - // }) - // },error => { + // @HostListener('click') + // wasClicked() { + // this.dataSource.resolveCommandModelByName({ + // command: this.command, + // model: this.model + // }).subscribe(commandModel => { + // debugger; + // const event = { + // commandName: this.command, + // viewModel: this.model, + // commandModel: commandModel, + // shouldSetCommandModel: true + // } + // this.formCreate.emit(event); + + // if (event.formGroup == null) + // throw new Error('form group should be set, after form createEvent'); + + // if (event.shouldSetCommandModel) + // event.formGroup.patchValue(commandModel); + + // const initialState = { + // dataSource: this.dataSource, + // command: this.command, + // template: this.template, + // title: this.commandTitle, + // refreshOnSuccess: this.refreshOnSuccess === undefined ? true : this.refreshOnSuccess, + // commandText: this.commandText || 'OK', + // cancelText: this.cancelText || 'Cancel', + // modelForm: event.formGroup, + // commandModel:commandModel + // }; + + // this.modalService.show(FormGroupCommandModalComponent, { + // animated: this.animated === undefined ? true : this.animated, + // initialState // }); - // }) + + // }, error => { + + // }); // } } diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.html index 4642185..d640079 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.html +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.html @@ -21,7 +21,7 @@
- +
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.ts index fab8214..c77e1d9 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.ts +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.ts @@ -23,7 +23,7 @@ export class FormGroupCommandModalComponent implements OnInit { commandText: string; cancelText: string; errorMessage: string; - + commandModel:any; private _notifyMessage: Subscription; private _validationError: Subscription; @@ -56,7 +56,10 @@ export class FormGroupCommandModalComponent implements OnInit { } const finalModel = this.modelForm.value; - //this.modelForm.setValue(this.commandModel) + if(this.commandModel.id) + { + finalModel.id = this.commandModel.id; + } this.loading = true; this.dataSource.executeCommandByName(this.command, finalModel) .pipe( diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/data-source-pagination/data-source-pagination.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/data-source-pagination/data-source-pagination.component.html index fe8aa1a..493f554 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/data-source-pagination/data-source-pagination.component.html +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/data-source-pagination/data-source-pagination.component.html @@ -1,3 +1,2 @@ - \ No newline at end of file diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/data-source-pagination/data-source-pagination.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/data-source-pagination/data-source-pagination.component.ts index 5e67119..ef2b700 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/data-source-pagination/data-source-pagination.component.ts +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/data-source-pagination/data-source-pagination.component.ts @@ -1,26 +1,35 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, OnInit, Input, OnDestroy, ChangeDetectorRef } from '@angular/core'; import { IDataSource } from '@poweredsoft/data'; +import { Subscription } from 'rxjs'; @Component({ selector: 'psbx-ds-pagination', templateUrl: './data-source-pagination.component.html', styleUrls: ['./data-source-pagination.component.scss'] }) -export class DataSourcePaginationComponent implements OnInit { +export class DataSourcePaginationComponent implements OnInit, OnDestroy { + - @Input() pages: any[]; @Input() dataSource: IDataSource + numberOfItems: number = 0; + private dataSubscription: Subscription; - totalItems:Number; + constructor(private cdf: ChangeDetectorRef) { } + ngOnDestroy(): void { + this.dataSubscription.unsubscribe(); + } - constructor() { } - - pageChanged(event){ - this.dataSource.page = event.page; + get pageSize() { + return this.dataSource.pageSize; } ngOnInit(): void { - + this.dataSubscription = this.dataSource.data$.subscribe(latest => { + if (latest) + this.numberOfItems = latest.totalRecords; + else + this.numberOfItems = 0; + }); } } diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/psbxPagination.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/psbxPagination.module.ts index 2d3d1d3..d083a02 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/psbxPagination.module.ts +++ b/projects/poweredsoft/ngx-bootstrap/src/lib/pagination/psbxPagination.module.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { DataSourcePaginationComponent } from './data-source-pagination/data-source-pagination.component'; import { PaginationModule } from 'ngx-bootstrap/pagination'; +import { FormsModule } from '@angular/forms'; @NgModule({ @@ -9,6 +10,7 @@ import { PaginationModule } from 'ngx-bootstrap/pagination'; imports: [ CommonModule, PaginationModule.forRoot(), + FormsModule ], exports:[DataSourcePaginationComponent] }) diff --git a/projects/poweredsoft/ngx-bootstrap/src/public-api.ts b/projects/poweredsoft/ngx-bootstrap/src/public-api.ts index a535aac..e8c4798 100644 --- a/projects/poweredsoft/ngx-bootstrap/src/public-api.ts +++ b/projects/poweredsoft/ngx-bootstrap/src/public-api.ts @@ -7,4 +7,6 @@ export * from './lib/command-modal/directives/command-modal.directive'; export * from './lib/form-group-command-modal/form-group-command-modal.module'; export * from './lib/form-group-command-modal/directives/form-group-command-modal.directive'; export * from './lib/pagination/psbxPagination.module'; -export * from './lib/pagination/data-source-pagination/data-source-pagination.component'; \ No newline at end of file +export * from './lib/pagination/data-source-pagination/data-source-pagination.component'; +export * from './lib/confirm-modal/confirm-modal.module'; +export * from './lib/confirm-modal/confirm-modal.service'; \ No newline at end of file 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 66ce517..f82830b 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 @@ -12,7 +12,6 @@ import { DataGridFooterDirective } from '../directives/data-grid-footer.directiv export class DataGridComponent implements OnInit { latestResult: IQueryExecutionResult & IQueryExecutionGroupResult; - pages: any[]; @ContentChildren(DataGridColDirective) columnDefinitions: QueryList; @ContentChildren(DataGridHeaderDirective) gridHeaders: QueryList; @@ -39,8 +38,6 @@ export class DataGridComponent implements OnInit { console.log(this.columnDefinitions); this.dataSource.data$.subscribe(newData => { this.latestResult = newData; - if (newData) - this.pages = new Array(newData.numberOfPages); }); } diff --git a/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.html b/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.html index a7de42b..fbc9d2b 100644 --- a/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.html +++ b/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.html @@ -32,7 +32,7 @@ - + @@ -42,12 +42,12 @@ New Name New Address - + Name Address - + \ No newline at end of file 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 5e67e4f..ea67239 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 @@ -21,20 +21,25 @@ Actions - + + + [model]="model" (formCreate)="onFormCreate($event)">Remove + + - + -
diff --git a/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.ts b/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.ts index 3a885cc..d6fb703 100644 --- a/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.ts +++ b/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.ts @@ -31,8 +31,7 @@ export class FormGroupModalDemoComponent implements OnInit { }); } - onFormCreate(event: IModelFormCreateEvent) { - debugger; + onFormCreate(event: IModelFormCreateEvent) { event.shouldSetCommandModel = false; event.formGroup = this.fb.group({ 'name': [event.commandModel.name, Validators.required], @@ -41,18 +40,5 @@ export class FormGroupModalDemoComponent implements OnInit { } - newMerchant(name: string) { - this.merchantDataSource.executeCommandByName('addMerchant', { - name: name - }).subscribe( - res => { - alert('it worked!'); - this.merchantDataSource.refresh(); - }, - err => { - console.log(err); - alert('failed'); - } - ); - } + } diff --git a/src/app/pagination-demo/pagination-demo.module.ts b/src/app/pagination-demo/pagination-demo.module.ts index 095210b..4666c97 100644 --- a/src/app/pagination-demo/pagination-demo.module.ts +++ b/src/app/pagination-demo/pagination-demo.module.ts @@ -4,8 +4,9 @@ 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 } from '@poweredsoft/ngx-bootstrap'; +import { psbxPaginationModule, CommandModalModule, ConfirmModalModule } from '@poweredsoft/ngx-bootstrap'; import { FormsModule } from '@angular/forms'; +import { ModalModule } from 'ngx-bootstrap/modal'; @NgModule({ @@ -16,7 +17,9 @@ import { FormsModule } from '@angular/forms'; psbxPaginationModule, DataGridModule, CommandModalModule, - FormsModule + ConfirmModalModule, + FormsModule + ] }) export class PaginationDemoModule { } 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 9c56cc0..1087315 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 @@ -17,19 +17,14 @@
{{model.address}}
- - Actions - - - - - + - + + +

Do you want to confirm?

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 d52a0a2..1646e23 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 @@ -2,8 +2,8 @@ import { Component, OnInit } 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 { IModelFormCreateEvent } from '@poweredsoft/ngx-bootstrap'; import { FormBuilder, Validators } from '@angular/forms'; +import { ConfirmModalService } from '@poweredsoft/ngx-bootstrap'; @Component({ selector: 'ps-pagination', @@ -11,15 +11,27 @@ import { FormBuilder, Validators } from '@angular/forms'; styleUrls: ['./pagination-demo.component.scss'] }) export class PaginationDemoComponent implements OnInit { - columns = ['id','name', 'address', 'commands'] + columns = ['id','name', 'address'] merchantDataSource: IDataSource; - constructor(private merchantService: MerchantService){ + constructor(private merchantService: MerchantService, private confirmModalService: ConfirmModalService){ this.merchantDataSource = this.createDataSource(); } pages:any; + testService() { + this.confirmModalService.confirm({ + message: 'Do you want to delete this merchant?', + yesText: 'yes delete this merchant', + yesClass: 'danger', + noText: 'no please dont', + noClass: 'light' + }).subscribe(result => { + console.log(result); + }) + } + removeMerchant(id: string) { this.merchantDataSource.executeCommandByName('removeMerchant', { id: id