@osimatic/helpers-js 1.5.2 → 1.5.3

package/count_down.js

@@ -1,7 +1,12 @@
 class CountDown {
 
-	constructor(div, callbackOnRefreshData) {
-		// console.log('constructor');
+	static init(div, options = {}) {
+		const {
+			onRefreshData,
+			labelNextUpdate = 'Prochaine mise à jour',
+			labelDoUpdate = 'Mettre à jour',
+		} = options;
+
 		if (!div.length) {
 			return;
 		}
@@ -14,43 +19,63 @@ class CountDown {
 			.append('<div class="count_down_link"><a href="#" data-loading-text="<i class=\'fa fa-circle-notch fa-spin\'></i>">'+labelDoUpdate+'</a></div>')
 		;
 
-		this.div = div;
-		this.callbackOnRefreshData = callbackOnRefreshData;
+		let alreadyMakingRequest = false;
+		let secondsBefRefresh = 10;
+		let refreshIntervalMillis = 60;
+		let currentMillis = 0;
+		let currentSecond = 0;
+
+		function refreshData() {
+			currentMillis = 0;
+
+			//Pour ne pas relancer une requête si la précédente n'est pas encore finie
+			if (true === alreadyMakingRequest) {
+				console.log('Already making request, no new request lauched.');
+				return;
+			}
 
-		this.alreadyMakingRequest = false;
-		this.secondsBefRefresh = 10;
-		this.refreshIntervalMillis = 60;
-		this.currentMillis = 0;
-		this.currentSecond = 0;
+			if (typeof onRefreshData == 'function') {
+				alreadyMakingRequest = true;
+				div.find('.count_down_link a').attr('disabled', true).button('loading');
+
+				onRefreshData(
+					// completeCallback
+					() => {
+						alreadyMakingRequest = false;
+						div.find('.count_down_link a').attr('disabled', false).button('reset');
+					}
+				);
+			}
+		}
 
 		if (div.find('.count_down_link a').length) {
 			div.find('.count_down_link a').click(() => {
-				this.refreshData();
+				refreshData();
 				return false;
 			});
 		}
 
 		setInterval(() => {
 			if (!div.find('.count_down_link a').length || !div.find('.count_down_link a').prop('disabled')) {
-				this.currentMillis += this.refreshIntervalMillis;
+				currentMillis += refreshIntervalMillis;
 			}
 			else {
-				this.currentMillis = 0;
+				currentMillis = 0;
 			}
 
-			this.currentSecond = parseInt(this.currentMillis / 1000);
+			currentSecond = parseInt(currentMillis / 1000);
 
 			//countDownRefresh();
 			var divCountDownText;
 			var divCountDownCurrentSizePx;
 
-			if (this.currentSecond >= this.secondsBefRefresh) {
+			if (currentSecond >= secondsBefRefresh) {
 				divCountDownCurrentSizePx = 120;
 				divCountDownText = '0s';
 			}
 			else {
-				divCountDownCurrentSizePx = Math.round((120/(this.secondsBefRefresh*1000)) * this.currentMillis);
-				divCountDownText = (this.secondsBefRefresh-this.currentSecond) + 's';
+				divCountDownCurrentSizePx = Math.round((120/(secondsBefRefresh*1000)) * currentMillis);
+				divCountDownText = (secondsBefRefresh-currentSecond) + 's';
 			}
 
 			if (div.find('.count_down_current').length) {
@@ -60,42 +85,15 @@ class CountDown {
 				div.find('.count_down_text').html(divCountDownText);
 			}
 
-			if (this.currentSecond >= this.secondsBefRefresh) {
-				this.currentMillis = 0;
+			if (currentSecond >= secondsBefRefresh) {
+				currentMillis = 0;
 				setTimeout(() => {
-					this.refreshData();
+					refreshData();
 				}, 100);
 			}
-		}, this.refreshIntervalMillis);
-
-		this.refreshData();
-	}
+		}, refreshIntervalMillis);
 
-	setCallbackOnRefreshData(callback) {
-		this.callbackOnRefreshData = callback;
-	}
-
-	refreshData() {
-		this.currentMillis = 0;
-
-		//Pour ne pas relancer une requête si la précédente n'est pas encore finie
-		if (true === this.alreadyMakingRequest) {
-			console.log('Already making request, no new request lauched.');
-			return;
-		}
-
-		if (typeof this.callbackOnRefreshData == 'function') {
-			CountDown.alreadyMakingRequest = true;
-			this.div.find('.count_down_link a').attr('disabled', true).button('loading');
-
-			this.callbackOnRefreshData(
-				// completeCallback
-				() => {
-					this.alreadyMakingRequest = false;
-					this.div.find('.count_down_link a').attr('disabled', false).button('reset');
-				}
-			);
-		}
+		refreshData();
 	}
 
 }

package/date_time.js

@@ -1,4 +1,3 @@
-
 require('./string');
 
 class DateTimeFormatter {

package/details_sub_array.js

@@ -1,11 +1,22 @@
+const { HTTPClient } = require('./http_client');
+
 class DetailsSubArray {
 
-	static initDetailsLink(table, callbackOnDetailsActionRequestSuccess, callbackOnDetailsActionRequestError, callbackOnDetailsActionRequestBeforeSend) {
+	static initDetailsLink(table, options = {}) {
+		const {
+			onSuccess,
+			onError,
+			onBeforeSend,
+			labelErrorOccurred = 'Une erreur s\'est produite.',
+			showDetailsLabel = 'Afficher les détails',
+			hideDetailsLabel = 'Masquer les détails',
+		} = options;
+
 		function getNbColumns(tr) {
 			return tr.closest('table').find('thead tr').children().length;
 		}
 		function displayErrorRow(tr) {
-			tr.after($('<tr class="text-error"><td colspan="'+getNbColumns(tr)+'">'+(typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.')+'</td></tr>'));
+			tr.after($('<tr class="text-error"><td colspan="'+getNbColumns(tr)+'">'+labelErrorOccurred+'</td></tr>'));
 		}
 		function displayDetailsRow(tr, content) {
 			var trContent = $(''
@@ -67,8 +78,8 @@ class DetailsSubArray {
 		function doDetailsActionRequest(link) {
 			displayLoading(link);
 
-			if (typeof callbackOnDetailsActionRequestBeforeSend != 'undefined' && callbackOnDetailsActionRequestBeforeSend != null) {
-				displayDetailsRow(link.closest('tr'), callbackOnDetailsActionRequestBeforeSend(link));
+			if (onBeforeSend != null) {
+				displayDetailsRow(link.closest('tr'), onBeforeSend(link));
 				hideLoading(link);
 				setHideDetailsLink(link);
 				return;
@@ -84,27 +95,27 @@ class DetailsSubArray {
 			HTTPClient.request('GET', link.data('url_details'), null,
 				(jsonObj) => {
 					if (jsonObj == null) {
-						if (typeof callbackOnDetailsActionRequestError != 'undefined' && callbackOnDetailsActionRequestError != null) {
-							callbackOnDetailsActionRequestError(link);
+						if (onError != null) {
+							onError(link);
 							return;
 						}
 						displayErrorRow(link.closest('tr'));
 						return;
 					}
 
-					if (typeof callbackOnDetailsActionRequestSuccess != 'undefined' && callbackOnDetailsActionRequestSuccess != null) {
-						displayDetailsRow(link.closest('tr'), callbackOnDetailsActionRequestSuccess(jsonObj, link));
+					if (onSuccess != null) {
+						displayDetailsRow(link.closest('tr'), onSuccess(jsonObj, link));
 					}
 
 					onComplete();
 				},
 				() => {
-					if (typeof callbackOnDetailsActionRequestError != 'undefined' && callbackOnDetailsActionRequestError != null) {
-						callbackOnDetailsActionRequestError(link);
+					if (onError != null) {
+						onError(link);
 						return;
 					}
 
-					link.closest('tr').after($('<tr class="error"><td colspan="6" class="center">'+(typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  'Une erreur s’est produite.')+'</td></tr>'));
+					link.closest('tr').after($('<tr class="error"><td colspan="6" class="center">'+(labelErrorOccurred ??'Une erreur s’est produite.')+'</td></tr>'));
 
 					onComplete();
 					//window.location.replace(decodeURIComponent(urlRetour));

package/flash_message.js

@@ -14,14 +14,18 @@ class FlashMessage {
 			modal.modal('hide');
 		}
 
-		$('div.snackbar').remove();
-		let snackbar = $('<div class="snackbar '+type+'" '+(null !== domId ? 'id="'+domId+'"' : '')+'></div>');
-		$('html body').append(snackbar);
-		snackbar.html(message);
-		snackbar.addClass('show');
+		document.querySelectorAll('div.snackbar').forEach(el => el.remove());
+		const snackbar = document.createElement('div');
+		snackbar.className = 'snackbar ' + type;
+		if (null !== domId) {
+			snackbar.id = domId;
+		}
+		snackbar.innerHTML = message;
+		snackbar.classList.add('show');
+		document.querySelector('body').appendChild(snackbar);
 
 		setTimeout(function () {
-			$('div.snackbar').remove();
+			document.querySelectorAll('div.snackbar').forEach(el => el.remove());
 			if (typeof onMessageHidden == 'function') {
 				onMessageHidden();
 			}