@osimatic/helpers-js 1.1.42 → 1.1.44

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 (2) hide show
  1. package/date_time.js +49 -29
  2. package/package.json +1 -1
package/date_time.js CHANGED
@@ -84,8 +84,8 @@ class DateTime {
84
84
  */
85
85
  }
86
86
 
87
- static getSqlDateTime(jsDate) {
88
- return this.getSqlDate(jsDate)+' '+this.getSqlTime(jsDate);
87
+ static getSqlDateTime(jsDate, timeZone="Europe/Paris") {
88
+ return this.getSqlDate(jsDate, timeZone)+' '+this.getSqlTime(jsDate, timeZone);
89
89
  }
90
90
 
91
91
  static getDateForInputDate(jsDate, timeZone="Europe/Paris") {
@@ -395,18 +395,22 @@ class SqlDate {
395
395
  if (sqlDate == null) {
396
396
  return null;
397
397
  }
398
- return new Date(sqlDate.substring(0, 4), sqlDate.substring(5, 7)-1, sqlDate.substring(8, 10), 0, 0, 0);
398
+ return new Date(Date.UTC(sqlDate.substring(0, 4), sqlDate.substring(5, 7)-1, sqlDate.substring(8, 10), 0, 0, 0));
399
399
  }
400
400
 
401
401
  static getCurrentSqlDate() {
402
402
  return DateTime.getSqlDate(new Date());
403
403
  }
404
404
 
405
- static getDateDigitalDisplay(sqlDate, locale="fr-FR") {
406
- return SqlDateTime.getDateDigitalDisplay(sqlDate+" 00:00:00", locale);
405
+ static getDateDigitalDisplay(sqlDate, locale="fr-FR", timeZone="Europe/Paris") {
406
+ return SqlDateTime.getDateDigitalDisplay(sqlDate+" 00:00:00", locale, timeZone);
407
407
  }
408
- static getDateTextDisplay(sqlDate, locale="fr-FR") {
409
- return SqlDateTime.getDateTextDisplay(sqlDate+" 00:00:00", locale);
408
+ static getDateTextDisplay(sqlDate, locale="fr-FR", timeZone="Europe/Paris") {
409
+ return SqlDateTime.getDateTextDisplay(sqlDate+" 00:00:00", locale, timeZone);
410
+ }
411
+
412
+ static getDateForInputDate(sqlDate, timeZone="Europe/Paris") {
413
+ return SqlDateTime.getDateForInputDate(sqlDate+" 00:00:00", timeZone);
410
414
  }
411
415
 
412
416
  static getYear(sqlDate) {
@@ -437,24 +441,32 @@ class SqlTime {
437
441
  if ((sqlTime.match(/\:/g) || []).length == 1) {
438
442
  sqlTime += ':00';
439
443
  }
440
- let jsDate = new Date();
444
+
441
445
  let arrayTime = sqlTime.split(':');
442
- jsDate.setHours(arrayTime[0], arrayTime[1], arrayTime[2], 0);
443
- return jsDate;
446
+ return new Date(Date.UTC(1970, 0, 1, arrayTime[0], arrayTime[1], arrayTime[2]));
447
+
448
+ /*let jsDate = new Date();
449
+ jsDate.setUTCFullYear(1970, 0, 1);
450
+ jsDate.setUTCHours(arrayTime[0], arrayTime[1], arrayTime[2], 0);
451
+ return jsDate;*/
444
452
  }
445
453
 
446
454
  static getCurrentSqlTime() {
447
455
  return DateTime.getSqlTime(new Date());
448
456
  }
449
457
 
450
- static getTimeDisplay(sqlTime, locale="fr-FR") {
451
- return SqlDateTime.getTimeDisplay('1970-01-01 '+sqlTime, locale);
458
+ static getTimeDisplay(sqlTime, locale="fr-FR", timeZone="Europe/Paris") {
459
+ return SqlDateTime.getTimeDisplay('1970-01-01 '+sqlTime, locale, timeZone);
452
460
  }
453
- static getTimeDigitalDisplay(sqlTime, locale="fr-FR") {
454
- return SqlDateTime.getTimeDigitalDisplay('1970-01-01 '+sqlTime, locale);
461
+ static getTimeDigitalDisplay(sqlTime, locale="fr-FR", timeZone="Europe/Paris") {
462
+ return SqlDateTime.getTimeDigitalDisplay('1970-01-01 '+sqlTime, locale, timeZone);
455
463
  }
456
- static getTimeDisplayWithNbDays(sqlTime, previousSqlTime) {
457
- return SqlDateTime.getTimeDisplayWithNbDays('1970-01-01 '+sqlTime, '1970-01-01 '+previousSqlTime, locale);
464
+ static getTimeDisplayWithNbDays(sqlTime, previousSqlTime, locale="fr-FR", timeZone="Europe/Paris") {
465
+ return SqlDateTime.getTimeDisplayWithNbDays('1970-01-01 '+sqlTime, '1970-01-01 '+previousSqlTime, locale, timeZone);
466
+ }
467
+
468
+ static getTimeForInputTime(sqlTime, timeZone="Europe/Paris", withSeconds=false) {
469
+ return SqlDateTime.getTimeForInputTime('1970-01-01 '+sqlTime, timeZone, withSeconds);
458
470
  }
459
471
  }
460
472
 
@@ -481,28 +493,36 @@ class SqlDateTime {
481
493
  if (sqlDateTime == null) {
482
494
  return null;
483
495
  }
484
- return new Date(sqlDateTime.substring(0, 4), sqlDateTime.substring(5, 7)-1, sqlDateTime.substring(8, 10), sqlDateTime.substring(11, 13), sqlDateTime.substring(14, 16), sqlDateTime.substring(17, 19));
496
+ //return new Date(sqlDateTime.substring(0, 4), sqlDateTime.substring(5, 7)-1, sqlDateTime.substring(8, 10), sqlDateTime.substring(11, 13), sqlDateTime.substring(14, 16), sqlDateTime.substring(17, 19));
497
+ return new Date(Date.UTC(sqlDateTime.substring(0, 4), sqlDateTime.substring(5, 7)-1, sqlDateTime.substring(8, 10), sqlDateTime.substring(11, 13), sqlDateTime.substring(14, 16), sqlDateTime.substring(17, 19)));
485
498
  }
486
499
 
487
- static getDateDigitalDisplay(sqlDateTime, locale="fr-FR") {
488
- return DateTime.getDateDigitalDisplay(this.parse(sqlDateTime), locale);
500
+ static getDateDigitalDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
501
+ return DateTime.getDateDigitalDisplay(this.parse(sqlDateTime), locale, timeZone);
489
502
  }
490
- static getDateTextDisplay(sqlDateTime, locale="fr-FR") {
491
- return DateTime.getDateTextDisplay(this.parse(sqlDateTime), locale);
503
+ static getDateTextDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
504
+ return DateTime.getDateTextDisplay(this.parse(sqlDateTime), locale, timeZone);
492
505
  }
493
506
 
494
- static getTimeDisplay(sqlDateTime, locale="fr-FR") {
495
- return DateTime.getTimeDisplay(this.parse(sqlDateTime), locale);
507
+ static getTimeDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
508
+ return DateTime.getTimeDisplay(this.parse(sqlDateTime), locale, timeZone);
509
+ }
510
+ static getTimeDisplayWithNbDays(sqlDateTime, previousSqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
511
+ return DateTime.getTimeDisplayWithNbDays(this.parse(sqlDateTime), this.parse(previousSqlDateTime), locale, timeZone);
496
512
  }
497
- static getTimeDisplayWithNbDays(sqlDateTime, previousSqlDateTime) {
498
- return DateTime.getTimeDisplayWithNbDays(this.parse(sqlDateTime), this.parse(previousSqlDateTime), locale);
513
+ static getTimeDigitalDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
514
+ return DateTime.getTimeDigitalDisplay(this.parse(sqlDateTime), locale, timeZone);
499
515
  }
500
- static getTimeDigitalDisplay(sqlDateTime, locale="fr-FR") {
501
- return DateTime.getTimeDigitalDisplay(this.parse(sqlDateTime), locale);
516
+
517
+ static getDateTimeDigitalDisplay(sqlDateTime, locale="fr-FR", timeZone="Europe/Paris") {
518
+ return DateTime.getDateTimeDigitalDisplay(this.parse(sqlDateTime), locale, timeZone);
502
519
  }
503
520
 
504
- static getDateTimeDigitalDisplay(sqlDateTime, locale="fr-FR") {
505
- return DateTime.getDateTimeDigitalDisplay(this.parse(sqlDateTime), locale);
521
+ static getDateForInputDate(sqlDateTime, timeZone="Europe/Paris") {
522
+ return DateTime.getDateForInputDate(this.parse(sqlDateTime), timeZone);
523
+ }
524
+ static getTimeForInputTime(sqlDateTime, timeZone="Europe/Paris", withSeconds=false) {
525
+ return DateTime.getTimeForInputTime(this.parse(sqlDateTime), timeZone, withSeconds);
506
526
  }
507
527
 
508
528
  static getYear(sqlDateTime) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@osimatic/helpers-js",
3
- "version": "1.1.42",
3
+ "version": "1.1.44",
4
4
  "main": "main.js",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"