@osimatic/helpers-js 1.0.8 → 1.0.11

package/.idea/helpers-js.iml

@@ -0,0 +1,8 @@
+<?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

@@ -0,0 +1,8 @@
+<?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

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

package/README

@@ -0,0 +1 @@
+npm install @osimatic/helpers-js

package/array.js

@@ -42,7 +42,7 @@ Array.prototype.filterUnique = function() {
 	return this.filter((v, i, a) => a.indexOf(v) === i);
 };
 
-function getValuesByKeyInArrayOfArrays(array, key) {
+Array.getValuesByKeyInArrayOfArrays = function(array, key) {
 	let listeValues = [];
 	for (let i in array) {
 		let subArray = array[i];
@@ -63,7 +63,7 @@ Object.filter = (obj, predicate) => {
 		.reduce( (res, key) => (res[key] = obj[key], res), {} );
 };
 
-function renameKeys(obj, keysMap) {
+Object.renameKeys = function(obj, keysMap) {
 	return Object.keys(obj).reduce(
 		(acc, key) => ({
 			...acc,
@@ -71,9 +71,9 @@ function renameKeys(obj, keysMap) {
 		}),
 		{}
 	);
-}
+};
 
-function renameKeysByCallback(obj, callback) {
+Object.renameKeysByCallback = function(obj, callback) {
 	return Object.keys(obj).reduce(
 		(acc, key) => ({
 			...acc,
@@ -82,5 +82,3 @@ function renameKeysByCallback(obj, callback) {
 		{}
 	);
 }
-
-module.exports = { getValuesByKeyInArrayOfArrays, renameKeys, renameKeysByCallback };

package/changelog.txt

@@ -0,0 +1,28 @@
+
+1.0.9 :
+copierTexte(str) -> str.copyToClipboard()
+truncateString(str, ...) -> str.truncateString(...)
+
+NumberValue.isNumeric(str) -> str.isNumeric()
+NumberValue.format(number, nbDecimal, locale) -> number.format(nbDecimal, locale) OU Number.format(number, nbDecimal, locale)
+NumberValue.formatCurrency(montant, currency, nbDecimal, locale) -> montant.formatCurrency(currency, nbDecimal, locale)
+NumberValue.formatPercent(number, nbDecimal, locale) -> number.formatPercent(nbDecimal, locale)
+NumberValue.random(min, max) -> Number.random(min, max)
+NumberValue.padLeft2(n) -> n.padLeft2()
+NumberValue.roundDecimal(nombre, precision) -> nombre.roundDecimal(precision)
+
+nombre.formatAsString(locale, minimumFractionDigits) -> nombre.format(nbDecimal, locale)
+montant.formatAsCurrency(locale, currency, nbFractionDigits) -> montant.formatCurrency(currency, nbDecimal, locale)
+number.formatAsPercent(locale, minimumFractionDigits) -> number.formatPercent(nbDecimal, locale)
+
+constante COUNTRIES_LIST -> Country.getCountryList()
+activateTab(...) -> Navigation.activateTab(...)
+
+renameKeys(...) -> Object.renameKeys(...)
+renameKeysByCallback(...) -> Object.renameKeysByCallback(...)
+getValuesByKeyInArrayOfArrays(...) -> Array.getValuesByKeyInArrayOfArrays(...)
+getValuesByKeyInArrayOfArrays(array, ...) -> array.getValuesByKeyInArrayOfArrays(...)
+
+hasGetUserMedia() -> non remplacé
+
+paginationAsList(...) -> Pagination.paginate(...)

package/duration.js

@@ -1,8 +1,12 @@
 
 class Duration {
 
-	static formatNbDays(nbDays) {
-		return NumberValue.format(nbDays, 2, locale);
+	static formatNbDays(nbDays, locale) {
+		locale = (typeof locale != 'undefined'?locale:'fr-FR');
+		return new Intl.NumberFormat(locale, {
+			minimumFractionDigits: 2,
+			maximumFractionDigits: 2
+		}).format(nbDays);
 	}
 	static formatNbDaysIfPositive(nbDays) {
 		return nbDays < 0 ? '-' : this.formatNbDays(nbDays);
@@ -12,11 +16,11 @@ class Duration {
 	}
 
 	static convertToDurationAsCentieme(durationInSeconds) {
-		var hour = Math.floor(durationInSeconds / 3600);
-		var minutes = durationInSeconds % 3600;
+		let hour = Math.floor(durationInSeconds / 3600);
+		let minutes = durationInSeconds % 3600;
 		minutes = Math.floor(minutes / 60);
 		// minutes = minutes - (minutes % 60);
-		var minCentieme = Math.round( (minutes / 60 ) * 100 );
+		let minCentieme = Math.round( (minutes / 60 ) * 100 );
 		return parseFloat(hour+'.'+minCentieme);
 	}
 
@@ -27,17 +31,17 @@ class Duration {
 	static convertToDurationInHourChronoDisplay(durationInSeconds, displayMode) {
 		displayMode = typeof displayMode != 'undefined' ? displayMode : 'chrono';
 
-		var durationInSecondsOriginal = durationInSeconds;
+		let durationInSecondsOriginal = durationInSeconds;
 		durationInSeconds = Math.abs(durationInSeconds);
-		var seconds = ( durationInSeconds % 60 );
-		var remander = ( durationInSeconds % 3600 ) - seconds;
-		var minutes = ( remander / 60 );
+		let seconds = ( durationInSeconds % 60 );
+		let remander = ( durationInSeconds % 3600 ) - seconds;
+		let minutes = ( remander / 60 );
 		remander = ( durationInSeconds ) - ( durationInSeconds % 3600 );
-		var hours = ( remander / 3600 );
+		let hours = ( remander / 3600 );
 		if(hours.toString().length < 2) hours = '0'+hours;
-		if(hours.toString().charAt(0) == "-") hours[0] = '0';
+		if(hours.toString().charAt(0) === "-") hours[0] = '0';
 		if(minutes.toString().length < 2) minutes = '0'+minutes;
-		if(minutes.toString().charAt(0) == "-") minutes[0] = '0';
+		if(minutes.toString().charAt(0) === "-") minutes[0] = '0';
 		if(seconds.toString().length < 2) seconds = '0'+seconds;
 		return (durationInSecondsOriginal < 0 ? '- ' : '')+hours+':'+minutes+(displayMode==='input_time'?':':'.')+seconds;
 	}
@@ -49,8 +53,8 @@ class Duration {
 		if (libelleEntier == null) libelleEntier = false;
 		
 		// Heures
-		var strHeure = '';
-		var nbHeures = this.getNbHoursOfDurationInSeconds(durationInSeconds);
+		let strHeure = '';
+		let nbHeures = this.getNbHoursOfDurationInSeconds(durationInSeconds);
 		strHeure += nbHeures;
 		if (libelleEntier) {
 			strHeure += ' heure'+(nbHeures>1?'s':'');
@@ -60,8 +64,8 @@ class Duration {
 		}
 		
 		// Minutes
-		var strMinute = '';
-		var nbMinutes = 0;
+		let strMinute = '';
+		let nbMinutes = 0;
 		if (withMinutes) {
 			nbMinutes = this.getNbMinutesRemainingOfDurationInSeconds(durationInSeconds);
 			strMinute += ' ';
@@ -78,9 +82,9 @@ class Duration {
 		}
 		
 		// Secondes
-		var strSeconde = '';
+		let strSeconde = '';
 		if (withSecondes) {
-			var nbSecondes = this.getNbSecondsRemainingOfDurationInSeconds(durationInSeconds);
+			let nbSecondes = this.getNbSecondsRemainingOfDurationInSeconds(durationInSeconds);
 			strSeconde += ' ';
 			//strSeconde += sprintf('%02d', nbSecondes);
 			strSeconde += nbSecondes.toString().padStart(2, '0');
@@ -96,25 +100,25 @@ class Duration {
 	}
 
 	static roundNbSeconds(durationInSeconds, roundPrecision, roundMode) {
-		var hours = Math.floor(durationInSeconds / 3600);
-		var minutes = Math.floor((durationInSeconds % 3600) / 60);
-		var seconds = durationInSeconds % 60;
+		let hours = Math.floor(durationInSeconds / 3600);
+		let minutes = Math.floor((durationInSeconds % 3600) / 60);
+		let seconds = durationInSeconds % 60;
 
-		var hoursRounded = hours;
-		var minutesRounded = minutes;
-		var secondsRounded = seconds;
+		let hoursRounded = hours;
+		let minutesRounded = minutes;
+		let secondsRounded = seconds;
 
 		if (roundPrecision > 0) {
-			var minutesRemaining = minutes % roundPrecision;
-			var minutesRemainingAndSecondsAsCentieme = minutesRemaining + seconds/60;
-			if (minutesRemainingAndSecondsAsCentieme == 0) {
+			let minutesRemaining = minutes % roundPrecision;
+			let minutesRemainingAndSecondsAsCentieme = minutesRemaining + seconds/60;
+			if (minutesRemainingAndSecondsAsCentieme === 0) {
 				// pas d'arrondissement
 			}
 			else {
 				var halfRoundPrecision = roundPrecision / 2;
 				hoursRounded = hours;
 				secondsRounded = 0;
-				if (roundMode == 'up' || (roundMode == 'close' && minutesRemainingAndSecondsAsCentieme > halfRoundPrecision)) {
+				if (roundMode === 'up' || (roundMode === 'close' && minutesRemainingAndSecondsAsCentieme > halfRoundPrecision)) {
 					// Arrondissement au dessus
 					if (minutes > (60-roundPrecision)) {
 						minutesRounded = 0;

package/flash_message.js

@@ -1,8 +1,7 @@
 class FlashMessage {
-
 	static displayRequestFailure(status, exception, modal) {
 		console.log('request failure. Status: ', status, ' Exception: ', exception);
-		this.display('danger', "Une erreur s'est produite.", false, modal);
+		this.display('danger', typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  "Une erreur s'est produite.", false, modal);
 	}
 
 	static displaySuccess(message, reload, modal) {

package/form_helper.js

@@ -161,6 +161,26 @@ class FormHelper {
 	// Messages
 	// ------------------------------------------------------------
 
+	static extractErrorKeyOfJson(json, onlyIfUniqueError) {
+		if (typeof json == 'undefined' || json == null) {
+			return null;
+		}
+
+		if (typeof json.error != 'undefined') {
+			return json.error;
+		}
+
+		if (typeof onlyIfUniqueError != 'undefined' && onlyIfUniqueError && !json.length || json.length > 1) {
+			return null;
+		}
+
+		if (typeof json[0] != 'undefined' && typeof json[0].error != 'undefined') {
+			return json[0].error;
+		}
+
+		return null;
+	}
+
 	static hideFormErrors(form) {
 		form.find('div.form_errors').remove();
 		return form;

package/google_maps.js

@@ -19,7 +19,7 @@ class GoogleMap {
 	}
 
 	static getUrl(latitude, longitude) {
-		return 'http://maps.google.com/?q='+latitude+','+longitude+'';
+		return 'https://maps.google.com/?q='+latitude+','+longitude+'';
 	}
 
 	static getUrlFromCoordinates(locationCoordinates) {

package/google_recaptcha.js

@@ -0,0 +1,78 @@
+class GoogleRecaptcha {
+	static onLoad() {
+		console.log('GoogleRecaptcha.onLoad');
+		if (typeof grecaptcha == 'undefined' || typeof grecaptcha.render != 'function') {
+			console.log('var grecaptcha undefined');
+			return;
+		}
+
+		if (typeof GoogleRecaptcha.googleCaptchaRendersCallback == 'undefined') {
+			GoogleRecaptcha.googleCaptchaRendersCallback = [];
+		}
+
+		GoogleRecaptcha.googleCaptchaRendersCallback.forEach(callback => callback());
+		GoogleRecaptcha.googleCaptchaRendersCallback = [];
+
+		/*document.querySelectorAll('.grecaptcha').forEach(element => {
+			try {
+				console.log(element.id);
+				//grecaptchaWidgets[element.id] = grecaptcha.render(element.id, googleReCaptchaDatas);
+			}
+			catch (e) {
+				console.log('Exception during grecaptcha.render', e);
+			}
+		});*/
+	}
+
+	static addRenderCallback(callback) {
+		if (typeof GoogleRecaptcha.googleCaptchaRendersCallback == 'undefined') {
+			GoogleRecaptcha.googleCaptchaRendersCallback = [];
+		}
+
+		GoogleRecaptcha.googleCaptchaRendersCallback.push(callback);
+		console.log('GoogleRecaptcha.addRenderCallback');
+		GoogleRecaptcha.onLoad();
+	}
+
+	static reset(id) {
+		if (typeof grecaptcha == 'undefined' || typeof grecaptcha.render != 'function') {
+			console.log('var grecaptcha.render undefined');
+			return;
+		}
+
+		if (typeof GoogleRecaptcha.grecaptchaWidgets == 'undefined') {
+			GoogleRecaptcha.grecaptchaWidgets = [];
+		}
+
+		if (typeof GoogleRecaptcha.grecaptchaWidgets[id] == 'undefined') {
+			try {
+				GoogleRecaptcha.grecaptchaWidgets[id] = grecaptcha.render(id, googleReCaptchaDatas);
+			}
+			catch (e) {
+				console.log('Exception during grecaptcha.render', e);
+			}
+		}
+		else {
+			grecaptcha.reset(GoogleRecaptcha.grecaptchaWidgets[id]);
+		}
+	}
+}
+
+module.exports = { GoogleRecaptcha };
+
+/*
+var grecaptchaWidgets = [];
+
+function grecaptchaOnload () {
+	if (typeof grecaptcha == 'undefined') {
+		console.log('var grecaptcha undefined');
+		return;
+	}
+	document.querySelectorAll('.grecaptcha').forEach(element => {
+		grecaptchaWidgets[element.id] = grecaptcha.render(element.id, googleReCaptchaDatas);
+	});
+	//$('.grecaptcha').each(function(idx, el) {
+	//	grecaptchaWidgets[$(el).attr('id')] = grecaptcha.render($(el).attr('id'), googleReCaptchaDatas);
+	//});
+}
+*/

package/index.js

@@ -1,37 +1,47 @@
 //A noter : les réécritures de prototypes définies dans certains fichiers n'ont pas besoin d'être exportés depuis le module en question (exemple Array / Object dans array.js).
 //Il faut uniquement appeler require() (sans récupérer le retour) et ajouter la/les classe(s) concernée(s) dans l'export ci-dessous (l'appel de require() applique l'extension).
 
+// rien à exporter (que des extensions d'objet natif)
+require('./string');
+require('./array');
+
+// exports d'ojets non natif
 const { HTTPRequest, Cookie, UrlAndQueryString } = require('./network');
 const { IBAN } = require('./bank');
 const { AudioMedia } = require('./media');
 const { PersonName, Email, TelephoneNumber } = require('./contact_details');
-const { CountDown } = require('./count_down');
-const { DataTable } = require('./data_table');
 const { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, InputPeriod } = require('./date_time');
-const { DetailsSubArray } = require('./details_sub_array');
 const { Duration } = require('./duration');
 const { File, CSV, Img } = require('./file');
-const { FlashMessage } = require('./flash_message');
 const { FormHelper } = require('./form_helper');
-const { GoogleMap } = require('./google_maps');
+const { Country, PostalAddress, Location } = require('./location');
+const { SocialNetwork } = require('./social_network');
+const { sleep, refresh } = require('./util');
+const { chr, ord, trim, empty } = require('./php.min');
+
+// exports plugins "maison"
+const { DataTable } = require('./data_table');
+const { Pagination, Navigation } = require('./paging');
+const { FlashMessage } = require('./flash_message');
+const { CountDown } = require('./count_down');
+const { DetailsSubArray } = require('./details_sub_array');
 const { ImportFromCsv } = require('./import_from_csv');
 const { JwtToken, JwtSession } = require('./jwt');
 const { ListBox } = require('./list_box');
-const { COUNTRIES_LIST, Country, PostalAddress, Location } = require('./location');
-const { SocialNetwork } = require('./social_network');
-const { getValuesByKeyInArrayOfArrays, renameKeys, renameKeysByCallback } = require('./array');
-const { NumberValue } = require('./number');
-const { selectionnerContenuNode, copierTexte, truncateString } = require('./string');
-const { addBookmark, sleep, refresh } = require('./util');
-const { chr, ord, trim, empty } = require('./php.min');
-const { Pagination, activateTab } = require('./paging');
+
+// exports surcouche lib externe
 const { GoogleCharts } = require('./google_charts');
+const { GoogleRecaptcha } = require('./google_recaptcha');
+const { GoogleMap } = require('./google_maps');
+const { OpenStreetMap } = require('./open_street_map');
+
+// deprecated
+const { NumberValue } = require('./number');
 
 module.exports = {
-    HTTPRequest, Cookie, UrlAndQueryString, IBAN, AudioMedia, PersonName, Email, TelephoneNumber, CountDown, DataTable,
-    DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, InputPeriod, DetailsSubArray, Duration, File, CSV, Img,
-    FlashMessage, FormHelper, GoogleMap, ImportFromCsv, JwtToken, JwtSession, ListBox, COUNTRIES_LIST, Country, PostalAddress, 
-    Location, SocialNetwork, Array, Object, getValuesByKeyInArrayOfArrays, renameKeys, renameKeysByCallback, Number, NumberValue,
-    String, selectionnerContenuNode, copierTexte, truncateString, addBookmark, sleep, refresh, chr, ord, trim, empty, Pagination, 
-    activateTab, GoogleCharts
+    Array, Object, Number, String,
+    HTTPRequest, Cookie, UrlAndQueryString, IBAN, AudioMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, InputPeriod, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, Location, SocialNetwork, NumberValue,
+    DataTable, Pagination, Navigation, FlashMessage, CountDown, DetailsSubArray, ImportFromCsv, JwtToken, JwtSession, ListBox,
+    sleep, refresh, chr, ord, trim, empty,
+    GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
 };