@webtypen/webframez-core 0.2.53 → 0.2.55

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