@webtypen/webframez-core 0.2.50 → 0.2.51

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 +17 -8
  2. package/package.json +1 -1
  3. package/src/Datatable/Datatable.ts +19 -8
package/dist/Datatable/Datatable.js CHANGED
@@ -333,6 +333,7 @@ class Datatable {
333
333
  }
334
334
  // Handle integer/float range
335
335
  if ((filterEl.type === "integer-range" ||
336
+ filterEl.type === "currency" ||
336
337
  filterEl.type === "float-range" ||
337
338
  filterEl.type === "date-range" ||
338
339
  filterEl.type === "daterange") &&
@@ -341,7 +342,7 @@ class Datatable {
341
342
  if (valueClean.startsWith("<=")) {
342
343
  const val = valueClean.replace("<=", "").trim();
343
344
  out[mappingKey] = {
344
- $lte: filterEl.type === "float-range"
345
+ $lte: filterEl.type === "float-range" || filterEl.type === "currency"
345
346
  ? parseFloat(val.toString().replace(",", "."))
346
347
  : filterEl.type === "integer-range"
347
348
  ? parseInt(val.toString().replace(",", "."))
@@ -351,7 +352,7 @@ class Datatable {
351
352
  else if (valueClean.startsWith("<")) {
352
353
  const val = valueClean.replace("<", "").trim();
353
354
  out[mappingKey] = {
354
- $lt: filterEl.type === "float-range"
355
+ $lt: filterEl.type === "float-range" || filterEl.type === "currency"
355
356
  ? parseFloat(val.toString().replace(",", "."))
356
357
  : filterEl.type === "integer-range"
357
358
  ? parseInt(val.toString().replace(",", "."))
@@ -361,7 +362,7 @@ class Datatable {
361
362
  else if (valueClean.startsWith(">=")) {
362
363
  const val = valueClean.replace(">=", "").trim();
363
364
  out[mappingKey] = {
364
- $gte: filterEl.type === "float-range"
365
+ $gte: filterEl.type === "float-range" || filterEl.type === "currency"
365
366
  ? parseFloat(val.toString().replace(",", "."))
366
367
  : filterEl.type === "integer-range"
367
368
  ? parseInt(val.toString().replace(",", "."))
@@ -371,7 +372,7 @@ class Datatable {
371
372
  else if (valueClean.startsWith(">")) {
372
373
  const val = valueClean.replace(">", "").trim();
373
374
  out[mappingKey] = {
374
- $gt: filterEl.type === "float-range"
375
+ $gt: filterEl.type === "float-range" || filterEl.type === "currency"
375
376
  ? parseFloat(val.toString().replace(",", "."))
376
377
  : filterEl.type === "integer-range"
377
378
  ? parseInt(val.toString().replace(",", "."))
@@ -381,7 +382,7 @@ class Datatable {
381
382
  else if (valueClean.startsWith("!=")) {
382
383
  const val = valueClean.replace("!=", "").trim();
383
384
  out[mappingKey] = {
384
- $ne: filterEl.type === "float-range"
385
+ $ne: filterEl.type === "float-range" || filterEl.type === "currency"
385
386
  ? parseFloat(val.toString().replace(",", "."))
386
387
  : filterEl.type === "integer-range"
387
388
  ? parseInt(val.toString().replace(",", "."))
@@ -393,13 +394,21 @@ class Datatable {
393
394
  const min = range[0].toString().replace(",", ".");
394
395
  const max = range[1].toString().replace(",", ".");
395
396
  out[mappingKey] = {
396
- $gte: filterEl.type === "float-range" ? parseFloat(min) : filterEl.type === "integer-range" ? parseInt(min) : min,
397
- $lte: filterEl.type === "float-range" ? parseFloat(max) : filterEl.type === "integer-range" ? parseInt(max) : max,
397
+ $gte: filterEl.type === "float-range" || filterEl.type === "currency"
398
+ ? parseFloat(min)
399
+ : filterEl.type === "integer-range"
400
+ ? parseInt(min)
401
+ : min,
402
+ $lte: filterEl.type === "float-range" || filterEl.type === "currency"
403
+ ? parseFloat(max)
404
+ : filterEl.type === "integer-range"
405
+ ? parseInt(max)
406
+ : max,
398
407
  };
399
408
  }
400
409
  else {
401
410
  out[mappingKey] =
402
- filterEl.type === "float-range"
411
+ filterEl.type === "float-range" || filterEl.type === "currency"
403
412
  ? parseFloat(valueClean.toString().replace(",", "."))
404
413
  : filterEl.type === "integer-range"
405
414
  ? parseInt(valueClean)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webtypen/webframez-core",
3
- "version": "0.2.50",
3
+ "version": "0.2.51",
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
@@ -348,6 +348,7 @@ export class Datatable {
348
348
  // Handle integer/float range
349
349
  if (
350
350
  (filterEl.type === "integer-range" ||
351
+ filterEl.type === "currency" ||
351
352
  filterEl.type === "float-range" ||
352
353
  filterEl.type === "date-range" ||
353
354
  filterEl.type === "daterange") &&
@@ -359,7 +360,7 @@ export class Datatable {
359
360
 
360
361
  out[mappingKey] = {
361
362
  $lte:
362
- filterEl.type === "float-range"
363
+ filterEl.type === "float-range" || filterEl.type === "currency"
363
364
  ? parseFloat(val.toString().replace(",", "."))
364
365
  : filterEl.type === "integer-range"
365
366
  ? parseInt(val.toString().replace(",", "."))
@@ -370,7 +371,7 @@ export class Datatable {
370
371
 
371
372
  out[mappingKey] = {
372
373
  $lt:
373
- filterEl.type === "float-range"
374
+ filterEl.type === "float-range" || filterEl.type === "currency"
374
375
  ? parseFloat(val.toString().replace(",", "."))
375
376
  : filterEl.type === "integer-range"
376
377
  ? parseInt(val.toString().replace(",", "."))
@@ -381,7 +382,7 @@ export class Datatable {
381
382
 
382
383
  out[mappingKey] = {
383
384
  $gte:
384
- filterEl.type === "float-range"
385
+ filterEl.type === "float-range" || filterEl.type === "currency"
385
386
  ? parseFloat(val.toString().replace(",", "."))
386
387
  : filterEl.type === "integer-range"
387
388
  ? parseInt(val.toString().replace(",", "."))
@@ -392,7 +393,7 @@ export class Datatable {
392
393
 
393
394
  out[mappingKey] = {
394
395
  $gt:
395
- filterEl.type === "float-range"
396
+ filterEl.type === "float-range" || filterEl.type === "currency"
396
397
  ? parseFloat(val.toString().replace(",", "."))
397
398
  : filterEl.type === "integer-range"
398
399
  ? parseInt(val.toString().replace(",", "."))
@@ -403,7 +404,7 @@ export class Datatable {
403
404
 
404
405
  out[mappingKey] = {
405
406
  $ne:
406
- filterEl.type === "float-range"
407
+ filterEl.type === "float-range" || filterEl.type === "currency"
407
408
  ? parseFloat(val.toString().replace(",", "."))
408
409
  : filterEl.type === "integer-range"
409
410
  ? parseInt(val.toString().replace(",", "."))
@@ -415,12 +416,22 @@ export class Datatable {
415
416
  const max = range[1].toString().replace(",", ".");
416
417
 
417
418
  out[mappingKey] = {
418
- $gte: filterEl.type === "float-range" ? parseFloat(min) : filterEl.type === "integer-range" ? parseInt(min) : min,
419
- $lte: filterEl.type === "float-range" ? parseFloat(max) : filterEl.type === "integer-range" ? parseInt(max) : max,
419
+ $gte:
420
+ filterEl.type === "float-range" || filterEl.type === "currency"
421
+ ? parseFloat(min)
422
+ : filterEl.type === "integer-range"
423
+ ? parseInt(min)
424
+ : min,
425
+ $lte:
426
+ filterEl.type === "float-range" || filterEl.type === "currency"
427
+ ? parseFloat(max)
428
+ : filterEl.type === "integer-range"
429
+ ? parseInt(max)
430
+ : max,
420
431
  };
421
432
  } else {
422
433
  out[mappingKey] =
423
- filterEl.type === "float-range"
434
+ filterEl.type === "float-range" || filterEl.type === "currency"
424
435
  ? parseFloat(valueClean.toString().replace(",", "."))
425
436
  : filterEl.type === "integer-range"
426
437
  ? parseInt(valueClean)