@osimatic/helpers-js 1.0.71 → 1.0.74

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

@@ -200,11 +200,12 @@ class FormHelper {
 	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv) {
 		this.displayFormErrorsFromText(form, this.getFormErrorText(errors), errorWrapperDiv);
 		if (btnSubmit != null) {
-			if (btnSubmit.buttonLoader != null) {
-				btnSubmit.buttonLoader('reset');
-			} else {
-				btnSubmit.attr('disabled', false).button('reset');
-			}
+			FormHelper.buttonLoader(btnSubmit, 'reset');
+			//if (btnSubmit.buttonLoader != null) {
+			//	btnSubmit.buttonLoader('reset');
+			//} else {
+			//	btnSubmit.attr('disabled', false).button('reset');
+			//}
 		}
 	}
 
@@ -311,7 +312,7 @@ class EditValue {
 
 			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');
+				FormHelper.buttonLoader(parent.find('button'), 'loading');
 				let newValue = parent.find('input').val();
 				onSubmitCallback(newValue, parent,
 					(isSuccess, valueFormatCallback) => {

package/import_from_csv.js

@@ -24,7 +24,7 @@ class ImportFromCsv {
 
 		formUpload.find('button[type="submit"]').click(function(event) {
 			event.preventDefault();
-			$(this).buttonLoader('loading');
+			FormHelper.buttonLoader($(this), 'loading');
 			formUpload.find('div.errors').addClass('hide');
 
 			let isFileParsed = false;
@@ -69,7 +69,7 @@ class ImportFromCsv {
 					if (!isFileParsed) {
 						formUpload.find('div.errors').html(errorMessageFileEmpty).removeClass('hide');
 					}
-					formUpload.find('button[type="submit"]').buttonLoader('reset');
+					FormHelper.buttonLoader(formUpload.find('button[type="submit"]'), 'reset');
 				}
 			});
 			event.preventDefault();
@@ -77,7 +77,7 @@ class ImportFromCsv {
 
 		formMatching.find('button[type="submit"]').click(function (event) {
 			event.preventDefault();
-			$(this).buttonLoader('loading');
+			FormHelper.buttonLoader($(this), 'loading');
 			formMatching.find('div.errors').addClass('hide').empty();
 			divResult.find('table tr').removeClass('danger');
 			
@@ -86,7 +86,7 @@ class ImportFromCsv {
 
 			if ($.isEmptyObject(tabLink)) {
 				formMatching.find('div.errors').html(errorMessageImportSelectColumns).removeClass('hide');
-				$(this).buttonLoader('reset');
+				FormHelper.buttonLoader($(this), 'reset');
 				return false;
 			}
 
@@ -103,7 +103,7 @@ class ImportFromCsv {
 					else {
 						formMatching.find('div.errors').html(ImportFromCsv.getErrorsHtmlOfImportData(json, divResult)).removeClass('hide');
 					}
-					formMatching.find('button[type="submit"]').buttonLoader('reset');
+					FormHelper.buttonLoader(formMatching.find('button[type="submit"]'), 'reset');
 				}
 			);
 		});

package/media.js

@@ -15,14 +15,13 @@ class AudioMedia {
 		});
 
 		div.find('.play_asynchronously_link').off('click').click(function () {
-			if ($(this).buttonLoader('loading') != null) {
-				let button = $(this).buttonLoader('loading');
-				AudioMedia.playAudioUrl($(this).data('url'), () => button.buttonLoader('reset'));
-			} else {
-				let button = $(this).attr('disabled', true).button('loading');
-				AudioMedia.playAudioUrl($(this).data('url'), () => button.attr('disabled', false).button('reset'));
-			}
-
+			//if (FormHelper.buttonLoader($(this), 'loading') != null) {
+			let button = FormHelper.buttonLoader($(this), 'loading');
+			AudioMedia.playAudioUrl($(this).data('url'), () => FormHelper.buttonLoader(button, 'reset'));
+			//} else {
+			//	let button = $(this).attr('disabled', true).button('loading');
+			//	AudioMedia.playAudioUrl($(this).data('url'), () => button.attr('disabled', false).button('reset'));
+			//}
 			return false;
 		});
 

package/network.js

@@ -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), errorCallback);
 					return;
 				}
 
 				if (response.ok) {
+					const blobData = await response.blob();
 					File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition'));
 				}
 				else {

package/package.json

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