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