grid-filter-demo works!
-ID
- {{model.id}}
@@ -34,50 +32,73 @@
Name
- {{model.name}}
Address
{{model.address}}
- Priority
+ {{model.ordering}}
+ Open Date
+ {{model.openDate}}
+
-
- Do you want to confirm?
- - +Do you want to confirm?
+ +
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 3116897..041acd5 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
@@ -101,4 +101,7 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/src/app/ng-select-demo/ng-select-demo-routing.module.ts b/src/app/ng-select-demo/ng-select-demo-routing.module.ts
new file mode 100644
index 0000000..d6cee6c
--- /dev/null
+++ b/src/app/ng-select-demo/ng-select-demo-routing.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from '@angular/router';
+import { NgSelectDemoComponent } from './ng-select-demo/ng-select-demo.component';
+
+
+const routes: Routes =[
+ {
+ path: '',
+ component: NgSelectDemoComponent
+ }
+]
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+export class NgSelectDemoRoutingModule {
+
+}
\ No newline at end of file
diff --git a/src/app/ng-select-demo/ng-select-demo.module.ts b/src/app/ng-select-demo/ng-select-demo.module.ts
new file mode 100644
index 0000000..fae2d4c
--- /dev/null
+++ b/src/app/ng-select-demo/ng-select-demo.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { NgSelectDemoComponent } from './ng-select-demo/ng-select-demo.component';
+import { NgSelectDemoRoutingModule } from './ng-select-demo-routing.module';
+
+
+
+@NgModule({
+ declarations: [NgSelectDemoComponent],
+ imports: [
+ CommonModule,
+ NgSelectDemoRoutingModule
+ ]
+})
+export class NgSelectDemoModule { }
diff --git a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.scss b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.scss
new file mode 100644
index 0000000..e69de29
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
new file mode 100644
index 0000000..ad5b580
--- /dev/null
+++ b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'ps-ng-select-demo',
+ templateUrl: './ng-select-demo.component.html',
+ styleUrls: ['./ng-select-demo.component.scss']
+})
+export class NgSelectDemoComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
From 88dd6bb922ff4c582787632c44615631aae05955 Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Tue, 30 Jun 2020 14:09:53 -0500
Subject: [PATCH 09/25] ng-select installed
---
package-lock.json | 8 ++++++++
package.json | 1 +
src/app/ng-select-demo/ng-select-demo.module.ts | 4 ++++
src/styles.scss | 3 ++-
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/package-lock.json b/package-lock.json
index c3334f8..c5e468b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1644,6 +1644,14 @@
}
}
},
+ "@ng-select/ng-select": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-4.0.1.tgz",
+ "integrity": "sha512-f5NzrKRvswOvxa8BzBgAUOpzl0B8SrlVQHQLB2zPymuZlzC2dWUi9mUhgu6s2igwdClmrZ8bysNBBNpgqHskyA==",
+ "requires": {
+ "tslib": "^1.10.0"
+ }
+ },
"@ngtools/webpack": {
"version": "9.1.7",
"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.7.tgz",
diff --git a/package.json b/package.json
index 2d27be7..5ba2c3d 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"@angular/platform-browser": "~9.1.4",
"@angular/platform-browser-dynamic": "~9.1.4",
"@angular/router": "~9.1.4",
+ "@ng-select/ng-select": "^4.0.1",
"@poweredsoft/data": "0.0.26",
"@poweredsoft/ngx-data": "0.0.13",
"@poweredsoft/ngx-data-apollo": "0.0.8",
diff --git a/src/app/ng-select-demo/ng-select-demo.module.ts b/src/app/ng-select-demo/ng-select-demo.module.ts
index fae2d4c..5c9072b 100644
--- a/src/app/ng-select-demo/ng-select-demo.module.ts
+++ b/src/app/ng-select-demo/ng-select-demo.module.ts
@@ -2,6 +2,8 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
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 } from '@angular/forms';
@@ -9,6 +11,8 @@ import { NgSelectDemoRoutingModule } from './ng-select-demo-routing.module';
declarations: [NgSelectDemoComponent],
imports: [
CommonModule,
+ NgSelectModule,
+ FormsModule,
NgSelectDemoRoutingModule
]
})
diff --git a/src/styles.scss b/src/styles.scss
index 9d53205..a013fb2 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,3 +1,4 @@
/* You can add global styles to this file, and also import other style files */
@import '~bootstrap/scss/bootstrap';
-@import '~ngx-bootstrap/datepicker/bs-datepicker.css';
\ No newline at end of file
+@import '~ngx-bootstrap/datepicker/bs-datepicker.css';
+@import "~@ng-select/ng-select/themes/default.theme.css";
\ No newline at end of file
From 7f75f35b2a3a04d720087ab9a56bedde88ce5c69 Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Tue, 30 Jun 2020 15:48:41 -0500
Subject: [PATCH 10/25] ps-ng-select works one shot
---
.../ng-multi-select.component.html | 1 +
.../ng-multi-select.component.scss | 0
.../ng-multi-select.component.spec.ts | 25 +++++++
.../ng-multi-select.component.ts | 15 ++++
.../ng-select/ng-select.component.html | 9 +++
.../ng-select/ng-select.component.scss | 0
.../ng-select/ng-select.component.spec.ts | 25 +++++++
.../ng-select/ng-select.component.ts | 74 +++++++++++++++++++
.../lib/ps-selectors/ps-selectors.module.ts | 19 +++++
.../poweredsoft/ngx-cdk-ui/src/public-api.ts | 7 +-
.../ng-select-demo/ng-select-demo.module.ts | 4 +-
.../ng-select-demo.component.html | 4 +
.../ng-select-demo.component.ts | 21 +++++-
13 files changed, 199 insertions(+), 5 deletions(-)
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.html
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.scss
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.spec.ts
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.html
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.scss
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.spec.ts
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts
create mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.html b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.html
new file mode 100644
index 0000000..5955490
--- /dev/null
+++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.html
@@ -0,0 +1 @@
+ng-multi-select works!
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.scss b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.spec.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.spec.ts new file mode 100644 index 0000000..dd1f6e1 --- /dev/null +++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NgMultiSelectComponent } from './ng-multi-select.component'; + +describe('NgMultiSelectComponent', () => { + let component: NgMultiSelectComponent; + let fixture: ComponentFixtureSelected: {{selectedId | json }} \ No newline at end of file diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.scss b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.spec.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.spec.ts new file mode 100644 index 0000000..9dc9b61 --- /dev/null +++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NgSelectComponent } from './ng-select.component'; + +describe('NgSelectComponent', () => { + let component: NgSelectComponent; + let fixture: ComponentFixture
ng-multi-select works!
+Select multiple elements
+ +
+ Selected value:
+
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts
index abf5717..f56cf51 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts
+++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts
@@ -1,15 +1,97 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Input, ChangeDetectorRef, OnDestroy } from '@angular/core';
+import { Observable, Subscription, Subject } from 'rxjs';
+import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
+import { map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
@Component({
selector: 'ps-ng-multi-select',
templateUrl: './ng-multi-select.component.html',
styleUrls: ['./ng-multi-select.component.scss']
})
-export class NgMultiSelectComponent implements OnInit {
+export class NgMultiSelectComponent implements OnInit, OnDestroy {
- constructor() { }
+ @Input() dataSource: IDataSource+
-
+
- {{item.name}} +
Single Select Demo
+Multi-Select Demo
+Selected: {{selectedId | json }} \ No newline at end of file diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts index 7bce209..4cb4f62 100644 --- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts +++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts @@ -1,47 +1,86 @@ -import { Component, OnInit, Input, ChangeDetectorRef, OnDestroy } from '@angular/core'; +import { Component, OnInit, Input, ChangeDetectorRef, OnDestroy, ContentChild, QueryList, ContentChildren, ViewChild, forwardRef, EventEmitter, Output } from '@angular/core'; import { IDataSource, ISimpleFilter } from '@poweredsoft/data'; import { Observable, Subject, Subscription } from 'rxjs'; import { distinctUntilChanged, debounceTime, map } from 'rxjs/operators'; +import { SelectOptionTemplateDirective } from '../select-option-template.directive'; +import { NgSelectComponent as SelectComponent } from '@ng-select/ng-select'; +import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms'; @Component({ selector: 'ps-ng-select', templateUrl: './ng-select.component.html', + providers: [{ + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => NgSelectComponent), + multi: true +}], styleUrls: ['./ng-select.component.scss'] }) -export class NgSelectComponent implements OnInit, OnDestroy { +export class NgSelectComponent implements OnInit, OnDestroy, ControlValueAccessor { + @ContentChild(SelectOptionTemplateDirective) selectTemplate: SelectOptionTemplateDirective; + @ViewChild(SelectComponent, { static: true }) selectComponent: SelectComponent; @Input() dataSource: IDataSource
Single Select Demo
-
+ {{ item.name }} - {{ item.address }}
+
+Multi-Select Demo
-
+ {{ item.name }} - {{ item.address }}
+
+multi-select works!
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.scss b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts new file mode 100644 index 0000000..7da49d0 --- /dev/null +++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'ps-ng-multi-select', + templateUrl: './multi-select.component.html', + styleUrls: ['./multi-select.component.scss'] +}) +export class MultiSelectComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html new file mode 100644 index 0000000..feb5be1 --- /dev/null +++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html @@ -0,0 +1,17 @@ +Single Select Demo
+
+
+
+
+
+
+
+
+
+
+
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts
index 7da49d0..dd82022 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts
@@ -1,15 +1,158 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ContentChild, ViewChild, Input, Output, EventEmitter, ChangeDetectorRef, forwardRef } from '@angular/core';
+import { SelectLabelTemplateDirective } from '../select-label-template.directive';
+import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
+import { Observable, Subject, Subscription } from 'rxjs';
+import { map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
+import { NgSelectComponent as SelectComponent } from '@ng-select/ng-select';
+import { NG_VALUE_ACCESSOR } from '@angular/forms';
+import { SelectOptionTemplateDirective } from '../select-option-template.directive';
@Component({
selector: 'ps-ng-multi-select',
templateUrl: './multi-select.component.html',
+ providers: [{
+ provide: NG_VALUE_ACCESSOR,
+ useExisting: forwardRef(() => MultiSelectComponent),
+ multi: true
+}],
styleUrls: ['./multi-select.component.scss']
})
export class MultiSelectComponent implements OnInit {
- constructor() { }
+
+ @ContentChild(SelectOptionTemplateDirective) optionTemplate: SelectOptionTemplateDirective;
+ @ContentChild(SelectLabelTemplateDirective) labelTemplate: SelectLabelTemplateDirective;
+
+ @ViewChild(SelectComponent, { static: true }) selectComponent: SelectComponent;
+ @Input() dataSource: IDataSource;
+ @Input() searchPath: string;
+ @Input() searchType: string;
+ @Input() sortingPath: string;
+ @Input() serverFiltering:boolean;
+ @Input() bindLabel:string;
+ @Input() bindValue: string;
+
+ @Output('change') changeEvent = new EventEmitter();
+
+ trackFn: (item: any) => any;
+ data$ : Observable;
+ isLoading:boolean = false;
+ searchInput$ = new Subject();
+
+ private _loadingSubscription: Subscription;
+
+ constructor(private cdr: ChangeDetectorRef) {
+ this.trackFn = this.trackBy.bind(this);
+
+ }
+
+ trackBy(item: any) {
+ return this.dataSource.resolveIdField(item);
+ }
+
+ valueChanged(event) {
+ this.changeEvent.emit(event);
+ }
+
+ writeValue(obj: any): void {
+ this.selectComponent.writeValue(obj);
+ }
+ registerOnChange(fn: any): void {
+ this.selectComponent.registerOnChange(fn);
+ }
+ registerOnTouched(fn: any): void {
+ this.selectComponent.registerOnTouched(fn);
+ }
+ setDisabledState?(isDisabled: boolean): void {
+ if (this.selectComponent.setDisabledState)
+ this.selectComponent.setDisabledState(isDisabled);
+ }
+ ngOnDestroy(): void {
+ this._loadingSubscription.unsubscribe();
+ }
ngOnInit(): void {
+ this.dataFetching();
+ this.detectLoading();
+
+ console.log(this.serverFiltering);
+
+ if(this.serverFiltering){
+ this.searchOnServer();
+ }else{
+ this.refreshDataSource();
+ }
+ }
+
+ dataFetching(){
+ this.data$ = this.dataSource.data$.pipe(
+ map(t => {
+ if (t == null)
+ return [];
+ return t.data;
+ })
+ );
+ }
+
+ detectLoading(){
+ this._loadingSubscription = this.dataSource.loading$.subscribe(loading => {
+ this.isLoading = loading;
+ this.cdr.detectChanges();
+ });
+ }
+
+ searchOnServer(){
+ this.searchInput$.pipe(
+ distinctUntilChanged(), // emit the difference from previous input
+ debounceTime(500) // this is for delaying searching speed
+ ).subscribe(searchTerm => this.refreshDataSource(searchTerm, 1, 100)); // page: 1, pageSize: 50
+
+ this.refreshDataSource(); //send the query to server to sorting & filtering by default
+ }
+
+ get selectedModel() {
+
+ return this.selectComponent.selectedItems.map(t => t.value);
+ //return this.selectComponent.hasValue ? this.selectComponent.selectedItems[0].value : null;
+ }
+
+ refreshDataSource(searchTerm:any = null, page:number = null, pageSize:number = null){
+ let searchfilters:ISimpleFilter[] = null;
+ if(searchTerm){
+ searchfilters = [{
+ path: this.searchPath || this.bindLabel,
+ type: this.searchType || 'Contains', // Default: Contains
+ value: searchTerm
+ }]
+ }
+ this.dataSource.query({
+ page: page,
+ pageSize: pageSize,
+ filters:searchfilters,
+ sorts:[
+ {path: this.sortingPath || this.bindLabel, ascending: true}
+ ]
+ })
+ }
+
+ get hasOptionTemplate() {
+ return this.optionTemplate ? true : false;
+ }
+
+ get selectOptionTemplate(){
+ if (this.optionTemplate)
+ return this.optionTemplate.template;
+ return null;
+ }
+
+ get hasLabelTemplate() {
+ return this.labelTemplate ? true : false;
+ }
+
+ get selectLabelTemplate(){
+ if (this.labelTemplate)
+ return this.labelTemplate.template;
+ return null;
}
}
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html
index feb5be1..c065dd5 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html
@@ -14,4 +14,14 @@
}">
+
+
+
+
+
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.ts
index d93d4a7..f0980bc 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.ts
@@ -5,6 +5,8 @@ import { Observable, Subject, Subscription } from 'rxjs';
import { map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
import { NgSelectComponent as SelectComponent } from '@ng-select/ng-select';
import { NG_VALUE_ACCESSOR } from '@angular/forms';
+import { SelectOptionTemplateDirective } from '../select-option-template.directive';
+
@Component({
selector: 'ps-ng-select',
@@ -18,7 +20,10 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms';
})
export class NgSelectComponent implements OnInit {
- @ContentChild(SelectLabelTemplateDirective) LabelTemplate: SelectLabelTemplateDirective;
+ @ContentChild(SelectOptionTemplateDirective) optionTemplate: SelectOptionTemplateDirective;
+ @ContentChild(SelectLabelTemplateDirective) labelTemplate: SelectLabelTemplateDirective;
+
+
@ViewChild(SelectComponent, { static: true }) selectComponent: SelectComponent;
@Input() dataSource: IDataSource;
@Input() searchPath: string;
@@ -107,8 +112,8 @@ export class NgSelectComponent implements OnInit {
this.refreshDataSource(); //send the query to server to sorting & filtering by default
}
- get selectedModel() {
- return this.selectComponent.hasValue ? this.selectComponent.selectedItems[0].value : null;
+ get selectedModel() {
+ return this.selectComponent.hasValue ? this.selectComponent.selectedItems[0] : null;
}
refreshDataSource(searchTerm:any = null, page:number = null, pageSize:number = null){
@@ -131,13 +136,22 @@ export class NgSelectComponent implements OnInit {
}
get hasOptionTemplate() {
- return this.LabelTemplate ? true : false;
+ return this.optionTemplate ? true : false;
}
get selectOptionTemplate(){
- if (this.LabelTemplate)
- return this.LabelTemplate.template;
+ if (this.optionTemplate)
+ return this.optionTemplate.template;
return null;
}
+ get hasLabelTemplate() {
+ return this.labelTemplate ? true : false;
+ }
+
+ get selectLabelTemplate(){
+ if (this.labelTemplate)
+ return this.labelTemplate.template;
+ return null;
+ }
}
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts
index df8f1fa..57a5fb2 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts
@@ -5,11 +5,12 @@ import { MultiSelectComponent } from './multi-select/multi-select.component';
import { FormsModule } from '@angular/forms';
import { NgSelectModule } from '@ng-select/ng-select';
import { SelectLabelTemplateDirective } from './select-label-template.directive';
+import { SelectOptionTemplateDirective } from './select-option-template.directive';
@NgModule({
- declarations: [NgSelectComponent, MultiSelectComponent, SelectLabelTemplateDirective],
+ declarations: [NgSelectComponent, MultiSelectComponent, SelectLabelTemplateDirective, SelectOptionTemplateDirective],
imports: [
CommonModule,
FormsModule,
@@ -18,7 +19,8 @@ import { SelectLabelTemplateDirective } from './select-label-template.directive'
exports:[
NgSelectComponent,
MultiSelectComponent,
- SelectLabelTemplateDirective
+ SelectLabelTemplateDirective,
+ SelectOptionTemplateDirective
]
})
export class PsNgSelectorsModule { }
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.spec.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.spec.ts
deleted file mode 100644
index d6da15f..0000000
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.spec.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { SelectLabelTemplateDirective } from './select-label-template.directive';
-
-describe('SelectLabelTemplateDirective', () => {
- it('should create an instance', () => {
- const directive = new SelectLabelTemplateDirective();
- expect(directive).toBeTruthy();
- });
-});
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/select-option-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-option-template.directive.ts
similarity index 81%
rename from projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/select-option-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-option-template.directive.ts
index ef1381d..1b79579 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/select-option-template.directive.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-option-template.directive.ts
@@ -1,7 +1,7 @@
import { Directive, TemplateRef } from '@angular/core';
@Directive({
- selector: '[psSelectOptionTemplate]'
+ selector: '[psNgSelectOption]'
})
export class SelectOptionTemplateDirective {
diff --git a/projects/poweredsoft/ng-select/src/public-api.ts b/projects/poweredsoft/ng-select/src/public-api.ts
index 262f25f..08def64 100644
--- a/projects/poweredsoft/ng-select/src/public-api.ts
+++ b/projects/poweredsoft/ng-select/src/public-api.ts
@@ -6,6 +6,7 @@ export * from './lib/ps-ng-selectors/ps-ng-selectors.module';
export * from './lib/ps-ng-selectors/ng-select/ng-select.component';
export * from './lib/ps-ng-selectors/multi-select/multi-select.component';
export * from './lib/ps-ng-selectors/select-label-template.directive';
+export * from './lib/ps-ng-selectors/select-option-template.directive'
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts
index e399722..20f089f 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts
+++ b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts
@@ -4,17 +4,17 @@ import { NgSelectComponent } from './ng-select/ng-select.component';
import { NgMultiSelectComponent } from './ng-multi-select/ng-multi-select.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NgSelectModule } from '@ng-select/ng-select';
-import { SelectOptionTemplateDirective } from './select-option-template.directive';
+
@NgModule({
- declarations: [NgSelectComponent, NgMultiSelectComponent, SelectOptionTemplateDirective],
+ declarations: [NgSelectComponent, NgMultiSelectComponent ],
imports: [
CommonModule,
FormsModule,
NgSelectModule,
],
- exports:[NgSelectComponent,NgMultiSelectComponent,SelectOptionTemplateDirective]
+ exports:[NgSelectComponent,NgMultiSelectComponent]
})
export class PsSelectorsModule { }
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts b/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
index 04015df..0ebdcc6 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
+++ b/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
@@ -17,4 +17,3 @@ export * from './lib/data-grid/directives/data-grid-col-sort.directive';
export * from './lib/ps-selectors/ps-selectors.module';
export * from './lib/ps-selectors/ng-select/ng-select.component';
export * from './lib/ps-selectors/ng-multi-select/ng-multi-select.component';
-export * from './lib/ps-selectors/select-option-template.directive';
\ No newline at end of file
diff --git a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html
index 1c1b924..6e5086a 100644
--- a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html
+++ b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html
@@ -1,39 +1,34 @@
-
-
- ID
{{model.id}}
+
+
Some header
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 6abfc63..148fe65 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
@@ -13,27 +13,14 @@
ID
{{model.id}}
-
-
-
-
-
+ {{model.id}}
Name
{{model.name}}
@@ -42,15 +29,15 @@
{{model.address}}
-
Priority
{{model.ordering}}
-
-
-
+
+
@@ -58,7 +45,7 @@
{{model.openDate}}
-
diff --git a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html
index 3e45f9b..271e430 100644
--- a/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html
+++ b/src/app/ng-select-demo/ng-select-demo/ng-select-demo.component.html
@@ -11,21 +11,34 @@ selected: {{ myValue | json }}
-
selected: {{ myForm.value | json }}
+
Name: {{ item.name }} - Address: {{item.address }}
selected: {{ myValue3 | json }}
+
+
+selected: {{ myValue2 | json }}
+
{{ item.name }} - {{ item.address }}
-Multi-Select Demo
-multi-select works!
+Single Select Demo
-
- {{ item.name }} - {{ item.address }}
+
+
+selected: {{ myValue | json }}
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+selected: {{ myValue | json }}
+
diff --git a/src/assets/avatar.png b/src/assets/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..796e320412d2ad2721b0dc4dc065021b45e25de4
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1SGcvS$+jloCO|{#S9F5M?jcysy3fAP_V?)
z#WBRAGg+rJJ?Q{r)V?_l23Zw49n+hb=R6DI%g8X{p5xjh|B=Dxt+TO%M5m`>#eogp
zia(fG_zaxeW`vlSFsEF}Flq2mJdz@ibU;AgIpV_!!O8j`SRM!P3+(uQ(pziBLUW*^
lEdj2~F034t2^nl03@$Rtg^Rg8ZUXIR@O1TaS?83{1OVYAIq?7h
literal 0
HcmV?d00001
From 3806e44945184834382bb28880b345b69ca2e087 Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Mon, 6 Jul 2020 15:41:58 -0500
Subject: [PATCH 16/25] demo checking
---
.../multi-select/multi-select.component.ts | 2 -
.../form-group-command-modal.component.ts | 4 +-
.../ng-multi-select.component.html | 21 ---
.../ng-multi-select.component.scss | 0
.../ng-multi-select.component.spec.ts | 25 ---
.../ng-multi-select.component.ts | 97 ------------
.../ng-select/ng-select.component.html | 0
.../ng-select/ng-select.component.scss | 0
.../ng-select/ng-select.component.spec.ts | 25 ---
.../ng-select/ng-select.component.ts | 143 ------------------
.../lib/ps-selectors/ps-selectors.module.ts | 20 ---
.../poweredsoft/ngx-cdk-ui/src/public-api.ts | 4 -
.../command-modal-demo.component.html | 2 +-
.../data-grid-demo-home.component.html | 8 +-
.../ng-select-demo.component.html | 11 +-
.../ng-select-demo.component.ts | 11 +-
src/assets/32x32-blue.png | Bin 0 -> 1344 bytes
17 files changed, 23 insertions(+), 350 deletions(-)
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.html
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.scss
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.spec.ts
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.html
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.scss
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.spec.ts
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts
delete mode 100644 projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts
create mode 100644 src/assets/32x32-blue.png
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts
index dd82022..33734e9 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts
@@ -111,9 +111,7 @@ export class MultiSelectComponent implements OnInit {
}
get selectedModel() {
-
return this.selectComponent.selectedItems.map(t => t.value);
- //return this.selectComponent.hasValue ? this.selectComponent.selectedItems[0].value : null;
}
refreshDataSource(searchTerm:any = null, page:number = null, pageSize:number = null){
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 fd1766f..b08ce0c 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
@@ -37,9 +37,9 @@ export class FormGroupCommandModalComponent implements OnInit {
ngOnInit(): void {
this.errorMessage = null;
- // this._notifyMessage = this.dataSource.notifyMessage$.subscribe(message => {
+ this._notifyMessage = this.dataSource.notifyMessage$.subscribe(message => {
- // });
+ });
this._validationError = this.dataSource.validationError$.subscribe(validatorErrors => {
let validationSummary = '';
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.html b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.html
deleted file mode 100644
index 44df12c..0000000
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ NgMultiSelectComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(NgMultiSelectComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts
deleted file mode 100644
index f56cf51..0000000
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Component, OnInit, Input, ChangeDetectorRef, OnDestroy } from '@angular/core';
-import { Observable, Subscription, Subject } from 'rxjs';
-import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
-import { map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
-
-@Component({
- selector: 'ps-ng-multi-select',
- templateUrl: './ng-multi-select.component.html',
- styleUrls: ['./ng-multi-select.component.scss']
-})
-export class NgMultiSelectComponent implements OnInit, OnDestroy {
-
- @Input() dataSource: IDataSource;
- @Input() searchPath: string;
- @Input() searchType: string = "Contains";
- @Input() sortingPath: string;
- @Input() disableServer:boolean = false;
- @Input() bindLabel:string;
-
- data$ : Observable;
- selectedId:any[];
- isLoading:boolean = false;
- searchInput$ = new Subject();
- private _dataSubscription: Subscription;
-
- constructor(private cdr: ChangeDetectorRef) {
- }
-
- ngOnDestroy(): void {
- this._dataSubscription.unsubscribe();
- }
-
- ngOnInit() {
- this.dataFetching();
- this.detectLoading();
- if(!this.disableServer){
- this.searchOnServer();
- }else{
- this.refreshDataSource();
- }
-
- }
-
- dataFetching(){
- this.data$ = this.dataSource.data$.pipe(
- map(t => {
- if (t == null)
- return [];
- return t.data;
- })
- );
- this._dataSubscription = this.dataSource.data$.subscribe();
- }
-
- detectLoading(){
- this.dataSource.loading$.subscribe(loading => {
- this.isLoading = loading;
- this.cdr.detectChanges();
- });
- }
-
- searchOnServer(){
- this.searchInput$.pipe(
- distinctUntilChanged(), // emit the difference from previous input
- debounceTime(500) // this is for delaying searching speed
- ).subscribe(searchTerm => this.refreshDataSource(searchTerm, 1, 50)); // page: 1, pageSize: 100
-
- this.refreshDataSource(); //send the query to server to sorting & filtering by default
- }
-
- refreshDataSource(searchTerm:any = null, page:number=null, pageSize:number=null){
- let searchfilters:ISimpleFilter[] = null;
- if(searchTerm){
- searchfilters = [{
- path: this.searchPath,
- type: this.searchType, // Default: Contains
- value: searchTerm
- }]
- }
- this.dataSource.query({
- page: page,
- pageSize: pageSize,
- filters:searchfilters,
- sorts:[
- {path: this.sortingPath, ascending: true}
- ]
- })
- }
-
- clearModel() {
- this.selectedId = [];
-}
-
-changeModel() {
- this.selectedId = [{ name: 'New person' }];
-}
-}
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.html b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.html
deleted file mode 100644
index e69de29..0000000
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.scss b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.spec.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.spec.ts
deleted file mode 100644
index 9dc9b61..0000000
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NgSelectComponent } from './ng-select.component';
-
-describe('NgSelectComponent', () => {
- let component: NgSelectComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ NgSelectComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(NgSelectComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts
deleted file mode 100644
index 4cb4f62..0000000
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-select/ng-select.component.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { Component, OnInit, Input, ChangeDetectorRef, OnDestroy, ContentChild, QueryList, ContentChildren, ViewChild, forwardRef, EventEmitter, Output } from '@angular/core';
-import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
-import { Observable, Subject, Subscription } from 'rxjs';
-import { distinctUntilChanged, debounceTime, map } from 'rxjs/operators';
-import { SelectOptionTemplateDirective } from '../select-option-template.directive';
-import { NgSelectComponent as SelectComponent } from '@ng-select/ng-select';
-import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms';
-
-@Component({
- selector: 'ps-ng-select',
- templateUrl: './ng-select.component.html',
- providers: [{
- provide: NG_VALUE_ACCESSOR,
- useExisting: forwardRef(() => NgSelectComponent),
- multi: true
-}],
- styleUrls: ['./ng-select.component.scss']
-})
-export class NgSelectComponent implements OnInit, OnDestroy, ControlValueAccessor {
-
- @ContentChild(SelectOptionTemplateDirective) selectTemplate: SelectOptionTemplateDirective;
- @ViewChild(SelectComponent, { static: true }) selectComponent: SelectComponent;
- @Input() dataSource: IDataSource;
- @Input() searchPath: string;
- @Input() searchType: string;
- @Input() sortingPath: string;
- @Input() serverFiltering:boolean;
- @Input() bindLabel:string;
- @Input() bindValue: string;
-
- @Output('change') changeEvent = new EventEmitter();
-
- trackFn: (item: any) => any;
- data$ : Observable;
- isLoading:boolean = false;
- searchInput$ = new Subject();
-
- private _loadingSubscription: Subscription;
-
- constructor(private cdr: ChangeDetectorRef) {
- this.trackFn = this.trackBy.bind(this);
-
- }
-
- valueChanged(event) {
- this.changeEvent.emit(event);
- }
-
- writeValue(obj: any): void {
- this.selectComponent.writeValue(obj);
- }
- registerOnChange(fn: any): void {
- this.selectComponent.registerOnChange(fn);
- }
- registerOnTouched(fn: any): void {
- this.selectComponent.registerOnTouched(fn);
- }
- setDisabledState?(isDisabled: boolean): void {
- if (this.selectComponent.setDisabledState)
- this.selectComponent.setDisabledState(isDisabled);
- }
-
- trackBy(item: any) {
- return this.dataSource.resolveIdField(item);
- }
-
- ngOnDestroy(): void {
- this._loadingSubscription.unsubscribe();
- }
-
- ngOnInit(): void {
- this.dataFetching();
- this.detectLoading();
-
- console.log(this.serverFiltering);
-
- if(this.serverFiltering){
- this.searchOnServer();
- }else{
- this.refreshDataSource();
- }
- }
-
- dataFetching(){
- this.data$ = this.dataSource.data$.pipe(
- map(t => {
- if (t == null)
- return [];
- return t.data;
- })
- );
- }
-
- detectLoading(){
- this._loadingSubscription = this.dataSource.loading$.subscribe(loading => {
- this.isLoading = loading;
- this.cdr.detectChanges();
- });
- }
-
- searchOnServer(){
- this.searchInput$.pipe(
- distinctUntilChanged(), // emit the difference from previous input
- debounceTime(500) // this is for delaying searching speed
- ).subscribe(searchTerm => this.refreshDataSource(searchTerm, 1, 100)); // page: 1, pageSize: 50
-
- this.refreshDataSource(); //send the query to server to sorting & filtering by default
- }
-
- get selectedModel() {
- return this.selectComponent.hasValue ? this.selectComponent.selectedItems[0].value : null;
- }
-
- refreshDataSource(searchTerm:any = null, page:number = null, pageSize:number = null){
- let searchfilters:ISimpleFilter[] = null;
- if(searchTerm){
- searchfilters = [{
- path: this.searchPath || this.bindLabel,
- type: this.searchType || 'Contains', // Default: Contains
- value: searchTerm
- }]
- }
- this.dataSource.query({
- page: page,
- pageSize: pageSize,
- filters:searchfilters,
- sorts:[
- {path: this.sortingPath || this.bindLabel, ascending: true}
- ]
- })
- }
-
- get hasOptionTemplate() {
- return this.selectTemplate ? true : false;
- }
-
- get selectOptionTemplate(){
- if (this.selectTemplate)
- return this.selectTemplate.template;
- return null;
- }
-
-}
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts
deleted file mode 100644
index 20f089f..0000000
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ps-selectors.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { NgSelectComponent } from './ng-select/ng-select.component';
-import { NgMultiSelectComponent } from './ng-multi-select/ng-multi-select.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NgSelectModule } from '@ng-select/ng-select';
-
-
-
-
-@NgModule({
- declarations: [NgSelectComponent, NgMultiSelectComponent ],
- imports: [
- CommonModule,
- FormsModule,
- NgSelectModule,
- ],
- exports:[NgSelectComponent,NgMultiSelectComponent]
-})
-export class PsSelectorsModule { }
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts b/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
index 0ebdcc6..fc3e30d 100644
--- a/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
+++ b/projects/poweredsoft/ngx-cdk-ui/src/public-api.ts
@@ -13,7 +13,3 @@ export * from './lib/data-grid/directives/data-grid-loader.directive';
export * from './lib/data-grid/directives/data-grid-cell-filter.directive';
export * from './lib/data-grid/directives/data-grid-col-sort.directive';
-//ng selects
-export * from './lib/ps-selectors/ps-selectors.module';
-export * from './lib/ps-selectors/ng-select/ng-select.component';
-export * from './lib/ps-selectors/ng-multi-select/ng-multi-select.component';
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 d3bfc3e..b7b4d0f 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
@@ -46,7 +46,7 @@
-
- Single Select Demo | ngModel | option template
+
+
+ {{item | json}}
Multi-Select Demo
+Select multiple elements
- -
- Selected value:
-
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.scss b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.spec.ts b/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.spec.ts
deleted file mode 100644
index dd1f6e1..0000000
--- a/projects/poweredsoft/ngx-cdk-ui/src/lib/ps-selectors/ng-multi-select/ng-multi-select.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NgMultiSelectComponent } from './ng-multi-select.component';
-
-describe('NgMultiSelectComponent', () => {
- let component: NgMultiSelectComponent;
- let fixture: ComponentFixture-
-
-
- {{item.name}} -
+
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 041acd5..6abfc63 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
@@ -11,10 +11,10 @@
ID
+ {{model.id}}
+ Single Select Demo | label Template
+ Merchant: {{ item.name }} - Address: {{ item.address }}
+
+
Name: {{ item.name }} - Address: {{item.address }}
Single Select Demo | notFound Template
+
+
+
+ No data found for "{{searchTerm}}"
+
+ Multi-Select Demo
From 5d0cb30a48df10e5819695af19ed4b9bf107f449 Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Wed, 8 Jul 2020 11:54:32 -0500
Subject: [PATCH 19/25] fix wrong name for select/filter/sorting
---
.../multi-select/multi-select.component.html | 0
.../multi-select/multi-select.component.scss | 0
.../multi-select/multi-select.component.ts | 0
.../ng-select/ng-select.component.html | 0
.../ng-select/ng-select.component.scss | 0
.../ng-select/ng-select.component.ts | 0
.../not-found-template.directive.ts | 0
.../ps-ng-select.module.ts} | 2 +-
.../select-label-template.directive.ts | 0
.../select-option-template.directive.ts | 0
.../poweredsoft/ng-select/src/public-api.ts | 15 +++----
.../data-source-filter.module.ts | 27 ++++++++++++
...ata-source-datetime-filter.component.html} | 0
...ata-source-datetime-filter.component.scss} | 0
... data-source-datetime-filter.component.ts} | 8 ++--
.../dataSource-filter/grid-filter.module.ts | 27 ------------
... data-source-number-filter.component.html} | 0
... data-source-number-filter.component.scss} | 0
...=> data-source-number-filter.component.ts} | 6 +--
...=> data-source-text-filter.component.html} | 0
...=> data-source-text-filter.component.scss} | 0
...s => data-source-text-filter.component.ts} | 6 +--
...odule.ts => data-source-sorting.module.ts} | 4 +-
...tml => data-source-sorting.component.html} | 0
...css => data-source-sorting.component.scss} | 0
...nt.ts => data-source-sorting.component.ts} | 4 +-
.../form-group-command-modal.directive.ts | 44 -------------------
.../ngx-bootstrap/src/public-api.ts | 12 ++---
.../form-group-modal-demo.component.html | 4 --
.../grid-filter-demo.module.ts | 6 +--
.../grid-filter-demo.component.html | 4 +-
.../ng-select-demo/ng-select-demo.module.ts | 4 +-
32 files changed, 61 insertions(+), 112 deletions(-)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/multi-select/multi-select.component.html (100%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/multi-select/multi-select.component.scss (100%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/multi-select/multi-select.component.ts (100%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/ng-select/ng-select.component.html (100%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/ng-select/ng-select.component.scss (100%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/ng-select/ng-select.component.ts (100%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/not-found-template.directive.ts (100%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors/ps-ng-selectors.module.ts => ps-ng-select/ps-ng-select.module.ts} (95%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/select-label-template.directive.ts (100%)
rename projects/poweredsoft/ng-select/src/lib/{ps-ng-selectors => ps-ng-select}/select-option-template.directive.ts (100%)
create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/{datetime-filter.component.html => data-source-datetime-filter.component.html} (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/{datetime-filter.component.scss => data-source-datetime-filter.component.scss} (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/{datetime-filter.component.ts => data-source-datetime-filter.component.ts} (85%)
delete mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/grid-filter.module.ts
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/{number-filter.component.html => data-source-number-filter.component.html} (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/{number-filter.component.scss => data-source-number-filter.component.scss} (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/{number-filter.component.ts => data-source-number-filter.component.ts} (90%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/{text-filter.component.html => data-source-text-filter.component.html} (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/{text-filter.component.scss => data-source-text-filter.component.scss} (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/{text-filter.component.ts => data-source-text-filter.component.ts} (90%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/{ds-sorting.module.ts => data-source-sorting.module.ts} (63%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/{ds-sorting.component.html => data-source-sorting.component.html} (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/{ds-sorting.component.scss => data-source-sorting.component.scss} (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/{ds-sorting.component.ts => data-source-sorting.component.ts} (88%)
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.html b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.html
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.html
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.html
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.scss b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.scss
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.scss
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.scss
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/multi-select/multi-select.component.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.html
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.html
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.html
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.scss b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.scss
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.scss
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.scss
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ng-select/ng-select.component.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/not-found-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/not-found-template.directive.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/not-found-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/not-found-template.directive.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
similarity index 95%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
index 1df2cd8..a833cda 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/ps-ng-selectors.module.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
@@ -25,4 +25,4 @@ import { NotFoundTemplateDirective } from './not-found-template.directive';
NotFoundTemplateDirective
]
})
-export class PsNgSelectorsModule { }//NGSELECT
+export class PsNgSelectModule { }//NGSELECT
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-label-template.directive.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-label-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-label-template.directive.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-option-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-option-template.directive.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-selectors/select-option-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-option-template.directive.ts
diff --git a/projects/poweredsoft/ng-select/src/public-api.ts b/projects/poweredsoft/ng-select/src/public-api.ts
index eaa0877..8c65c66 100644
--- a/projects/poweredsoft/ng-select/src/public-api.ts
+++ b/projects/poweredsoft/ng-select/src/public-api.ts
@@ -2,12 +2,9 @@
* Public API Surface of ng-select
*/
-export * from './lib/ps-ng-selectors/ps-ng-selectors.module';
-export * from './lib/ps-ng-selectors/ng-select/ng-select.component';
-export * from './lib/ps-ng-selectors/multi-select/multi-select.component';
-export * from './lib/ps-ng-selectors/select-label-template.directive';
-export * from './lib/ps-ng-selectors/select-option-template.directive';
-export * from './lib/ps-ng-selectors/not-found-template.directive';
-
-
-
+export * from './lib/ps-ng-select/ps-ng-select.module';
+export * from './lib/ps-ng-select/ng-select/ng-select.component';
+export * from './lib/ps-ng-select/multi-select/multi-select.component';
+export * from './lib/ps-ng-select/select-label-template.directive';
+export * from './lib/ps-ng-select/select-option-template.directive';
+export * from './lib/ps-ng-select/not-found-template.directive';
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts
new file mode 100644
index 0000000..ca1bb73
--- /dev/null
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { DataSourceTextFilterComponent } from './text-filter/data-source-text-filter.component';
+import { FormsModule } from '@angular/forms';
+import { DataSourceNumberFilterComponent } from './number-filter/data-source-number-filter.component';
+import { DataSourceDatetimeFilterComponent } from './datetime-filter/data-source-datetime-filter.component';
+import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
+import { PopoverModule } from 'ngx-bootstrap/popover';
+import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+
+
+
+
+@NgModule({
+ declarations: [DataSourceTextFilterComponent, DataSourceNumberFilterComponent,DataSourceDatetimeFilterComponent],
+ imports: [
+ CommonModule,
+ FormsModule,
+ BsDatepickerModule.forRoot(),
+ PopoverModule.forRoot(),
+ BsDropdownModule.forRoot(),
+ TooltipModule.forRoot()
+ ],
+ exports: [DataSourceTextFilterComponent, DataSourceNumberFilterComponent,DataSourceDatetimeFilterComponent]
+})
+export class DataSourceFilterModule { }
\ No newline at end of file
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.scss
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.scss
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.scss
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
similarity index 85%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
index 4b6ce79..5c8c5ec 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/datetime-filter.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
@@ -2,11 +2,11 @@ import { Component, OnInit, Input } from '@angular/core';
import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
@Component({
- selector: 'psbx-datetime-filter',
- templateUrl: './datetime-filter.component.html',
- styleUrls: ['./datetime-filter.component.scss']
+ selector: 'psbx-ds-datetime-filter',
+ templateUrl: './data-source-datetime-filter.component.html',
+ styleUrls: ['./data-source-datetime-filter.component.scss']
})
-export class DatetimeFilterComponent {
+export class DataSourceDatetimeFilterComponent {
@Input() path: string;
@Input() dataSource : IDataSource;
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/grid-filter.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/grid-filter.module.ts
deleted file mode 100644
index a720d04..0000000
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/grid-filter.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { TextFilterComponent } from './text-filter/text-filter.component';
-import { FormsModule } from '@angular/forms';
-import { NumberFilterComponent } from './number-filter/number-filter.component';
-import { DatetimeFilterComponent } from './datetime-filter/datetime-filter.component';
-import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
-import { PopoverModule } from 'ngx-bootstrap/popover';
-import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
-
-
-
-
-@NgModule({
- declarations: [TextFilterComponent, NumberFilterComponent,DatetimeFilterComponent],
- imports: [
- CommonModule,
- FormsModule,
- BsDatepickerModule.forRoot(),
- PopoverModule.forRoot(),
- BsDropdownModule.forRoot(),
- TooltipModule.forRoot()
- ],
- exports: [TextFilterComponent, NumberFilterComponent,DatetimeFilterComponent]
-})
-export class GridFilterModule { } //DS Filter
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.scss
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.scss
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.scss
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.ts
similarity index 90%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.ts
index 74048b8..bcc395b 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/number-filter.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.ts
@@ -4,10 +4,10 @@ import { ISimpleFilter } from '../../models/IFilter';
@Component({
selector: 'psbx-ds-number-filter',
- templateUrl: './number-filter.component.html',
- styleUrls: ['./number-filter.component.scss']
+ templateUrl: './data-source-number-filter.component.html',
+ styleUrls: ['./data-source-number-filter.component.scss']
})
-export class NumberFilterComponent implements OnInit {
+export class DataSourceNumberFilterComponent implements OnInit {
@Input() dataSource : IDataSource;
@Input() path:string;
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.scss
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.scss
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.scss
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.ts
similarity index 90%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.ts
index 990356f..9ebd44a 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/text-filter.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.ts
@@ -6,10 +6,10 @@ import { PopoverDirective } from 'ngx-bootstrap/popover';
@Component({
selector: 'psbx-ds-text-filter',
- templateUrl: './text-filter.component.html',
- styleUrls: ['./text-filter.component.scss']
+ templateUrl: './data-source-text-filter.component.html',
+ styleUrls: ['./data-source-text-filter.component.scss']
})
-export class TextFilterComponent implements OnInit {
+export class DataSourceTextFilterComponent implements OnInit {
@Input() dataSource : IDataSource;
@Input() path:string;
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/data-source-sorting.module.ts
similarity index 63%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting.module.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/data-source-sorting.module.ts
index 614d8d9..a4597b0 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting.module.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/data-source-sorting.module.ts
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { DataSourceSortingComponent } from './ds-sorting/ds-sorting.component';
+import { DataSourceSortingComponent } from './ds-sorting/data-source-sorting.component';
@@ -11,4 +11,4 @@ import { DataSourceSortingComponent } from './ds-sorting/ds-sorting.component';
],
exports:[DataSourceSortingComponent]
})
-export class GridSortingModule { }
+export class DataSourceSortingModule { }
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.html
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.html
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.scss b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.scss
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.scss
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.scss
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.ts
similarity index 88%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.ts
index bf66deb..1b57287 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/ds-sorting.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-sorting/ds-sorting/data-source-sorting.component.ts
@@ -3,8 +3,8 @@ import { IDataSource } from '@poweredsoft/data';
@Component({
selector: 'psbx-ds-sorting',
- templateUrl: './ds-sorting.component.html',
- styleUrls: ['./ds-sorting.component.scss']
+ templateUrl: './data-source-sorting.component.html',
+ styleUrls: ['./data-source-sorting.component.scss']
})
export class DataSourceSortingComponent implements OnInit {
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 c037cd1..42de551 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
@@ -95,48 +95,4 @@ export class FormGroupCommandModalDirective {
});
}
- // @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/public-api.ts b/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
index ea42355..4deaf47 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/public-api.ts
@@ -13,9 +13,9 @@ export * from './lib/confirm-modal/confirm-modal.service';
export * from './lib/confirm-modal/confirm-modal.directive';
export * from './lib/spinner/spinner.module';
export * from './lib/spinner/spinner/spinner.component';
-export * from './lib/dataSource-filter/grid-filter.module';
-export * from './lib/dataSource-filter/text-filter/text-filter.component';
-export * from './lib/dataSource-filter/number-filter/number-filter.component';
-export * from './lib/dataSource-filter/datetime-filter/datetime-filter.component';
-export * from './lib/dataSource-sorting/ds-sorting.module';
-export * from './lib/dataSource-sorting/ds-sorting/ds-sorting.component';
\ No newline at end of file
+export * from './lib/dataSource-filter/data-source-filter.module';
+export * from './lib/dataSource-filter/text-filter/data-source-text-filter.component';
+export * from './lib/dataSource-filter/number-filter/data-source-number-filter.component';
+export * from './lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component';
+export * from './lib/dataSource-sorting/data-source-sorting.module';
+export * from './lib/dataSource-sorting/ds-sorting/data-source-sorting.component';
\ 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 02442e8..94bce33 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
@@ -23,12 +23,8 @@
-
-
-
diff --git a/src/app/grid-filter&sorting-demo/grid-filter-demo.module.ts b/src/app/grid-filter&sorting-demo/grid-filter-demo.module.ts
index e3b3dc5..0a2a6ae 100644
--- a/src/app/grid-filter&sorting-demo/grid-filter-demo.module.ts
+++ b/src/app/grid-filter&sorting-demo/grid-filter-demo.module.ts
@@ -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 { }
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 148fe65..0d3d0bb 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
@@ -43,8 +43,8 @@
Open Date
{{model.openDate}}
-
-
+
+
diff --git a/src/app/ng-select-demo/ng-select-demo.module.ts b/src/app/ng-select-demo/ng-select-demo.module.ts
index 0bd078e..2088487 100644
--- a/src/app/ng-select-demo/ng-select-demo.module.ts
+++ b/src/app/ng-select-demo/ng-select-demo.module.ts
@@ -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 { }
From 66d34d101909312cf79acdf10d0e60554b4f58a1 Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Wed, 8 Jul 2020 13:05:24 -0500
Subject: [PATCH 20/25] datetime temp commit
---
.../multi-select/multi-select.component.ts | 7 ++---
.../ng-select/ng-select.component.ts | 6 ++---
...data-source-datetime-filter.component.html | 26 ++++++++++++-------
.../data-source-datetime-filter.component.ts | 6 ++++-
.../data-source-number-filter.component.html | 2 +-
.../data-source-text-filter.component.html | 2 +-
.../form-group-command-modal.component.ts | 4 +--
.../command-modal-demo.component.ts | 9 +++++--
.../data-grid-demo-home.component.ts | 9 +++++--
.../form-group-modal-demo.component.ts | 10 +++++--
.../grid-filter-demo.component.ts | 1 -
.../pagination/pagination-demo.component.ts | 9 +++++--
12 files changed, 58 insertions(+), 33 deletions(-)
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
index 33734e9..e45ecfc 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ContentChild, ViewChild, Input, Output, EventEmitter, ChangeDetectorRef, forwardRef } from '@angular/core';
+import { Component, OnInit, ContentChild, ViewChild, Input, Output, EventEmitter, ChangeDetectorRef, forwardRef, OnDestroy } from '@angular/core';
import { SelectLabelTemplateDirective } from '../select-label-template.directive';
import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
import { Observable, Subject, Subscription } from 'rxjs';
@@ -17,7 +17,7 @@ import { SelectOptionTemplateDirective } from '../select-option-template.directi
}],
styleUrls: ['./multi-select.component.scss']
})
-export class MultiSelectComponent implements OnInit {
+export class MultiSelectComponent implements OnInit,OnDestroy {
@ContentChild(SelectOptionTemplateDirective) optionTemplate: SelectOptionTemplateDirective;
@@ -74,9 +74,6 @@ export class MultiSelectComponent implements OnInit {
ngOnInit(): void {
this.dataFetching();
this.detectLoading();
-
- console.log(this.serverFiltering);
-
if(this.serverFiltering){
this.searchOnServer();
}else{
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
index ae8ca06..9b3cb33 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ContentChild, ViewChild, Input, Output, EventEmitter, ChangeDetectorRef, forwardRef } from '@angular/core';
+import { Component, OnInit, ContentChild, ViewChild, Input, Output, EventEmitter, ChangeDetectorRef, forwardRef, OnDestroy } from '@angular/core';
import { SelectLabelTemplateDirective } from '../select-label-template.directive';
import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
import { Observable, Subject, Subscription } from 'rxjs';
@@ -19,7 +19,7 @@ import { NotFoundTemplateDirective } from '../not-found-template.directive';
}],
styleUrls: ['./ng-select.component.scss']
})
-export class NgSelectComponent implements OnInit {
+export class NgSelectComponent implements OnInit,OnDestroy {
@ContentChild(SelectOptionTemplateDirective) optionTemplate: SelectOptionTemplateDirective;
@ContentChild(SelectLabelTemplateDirective) labelTemplate: SelectLabelTemplateDirective;
@@ -80,8 +80,6 @@ export class NgSelectComponent implements OnInit {
this.dataFetching();
this.detectLoading();
- console.log(this.serverFiltering);
-
if(this.serverFiltering){
this.searchOnServer();
}else{
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
index ac319c2..ce785ac 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
@@ -1,19 +1,25 @@
;
+ private _dataSubscription: Subscription;
constructor(private merchantService: MerchantService){
this.merchantDataSource = this.createDataSource();
}
+ ngOnDestroy(): void {
+ this._dataSubscription.unsubscribe();
+ }
newMerchant(name: string) {
this.merchantDataSource.executeCommandByName('addMerchant', {
diff --git a/src/app/data-grid-demo/data-grid-demo-home/data-grid-demo-home.component.ts b/src/app/data-grid-demo/data-grid-demo-home/data-grid-demo-home.component.ts
index b6307fc..b9d5dcb 100644
--- a/src/app/data-grid-demo/data-grid-demo-home/data-grid-demo-home.component.ts
+++ b/src/app/data-grid-demo/data-grid-demo-home/data-grid-demo-home.component.ts
@@ -1,22 +1,27 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
import { DataSource, IDataSource, IQueryExecutionResult, IQueryExecutionGroupResult } from '@poweredsoft/data';
import { IMerchant } from 'src/app/data/services/IMerchant';
import { MerchantService } from 'src/app/data/services/merchant.service';
+import { Subscription } from 'rxjs';
@Component({
selector: 'ps-data-grid-demo-home',
templateUrl: './data-grid-demo-home.component.html',
styleUrls: ['./data-grid-demo-home.component.scss']
})
-export class DataGridDemoHomeComponent implements OnInit {
+export class DataGridDemoHomeComponent implements OnInit, OnDestroy {
title = 'cdkDemo';
columns = ['id','name', 'address', 'commands']
merchantDataSource: IDataSource;
+ private _dataSubscription: Subscription;
constructor(private merchantService: MerchantService){
this.merchantDataSource = this.createDataSource();
}
+ ngOnDestroy(): void {
+ this._dataSubscription.unsubscribe();
+ }
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 d6fb703..f6e872a 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
@@ -1,16 +1,18 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } 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 { FormGroup, FormControl, FormBuilder, Validators } from '@angular/forms';
import { IModelFormCreateEvent } from 'projects/poweredsoft/ngx-bootstrap/src/public-api';
+import { Subscription } from 'rxjs';
+import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
@Component({
selector: 'ps-form-group-modal-demo',
templateUrl: './form-group-modal-demo.component.html',
styleUrls: ['./form-group-modal-demo.component.scss']
})
-export class FormGroupModalDemoComponent implements OnInit {
+export class FormGroupModalDemoComponent implements OnInit,OnDestroy {
createDataSource(): IDataSource {
return this.merchantService.createDataSource();
@@ -18,10 +20,14 @@ export class FormGroupModalDemoComponent implements OnInit {
pages:any;
merchantDataSource: IDataSource;
+ private _dataSubscription: Subscription;
columns = ['id','name', 'address', 'actions'];
constructor(private merchantService: MerchantService, private fb: FormBuilder) {
this.merchantDataSource = this.createDataSource();
}
+ ngOnDestroy(): void {
+ this._dataSubscription.unsubscribe();
+ }
ngOnInit(): void {
this.merchantDataSource.refresh();
diff --git a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.ts b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.ts
index 6bd9dd1..d950b97 100644
--- a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.ts
+++ b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.ts
@@ -15,7 +15,6 @@ export class GridFilterDemoComponent implements OnInit {
merchantDataSource: IDataSource;
constructor(private merchantService: MerchantService){
this.merchantDataSource = this.createDataSource();
- console.log(this.merchantDataSource);
}
pages:any;
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 b00831b..4da193d 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
@@ -1,22 +1,27 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } 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 { FormBuilder, Validators } from '@angular/forms';
import { ConfirmModalService } from '@poweredsoft/ngx-bootstrap';
+import { Subscription } from 'rxjs';
@Component({
selector: 'ps-pagination',
templateUrl: './pagination-demo.component.html',
styleUrls: ['./pagination-demo.component.scss']
})
-export class PaginationDemoComponent implements OnInit {
+export class PaginationDemoComponent implements OnInit, OnDestroy {
columns = ['id','name', 'address','commands']
merchantDataSource: IDataSource;
+ private _dataSubscription: Subscription;
constructor(private merchantService: MerchantService, private confirmModalService: ConfirmModalService){
this.merchantDataSource = this.createDataSource();
}
+ ngOnDestroy(): void {
+ this._dataSubscription.unsubscribe();
+ }
pages:any;
From f70260864087191d27d0335eb02899baa51bdbe8 Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Thu, 9 Jul 2020 13:41:22 -0500
Subject: [PATCH 21/25] commit for current
---
.../not-found-template.directive.ts | 0
.../select-label-template.directive.ts | 2 +-
.../select-option-template.directive.ts | 0
.../multi-select/multi-select.component.ts | 4 +-
.../ng-select/ng-select.component.ts | 6 +-
.../lib/ps-ng-select/ps-ng-select.module.ts | 6 +-
.../poweredsoft/ng-select/src/public-api.ts | 6 +-
.../lib/command-modal/command-modal.module.ts | 4 +-
.../command-modal.component.spec.ts | 25 ----
.../command-modal/command-modal.component.ts | 7 +-
.../directives/command-modal.directive.ts | 7 +-
.../directives/input-validator.directive.ts | 19 ---
.../src/lib/command/command.module.ts | 16 ++
.../command/directives/command.directive.ts | 70 +++++++++
.../confirm-modal/confirm-modal.component.ts | 6 +-
.../confirm-modal/confirm-modal.directive.ts | 55 -------
.../lib/confirm-modal/confirm-modal.module.ts | 8 +-
.../data-source-filter.module.ts | 0
...data-source-datetime-filter.component.html | 48 ++++--
...data-source-datetime-filter.component.scss | 0
.../data-source-datetime-filter.component.ts | 137 ++++++++++++++++++
.../data-source-number-filter.component.html | 2 +-
.../data-source-number-filter.component.scss | 0
.../data-source-number-filter.component.ts | 6 +-
.../data-source-text-filter.component.html | 2 +-
.../data-source-text-filter.component.scss | 0
.../data-source-text-filter.component.ts | 2 +-
.../data-source-sorting.module.ts | 0
.../data-source-sorting.component.html | 0
.../data-source-sorting.component.scss | 0
.../data-source-sorting.component.ts | 0
.../data-source-datetime-filter.component.ts | 61 --------
.../form-group-command-modal.directive.ts | 27 +---
.../form-group-command-modal.component.ts | 10 +-
.../ngx-bootstrap/src/lib/models/IFilter.ts | 9 --
...ination.module.ts => pagination.module.ts} | 6 +-
.../ngx-bootstrap/src/public-api.ts | 17 ++-
.../command-modal-demo.module.ts | 7 +-
.../command-modal-demo.component.html | 19 ++-
.../command-modal-demo.component.ts | 2 +-
.../data-grid-demo-home.component.ts | 2 +-
.../form-group-modal-demo.module.ts | 5 +-
.../form-group-modal-demo.component.html | 4 +-
.../form-group-modal-demo.component.ts | 2 +-
.../grid-filter-demo.module.ts | 7 +-
.../grid-filter-demo.component.html | 4 +-
.../ng-select-demo.component.html | 7 +-
.../pagination-demo/pagination-demo.module.ts | 4 +-
.../pagination/pagination-demo.component.html | 4 +-
.../pagination/pagination-demo.component.ts | 2 +-
50 files changed, 369 insertions(+), 268 deletions(-)
rename projects/poweredsoft/ng-select/src/lib/ps-ng-select/{ => directives}/not-found-template.directive.ts (100%)
rename projects/poweredsoft/ng-select/src/lib/ps-ng-select/{ => directives}/select-label-template.directive.ts (70%)
rename projects/poweredsoft/ng-select/src/lib/ps-ng-select/{ => directives}/select-option-template.directive.ts (100%)
delete mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.spec.ts
delete mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/input-validator.directive.ts
create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/command/command.module.ts
create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/command/directives/command.directive.ts
delete mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.directive.ts
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/data-source-filter.module.ts (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/datetime-filter/data-source-datetime-filter.component.html (54%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/datetime-filter/data-source-datetime-filter.component.scss (100%)
create mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/data-source-filter/datetime-filter/data-source-datetime-filter.component.ts
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/number-filter/data-source-number-filter.component.html (97%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/number-filter/data-source-number-filter.component.scss (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/number-filter/data-source-number-filter.component.ts (92%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/text-filter/data-source-text-filter.component.html (97%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/text-filter/data-source-text-filter.component.scss (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-filter => data-source-filter}/text-filter/data-source-text-filter.component.ts (97%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-sorting => data-source-sorting}/data-source-sorting.module.ts (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-sorting => data-source-sorting}/ds-sorting/data-source-sorting.component.html (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-sorting => data-source-sorting}/ds-sorting/data-source-sorting.component.scss (100%)
rename projects/poweredsoft/ngx-bootstrap/src/lib/{dataSource-sorting => data-source-sorting}/ds-sorting/data-source-sorting.component.ts (100%)
delete mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
delete mode 100644 projects/poweredsoft/ngx-bootstrap/src/lib/models/IFilter.ts
rename projects/poweredsoft/ngx-bootstrap/src/lib/pagination/{psbxPagination.module.ts => pagination.module.ts} (71%)
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/not-found-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/directives/not-found-template.directive.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-select/not-found-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/directives/not-found-template.directive.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-label-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/directives/select-label-template.directive.ts
similarity index 70%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-label-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/directives/select-label-template.directive.ts
index 55dc0a1..7c667a0 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-label-template.directive.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/directives/select-label-template.directive.ts
@@ -1,4 +1,4 @@
-import { Directive, TemplateRef, Input } from '@angular/core';
+import { Directive, TemplateRef } from '@angular/core';
@Directive({
selector: '[psNgSelectLabel]'
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-option-template.directive.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/directives/select-option-template.directive.ts
similarity index 100%
rename from projects/poweredsoft/ng-select/src/lib/ps-ng-select/select-option-template.directive.ts
rename to projects/poweredsoft/ng-select/src/lib/ps-ng-select/directives/select-option-template.directive.ts
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
index e45ecfc..c976dfa 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
@@ -1,11 +1,11 @@
import { Component, OnInit, ContentChild, ViewChild, Input, Output, EventEmitter, ChangeDetectorRef, forwardRef, OnDestroy } from '@angular/core';
-import { SelectLabelTemplateDirective } from '../select-label-template.directive';
+import { SelectLabelTemplateDirective } from '../directives/select-label-template.directive';
import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
import { Observable, Subject, Subscription } from 'rxjs';
import { map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
import { NgSelectComponent as SelectComponent } from '@ng-select/ng-select';
import { NG_VALUE_ACCESSOR } from '@angular/forms';
-import { SelectOptionTemplateDirective } from '../select-option-template.directive';
+import { SelectOptionTemplateDirective } from '../directives/select-option-template.directive';
@Component({
selector: 'ps-ng-multi-select',
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
index 9b3cb33..a3502c2 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
@@ -1,12 +1,12 @@
import { Component, OnInit, ContentChild, ViewChild, Input, Output, EventEmitter, ChangeDetectorRef, forwardRef, OnDestroy } from '@angular/core';
-import { SelectLabelTemplateDirective } from '../select-label-template.directive';
+import { SelectLabelTemplateDirective } from '../directives/select-label-template.directive';
import { IDataSource, ISimpleFilter } from '@poweredsoft/data';
import { Observable, Subject, Subscription } from 'rxjs';
import { map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
import { NgSelectComponent as SelectComponent } from '@ng-select/ng-select';
import { NG_VALUE_ACCESSOR } from '@angular/forms';
-import { SelectOptionTemplateDirective } from '../select-option-template.directive';
-import { NotFoundTemplateDirective } from '../not-found-template.directive';
+import { SelectOptionTemplateDirective } from '../directives/select-option-template.directive';
+import { NotFoundTemplateDirective } from '../directives/not-found-template.directive';
@Component({
diff --git a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
index a833cda..3b89b59 100644
--- a/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
+++ b/projects/poweredsoft/ng-select/src/lib/ps-ng-select/ps-ng-select.module.ts
@@ -4,9 +4,9 @@ import { NgSelectComponent } from './ng-select/ng-select.component';
import { MultiSelectComponent } from './multi-select/multi-select.component';
import { FormsModule } from '@angular/forms';
import { NgSelectModule } from '@ng-select/ng-select';
-import { SelectLabelTemplateDirective } from './select-label-template.directive';
-import { SelectOptionTemplateDirective } from './select-option-template.directive';
-import { NotFoundTemplateDirective } from './not-found-template.directive';
+import { SelectLabelTemplateDirective } from './directives/select-label-template.directive';
+import { SelectOptionTemplateDirective } from './directives/select-option-template.directive';
+import { NotFoundTemplateDirective } from './directives/not-found-template.directive';
diff --git a/projects/poweredsoft/ng-select/src/public-api.ts b/projects/poweredsoft/ng-select/src/public-api.ts
index 8c65c66..7a883ee 100644
--- a/projects/poweredsoft/ng-select/src/public-api.ts
+++ b/projects/poweredsoft/ng-select/src/public-api.ts
@@ -5,6 +5,6 @@
export * from './lib/ps-ng-select/ps-ng-select.module';
export * from './lib/ps-ng-select/ng-select/ng-select.component';
export * from './lib/ps-ng-select/multi-select/multi-select.component';
-export * from './lib/ps-ng-select/select-label-template.directive';
-export * from './lib/ps-ng-select/select-option-template.directive';
-export * from './lib/ps-ng-select/not-found-template.directive';
+export * from './lib/ps-ng-select/directives/select-label-template.directive';
+export * from './lib/ps-ng-select/directives/select-option-template.directive';
+export * from './lib/ps-ng-select/directives/not-found-template.directive';
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 0940f87..c80c5da 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,7 +3,7 @@ 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';
+
import { FormsModule } from '@angular/forms';
@NgModule({
@@ -12,7 +12,7 @@ import { FormsModule } from '@angular/forms';
ModalModule.forRoot(),
FormsModule
],
- declarations: [CommandModalDirective, CommandModalComponent, InputValidatorDirective],
+ declarations: [CommandModalDirective, CommandModalComponent],
exports: [CommandModalDirective]
})
export class CommandModalModule { }
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.spec.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.spec.ts
deleted file mode 100644
index 89276ef..0000000
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CommandModalComponent } from './command-modal.component';
-
-describe('CommandModalComponent', () => {
- let component: CommandModalComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ CommandModalComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(CommandModalComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.ts
index 4408a68..3e37018 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, TemplateRef, OnDestroy } from '@angular/core';
+import { Component, OnInit, TemplateRef, OnDestroy, EventEmitter } from '@angular/core';
import { IDataSource } from '@poweredsoft/data';
import { BsModalRef } from 'ngx-bootstrap/modal';
import { finalize} from 'rxjs/operators';
@@ -24,6 +24,8 @@ export class CommandModalComponent implements OnInit, OnDestroy {
form:NgForm;
validationMessage:string ;
+ successEmitter: EventEmitter;
+
private _notifyMessage: Subscription;
private _validationError: Subscription;
@@ -62,11 +64,12 @@ export class CommandModalComponent implements OnInit, OnDestroy {
this.loading = false;
})
)
- .subscribe(success => {
+ .subscribe(commandResult => {
if (this.refreshOnSuccess)
this.dataSource.refresh();
this.modalRef.hide();
+ this.successEmitter.emit(commandResult);
}, fail => {
// you do not want to close on failure.. so just ignore..
});
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 c7c7418..02b45a3 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
@@ -1,4 +1,4 @@
-import { Directive, HostListener, Input, TemplateRef } from '@angular/core';
+import { Directive, HostListener, Input, TemplateRef, Output, EventEmitter } from '@angular/core';
import { IDataSource } from '@poweredsoft/data';
import { BsModalService } from 'ngx-bootstrap/modal';
import { CommandModalComponent } from '../command-modal/command-modal.component';
@@ -21,6 +21,8 @@ export class CommandModalDirective {
@Input() cancelText: string;
@Input() animated: boolean;
+ @Output() success: EventEmitter = new EventEmitter();
+
@HostListener('click')
wasClicked() {
this.dataSource.resolveCommandModelByName({
@@ -35,7 +37,8 @@ export class CommandModalDirective {
title: this.commandTitle,
refreshOnSuccess: this.refreshOnSuccess === undefined ? true : this.refreshOnSuccess,
commandText: this.commandText || 'OK',
- cancelText: this.cancelText || 'Cancel'
+ cancelText: this.cancelText || 'Cancel',
+ successEmitter: this.success
};
this.modalService.show(CommandModalComponent, {
animated: this.animated === undefined ? true : this.animated,
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
deleted file mode 100644
index 8fb46d8..0000000
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/directives/input-validator.directive.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-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/command/command.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/command/command.module.ts
new file mode 100644
index 0000000..4ce5b10
--- /dev/null
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/command/command.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { CommandDirective } from './directives/command.directive';
+import { ConfirmModalModule } from '../confirm-modal/confirm-modal.module';
+
+
+
+@NgModule({
+ declarations: [CommandDirective],
+ imports: [
+ CommonModule,
+ ConfirmModalModule
+ ],
+ exports:[CommandDirective]
+})
+export class CommandModule { }
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/command/directives/command.directive.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/command/directives/command.directive.ts
new file mode 100644
index 0000000..5d042ba
--- /dev/null
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/command/directives/command.directive.ts
@@ -0,0 +1,70 @@
+import { Directive, Input, TemplateRef, HostListener, Output, EventEmitter } from '@angular/core';
+import { IDataSource } from '@poweredsoft/data';
+import { ConfirmModalService } from '../../confirm-modal/confirm-modal.service';
+
+@Directive({
+ selector: '[psbxCommand]'
+})
+export class CommandDirective {
+
+ constructor(private confirmModalService: ConfirmModalService) { }
+
+
+ @Input() dataSource: IDataSource;
+ @Input() command: string;
+ @Input() model: any;
+ @Input() refreshOnSuccess: boolean;
+ @Input() animated: boolean;
+
+ @Input() confirm: boolean;
+ @Input() confirmMessage: string;
+ @Input() yesText: string;
+ @Input() noText: string;
+ @Input() yesClass: string;
+ @Input() noClass: string;
+
+ @Output() success: EventEmitter = new EventEmitter();
+ @Output() failure: EventEmitter = new EventEmitter();
+
+ private doCommand() {
+ this.dataSource.resolveCommandModelByName({
+ command: this.command,
+ model: this.model
+ }).subscribe(commandModel => {
+ this.dataSource.executeCommandByName(this.command, commandModel).subscribe(
+ commandResult => {
+ if (this.refreshOnSuccess !== false)
+ this.dataSource.refresh();
+
+ this.success.emit(commandResult);
+ },
+ commandError => {
+ this.failure.emit(commandError);
+ }
+ );
+ }, resolveCommandError => {
+ this.failure.emit(resolveCommandError);
+ });
+ }
+
+
+ @HostListener('click')
+ wasClicked() {
+
+ if (this.confirm) {
+ this.confirmModalService.confirm({
+ message: this.confirmMessage,
+ yesText: this.yesText || 'yes',
+ yesClass: this.yesClass || 'danger',
+ noText: this.noText || 'no',
+ noClass: this.noClass || 'light',
+ }).subscribe(result => {
+ if (result)
+ this.doCommand();
+ })
+ } else {
+ this.doCommand();
+ }
+ }
+
+}
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
index 7259d73..3047239 100644
--- 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
@@ -1,4 +1,4 @@
-import { Component, OnInit, TemplateRef } from '@angular/core';
+import { Component, OnInit, TemplateRef, EventEmitter } from '@angular/core';
import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
import { Observer } from 'rxjs';
@@ -27,11 +27,11 @@ export class ConfirmModalComponent implements OnInit {
}
get yesButtonClass() {
- return `btn btn-sm btn-${this.yesClass}`
+ return `btn btn-${this.yesClass}`
}
get noButtonClass() {
- return `btn btn-sm btn-${this.noClass}`
+ return `btn btn-${this.noClass}`
}
confirm(): void {
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.directive.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.directive.ts
deleted file mode 100644
index ce53863..0000000
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/confirm-modal/confirm-modal.directive.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Directive, Input, TemplateRef, HostListener } from '@angular/core';
-import { ConfirmModalService } from './confirm-modal.service';
-import { IDataSource } from '@poweredsoft/data';
-
-@Directive({
- selector: '[psbxConfirmModal]'
-})
-export class ConfirmModalDirective {
-
- constructor(private confirmModalService: ConfirmModalService) { }
-
-
- @Input() dataSource: IDataSource;
- @Input() command: string;
- @Input() model: any;
- @Input() template: TemplateRef;
- @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 => {
- 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 => {
- if(result){
- this.dataSource.executeCommandByName(this.command, commandModel).subscribe(
- res => {
- this.dataSource.refresh();
- },
- err => {
- console.log(err);
- alert('failed');
- }
- );
- }
- })
-
- }, error => {
-
- });
- }
-
-}
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
index fcfda3a..94314af 100644
--- 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
@@ -3,18 +3,20 @@ 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';
-import { ConfirmModalDirective } from './confirm-modal.directive';
+import { CommandModule } from '../command/command.module';
+
@NgModule({
- declarations: [ConfirmModalComponent, ConfirmModalDirective],
+ declarations: [ConfirmModalComponent],
imports: [
CommonModule,
+ //CommandModule,
ModalModule.forRoot(),
],
- exports:[ConfirmModalDirective],
+ exports:[],
providers: [ConfirmModalService]
})
export class ConfirmModalModule { }
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/data-source-filter/data-source-filter.module.ts
similarity index 100%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/data-source-filter.module.ts
rename to projects/poweredsoft/ngx-bootstrap/src/lib/data-source-filter/data-source-filter.module.ts
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/data-source-filter/datetime-filter/data-source-datetime-filter.component.html
similarity index 54%
rename from projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
rename to projects/poweredsoft/ngx-bootstrap/src/lib/data-source-filter/datetime-filter/data-source-datetime-filter.component.html
index ce785ac..9e7a508 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/data-source-filter/datetime-filter/data-source-datetime-filter.component.html
@@ -1,4 +1,5 @@
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+ bsDatepicker [(ngModel)]="filterValue">
+
+
+
+
+
+
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
index 5c8c5ec..1fa81c8 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
@@ -16,6 +16,10 @@ export class DataSourceDatetimeFilterComponent {
filterType: string = 'Equal';
filterTypes = [
{key:'equal', value: 'Equal'},
+ {key:'Greater Than', value: 'GreaterThan'},
+ {key:'Less Than', value: 'LessThan'},
+ {key:'Greater Than Equal', value: 'GreaterThanOrEqual'},
+ {key:'Less Than Equal', value: 'LessThanOrEqual'},
];
@@ -31,7 +35,7 @@ export class DataSourceDatetimeFilterComponent {
return "Filter by "+ this.path;
}
- applyFilter(){debugger;
+ applyFilter(){
this.isFiltering = true;
const filters = this.dataSource.filters;
const existingFilter = filters.find(t => (t as ISimpleFilter).path == this.path) as ISimpleFilter;
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html
index d797b24..76e11e8 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html
@@ -8,7 +8,7 @@
-
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html
index 28aa89f..08b65cc 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html
@@ -10,7 +10,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 b08ce0c..f1c3a92 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
@@ -1,4 +1,4 @@
-import { Component, OnInit, TemplateRef } from '@angular/core';
+import { Component, OnInit, TemplateRef, OnDestroy } from '@angular/core';
import { BsModalRef } from 'ngx-bootstrap/modal';
import { IDataSource } from '@poweredsoft/data';
import { finalize } from 'rxjs/operators';
@@ -10,7 +10,7 @@ import { FormGroup, FormControl } from '@angular/forms';
templateUrl: './form-group-command-modal.component.html',
styleUrls: ['./form-group-command-modal.component.scss']
})
-export class FormGroupCommandModalComponent implements OnInit {
+export class FormGroupCommandModalComponent implements OnInit, OnDestroy {
modelForm: FormGroup;
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 f0263ec..ebc157f 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,23 +1,28 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } 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 { BsModalRef } from 'ngx-bootstrap/modal';
+import { Subscription } from 'rxjs';
@Component({
selector: 'ps-command-modal-demo',
templateUrl: './command-modal-demo.component.html',
styleUrls: ['./command-modal-demo.component.scss']
})
-export class CommandModalDemoComponent implements OnInit {
+export class CommandModalDemoComponent implements OnInit,OnDestroy {
columns = ['id','name', 'address', 'commands'];
pages:any;
merchantDataSource: IDataSource