@osimatic/helpers-js 1.0.30 → 1.0.33

package/changelog.txt

@@ -37,4 +37,6 @@ let httpHeaders = {...} -> HTTPRequest.setHeader(key, value);
 remplacer l'utilisation des variables httpHeaders / _httpHeaders par HTTPRequest.getHeaders()
 
 FlashMessage.displayRequestFailure(status, exception, modal) -> FlashMessage.displayError(labelErrorOccured, modal)
-FormHelper.logRequestFailure(status, exception) -> HTTPRequest.logJqueryRequestFailure(jqxhr, status, exception) (le log de l'erreur est devenu inutile car fait de base dans la classe HTTPRequest)
+FormHelper.logRequestFailure(status, exception) -> HTTPRequest.logJqueryRequestFailure(jqxhr, status, exception) (le log de l'erreur est devenu inutile car fait de base dans la classe HTTPRequest)
+
+Location.checkCoordinates(...) -> GeographicCoordinates.check(...) (car Location est déjà défini en javascript natif)

package/data_table.js

@@ -284,7 +284,7 @@ class DataTable {
 		}
 
 		if (error == null) {
-			return this.displayErrorMessage(div, (typeof defaultMessage != 'undefined' ? defaultMessage : labelErrorOccured));
+			return this.displayErrorMessage(div, (typeof defaultMessage != 'undefined' ? defaultMessage : (typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.')));
 		}
 		return this.displayErrorMessage(div, 'Critères sélectionnés incorrect.');
 	}

package/details_sub_array.js

@@ -5,7 +5,7 @@ class DetailsSubArray {
 			return tr.closest('table').find('thead tr').children().length;
 		}
 		function displayErrorRow(tr) {
-			tr.after($('<tr class="text-error"><td colspan="'+getNbColumns(tr)+'">'+labelErrorOccured+'</td></tr>'));
+			tr.after($('<tr class="text-error"><td colspan="'+getNbColumns(tr)+'">'+(typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.')+'</td></tr>'));
 		}
 		function displayDetailsRow(tr, content) {
 			var trContent = $(''
@@ -74,14 +74,15 @@ class DetailsSubArray {
 				return;
 			}
 
+			function onComplete() {
+				hideLoading(link);
+				setHideDetailsLink(link);
+				//link.attr('disabled', false).button('reset');
+			}
+
 			//link.attr('disabled', true).button('loading');
-			$.ajax({
-				url: link.data("url_details"),
-				method: 'GET',
-				headers: HTTPRequest.getHeaders(),
-				cache: false,
-				dataType: 'json',
-				success: function (jsonObj) {
+			HTTPRequest.get(link.data('url_details'), {},
+				(jsonObj) => {
 					if (jsonObj == null) {
 						if (typeof callbackOnDetailsActionRequestError != 'undefined' && callbackOnDetailsActionRequestError != null) {
 							callbackOnDetailsActionRequestError(link);
@@ -94,24 +95,21 @@ class DetailsSubArray {
 					if (typeof callbackOnDetailsActionRequestSuccess != 'undefined' && callbackOnDetailsActionRequestSuccess != null) {
 						displayDetailsRow(link.closest('tr'), callbackOnDetailsActionRequestSuccess(jsonObj, link));
 					}
-				},
-				error: function (jqxhr, status, exception) {
-					console.log('Detail request failure. Status: '+status+' ; Exception: '+exception);
 
+					onComplete();
+				},
+				() => {
 					if (typeof callbackOnDetailsActionRequestError != 'undefined' && callbackOnDetailsActionRequestError != null) {
 						callbackOnDetailsActionRequestError(link);
 						return;
 					}
 
-					link.closest('tr').after($('<tr class="error"><td colspan="6" class="center">'+labelErrorOccured+'</td></tr>'));
+					link.closest('tr').after($('<tr class="error"><td colspan="6" class="center">'+(typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.')+'</td></tr>'));
+
+					onComplete();
 					//window.location.replace(decodeURIComponent(urlRetour));
 				},
-				complete: function() {
-					hideLoading(link);
-					setHideDetailsLink(link);
-					//link.attr('disabled', false).button('reset');
-				}
-			});
+			);
 		}
 
 		table.find('a.details_link').each(function(idx, link) {

package/file.js

@@ -103,7 +103,7 @@ class Img {
 		$.ajax({
 			type: 'GET',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			cache: false,
 			xhrFields: {responseType: 'blob'},
 			success: (data) => {

package/flash_message.js

@@ -31,9 +31,8 @@ class FlashMessage {
 	/** @deprecated **/
 	static displayRequestFailure(status, exception, modal) {
 		console.log('request failure. Status: ', status, ' Exception: ', exception);
-		this.display('danger', typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  "Une erreur s'est produite.", false, modal);
+		this.display('danger', typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.', false, modal);
 	}
-
 }
 
 module.exports = { FlashMessage };

package/form_helper.js

@@ -255,6 +255,37 @@ class FormHelper {
 	}
 
 
+	static buttonLoader(button, action) {
+		button = $(button);
+		if (action === 'start' || action === 'loading') {
+			if (button.attr('disabled')) {
+				return self;
+			}
+			button.attr('disabled', true);
+			button.attr('data-btn-text', button.html());
+			//let text = '<span class="spinner"><i class=\'fa fa-circle-notch fa-spin\'></i></span>Traitement en cours…';
+			let text = '<i class=\'fa fa-circle-notch fa-spin\'></i> Traitement en cours…';
+			if (button.data('load-text') != undefined && button.data('load-text') != null && button.data('load-text') != '') {
+				text = button.data('load-text');
+			}
+			if (button.data('loading-text') != undefined && button.data('loading-text') != null && button.data('loading-text') != '') {
+				text = button.data('loading-text');
+			}
+			button.html(text);
+			button.addClass('disabled');
+		}
+		if (action === 'stop' || action === 'reset') {
+			button.html(button.attr('data-btn-text'));
+			button.removeClass('disabled');
+			button.attr('disabled', false);
+			//button.removeAttr("disabled");
+		}
+		return button;
+	}
+	
+	
+	
+	
 
 	/** @deprecated **/
 	static logRequestFailure(status, exception) {

package/index.js

@@ -15,7 +15,7 @@ const { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime } = require('./da
 const { Duration } = require('./duration');
 const { File, CSV, Img } = require('./file');
 const { FormHelper } = require('./form_helper');
-const { Country, PostalAddress, Location } = require('./location');
+const { Country, PostalAddress, GeographicCoordinates } = require('./location');
 const { SocialNetwork } = require('./social_network');
 const { sleep, refresh } = require('./util');
 const { chr, ord, trim, empty } = require('./php.min');
@@ -40,11 +40,9 @@ const { GoogleRecaptcha } = require('./google_recaptcha');
 const { GoogleMap } = require('./google_maps');
 const { OpenStreetMap } = require('./open_street_map');
 
-// deprecated
-
 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, Location, SocialNetwork,
+	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, SocialNetwork,
 	DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox,
 	sleep, refresh, chr, ord, trim, empty,
 	GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap

package/location.js

@@ -8,19 +8,19 @@ class Country {
 	}
 
 	static fillCountrySelect(select, defaultValue) {
-		Object.entries(Country.getCountryList()).forEach(([countryCode, countryName]) => select.append('<option value="'+countryCode+'">'+countryName+'</option>'));
+		Object.entries(Country.getCountries()).forEach(([countryCode, countryName]) => select.append('<option value="'+countryCode+'">'+countryName+'</option>'));
 		if (typeof defaultValue != 'undefined') {
 			select.val(defaultValue);
 		}
 		select.selectpicker('refresh');
 	}
 	static getCountryName(countryCode) {
-		if (Country.getCountryList().hasOwnProperty(countryCode)) {
-			return Country.getCountryList()[countryCode];
+		if (Country.getCountries().hasOwnProperty(countryCode)) {
+			return Country.getCountries()[countryCode];
 		}
 		return countryCode;
 	}
-	static getCountryList() {
+	static getCountries() {
 		return {
 			AF:'Afghanistan',
 			AX:'Åland Islands',
@@ -268,6 +268,23 @@ class Country {
 			ZW:'Zimbabwe',
 		};
 	}
+
+	static getContinents() {
+		return {
+			1: "Europe",
+			2: "Moyen-Orient",
+			3: "Afrique",
+			4: "Amérique du Nord",
+			5: "Amérique du Sud",
+			6: "Asie",
+			7: "Océanie",
+		};
+	}
+
+	/** @deprecated **/
+	static getCountryList() {
+		return Country.getCountries();
+	}
 }
 
 class PostalAddress {
@@ -377,10 +394,10 @@ class PostalAddress {
 	}
 }
 
-class Location {
-	static checkCoordinates(str) {
+class GeographicCoordinates {
+	static check(str) {
 		return /^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$/.test(str);
 	}
 }
 
-module.exports = { Country, PostalAddress, Location };
+module.exports = { Country, PostalAddress, GeographicCoordinates };

package/media.js

@@ -72,6 +72,49 @@ class AudioMedia {
 		}
 	}
 
+	static initAudioVisualization(canvas, audioStream) {
+		let canvasCtx = canvas.getContext("2d");
+		let canvasWidth = canvas.width;
+		let canvasHeight = canvas.height;
+		let audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+		let analyser = audioCtx.createAnalyser();
+
+		let distortion = audioCtx.createWaveShaper();
+		let source = audioCtx.createMediaStreamSource(audioStream);
+		source.connect(analyser);
+		analyser.connect(distortion);
+		distortion.connect(audioCtx.destination);
+
+		analyser.fftSize = 256;
+		let bufferLength = analyser.frequencyBinCount;
+		console.log(bufferLength);
+		let dataArray = new Uint8Array(bufferLength);
+
+		canvasCtx.clearRect(0, 0, canvasWidth, canvasHeight);
+
+		function draw() {
+			let drawVisual = requestAnimationFrame(draw);
+
+			analyser.getByteFrequencyData(dataArray);
+
+			canvasCtx.fillStyle = 'rgb(0, 0, 0)';
+			canvasCtx.fillRect(0, 0, canvasWidth, canvasHeight);
+
+			let barWidth = (canvasWidth / bufferLength) * 2.5;
+			let barHeight;
+			let x = 0;
+			for (let i = 0; i < bufferLength; i++) {
+				barHeight = dataArray[i] / 2;
+
+				canvasCtx.fillStyle = 'rgb(' + (barHeight + 100) + ',50,50)';
+				canvasCtx.fillRect(x, canvasHeight - barHeight / 2, barWidth, barHeight);
+
+				x += barWidth + 1;
+			}
+		}
+
+		draw();
+	}
 }
 
 //Source : https://www.npmjs.com/package/mic-check

package/network.js

@@ -14,7 +14,7 @@ class HTTPRequest {
 		this.headers[key] = value;
 	}
 
-	static getHeaders() {
+	static getHeaders(asObject) {
 		//if (typeof httpHeaders != 'undefined') {
 		//	return httpHeaders;
 		//}
@@ -23,6 +23,10 @@ class HTTPRequest {
 			this.headers = {};
 		}
 
+		if (typeof asObject != 'undefined' && asObject) {
+			return this.headers;
+		}
+
 		let httpHeaders = new Headers();
 		Object.entries(this.headers).forEach(([key, value]) => {
 			httpHeaders.append(key, value);
@@ -108,7 +112,7 @@ class HTTPRequest {
 		$.ajax({
 			type: 'GET',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			dataType: 'json',
 			cache: false,
 			success: (data) => successCallback(data),
@@ -187,7 +191,7 @@ class HTTPRequest {
 		let ajaxOptions = {
 			type: 'GET',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			cache: false,
 			xhrFields: {
 				responseType: 'blob'
@@ -238,7 +242,7 @@ class HTTPRequest {
 				jsonData = await response.json();
 				//console.log(url, jsonData);
 
-				if (response.status == 401 && (response.statusText === "Expired JWT Token" || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
+				if (response.status == 401 && url !== HTTPRequest.refreshTokenUrl && (response.statusText === "Expired JWT Token" || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
@@ -275,7 +279,7 @@ class HTTPRequest {
 		$.ajax({
 			type: 'POST',
 			url: url,
-			headers: HTTPRequest.getHeaders(),
+			headers: HTTPRequest.getHeaders(true),
 			dataType: 'json', // 22/09/2020 : à voir si cette ligne pose pb (utilisé pour requete import et peut être d'autres
 			data: formData,
 			cache: false,
@@ -287,7 +291,7 @@ class HTTPRequest {
 				}
 			},
 			error: (jqxhr, status, errorThrown) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && url !== HTTPRequest.refreshTokenUrl && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
@@ -324,8 +328,7 @@ class HTTPRequest {
 				JwtSession.setRefreshToken(data.refresh_token);
 				onCompleteCallback();
 			}, 
-			(jqxhr, status, exception) => {
-				console.log(exception);
+			() => {
 				JwtSession.logout();
 			}
 		);
@@ -351,11 +354,12 @@ class HTTPRequest {
 
 		xhr.onreadystatechange = function () {
 			if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
+				let data;
 				if (formatRetour == 'xml') {
-					var data = xhr.responseXML;
+					data = xhr.responseXML;
 				}
 				else {
-					var data = eval('(' + xhr.responseText + ')');
+					data = eval('(' + xhr.responseText + ')');
 				}
 				callback(data);
 			}
@@ -597,6 +601,7 @@ class UrlAndQueryString {
 
 	// deprecated
 
+	/** @deprecated **/
 	static parseQueryString(string) {
 		if (string === "" || string == null) return {};
 		if (string.charAt(0) === "?") string = string.slice(1);
@@ -636,6 +641,7 @@ class UrlAndQueryString {
 		return data0;
 	}
 
+	/** @deprecated **/
 	static getQuery(url) {
 		var str = url;
 		var strpos = str.indexOf('?');

package/package.json

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

package/todos/button_loader.js

@@ -1,50 +0,0 @@
-
-// Loading button plugin (removed from BS4)
-(function($) {
-	"use strict";
-
-	$.fn.extend({
-		/*
-		button: function (action) {
-			console.log(action);
-			if (action === 'loading' && this.data('loading-text')) {
-				console.log('loading');
-				this.data('original-text', this.html()).html(this.data('loading-text')).prop('disabled', true);
-			}
-			if (action === 'reset' && this.data('original-text')) {
-				console.log('reset');
-				this.html(this.data('original-text')).prop('disabled', false);
-			}
-		},
-		*/
-
-		buttonLoader: function (action) {
-			//console.log(action);
-			var self = $(this);
-			if (action === 'start' || action === 'loading') {
-				if ($(self).attr('disabled')) {
-					return self;
-				}
-				$(self).attr('disabled', true);
-				$(self).attr('data-btn-text', $(self).html());
-				//let text = '<span class="spinner"><i class=\'fa fa-circle-notch fa-spin\'></i></span>Traitement en cours…';
-				let text = '<i class=\'fa fa-circle-notch fa-spin\'></i> Traitement en cours…';
-				if ($(self).data('load-text') != undefined && $(self).data('load-text') != null && $(self).data('load-text') != '') {
-					text = $(self).data('load-text');
-				}
-				if ($(self).data('loading-text') != undefined && $(self).data('loading-text') != null && $(self).data('loading-text') != '') {
-					text = $(self).data('loading-text');
-				}
-				$(self).html(text);
-				$(self).addClass('disabled');
-			}
-			if (action === 'stop' || action === 'reset') {
-				$(self).html($(self).attr('data-btn-text'));
-				$(self).removeClass('disabled');
-				$(self).attr('disabled', false);
-				//$(self).removeAttr("disabled");
-			}
-			return self;
-		}
-	});
-}(jQuery));