@osimatic/helpers-js 1.0.69 → 1.0.73

package/date_time.js

@@ -1,18 +1,79 @@
 
-class DateTime {
+class DateTimeFormatter {
+	static getDateDigitalFormatter(locale, timeZone) {
+		if (this.dateDigitalFormatter == null) {
+			this.dateDigitalFormatter = new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'numeric', day: 'numeric', timeZone: timeZone }); 
+		}
+
+		return this.dateDigitalFormatter;
+	}
+
+	static getDateTextFormatter(locale, timeZone) {
+		if (this.dateTextFormatter == null) {
+			this.dateTextFormatter = new Intl.DateTimeFormat(locale, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', timeZone: timeZone });
+		}
+
+		return this.dateTextFormatter;
+	}
+
+	static getDateTimeFormatter(locale, timeZone) {
+		if (this.dateTimeFormatter == null) {
+			this.dateTimeFormatter = new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', timeZone: timeZone });
+		}
+
+		return this.dateTimeFormatter;
+	}
+
+	static getDateSqlFormatter(timeZone) {
+		if (this.dateSqlFormatter == null) {
+			this.dateSqlFormatter = new Intl.DateTimeFormat('fr-CA', { year: 'numeric', month: '2-digit', day: '2-digit', timeZone: timeZone });
+		}
+
+		return this.dateSqlFormatter;
+	}
 
+	static getTimeSqlFormatter(timeZone) {
+		if (this.timeSqlFormatter == null) {
+			this.timeSqlFormatter = new Intl.DateTimeFormat('en-GB', { hour: 'numeric', minute: 'numeric', second: 'numeric', hour12: false, timeZone: timeZone }); //hour12: false = 24h format
+		}
+
+		return this.timeSqlFormatter;
+	}
+
+	static getTimeFormatter(locale, timeZone) {
+		if (this.timeFormatter == null) {
+			this.timeFormatter = new Intl.DateTimeFormat(locale, { hour: 'numeric', minute: 'numeric', timeZone: timeZone });
+		}
+
+		return this.timeFormatter;
+	}
+
+	static getTimeDigitalFormatter(locale, timeZone) {
+		if (this.timeDigitalFormatter == null) {
+			this.timeDigitalFormatter = new Intl.DateTimeFormat(locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', timeZone: timeZone });
+		}
+
+		return this.timeDigitalFormatter;
+	}
+} 
+
+class DateTime {
 	static getSqlDate(jsDate, timeZone="Europe/Paris") {
-		let pad = function(num) { return ('00'+num).slice(-2) };
+		return DateTimeFormatter.getDateSqlFormatter(timeZone).format(jsDate).replace(/\//g,'-').replace(',','');
+		/*let pad = function(num) { return ('00'+num).slice(-2) };
 		// return jsDate.getUTCFullYear() + '-' + pad(jsDate.getUTCMonth() + 1) + '-' + pad(jsDate.getUTCDate());
 		//return jsDate.getFullYear() + '-' + pad(jsDate.getMonth() + 1) + '-' + pad(jsDate.getDate());
 		return jsDate.toLocaleDateString('fr-FR', {year: 'numeric', timeZone: timeZone})+'-'+jsDate.toLocaleDateString('fr-FR', {month: '2-digit', timeZone: timeZone})+'-'+jsDate.toLocaleDateString('fr-FR', {day: '2-digit', timeZone: timeZone});
+		*/
 	}
 
 	static getSqlTime(jsDate, timeZone="Europe/Paris") {
-		let pad = function(num) { return ('00'+num).slice(-2) };
+		return DateTimeFormatter.getTimeSqlFormatter(timeZone).format(jsDate);
+		/*let pad = function(num) { return ('00'+num).slice(-2) };
 		// return pad(jsDate.getUTCHours()) + ':' + pad(jsDate.getUTCMinutes()) + ':' + pad(jsDate.getUTCSeconds());
 		//return pad(jsDate.getHours()) + ':' + pad(jsDate.getMinutes()) + ':' + pad(jsDate.getSeconds());
 		return pad(jsDate.toLocaleTimeString('en-GB', {hour: 'numeric', timeZone: timeZone}))+':'+pad(jsDate.toLocaleTimeString('en-GB', {minute: 'numeric', timeZone: timeZone}))+':'+pad(jsDate.toLocaleTimeString('en-GB', {second: 'numeric', timeZone: timeZone}));
+		*/
 	}
 
 	static getSqlDateTime(jsDate) {
@@ -24,18 +85,25 @@ class DateTime {
 	}
 
 	static getDateDigitalDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
-		return jsDate.toLocaleDateString(locale, {year: 'numeric', month: 'numeric', day: 'numeric', timeZone: timeZone});
+		return DateTimeFormatter.getDateDigitalFormatter(locale, timeZone).format(jsDate);
+		//return jsDate.toLocaleDateString(locale, {year: 'numeric', month: 'numeric', day: 'numeric', timeZone: timeZone}); 
 	}
+
 	static getDateTextDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
-		return jsDate.toLocaleDateString(locale, {weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', timeZone: timeZone});
+		return DateTimeFormatter.getDateTextFormatter(locale, timeZone).format(jsDate);
+		//return jsDate.toLocaleDateString(locale, {weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', timeZone: timeZone});  
 	}
 
 	static getTimeDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
-		return jsDate.toLocaleTimeString(locale, {hour: 'numeric', minute: 'numeric', timeZone: timeZone});
+		return DateTimeFormatter.getTimeFormatter(locale, timeZone).format(jsDate);
+		//return jsDate.toLocaleTimeString(locale, {hour: 'numeric', minute: 'numeric', timeZone: timeZone}); 
 	}
+
 	static getTimeDigitalDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
-		return jsDate.toLocaleTimeString(locale, {hour: '2-digit', minute: '2-digit', second: '2-digit', timeZone: timeZone});
+		return DateTimeFormatter.getTimeDigitalFormatter(locale, timeZone).format(jsDate);
+		//return jsDate.toLocaleTimeString(locale, {hour: '2-digit', minute: '2-digit', second: '2-digit', timeZone: timeZone}); 
 	}
+
 	static getTimeDisplayWithNbDays(jsDate, jsPreviousDate, locale="fr-FR", timeZone="Europe/Paris") {
 		let str = this.getTimeDisplay(jsDate, locale, timeZone);
 		if (jsPreviousDate != 0 && jsPreviousDate != null) {
@@ -48,7 +116,8 @@ class DateTime {
 	}
 
 	static getDateTimeDigitalDisplay(jsDate, locale="fr-FR", timeZone="Europe/Paris") {
-		return jsDate.toLocaleDateString(locale, {year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', timeZone: timeZone});
+		return DateTimeFormatter.getDateTimeFormatter(locale, timeZone).format(jsDate);
+		//return jsDate.toLocaleDateString(locale, {year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', timeZone: timeZone}); 
 	}
 
 	static getYear(jsDate) {

package/form_helper.js

@@ -285,4 +285,49 @@ class FormHelper {
 
 }
 
-module.exports = { FormHelper };
+class EditValue {
+	static init(valueDiv, onSubmitCallback, getInputCallback) {
+		let link = $('<a href="#" class="text-warning"><i class="fas fa-pencil-alt"></i></a>');
+		valueDiv.parent().append('&nbsp;').append(link);
+
+		function cancelEdit(valueParentDiv) {
+			valueParentDiv.find('a, span').removeClass('hide');
+			valueParentDiv.find('form').remove();
+		}
+
+		link.click(function (e) {
+			e.preventDefault();
+
+			let parent = $(this).parent();
+
+			parent.find('a, span').addClass('hide');
+
+			let form = $('<form class="form-inline"></form>');
+
+			let value = parent.find('span').data('value') || parent.find('span').text();
+			let input = $( typeof getInputCallback == 'function' ? getInputCallback(value) : '<input type="text" />');
+			form.append(input);
+			form.find('input').addClass('form-control').css('width', 'auto').val(value);
+
+			let button = $('<button type="submit" class="btn btn-success ms-2" data-loading-text="<i class=\'fa fa-circle-notch fa-spin\'></i>" style="vertical-align: baseline;"><i class="fas fa-check"></i></button>');
+			button.click(function (e) {
+				parent.find('button').buttonLoader('loading');
+				let newValue = parent.find('input').val();
+				onSubmitCallback(newValue, parent,
+					(isSuccess, valueFormatCallback) => {
+						cancelEdit(parent);
+						if (isSuccess) {
+							parent.find('span').data('value', newValue).text(typeof valueFormatCallback == 'function' ? valueFormatCallback(newValue) : newValue);
+						}
+					}
+				);
+			});
+			form.append(button);
+
+			parent.append(form);
+			return false;
+		});
+	}
+}
+
+module.exports = { FormHelper, EditValue };

package/index.js

@@ -14,7 +14,7 @@ const { PersonName, Email, TelephoneNumber } = require('./contact_details');
 const { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime } = require('./date_time');
 const { Duration } = require('./duration');
 const { File, CSV, Img } = require('./file');
-const { FormHelper } = require('./form_helper');
+const { FormHelper, EditValue } = require('./form_helper');
 const { Country, PostalAddress, GeographicCoordinates } = require('./location');
 const { SocialNetwork } = require('./social_network');
 const { sleep, refresh } = require('./util');
@@ -47,7 +47,7 @@ const { WebSocket } = require('./web_socket');
 module.exports = {
 	Array, Object, Number, String,
 	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, SocialNetwork,
-	Browser, DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ApiTokenSession, ListBox, WebRTC, WebSocket, EventBus,
+	Browser, DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, EditValue, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ApiTokenSession, ListBox, WebRTC, WebSocket, EventBus,
 	sleep, refresh, chr, ord, trim, empty,
 	GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
 };

package/network.js

@@ -154,7 +154,7 @@ class HTTPRequest {
 				jsonData = await response.json();
 
 				if (HTTPRequest.isExpiredToken(response, jsonData)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback), errorCallback);
 					return;
 				}
 
@@ -192,7 +192,7 @@ class HTTPRequest {
 			},
 			error: (jqxhr, status, errorThrown) => {
 				if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback), errorCallback);
 					return;
 				}
 
@@ -227,16 +227,13 @@ class HTTPRequest {
 
 			const response = await fetch(url, requestInit);
 			try {
-				const blobData = await response.blob();
-				/*console.log(url);
-				console.log(blobData);*/
-
 				if (response.status === 401 && response.statusText === 'Expired JWT Token') {
-					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method), errorCallback);
 					return;
 				}
 
 				if (response.ok) {
+					const blobData = await response.blob();
 					File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition'));
 				}
 				else {
@@ -279,7 +276,7 @@ class HTTPRequest {
 			success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
 			error: (jqxhr, status, errorThrown) => {
 				if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method), errorCallback);
 					return;
 				}
 
@@ -316,7 +313,7 @@ class HTTPRequest {
 				//console.log(url, jsonData);
 
 				if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(response, jsonData)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback), errorCallback);
 					return;
 				}
 
@@ -364,7 +361,7 @@ class HTTPRequest {
 			},
 			error: (jqxhr, status, errorThrown) => {
 				if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback), errorCallback);
 					return;
 				}
 				if (jqxhr.status === 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
@@ -380,7 +377,7 @@ class HTTPRequest {
 		});
 	}
 
-	static refreshToken(onCompleteCallback) {
+	static refreshToken(onCompleteCallback, errorCallback) {
 		if (typeof this.refreshTokenCallback == 'function') {
 			this.refreshTokenCallback(onCompleteCallback);
 			return;
@@ -405,6 +402,7 @@ class HTTPRequest {
 			}, 
 			() => {
 				JwtSession.logout();
+				errorCallback();
 			}
 		);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.0.69",
+  "version": "1.0.73",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/.idea/helpers-js.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/helpers-js.iml" filepath="$PROJECT_DIR$/.idea/helpers-js.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>