@indigina/kendo 1.2.12 → 1.2.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/styles/Site.css +8 -0
- package/esm2020/lib/kendo.module.mjs +13 -4
- package/esm2020/lib/services/activity.filter.service.config.mjs +6 -0
- package/esm2020/lib/services/activity.filter.service.mjs +18 -14
- package/esm2020/lib/services/services.config.mjs +2 -0
- package/fesm2015/indigina-kendo.mjs +34 -15
- package/fesm2015/indigina-kendo.mjs.map +1 -1
- package/fesm2020/indigina-kendo.mjs +31 -15
- package/fesm2020/indigina-kendo.mjs.map +1 -1
- package/lib/kendo.module.d.ts +2 -1
- package/lib/services/activity.filter.service.config.d.ts +5 -0
- package/lib/services/activity.filter.service.d.ts +2 -2
- package/lib/services/services.config.d.ts +4 -0
- package/package.json +1 -1
|
@@ -22,7 +22,7 @@ import { CommonModule } from '@angular/common';
|
|
|
22
22
|
import * as i2$1 from '@angular/common/http';
|
|
23
23
|
import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
24
24
|
import * as i0 from '@angular/core';
|
|
25
|
-
import { EventEmitter, Directive, Input, Output, HostListener, Component, NgModule, ChangeDetectionStrategy, Injectable, ViewChildren, APP_INITIALIZER, ViewChild } from '@angular/core';
|
|
25
|
+
import { EventEmitter, Directive, Input, Output, HostListener, Component, NgModule, ChangeDetectionStrategy, Injectable, ViewChildren, APP_INITIALIZER, ViewChild, InjectionToken, Inject } from '@angular/core';
|
|
26
26
|
import * as i1$4 from '@angular/forms';
|
|
27
27
|
import { UntypedFormControl, Validators, ControlContainer, FormGroupDirective, ReactiveFormsModule, FormsModule, UntypedFormGroup } from '@angular/forms';
|
|
28
28
|
import { BrowserModule } from '@angular/platform-browser';
|
|
@@ -2706,9 +2706,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImpor
|
|
|
2706
2706
|
}]
|
|
2707
2707
|
}] });
|
|
2708
2708
|
|
|
2709
|
+
const dateFilterParameter = new InjectionToken('dateFilterParameter', {
|
|
2710
|
+
factory: () => 'start',
|
|
2711
|
+
providedIn: 'root',
|
|
2712
|
+
});
|
|
2713
|
+
|
|
2709
2714
|
class KendoModule {
|
|
2710
|
-
static forRoot(config) {
|
|
2711
|
-
|
|
2715
|
+
static forRoot(config, servicesConfig) {
|
|
2716
|
+
let module = {
|
|
2712
2717
|
ngModule: KendoModule,
|
|
2713
2718
|
providers: [
|
|
2714
2719
|
{
|
|
@@ -2722,6 +2727,14 @@ class KendoModule {
|
|
|
2722
2727
|
},
|
|
2723
2728
|
],
|
|
2724
2729
|
};
|
|
2730
|
+
const filterParameter = servicesConfig?.activityFilterServiceConfig?.dateFilterParameter;
|
|
2731
|
+
if (filterParameter) {
|
|
2732
|
+
module.providers.push({
|
|
2733
|
+
provide: dateFilterParameter,
|
|
2734
|
+
useValue: filterParameter,
|
|
2735
|
+
});
|
|
2736
|
+
}
|
|
2737
|
+
return module;
|
|
2725
2738
|
}
|
|
2726
2739
|
}
|
|
2727
2740
|
KendoModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: KendoModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
@@ -3052,9 +3065,10 @@ const dateFromKey = 'dateFrom';
|
|
|
3052
3065
|
const customFiltersKey = 'customFilters';
|
|
3053
3066
|
const nullKey = 'null';
|
|
3054
3067
|
class ActivityFilterService {
|
|
3055
|
-
constructor(route, router) {
|
|
3068
|
+
constructor(route, router, dateFilterParameterName) {
|
|
3056
3069
|
this.route = route;
|
|
3057
3070
|
this.router = router;
|
|
3071
|
+
this.dateFilterParameterName = dateFilterParameterName;
|
|
3058
3072
|
this.defaultFilter = {
|
|
3059
3073
|
dateTo: null,
|
|
3060
3074
|
dateFrom: null,
|
|
@@ -3063,9 +3077,8 @@ class ActivityFilterService {
|
|
|
3063
3077
|
skip: 0,
|
|
3064
3078
|
take: 10,
|
|
3065
3079
|
};
|
|
3066
|
-
this.DateFilterStartFieldName = 'start';
|
|
3067
3080
|
this.filterBehavior = new BehaviorSubject(this.defaultFilter);
|
|
3068
|
-
this.gridStateBehavior = new BehaviorSubject(FilterConverter.toGridState(this.defaultFilter, this.
|
|
3081
|
+
this.gridStateBehavior = new BehaviorSubject(FilterConverter.toGridState(this.defaultFilter, this.dateFilterParameterName));
|
|
3069
3082
|
this.filter$ = this.filterBehavior.asObservable();
|
|
3070
3083
|
this.gridState$ = this.gridStateBehavior.asObservable();
|
|
3071
3084
|
this.currentFilter = Object.assign({}, this.defaultFilter);
|
|
@@ -3078,12 +3091,12 @@ class ActivityFilterService {
|
|
|
3078
3091
|
else {
|
|
3079
3092
|
this.clearFilter();
|
|
3080
3093
|
this.setTodayDates();
|
|
3081
|
-
this.currentGridState = FilterConverter.toGridState(this.currentFilter, this.
|
|
3094
|
+
this.currentGridState = FilterConverter.toGridState(this.currentFilter, this.dateFilterParameterName);
|
|
3082
3095
|
}
|
|
3083
3096
|
this.filterBehavior.next(this.currentFilter);
|
|
3084
3097
|
});
|
|
3085
3098
|
this.filter$.subscribe((filter) => {
|
|
3086
|
-
this.gridStateBehavior.next(FilterConverter.toGridState(filter, this.
|
|
3099
|
+
this.gridStateBehavior.next(FilterConverter.toGridState(filter, this.dateFilterParameterName));
|
|
3087
3100
|
});
|
|
3088
3101
|
}
|
|
3089
3102
|
reset() {
|
|
@@ -3094,7 +3107,7 @@ class ActivityFilterService {
|
|
|
3094
3107
|
setFilter(filter) {
|
|
3095
3108
|
this.currentFilter.skip = 0;
|
|
3096
3109
|
this.currentFilter = Object.assign(filter);
|
|
3097
|
-
this.currentGridState = FilterConverter.toGridState(this.currentFilter, this.
|
|
3110
|
+
this.currentGridState = FilterConverter.toGridState(this.currentFilter, this.dateFilterParameterName);
|
|
3098
3111
|
}
|
|
3099
3112
|
applyFilter(filter) {
|
|
3100
3113
|
this.setFilter(filter);
|
|
@@ -3159,7 +3172,7 @@ class ActivityFilterService {
|
|
|
3159
3172
|
result[filter.field] = filter.value;
|
|
3160
3173
|
}
|
|
3161
3174
|
});
|
|
3162
|
-
result[filterKey] = FilterConverter.toGridState(this.currentFilter, this.
|
|
3175
|
+
result[filterKey] = FilterConverter.toGridState(this.currentFilter, this.dateFilterParameterName).filter;
|
|
3163
3176
|
return result;
|
|
3164
3177
|
}
|
|
3165
3178
|
fillCurrentFilter(object) {
|
|
@@ -3193,16 +3206,16 @@ class ActivityFilterService {
|
|
|
3193
3206
|
fillFromDescriptor(gridFilter) {
|
|
3194
3207
|
gridFilter?.filters.forEach((filter) => {
|
|
3195
3208
|
const filterDescriptor = filter;
|
|
3196
|
-
if (filterDescriptor.field === this.
|
|
3209
|
+
if (filterDescriptor.field === this.dateFilterParameterName &&
|
|
3197
3210
|
filterDescriptor.operator === Operators.lte) {
|
|
3198
3211
|
this.currentFilter.dateTo = filterDescriptor.value;
|
|
3199
3212
|
}
|
|
3200
|
-
if (filterDescriptor.field === this.
|
|
3213
|
+
if (filterDescriptor.field === this.dateFilterParameterName &&
|
|
3201
3214
|
filterDescriptor.operator === Operators.gte) {
|
|
3202
3215
|
this.currentFilter.dateFrom = filterDescriptor.value;
|
|
3203
3216
|
}
|
|
3204
3217
|
if (filterDescriptor.field &&
|
|
3205
|
-
filterDescriptor.field !== this.
|
|
3218
|
+
filterDescriptor.field !== this.dateFilterParameterName) {
|
|
3206
3219
|
this.setFieldFilter({
|
|
3207
3220
|
field: filterDescriptor.field,
|
|
3208
3221
|
filterTarget: FilterTargets.Grid,
|
|
@@ -3233,11 +3246,14 @@ class ActivityFilterService {
|
|
|
3233
3246
|
}
|
|
3234
3247
|
}
|
|
3235
3248
|
}
|
|
3236
|
-
ActivityFilterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ActivityFilterService, deps: [{ token: i1$5.ActivatedRoute }, { token: i1$5.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
3249
|
+
ActivityFilterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ActivityFilterService, deps: [{ token: i1$5.ActivatedRoute }, { token: i1$5.Router }, { token: dateFilterParameter }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
3237
3250
|
ActivityFilterService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ActivityFilterService });
|
|
3238
3251
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ActivityFilterService, decorators: [{
|
|
3239
3252
|
type: Injectable
|
|
3240
|
-
}], ctorParameters: function () { return [{ type: i1$5.ActivatedRoute }, { type: i1$5.Router }
|
|
3253
|
+
}], ctorParameters: function () { return [{ type: i1$5.ActivatedRoute }, { type: i1$5.Router }, { type: undefined, decorators: [{
|
|
3254
|
+
type: Inject,
|
|
3255
|
+
args: [dateFilterParameter]
|
|
3256
|
+
}] }]; } });
|
|
3241
3257
|
|
|
3242
3258
|
class EntityEditComponent {
|
|
3243
3259
|
get adapter() {
|