@webtypen/webframez-core 0.2.52 → 0.2.53

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 +15 -4
  2. package/package.json +1 -1
  3. package/src/Datatable/Datatable.ts +15 -4
package/dist/Datatable/Datatable.js CHANGED
@@ -329,7 +329,7 @@ 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;
@@ -337,18 +337,29 @@ class Datatable {
337
337
  }
338
338
  // Handle integer/float range
339
339
  if ((filterEl.type === "integer-range" ||
340
+ entryType === "integer-range" ||
340
341
  filterEl.type === "currency" ||
342
+ entryType === "currency" ||
341
343
  filterEl.type === "float-range" ||
344
+ entryType === "float-range" ||
342
345
  filterEl.type === "date-range" ||
346
+ entryType === "date-range" ||
347
+ entryType === "daterange" ||
343
348
  filterEl.type === "daterange") &&
344
349
  valueClean !== undefined) {
345
350
  const mappingKey = filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key;
346
351
  const cleanVal = (val) => {
347
- return filterEl.type === "float-range" || filterEl.type === "currency"
352
+ return filterEl.type === "float-range" ||
353
+ filterEl.type === "currency" ||
354
+ entryType === "float-range" ||
355
+ entryType === "currency"
348
356
  ? parseFloat(val.toString().replace(",", "."))
349
- : filterEl.type === "integer-range"
357
+ : filterEl.type === "integer-range" || entryType === "integer-range"
350
358
  ? parseInt(val.toString().replace(",", "."))
351
- : filterEl.type === "date-range" || filterEl.type === "daterange"
359
+ : filterEl.type === "date-range" ||
360
+ filterEl.type === "daterange" ||
361
+ entryType === "date-range" ||
362
+ entryType === "daterange"
352
363
  ? val.indexOf(".") > 0
353
364
  ? (0, moment_1.default)(val, "DD.MM.YYYY").format("YYYY-MM-DD")
354
365
  : 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.53",
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,7 +339,7 @@ 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;
@@ -349,20 +349,31 @@ export class Datatable {
349
349
  // Handle integer/float range
350
350
  if (
351
351
  (filterEl.type === "integer-range" ||
352
+ entryType === "integer-range" ||
352
353
  filterEl.type === "currency" ||
354
+ entryType === "currency" ||
353
355
  filterEl.type === "float-range" ||
356
+ entryType === "float-range" ||
354
357
  filterEl.type === "date-range" ||
358
+ entryType === "date-range" ||
359
+ entryType === "daterange" ||
355
360
  filterEl.type === "daterange") &&
356
361
  valueClean !== undefined
357
362
  ) {
358
363
  const mappingKey = filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key;
359
364
 
360
365
  const cleanVal = (val: any) => {
361
- return filterEl.type === "float-range" || filterEl.type === "currency"
366
+ return filterEl.type === "float-range" ||
367
+ filterEl.type === "currency" ||
368
+ entryType === "float-range" ||
369
+ entryType === "currency"
362
370
  ? parseFloat(val.toString().replace(",", "."))
363
- : filterEl.type === "integer-range"
371
+ : filterEl.type === "integer-range" || entryType === "integer-range"
364
372
  ? parseInt(val.toString().replace(",", "."))
365
- : filterEl.type === "date-range" || filterEl.type === "daterange"
373
+ : filterEl.type === "date-range" ||
374
+ filterEl.type === "daterange" ||
375
+ entryType === "date-range" ||
376
+ entryType === "daterange"
366
377
  ? val.indexOf(".") > 0
367
378
  ? moment(val, "DD.MM.YYYY").format("YYYY-MM-DD")
368
379
  : val