@webtypen/webframez-core 0.2.52 → 0.2.54

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.
Files changed (3) hide show
  1. package/dist/Datatable/Datatable.js +10 -9
  2. package/package.json +1 -1
  3. package/src/Datatable/Datatable.ts +10 -9
package/dist/Datatable/Datatable.js CHANGED
@@ -329,26 +329,27 @@ class Datatable {
329
329
  continue;
330
330
  }
331
331
  // Handle Boolean
332
- if (filterEl.type === "boolean") {
332
+ if (filterEl && filterEl.type === "boolean") {
333
333
  if ((typeof valueClean === "boolean" && valueClean) || (valueClean && valueClean.toString() === "true")) {
334
334
  out[filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key] = true;
335
335
  continue;
336
336
  }
337
337
  }
338
+ const tempType = filterEl && filterEl.type ? filterEl.type : entryType;
338
339
  // Handle integer/float range
339
- if ((filterEl.type === "integer-range" ||
340
- filterEl.type === "currency" ||
341
- filterEl.type === "float-range" ||
342
- filterEl.type === "date-range" ||
343
- filterEl.type === "daterange") &&
340
+ if ((tempType === "integer-range" ||
341
+ tempType === "currency" ||
342
+ tempType === "float-range" ||
343
+ tempType === "date-range" ||
344
+ tempType === "daterange") &&
344
345
  valueClean !== undefined) {
345
346
  const mappingKey = filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key;
346
347
  const cleanVal = (val) => {
347
- return filterEl.type === "float-range" || filterEl.type === "currency"
348
+ return tempType === "float-range" || tempType === "currency"
348
349
  ? parseFloat(val.toString().replace(",", "."))
349
- : filterEl.type === "integer-range"
350
+ : tempType === "integer-range"
350
351
  ? parseInt(val.toString().replace(",", "."))
351
- : filterEl.type === "date-range" || filterEl.type === "daterange"
352
+ : tempType === "date-range" || tempType === "daterange"
352
353
  ? val.indexOf(".") > 0
353
354
  ? (0, moment_1.default)(val, "DD.MM.YYYY").format("YYYY-MM-DD")
354
355
  : val
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webtypen/webframez-core",
3
- "version": "0.2.52",
3
+ "version": "0.2.54",
4
4
  "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
5
5
  "homepage": "https://webtypen.de/",
6
6
  "license": "MIT",
package/src/Datatable/Datatable.ts CHANGED
@@ -339,30 +339,31 @@ export class Datatable {
339
339
  }
340
340
 
341
341
  // Handle Boolean
342
- if (filterEl.type === "boolean") {
342
+ if (filterEl && filterEl.type === "boolean") {
343
343
  if ((typeof valueClean === "boolean" && valueClean) || (valueClean && valueClean.toString() === "true")) {
344
344
  out[filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key] = true;
345
345
  continue;
346
346
  }
347
347
  }
348
348
 
349
+ const tempType = filterEl && filterEl.type ? filterEl.type : entryType;
349
350
  // Handle integer/float range
350
351
  if (
351
- (filterEl.type === "integer-range" ||
352
- filterEl.type === "currency" ||
353
- filterEl.type === "float-range" ||
354
- filterEl.type === "date-range" ||
355
- filterEl.type === "daterange") &&
352
+ (tempType === "integer-range" ||
353
+ tempType === "currency" ||
354
+ tempType === "float-range" ||
355
+ tempType === "date-range" ||
356
+ tempType === "daterange") &&
356
357
  valueClean !== undefined
357
358
  ) {
358
359
  const mappingKey = filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key;
359
360
 
360
361
  const cleanVal = (val: any) => {
361
- return filterEl.type === "float-range" || filterEl.type === "currency"
362
+ return tempType === "float-range" || tempType === "currency"
362
363
  ? parseFloat(val.toString().replace(",", "."))
363
- : filterEl.type === "integer-range"
364
+ : tempType === "integer-range"
364
365
  ? parseInt(val.toString().replace(",", "."))
365
- : filterEl.type === "date-range" || filterEl.type === "daterange"
366
+ : tempType === "date-range" || tempType === "daterange"
366
367
  ? val.indexOf(".") > 0
367
368
  ? moment(val, "DD.MM.YYYY").format("YYYY-MM-DD")
368
369
  : val