Open-Harbor/ngx-data-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

datetime temp commit

Browse Source
This commit is contained in:
Yubing325 2020-07-08 13:05:24 -05:00
parent 5d0cb30a48
commit 66d34d1019
12 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
projects/poweredsoft/ng-select/src/lib/ps-ng-select/multi-select/multi-select.component.ts
View File

@ -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{

6
projects/poweredsoft/ng-select/src/lib/ps-ng-select/ng-select/ng-select.component.ts
View File

@ -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{

24
projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.html
View File

@ -1,19 +1,25 @@
<ng-template #popTemplate>
<div class="container" >
<div class="row">
<div class="form-group">
<input type="text"
<select class="custom-select" title="Choose one of the following..." [(ngModel)]="filterType" [ngModelOptions]="{standalone: true}">
<option *ngFor="let filter of filterTypes" [value]="filter.value">{{filter.key}}</option>
</select>
</div>
<div class="row mt-1 mb-1">
<input *ngIf="filterType =='GreaterThan' || filterType == 'LessThan'" type="text"
placeholder="Datepicker"
class="form-control"
bsDatepicker [(ngModel)]="filterValue">
</div>
</div>
<div class="row">
<input type="text"
placeholder="Daterangepicker"
class="form-control"
bsDaterangepicker>
</div>
<div class="row mt-1 mb-1">
<input *ngIf="filterType =='Equal'" type="text"
placeholder="Daterangepicker"
class="form-control"
bsDaterangepicker [(ngModel)]="filterValue">
</div>
<div class="row mt-2">
<button class="btn btn-primary mr-1" >Filter</button>
<button type="button" class="btn btn-warning" *ngIf="!isFiltering" (click)="pop.hide()">Hide</button>

6
projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/datetime-filter/data-source-datetime-filter.component.ts
View File

@ -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;

2
projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/number-filter/data-source-number-filter.component.html
View File

@ -8,7 +8,7 @@
</div>
<div class="row mt-1 mb-1">
<input type="number" class="form-control" placeholder="column value" aria-label="number"
<input type="number" class="form-control" placeholder="Value" aria-label="number"
aria-describedby="basic-addon1" [(ngModel)]="filterValue" [ngModelOptions]="{standalone: true}">
</div>

2
projects/poweredsoft/ngx-bootstrap/src/lib/dataSource-filter/text-filter/data-source-text-filter.component.html
View File

@ -10,7 +10,7 @@
</div>
<div class="row mt-1 mb-1">
<input type="text" class="form-control" placeholder="column value" aria-label="Username"
<input type="text" class="form-control" placeholder="Value" aria-label="Username"
aria-describedby="basic-addon1" [(ngModel)]="filterValue" [ngModelOptions]="{standalone: true}" >
</div>

4
projects/poweredsoft/ngx-bootstrap/src/lib/form-group-command-modal/form-group-command-modal/form-group-command-modal.component.ts
View File

@ -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;

9
src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.ts
View File

@ -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<IMerchant>;
private _dataSubscription: Subscription;
constructor(private merchantService: MerchantService){
this.merchantDataSource = this.createDataSource();
}
ngOnDestroy(): void {
this._dataSubscription.unsubscribe();
}
newMerchant(name: string) {
this.merchantDataSource.executeCommandByName('addMerchant', {

9
src/app/data-grid-demo/data-grid-demo-home/data-grid-demo-home.component.ts
View File

@ -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<IMerchant>;
private _dataSubscription: Subscription;
constructor(private merchantService: MerchantService){
this.merchantDataSource = this.createDataSource();
}
ngOnDestroy(): void {
this._dataSubscription.unsubscribe();
}

10
src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.ts
View File

@ -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<IMerchant> {
return this.merchantService.createDataSource();
@ -18,10 +20,14 @@ export class FormGroupModalDemoComponent implements OnInit {
pages:any;
merchantDataSource: IDataSource<IMerchant>;
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();

1
src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.ts
View File

@ -15,7 +15,6 @@ export class GridFilterDemoComponent implements OnInit {
merchantDataSource: IDataSource<IMerchant>;
constructor(private merchantService: MerchantService){
this.merchantDataSource = this.createDataSource();
console.log(this.merchantDataSource);
}
pages:any;

9
src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.ts
View File

@ -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<IMerchant>;
private _dataSubscription: Subscription;
constructor(private merchantService: MerchantService, private confirmModalService: ConfirmModalService){
this.merchantDataSource = this.createDataSource();
}
ngOnDestroy(): void {
this._dataSubscription.unsubscribe();
}
pages:any;