@osimatic/helpers-js 1.0.9 → 1.0.12

package/README

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

package/bank.js

@@ -4,4 +4,19 @@ class IBAN {
 	}
 }
 
-module.exports = { IBAN };
+class BankCard {
+	static formatCardNumber(cardNumber) {
+		if (cardNumber.length === 16) {
+			cardNumber = cardNumber.substring(0, 4)+'-'+cardNumber.substring(4, 8)+'-'+cardNumber.substring(8, 12)+'-'+cardNumber.substring(12, 16);
+			cardNumber = cardNumber.replace(/(\*)/gi, 'X');
+		}
+		return cardNumber;
+	}
+
+	static formatExpirationDate(expirationDate) {
+		let locale = typeof locale != 'undefined' ? locale : 'fr-FR';
+		return SqlDateTime.getMonthName(expirationDate, locale)+' '+SqlDateTime.getYear(expirationDate);
+	}
+}
+
+module.exports = { IBAN, BankCard };

package/changelog.txt

@@ -4,7 +4,7 @@ copierTexte(str) -> str.copyToClipboard()
 truncateString(str, ...) -> str.truncateString(...)
 
 NumberValue.isNumeric(str) -> str.isNumeric()
-NumberValue.format(number, nbDecimal, locale) -> number.format(nbDecimal, locale)
+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)
@@ -16,10 +16,13 @@ montant.formatAsCurrency(locale, currency, nbFractionDigits) -> montant.formatCu
 number.formatAsPercent(locale, minimumFractionDigits) -> number.formatPercent(nbDecimal, locale)
 
 constante COUNTRIES_LIST -> Country.getCountryList()
-activateTab(...) -> Pagination.activateTab(...)
+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/index.js

@@ -7,36 +7,44 @@ require('./array');
 
 // exports d'ojets non natif
 const { HTTPRequest, Cookie, UrlAndQueryString } = require('./network');
-const { IBAN } = require('./bank');
+const { IBAN, BankCard } = 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 { ImportFromCsv } = require('./import_from_csv');
-const { JwtToken, JwtSession } = require('./jwt');
-const { ListBox } = require('./list_box');
 const { Country, PostalAddress, Location } = require('./location');
 const { SocialNetwork } = require('./social_network');
-const { NumberValue } = require('./number');
 const { sleep, refresh } = require('./util');
 const { chr, ord, trim, empty } = require('./php.min');
-const { Pagination, activateTab } = require('./paging');
+
+// exports plugins "maison"
+const { DataTable } = require('./data_table');
+const { Pagination, Navigation } = require('./paging');
+const { DetailsSubArray } = require('./details_sub_array');
+const { SelectAll } = require('./select_all');
+const { MultipleActionInTable } = require('./multiple_action_in_table');
+const { ShoppingCart } = require('./shopping_cart');
+const { FlashMessage } = require('./flash_message');
+const { CountDown } = require('./count_down');
+const { ImportFromCsv } = require('./import_from_csv');
+const { JwtToken, JwtSession } = require('./jwt');
+const { ListBox } = require('./list_box');
+
+// 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 = {
     Array, Object, Number, String,
-    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, Country, PostalAddress,
-    Location, SocialNetwork, NumberValue, Pagination,
+    HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, InputPeriod, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, Location, SocialNetwork, NumberValue,
+    DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox,
     sleep, refresh, chr, ord, trim, empty,
-    GoogleCharts, GoogleRecaptcha
+    GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
 };

package/{todos/multiple_action_in_table.js → multiple_action_in_table.js}

@@ -111,11 +111,7 @@ class MultipleActionInTable {
 
 }
 
-$(function() {
-	$('table.table-action_multiple').each(function(idx, table) {
-		MultipleActionInTable.init($(table));
-	});
-});
+module.exports = { MultipleActionInTable };
 
 /*
 // init checkbox

package/number.js

@@ -71,6 +71,16 @@ Number.prototype.format = Number.prototype.format || function(nbDecimal, locale)
 	}).format(this);
 }
 
+if (!Number.format) {
+	Number.format = function(number, nbDecimal, locale) {
+		nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
+		return new Intl.NumberFormat(locale, {
+			minimumFractionDigits: nbDecimal,
+			maximumFractionDigits: nbDecimal
+		}).format(number);
+	};
+}
+
 /**
  * Number.prototype.format(n, x, s, c)
  *

package/open_street_map.js

@@ -0,0 +1,132 @@
+/**
+ * https://leafletjs.com/
+ * https://switch2osm.org/the-basics/
+ * https://www.openstreetmap.org/help
+ */
+class OpenStreetMap {
+
+	constructor(mapId, options) {
+		/*let [lat, lng] = button.data('coordinates').split(',');
+		let map = L.map('modal_map_canvas2').setView([lat, lng], 17);
+
+		L.marker([lat, lng], {
+			icon: L.icon({iconUrl: getIconOfMapMarker(button.data('type_marker'))}),
+			title: popoverContent.title
+			//popupopen: setTimeout(displayEmployeesAndCompaniesAndTasks, 250)
+		}).addTo(map)
+			.bindPopup(popoverContent.content)
+			//.openPopup()
+		;*/
+
+		this.markers = [];
+		this.locations = [];
+		this.mapId = mapId;
+
+		if (!$('#'+mapId).length) {
+			return;
+		}
+
+		this.map = L.map(mapId, options || {});
+
+		L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+			attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+		}).addTo(this.map);
+
+		this.centerOnFrance();
+	}
+
+	static getUrl(latitude, longitude) {
+		return 'https://www.openstreetmap.org/?mlat='+latitude+'&mlon='+longitude+'#map=17/'+latitude+'/'+longitude+'&layers=N';
+		//return 'https://www.openstreetmap.org/#map=17/'+latitude+'/'+longitude+'';
+	}
+
+	static getUrlFromCoordinates(locationCoordinates) {
+		locationCoordinates = locationCoordinates.split(',');
+		return this.getUrl(parseFloat(locationCoordinates[0]), parseFloat(locationCoordinates[1]));
+	}
+
+	setZoom(zoom) {
+		this.map.setZoom(zoom);
+	}
+
+	deleteMarkers() {
+		this.locations = [];
+
+		//this.markers.forEach(marker => marker.setMap(null));
+
+		this.markers.length = 0;
+		this.markers = [];
+	}
+
+	addMarkers(listLocations, icon) {
+		if (listLocations.length === 0) {
+			return;
+		}
+
+		listLocations.forEach(location => this.addMarker(location, icon));
+	}
+
+	addMarker(coordinates, options) {
+		let locationCoordinates = coordinates.split(',');
+		let latitude = parseFloat(locationCoordinates[0]);
+		let longitude = parseFloat(locationCoordinates[1]);
+
+		let marker = L.marker([latitude, longitude], {
+			icon: L.icon({
+				iconUrl: options['icon'],
+				iconSize: [22, 32],
+			}),
+			title: options['title'],
+		});
+
+		//marker.on('click', () => {
+		marker.on('popupopen', () => {
+			console.log('popupopen');
+			if (typeof options['on_click'] == 'function') {
+				options['on_click']();
+			}
+			return false;
+		});
+		marker.addTo(this.map);
+		marker.bindPopup(options['popup_content']);
+
+		this.markers.push(marker);
+		this.locations.push([latitude, longitude]);
+	}
+
+	centerOnFrance() {
+		this.map.setView([46.52863469527167, 2.43896484375], 6);
+	}
+
+	centerOnMarkers() {
+		this.map.invalidateSize(false);
+
+		if (this.locations.length === 0) {
+			return;
+		}
+
+		this.map.fitBounds(new L.LatLngBounds(this.locations));
+	}
+
+	connectMarkers() {
+		if (this.locations.length === 0) {
+			return;
+		}
+
+		let prevLocation = null;
+		let listLineCoordinates = [];
+		this.locations.forEach(location => {
+			if (prevLocation != null) {
+				listLineCoordinates.push([prevLocation, location]);
+			}
+			prevLocation = location;
+		});
+
+		listLineCoordinates.forEach(line => {
+			L.polyline(line, {color: '#728bec'}).addTo(this.map);
+		});
+
+	}
+}
+
+module.exports = { OpenStreetMap };

package/package.json

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

package/paging.js

@@ -95,7 +95,9 @@ class Pagination {
 
 		update();
 	}
+}
 
+class Navigation {
 	static activateTab(a) {
 		//console.log(a);
 		//a.click();
@@ -117,7 +119,7 @@ class Pagination {
 	}
 }
 
-module.exports = { Pagination };
+module.exports = { Pagination, Navigation };
 
 // deprecated
 /*

package/{todos/select_all.js → select_all.js}

@@ -114,19 +114,4 @@ class SelectAll {
 	}
 }
 
-$(function() {
-	// Dans un form-group
-	$('a.check_all').each(function(idx, link) {
-		SelectAll.initLinkInFormGroup($(link));
-	});
-
-	// Dans tableau
-	$('table tr input.check_all').each(function(idx, inputCheckAll) {
-		SelectAll.initInTable($(inputCheckAll).closest('table'));
-	});
-
-	// Dans un div
-	$('div.checkbox_with_check_all').each(function(idx, div) {
-		SelectAll.initDiv($(div));
-	});
-});
+module.exports = { SelectAll };

package/shopping_cart.js

@@ -0,0 +1,32 @@
+class ShoppingCart {
+	static addProduct(productId, quantity, data) {
+		let cart = this.getCart();
+		let item = cart.find(element => element.product_id == productId);
+		if (typeof item != 'undefined') {
+			cart.unsetVal(item);
+			quantity += item.quantity;
+		}
+		cart.push({product_id: productId, quantity: quantity, data: data});
+		localStorage.setItem('cart', JSON.stringify(cart));
+	}
+
+	static deleteProduct(productId) {
+		let cart = this.getCart();
+		cart.unsetVal(cart.find(element => element.product_id == productId));
+		localStorage.setItem('cart', JSON.stringify(cart));
+	}
+
+	static removeAllItems() {
+		localStorage.removeItem('cart');
+	}
+
+	static getCart() {
+		let cart = [];
+		if (localStorage.getItem('cart') != null) {
+			cart = JSON.parse(localStorage.getItem('cart'));
+		}
+		return cart;
+	}
+}
+
+module.exports = { ShoppingCart };

package/string.js

@@ -93,12 +93,17 @@ String.prototype.escapeHtml = String.prototype.escapeHtml || function() {
 };
 
 String.prototype.normalizeBreaks = String.prototype.normalizeBreaks || function(breaktype) {
-	return this.replace('/(\r\n|\r|\n)/ms', breaktype);
+	// 20/01/2022 : modifié car ne fonctionnait pas pour les string en provenance de textarea, enregistrée en bd puis réaffiché depuis bd
+	//return this.replace(/$/mg, breaktype).replace(new RegExp('/'+breaktype.escapeRegExp()+'$/'), '');
+	return this.replace(/(?:\r\n|\r|\n)/g, breaktype);
+	//return this.replace('/(\r\n|\r|\n)/ms', breaktype);
 	//return this.replace('/(?:\r\n|\r|\n)/g', breaktype);
 	//console.log(breaktype);
 	//return this.replace(new RegExp('\r?\n','g'), breaktype);
 };
-
+String.prototype.escapeRegExp = String.prototype.escapeRegExp || function() {
+	return this.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+};
 String.prototype.format = String.prototype.format || function() {
 	var args = arguments;
 	return this.replace(/{(\d+)}/g, (match, number) => (typeof args[number] != 'undefined' ? args[number] : match));

package/util.js

@@ -14,4 +14,4 @@ function refresh() {
 	window.location.reload(true);
 }
 
-module.exports = { addBookmark, sleep, refresh };
+module.exports = { sleep, refresh };