fix wrong name for select/filter/sorting

2020-07-08 11:54:32 -05:00
parent bc4bd55efc
commit 5d0cb30a48
32 changed files with 61 additions and 112 deletions
@@ -25,4 +25,4 @@ import { NotFoundTemplateDirective } from './not-found-template.directive';
    NotFoundTemplateDirective
  ]
 })
-export class PsNgSelectorsModule { }//NGSELECT
+export class PsNgSelectModule { }//NGSELECT
@@ -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';
@@ -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 { }
@@ -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<any>; 
@@ -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
@@ -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<any>;   
  @Input() path:string;
 
@@ -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<any>;   
  @Input() path:string;
@@ -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 { }
@@ -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 {

@@ -95,48 +95,4 @@ export class FormGroupCommandModalDirective {
    });
  }

-  // @HostListener('click')
-  // wasClicked() {
-  //   this.dataSource.resolveCommandModelByName({
-  //     command: this.command,
-  //     model: this.model
-  //   }).subscribe(commandModel => {
-  //     debugger;
-  //     const event = <IModelFormCreateEvent>{
-  //       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 => {
-
-  //   });
-  // }
-
 }
@@ -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';
+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';