;
+ @Input() commandTitle: string;
+ @Input() refreshOnSuccess: boolean;
+ @Input() commandText: string;
+ @Input() cancelText: string;
+ @Input() animated: boolean;
+
+ @HostListener('click')
+ wasClicked() {
+ 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(CommandModalComponent, {
+ animated: this.animated === undefined ? true : this.animated,
+ initialState
+ });
+
+ }, error => {
+
+ });
+ }
+
+
+}
diff --git a/projects/poweredsoft/ngx-bootstrap/src/public-api.ts b/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
index 6734a41..871c113 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
@@ -3,4 +3,4 @@
*/
export * from './lib/command-modal/command-modal.module';
-export * from './lib/command-modal/command-modal/command-modal.component';
\ No newline at end of file
+export * from './lib/command-modal/directives/command-modal.directive';
\ No newline at end of file
diff --git a/src/app/command-modal-demo/command-modal-demo.module.ts b/src/app/command-modal-demo/command-modal-demo.module.ts
index f291d86..53c9b27 100644
--- a/src/app/command-modal-demo/command-modal-demo.module.ts
+++ b/src/app/command-modal-demo/command-modal-demo.module.ts
@@ -2,14 +2,17 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { CommandModalDemoComponent } from './command-modal-demo/command-modal-demo.component';
import { CommandModalDemoRoutingModule } from './command-modal-demo-routing.module';
-
-
-
+import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
+import { CommandModalModule } from 'projects/poweredsoft/ngx-bootstrap/src/public-api';
+import {FormsModule} from '@angular/forms';
@NgModule({
declarations: [CommandModalDemoComponent],
imports: [
CommonModule,
- CommandModalDemoRoutingModule
+ CommandModalDemoRoutingModule,
+ DataGridModule,
+ CommandModalModule,
+ FormsModule
]
})
export class CommandModalDemoModule { }
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 bf60fb3..97fff78 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
@@ -1 +1,47 @@
-command-modal-demo works!
+
+ This is a demo for a command modal.
+
+
+
+
+
+
+
+ ID
+ {{model.id}}
+
+
+ Name
+ {{model.name}}
+
+
+ Address
+ {{model.address}}
+
+
+
+ Actions
+
+
+
+
+
+
+
+
+
+
+ New Name
+
+
+
+
+ Name
+
+ Address
+
+
\ No newline at end of file
diff --git a/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.ts b/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.ts
index 4b229ff..b10a2a0 100644
--- a/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.ts
+++ b/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.ts
@@ -1,4 +1,7 @@
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';
@Component({
selector: 'ps-command-modal-demo',
@@ -7,9 +10,41 @@ import { Component, OnInit } from '@angular/core';
})
export class CommandModalDemoComponent implements OnInit {
- constructor() { }
+ columns = ['id','name', 'address', 'commands']
+ merchantDataSource: IDataSource;
+ constructor(private merchantService: MerchantService){
+ this.merchantDataSource = this.createDataSource();
- ngOnInit(): void {
+ }
+
+ newMerchant(name: string) {
+ this.merchantDataSource.executeCommandByName('addMerchant', {
+ name: name
+ }).subscribe(
+ res => {
+ alert('it worked!');
+ this.merchantDataSource.refresh();
+ },
+ err => {
+ console.log(err);
+ alert('failed');
+ }
+ );
+ }
+
+ createDataSource(): IDataSource {
+ return this.merchantService.createDataSource();
+ }
+
+ ngOnInit() {
+ this.merchantDataSource.loading$.subscribe(isLoading => {
+ console.log('merchant data source event loading', isLoading);
+ });
+
+ this.merchantDataSource.data$.subscribe(receivedData => {
+ console.log('new data is coming from the server', receivedData);
+ });
+ this.merchantDataSource.refresh();
}
}
diff --git a/src/app/data-grid-demo/data-grid-demo.module.ts b/src/app/data-grid-demo/data-grid-demo.module.ts
index c4b3530..71648d5 100644
--- a/src/app/data-grid-demo/data-grid-demo.module.ts
+++ b/src/app/data-grid-demo/data-grid-demo.module.ts
@@ -4,7 +4,6 @@ import { CommonModule } from '@angular/common';
import { DataGridDemoRoutingModule } from './data-grid-demo-routing.module';
import { DataGridDemoHomeComponent } from './data-grid-demo-home/data-grid-demo-home.component';
import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
-import { PaginationModule } from 'ngx-bootstrap/pagination';
@NgModule({
@@ -12,8 +11,7 @@ import { PaginationModule } from 'ngx-bootstrap/pagination';
imports: [
CommonModule,
DataGridDemoRoutingModule,
- DataGridModule,
- PaginationModule
+ DataGridModule
]
})
export class DataGridDemoModule { }
diff --git a/src/app/data/services/merchant.service.ts b/src/app/data/services/merchant.service.ts
index d89fcf7..97560d0 100644
--- a/src/app/data/services/merchant.service.ts
+++ b/src/app/data/services/merchant.service.ts
@@ -78,7 +78,7 @@ export class MerchantService {
// viewModel -> transform to the form model for that command -> IChangeMerchantName
e => of({
- name: '',
+ name: 'A New merchant',
address: ''
})
);