@webtypen/webframez-core 0.2.51 → 0.2.52

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 +23 -41
  2. package/package.json +1 -1
  3. package/src/Datatable/Datatable.ts +22 -48
package/dist/Datatable/Datatable.js CHANGED
@@ -8,8 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  step((generator = generator.apply(thisArg, _arguments || [])).next());
9
9
  });
10
10
  };
11
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
11
14
  Object.defineProperty(exports, "__esModule", { value: true });
12
15
  exports.Datatable = void 0;
16
+ const moment_1 = __importDefault(require("moment"));
13
17
  const DBConnection_1 = require("../Database/DBConnection");
14
18
  const NumericFunctions_1 = require("../Functions/NumericFunctions");
15
19
  class Datatable {
@@ -339,54 +343,45 @@ class Datatable {
339
343
  filterEl.type === "daterange") &&
340
344
  valueClean !== undefined) {
341
345
  const mappingKey = filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key;
346
+ const cleanVal = (val) => {
347
+ return filterEl.type === "float-range" || filterEl.type === "currency"
348
+ ? parseFloat(val.toString().replace(",", "."))
349
+ : filterEl.type === "integer-range"
350
+ ? parseInt(val.toString().replace(",", "."))
351
+ : filterEl.type === "date-range" || filterEl.type === "daterange"
352
+ ? val.indexOf(".") > 0
353
+ ? (0, moment_1.default)(val, "DD.MM.YYYY").format("YYYY-MM-DD")
354
+ : val
355
+ : val;
356
+ };
342
357
  if (valueClean.startsWith("<=")) {
343
358
  const val = valueClean.replace("<=", "").trim();
344
359
  out[mappingKey] = {
345
- $lte: filterEl.type === "float-range" || filterEl.type === "currency"
346
- ? parseFloat(val.toString().replace(",", "."))
347
- : filterEl.type === "integer-range"
348
- ? parseInt(val.toString().replace(",", "."))
349
- : val,
360
+ $lte: cleanVal(val),
350
361
  };
351
362
  }
352
363
  else if (valueClean.startsWith("<")) {
353
364
  const val = valueClean.replace("<", "").trim();
354
365
  out[mappingKey] = {
355
- $lt: filterEl.type === "float-range" || filterEl.type === "currency"
356
- ? parseFloat(val.toString().replace(",", "."))
357
- : filterEl.type === "integer-range"
358
- ? parseInt(val.toString().replace(",", "."))
359
- : val,
366
+ $lt: cleanVal(val),
360
367
  };
361
368
  }
362
369
  else if (valueClean.startsWith(">=")) {
363
370
  const val = valueClean.replace(">=", "").trim();
364
371
  out[mappingKey] = {
365
- $gte: filterEl.type === "float-range" || filterEl.type === "currency"
366
- ? parseFloat(val.toString().replace(",", "."))
367
- : filterEl.type === "integer-range"
368
- ? parseInt(val.toString().replace(",", "."))
369
- : val,
372
+ $gte: cleanVal(val),
370
373
  };
371
374
  }
372
375
  else if (valueClean.startsWith(">")) {
373
376
  const val = valueClean.replace(">", "").trim();
374
377
  out[mappingKey] = {
375
- $gt: filterEl.type === "float-range" || filterEl.type === "currency"
376
- ? parseFloat(val.toString().replace(",", "."))
377
- : filterEl.type === "integer-range"
378
- ? parseInt(val.toString().replace(",", "."))
379
- : val,
378
+ $gt: cleanVal,
380
379
  };
381
380
  }
382
381
  else if (valueClean.startsWith("!=")) {
383
382
  const val = valueClean.replace("!=", "").trim();
384
383
  out[mappingKey] = {
385
- $ne: filterEl.type === "float-range" || filterEl.type === "currency"
386
- ? parseFloat(val.toString().replace(",", "."))
387
- : filterEl.type === "integer-range"
388
- ? parseInt(val.toString().replace(",", "."))
389
- : val,
384
+ $ne: cleanVal(val),
390
385
  };
391
386
  }
392
387
  else if (valueClean.indexOf("-") > 0) {
@@ -394,25 +389,12 @@ class Datatable {
394
389
  const min = range[0].toString().replace(",", ".");
395
390
  const max = range[1].toString().replace(",", ".");
396
391
  out[mappingKey] = {
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,
392
+ $gte: cleanVal(min),
393
+ $lte: cleanVal(max),
407
394
  };
408
395
  }
409
396
  else {
410
- out[mappingKey] =
411
- filterEl.type === "float-range" || filterEl.type === "currency"
412
- ? parseFloat(valueClean.toString().replace(",", "."))
413
- : filterEl.type === "integer-range"
414
- ? parseInt(valueClean)
415
- : valueClean;
397
+ out[mappingKey] = cleanVal(valueClean);
416
398
  }
417
399
  continue;
418
400
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webtypen/webframez-core",
3
- "version": "0.2.51",
3
+ "version": "0.2.52",
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
@@ -1,3 +1,4 @@
1
+ import moment from "moment";
1
2
  import { DBConnection } from "../Database/DBConnection";
2
3
  import { NumericFunctions } from "../Functions/NumericFunctions";
3
4
  import { Request } from "../Router/Request";
@@ -355,60 +356,48 @@ export class Datatable {
355
356
  valueClean !== undefined
356
357
  ) {
357
358
  const mappingKey = filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key;
359
+
360
+ const cleanVal = (val: any) => {
361
+ return filterEl.type === "float-range" || filterEl.type === "currency"
362
+ ? parseFloat(val.toString().replace(",", "."))
363
+ : filterEl.type === "integer-range"
364
+ ? parseInt(val.toString().replace(",", "."))
365
+ : filterEl.type === "date-range" || filterEl.type === "daterange"
366
+ ? val.indexOf(".") > 0
367
+ ? moment(val, "DD.MM.YYYY").format("YYYY-MM-DD")
368
+ : val
369
+ : val;
370
+ };
371
+
358
372
  if (valueClean.startsWith("<=")) {
359
373
  const val = valueClean.replace("<=", "").trim();
360
374
 
361
375
  out[mappingKey] = {
362
- $lte:
363
- filterEl.type === "float-range" || filterEl.type === "currency"
364
- ? parseFloat(val.toString().replace(",", "."))
365
- : filterEl.type === "integer-range"
366
- ? parseInt(val.toString().replace(",", "."))
367
- : val,
376
+ $lte: cleanVal(val),
368
377
  };
369
378
  } else if (valueClean.startsWith("<")) {
370
379
  const val = valueClean.replace("<", "").trim();
371
380
 
372
381
  out[mappingKey] = {
373
- $lt:
374
- filterEl.type === "float-range" || filterEl.type === "currency"
375
- ? parseFloat(val.toString().replace(",", "."))
376
- : filterEl.type === "integer-range"
377
- ? parseInt(val.toString().replace(",", "."))
378
- : val,
382
+ $lt: cleanVal(val),
379
383
  };
380
384
  } else if (valueClean.startsWith(">=")) {
381
385
  const val = valueClean.replace(">=", "").trim();
382
386
 
383
387
  out[mappingKey] = {
384
- $gte:
385
- filterEl.type === "float-range" || filterEl.type === "currency"
386
- ? parseFloat(val.toString().replace(",", "."))
387
- : filterEl.type === "integer-range"
388
- ? parseInt(val.toString().replace(",", "."))
389
- : val,
388
+ $gte: cleanVal(val),
390
389
  };
391
390
  } else if (valueClean.startsWith(">")) {
392
391
  const val = valueClean.replace(">", "").trim();
393
392
 
394
393
  out[mappingKey] = {
395
- $gt:
396
- filterEl.type === "float-range" || filterEl.type === "currency"
397
- ? parseFloat(val.toString().replace(",", "."))
398
- : filterEl.type === "integer-range"
399
- ? parseInt(val.toString().replace(",", "."))
400
- : val,
394
+ $gt: cleanVal,
401
395
  };
402
396
  } else if (valueClean.startsWith("!=")) {
403
397
  const val = valueClean.replace("!=", "").trim();
404
398
 
405
399
  out[mappingKey] = {
406
- $ne:
407
- filterEl.type === "float-range" || filterEl.type === "currency"
408
- ? parseFloat(val.toString().replace(",", "."))
409
- : filterEl.type === "integer-range"
410
- ? parseInt(val.toString().replace(",", "."))
411
- : val,
400
+ $ne: cleanVal(val),
412
401
  };
413
402
  } else if (valueClean.indexOf("-") > 0) {
414
403
  const range = valueClean.split("-");
@@ -416,26 +405,11 @@ export class Datatable {
416
405
  const max = range[1].toString().replace(",", ".");
417
406
 
418
407
  out[mappingKey] = {
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,
408
+ $gte: cleanVal(min),
409
+ $lte: cleanVal(max),
431
410
  };
432
411
  } else {
433
- out[mappingKey] =
434
- filterEl.type === "float-range" || filterEl.type === "currency"
435
- ? parseFloat(valueClean.toString().replace(",", "."))
436
- : filterEl.type === "integer-range"
437
- ? parseInt(valueClean)
438
- : valueClean;
412
+ out[mappingKey] = cleanVal(valueClean);
439
413
  }
440
414
 
441
415
  continue;