@osimatic/helpers-js 1.0.24 → 1.0.27

package/changelog.txt

@@ -31,3 +31,7 @@ getDateObjectSelected(lien) -> getSelectedDate(lien.closest('.form-group')
 selectFormDate(lien) -> setSelectedDate(lien.closest('.form-group')
 majSelectPeriode() / majSelectCompare() -> updatePeriodSelect(form)
 
+let URL_REFRESH = ... -> HTTPRequest.setRefreshTokenUrl(URL_REFRESH)
+let _httpHeaders = {...} -> HTTPRequest.setHeader(key, value);
+let httpHeaders = {...} -> HTTPRequest.setHeader(key, value);
+remplacer l'utilisation des variables httpHeaders / _httpHeaders par HTTPRequest.getHeaders()

package/date_time.js

@@ -419,128 +419,4 @@ class SqlDateTime {
 }
 
 
-class InputPeriod {
-
-	static addLinks(form) {
-		let divParent = form.find('input[type="date"][data-add_period_select_links]').parent();
-		if (divParent.hasClass('input-group')) {
-			divParent = divParent.parent();
-		}
-		divParent.append(''
-			+'<div class="select_period_links">'
-				+'<a href="#" class="period_select_yesterday">Hier</a> - '
-				+'<a href="#" class="period_select_current_week">Cette semaine</a> - '
-				+'<a href="#" class="period_select_last_week">La semaine dernière</a> - '
-				+'<a href="#" class="period_select_current_month">Ce mois-ci</a> - '
-				+'<a href="#" class="period_select_last_month">Le mois dernier</a> - '
-				+'<a href="#" class="period_select_current_year">Cette année</a>'
-			+'</div>'
-		);
-		this.init(form);
-	}
-
-	static init(form) {
-		let link;
-		//console.log(form.find('a.period_select_current_week'));
-
-		if ((link = form.find('a.period_select_today')).length) {
-			link.click(function() { InputPeriod.selectToday($(this)); return false; });
-		}
-		if ((link = form.find('a.period_select_yesterday')).length) {
-			link.click(function() { InputPeriod.selectPreviousDay($(this), 1); return false; });
-		}
-		if ((link = form.find('a.period_select_tomorrow')).length) {
-			link.click(function() { InputPeriod.selectFollowingDay($(this), 1); return false; });
-		}
-		if ((link = form.find('a.period_select_current_week')).length) {
-			link.click(function() { InputPeriod.selectCurrentWeek($(this)); return false; });
-		}
-		if ((link = form.find('a.period_select_last_week')).length) {
-			link.click(function() { InputPeriod.selectPreviousWeek($(this), 1); return false; });
-		}
-		if ((link = form.find('a.period_select_current_month')).length) {
-			link.click(function() { InputPeriod.selectCurrentMonth($(this)); return false; });
-		}
-		if ((link = form.find('a.period_select_last_month')).length) {
-			link.click(function() { InputPeriod.selectPreviousMonth($(this), 1); return false; });
-		}
-		if ((link = form.find('a.period_select_current_year')).length) {
-			link.click(function() { InputPeriod.selectCurrentYear($(this)); return false; });
-		}
-		if ((link = form.find('a.period_select_last_year')).length) {
-			link.click(function() { InputPeriod.selectCurrentYear($(this), 1); return false; });
-		}
-	}
-	
-
-	static selectToday(link) {
-		let date = new Date();
-		this.selectPeriod(link, date, date);
-	}
-	
-	static selectPreviousDay(lien, nbDays) {
-		this.selectFollowingDay(lien, -nbDays);
-	}
-	static selectFollowingDay(lien, nbDays) {
-		let date = new Date();
-		date.setDate(date.getDate() + nbDays);
-		this.selectPeriod(lien, date, date);
-	}
-	
-	static selectCurrentWeek(lien) {
-		let date = new Date();
-		this.selectPeriod(lien, DateTime.getFirstDayOfWeek(date), DateTime.getLastDayOfWeek(date));
-	}
-	static selectPreviousWeek(lien, nbWeeks) {
-		this.selectFollowingWeek(lien, -nbWeeks);
-	}
-	static selectFollowingWeek(lien, nbWeeks) {
-		let date = new Date();
-		date.setDate(date.getDate() + (7*nbWeeks));
-		this.selectPeriod(lien, DateTime.getFirstDayOfWeek(date), DateTime.getLastDayOfWeek(date));
-	}
-	
-	static selectCurrentMonth(lien) {
-		let date = new Date();
-		this.selectPeriod(lien, DateTime.getFirstDayOfMonth(date), DateTime.getLastDayOfMonth(date));
-	}
-	static selectPreviousMonth(lien, nbMonths) {
-		this.selectFollowingMonth(lien, -nbMonths);
-	}
-	static selectFollowingMonth(lien, nbMonths) {
-		let date = new Date();
-		date.setDate(1);
-		date.setMonth(date.getMonth() + nbMonths);
-		this.selectPeriod(lien, DateTime.getFirstDayOfMonth(date), DateTime.getLastDayOfMonth(date));
-	}
-	
-	static selectCurrentYear(lien) {
-		this.selectFollowingYear(lien, 0);
-	}
-	static selectPreviousYear(lien, nbAnneesMoins) {
-		this.selectFollowingYear(lien, -nbAnneesMoins);
-	}
-	static selectFollowingYear(lien, nbAnneesMoins) {
-		let date = new Date();
-		date.setFullYear(date.getFullYear() + nbAnneesMoins);
-		this.selectPeriod(lien, DateTime.getFirstDayOfYear(date), DateTime.getLastDayOfYear(date));
-	}
-	
-
-	static selectPeriod(link, startDate, endDate) {
-		let inputPeriodStart = link.parent().parent().find('input[type="date"]').filter('[name="date_start"], [name="start_date"], [name="start_period"], [name="period_start_date"]');
-		let inputPeriodEnd = link.parent().parent().find('input[type="date"]').filter('[name="date_end"], [name="end_date"], [name="end_period"], [name="period_end_date"]');
-		if (inputPeriodStart.length == 0 || inputPeriodEnd.length == 0) {
-			console.log('no period input found');
-			return;
-		}
-
-		//console.log(startDate);
-		//console.log(endDate);
-		inputPeriodStart.val(DateTime.getSqlDate(startDate));
-		inputPeriodEnd.val(DateTime.getSqlDate(endDate));
-	}
-	
-}
-
-module.exports = { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, InputPeriod };
+module.exports = { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime };

package/file.js

@@ -12,9 +12,9 @@ class File {
 		}
 		var type = contentType;
 
-        var blob = new Blob([data], {
-            type: type
-        });
+		var blob = new Blob([data], {
+			type: type
+		});
 
 		//console.log('disposition: '+disposition+' ; filename: '+filename+' ; type: '+type);
 		//console.log('blob: %o', blob);
@@ -37,30 +37,30 @@ class File {
 				a.click();
 			}
 
-            setTimeout(function () {
-                URL.revokeObjectURL(downloadUrl);
-            }, 100); // cleanup
+			setTimeout(function () {
+				URL.revokeObjectURL(downloadUrl);
+			}, 100); // cleanup
 		}
 	}
 
-    static formatFileSize(fileSizeInBytes, fractionDigits, locale) {
-        fractionDigits = (typeof fractionDigits != 'undefined' ? fractionDigits : 2);
-        var i = -1;
-        var byteUnits = ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-        if (fileSizeInBytes === 0) {
-            return '0 ' + byteUnits[0];
-        }
-        do {
-            fileSizeInBytes = fileSizeInBytes / 1024;
-            i++;
-        }
-        while (fileSizeInBytes > 1024);
-        //var size = Math.max(fileSizeInBytes, 0.1).toFixed(fractionDigits);
-        var size = Math.max(fileSizeInBytes, 0.1);
-        return (new Intl.NumberFormat(locale, {
-            maximumFractionDigits: fractionDigits
-        }).format(size)) + ' ' + byteUnits[i];
-    }
+	static formatFileSize(fileSizeInBytes, fractionDigits, locale) {
+		fractionDigits = (typeof fractionDigits != 'undefined' ? fractionDigits : 2);
+		var i = -1;
+		var byteUnits = ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+		if (fileSizeInBytes === 0) {
+			return '0 ' + byteUnits[0];
+		}
+		do {
+			fileSizeInBytes = fileSizeInBytes / 1024;
+			i++;
+		}
+		while (fileSizeInBytes > 1024);
+		//var size = Math.max(fileSizeInBytes, 0.1).toFixed(fractionDigits);
+		var size = Math.max(fileSizeInBytes, 0.1);
+		return (new Intl.NumberFormat(locale, {
+			maximumFractionDigits: fractionDigits
+		}).format(size)) + ' ' + byteUnits[i];
+	}
 }
 
 const CSV_FILE_EXTENSION = "csv";

package/form_date.js

@@ -1,17 +1,214 @@
-const {Object} = require('./index');
+// input period de type : Du <input type="date" name="start_date" /> au <input type="date" name="end_date" />
+class InputPeriod {
 
+	static addLinks(form) {
+		let divParent = form.find('input[type="date"][data-add_period_select_links]').parent();
+		if (divParent.hasClass('input-group')) {
+			divParent = divParent.parent();
+		}
+		divParent.append(''
+			+'<div class="select_period_links">'
+			+'<a href="#" class="period_select_yesterday">Hier</a> - '
+			+'<a href="#" class="period_select_current_week">Cette semaine</a> - '
+			+'<a href="#" class="period_select_last_week">La semaine dernière</a> - '
+			+'<a href="#" class="period_select_current_month">Ce mois-ci</a> - '
+			+'<a href="#" class="period_select_last_month">Le mois dernier</a> - '
+			+'<a href="#" class="period_select_current_year">Cette année</a>'
+			+'</div>'
+		);
+		this.init(form);
+	}
+
+	static init(form) {
+		let link;
+		//console.log(form.find('a.period_select_current_week'));
+
+		if ((link = form.find('a.period_select_today')).length) {
+			link.click(function() { InputPeriod.selectToday($(this)); return false; });
+		}
+		if ((link = form.find('a.period_select_yesterday')).length) {
+			link.click(function() { InputPeriod.selectPreviousDay($(this), 1); return false; });
+		}
+		if ((link = form.find('a.period_select_tomorrow')).length) {
+			link.click(function() { InputPeriod.selectFollowingDay($(this), 1); return false; });
+		}
+		if ((link = form.find('a.period_select_current_week')).length) {
+			link.click(function() { InputPeriod.selectCurrentWeek($(this)); return false; });
+		}
+		if ((link = form.find('a.period_select_last_week')).length) {
+			link.click(function() { InputPeriod.selectPreviousWeek($(this), 1); return false; });
+		}
+		if ((link = form.find('a.period_select_current_month')).length) {
+			link.click(function() { InputPeriod.selectCurrentMonth($(this)); return false; });
+		}
+		if ((link = form.find('a.period_select_last_month')).length) {
+			link.click(function() { InputPeriod.selectPreviousMonth($(this), 1); return false; });
+		}
+		if ((link = form.find('a.period_select_current_year')).length) {
+			link.click(function() { InputPeriod.selectCurrentYear($(this)); return false; });
+		}
+		if ((link = form.find('a.period_select_last_year')).length) {
+			link.click(function() { InputPeriod.selectCurrentYear($(this), 1); return false; });
+		}
+	}
+
+
+	static selectToday(link) {
+		let date = new Date();
+		this.selectPeriod(link, date, date);
+	}
+
+	static selectPreviousDay(lien, nbDays) {
+		this.selectFollowingDay(lien, -nbDays);
+	}
+	static selectFollowingDay(lien, nbDays) {
+		let date = new Date();
+		date.setDate(date.getDate() + nbDays);
+		this.selectPeriod(lien, date, date);
+	}
+
+	static selectCurrentWeek(lien) {
+		let date = new Date();
+		this.selectPeriod(lien, DateTime.getFirstDayOfWeek(date), DateTime.getLastDayOfWeek(date));
+	}
+	static selectPreviousWeek(lien, nbWeeks) {
+		this.selectFollowingWeek(lien, -nbWeeks);
+	}
+	static selectFollowingWeek(lien, nbWeeks) {
+		let date = new Date();
+		date.setDate(date.getDate() + (7*nbWeeks));
+		this.selectPeriod(lien, DateTime.getFirstDayOfWeek(date), DateTime.getLastDayOfWeek(date));
+	}
+
+	static selectCurrentMonth(lien) {
+		let date = new Date();
+		this.selectPeriod(lien, DateTime.getFirstDayOfMonth(date), DateTime.getLastDayOfMonth(date));
+	}
+	static selectPreviousMonth(lien, nbMonths) {
+		this.selectFollowingMonth(lien, -nbMonths);
+	}
+	static selectFollowingMonth(lien, nbMonths) {
+		let date = new Date();
+		date.setDate(1);
+		date.setMonth(date.getMonth() + nbMonths);
+		this.selectPeriod(lien, DateTime.getFirstDayOfMonth(date), DateTime.getLastDayOfMonth(date));
+	}
+
+	static selectCurrentYear(lien) {
+		this.selectFollowingYear(lien, 0);
+	}
+	static selectPreviousYear(lien, nbAnneesMoins) {
+		this.selectFollowingYear(lien, -nbAnneesMoins);
+	}
+	static selectFollowingYear(lien, nbAnneesMoins) {
+		let date = new Date();
+		date.setFullYear(date.getFullYear() + nbAnneesMoins);
+		this.selectPeriod(lien, DateTime.getFirstDayOfYear(date), DateTime.getLastDayOfYear(date));
+	}
+
+
+	static selectPeriod(link, startDate, endDate) {
+		let inputPeriodStart = link.parent().parent().find('input[type="date"]').filter('[name="date_start"], [name="start_date"], [name="start_period"], [name="period_start_date"]');
+		let inputPeriodEnd = link.parent().parent().find('input[type="date"]').filter('[name="date_end"], [name="end_date"], [name="end_period"], [name="period_end_date"]');
+		if (inputPeriodStart.length == 0 || inputPeriodEnd.length == 0) {
+			console.log('no period input found');
+			return;
+		}
+
+		//console.log(startDate);
+		//console.log(endDate);
+		inputPeriodStart.val(DateTime.getSqlDate(startDate));
+		inputPeriodEnd.val(DateTime.getSqlDate(endDate));
+	}
+
+}
+
+// input period de type : <select class="period">Aujourd'hui / Ce mois-ci / etc. / Personnalisé</select>
 class FormDate {
 	static initForm(form) {
+
+		function fillPeriodSelect(select) {
+			Object.entries(FormDate.getPeriodList()).forEach(([idx, tabListPeriode]) => {
+				let html = '<optgroup label="'+tabListPeriode['label']+'">';
+				Object.entries(tabListPeriode['list']).forEach(([key, label]) => {
+					html += '<option value="'+key+'">'+label+'</option>';
+				});
+				html += '</optgroup>';
+				select.append(html);
+			});
+			if (select.data('default_value')) {
+				select.val(select.data('default_value'));
+			}
+		}
+
+		function updatePeriodSelect(select) {
+			if (select.val() === 'perso') {
+				select.closest('.form-group').next().removeClass('hide');
+			}
+			else {
+				select.closest('.form-group').next().addClass('hide');
+			}
+		}
+
+		function updateForm(form) {
+			let periodSelect = form.find('select.periode');
+			if (periodSelect.length === 0) {
+				return;
+			}
+
+			updatePeriodSelect(periodSelect);
+
+			let comparedPeriodSelect = form.find('select.periodeCompare');
+			if (comparedPeriodSelect.length === 0) {
+				return;
+			}
+
+			let listValues = [];
+			let valueDefault = null;
+
+			comparedPeriodSelect.find('option').attr('disabled', false);
+
+			Object.entries(FormDate.getPeriodList()).forEach(([idx, tabListPeriode]) => {
+				if (idx != 0) {
+					let listKeyPeriode = Object.entries(tabListPeriode['list']).map(([key, value]) => key);
+					if (listKeyPeriode.indexOf(periodSelect.val()) !== -1) {
+						listValues = listKeyPeriode;
+						valueDefault = listKeyPeriode[1];
+					}
+					else {
+						comparedPeriodSelect.find('option[value="' + listKeyPeriode[0] + '"]').parent().children().attr('disabled', true);
+					}
+				}
+			});
+
+			if (periodSelect.val() === 'perso') {
+				valueDefault = 'perso';
+			}
+			else if (comparedPeriodSelect.val() !== 'perso' && listValues.indexOf(comparedPeriodSelect.val()) !== -1) {
+				valueDefault = comparedPeriodSelect.val();
+			}
+			comparedPeriodSelect.val(valueDefault);
+
+			updatePeriodSelect(comparedPeriodSelect);
+		}
+
 		// ---------- Choix période (new) ----------
 
-		// Formulaire de sélection de période
 		if (form.find('select.periode').length > 0) {
+			fillPeriodSelect(form.find('select.periode'));
 			form.find('select.periode').change(function() {
-				FormDate.updatePeriodSelect($(this).closest('form'));
+				updateForm($(this).closest('form'));
 			});
-			FormDate.updatePeriodSelect($(this).closest('form'));
 		}
 
+		if (form.find('select.periodeCompare').length > 0) {
+			fillPeriodSelect(form.find('select.periodeCompare'));
+			form.find('select.periodeCompare').change(function() {
+				updateForm($(this).closest('form'));
+			});
+		}
+
+		updateForm(form);
 
 		// ---------- Choix période (old) ----------
 
@@ -51,7 +248,7 @@ class FormDate {
 				'	<a href="#" class="lien_form_day_moins_8">J-8</a> - '+
 				'	<a href="#" class="lien_form_last_month">Le mois dernier</a> - '+
 				'	<a href="#" class="lien_form_month_moins_2">Mois M-2</a> - '+
-				'	<a href="#" class="lien_form_last_year">L\'année dernière</a>'+
+				'	<a href="#" class="lien_form_last_year">L’année dernière</a>'+
 				'</p>'
 			);
 		}
@@ -141,58 +338,99 @@ class FormDate {
 		//}
 	}
 
-	static updatePeriodSelect(form) {
-		function updateSelect(select) {
-			if (select.val() === 'perso') {
-				select.parent().parent().next().removeClass('hide');
-			}
-			else {
-				select.parent().parent().next().addClass('hide');
-			}
-		}
-
-		let periodSelect = form.find('select.period');
-		if (periodSelect.length === 0) {
-			return;
-		}
-
-		updateSelect(periodSelect);
-
-		let comparedPeriodSelect = form.find('select.compared_period');
-		if (comparedPeriodSelect.length === 0) {
-			return;
-		}
-
-		let listValues = [];
-		let valueDefault = null;
-
-		comparedPeriodSelect.find('option').attr('disabled', false);
-
-		let listePeriodeCompare = typeof listePeriodeCompare != 'undefined' ? listePeriodeCompare : {};
-		listePeriodeCompare.forEach(([idx, tabListPeriode]) => {
-			if (idx != 0) {
-				let listKeyPeriode = Object.entries(tabListPeriode['list']).map(([key, value]) => key);
-				if (listKeyPeriode.indexOf(periodSelect.val()) !== -1) {
-					listValues = listKeyPeriode;
-					valueDefault = listKeyPeriode[1];
-				}
-				else {
-					comparedPeriodSelect.find('option[value="' + listKeyPeriode[0] + '"]').parent().children().attr('disabled', true);
-				}
-			}
-		});
-	
-		if (periodSelect.val() === 'perso') {
-			valueDefault = 'perso';
-		}
-		else if (comparedPeriodSelect.val() !== 'perso' && listValues.indexOf(comparedPeriodSelect.val()) !== -1) {
-			valueDefault = comparedPeriodSelect.val();
-		}
-		comparedPeriodSelect.val(valueDefault);
-
-		updateSelect(comparedPeriodSelect);
+	static getPeriodList() {
+		return {
+			other: {label: 'Autre', list: {
+				perso: 						'Personnalisé',
+			}},
+			'1d': {label: 'Un jour', list: { // 1 jour
+				'ajd': 									'Aujourd’hui',
+				'hier': 								'Hier',
+				'jourMoins2': 							'Avant-hier',
+				'jourMoins3': 							'J-3',
+				'jourMoins7': 							'J-7',
+				'jourMoins8': 							'J-8',
+				'same_day_last_year': 					'Même jour l’année dernière',
+				'same_day_least_2_years': 				'Même jour l’année A-2',
+				'same_day_as_yesterday_last_year': 		'Même jour qu’hier l’année dernière',
+				'same_day_as_yesterday_least_2_years': 	'Même jour qu’hier l’année A-2'
+			}},
+			'1w': {label: 'Une semaine', list: { // 1 semaine
+				'curr_week': 					'Cette semaine',
+				'last_week': 					'La semaine dernière',
+				'weekMoins2': 					'Semaine S-2',
+				'weekMoins3': 					'Semaine S-3',
+				'weekMoins4': 					'Semaine S-4',
+			}},
+			'7d': {label: '7 jours', list: { // 7 jours
+				'last_7_days': 					'Les 7 derniers jours',
+				'last_7_days_before': 			'Les 7 jours avant',
+				'last_7_days_least_1_year': 	'Les mêmes 7 jours l’année dernière',
+				'last_7_days_least_2_years': 	'Les mêmes 7 jours l’année A-2',
+			}},
+			'14d': {label: '14 jours', list: { // 14 jours
+				'last_14_days': 				'Les 14 derniers jours',
+				'last_14_days_before': 			'Les 14 jours avant',
+				'last_14_days_least_1_year': 	'Les mêmes 14 jours l’année dernière',
+				'last_14_days_least_2_years': 	'Les mêmes 14 jours l’année A-2',
+			}},
+			// 30 jours
+			'30d': {label: '30 jours', list: {
+				'last_30_days': 				'Les 30 derniers jours',
+				'last_30_days_before': 			'Les 30 jours avant',
+				'last_30_days_least_1_year': 	'Les mêmes 30 jours l’année dernière',
+				'last_30_days_least_2_years': 	'Les mêmes 30 jours l’année A-2',
+			}},
+			'60d': {label: '60 jours', list: { // 60 jours
+				'last_60_days': 				'Les 60 derniers jours',
+				'last_60_days_before': 			'Les 60 jours avant',
+				'last_60_days_least_1_year': 	'Les mêmes 60 jours l’année dernière',
+				'last_60_days_least_2_years': 	'Les mêmes 60 jours l’année A-2',
+			}},
+			'1m': {label: 'Un mois', list: { // 1 mois
+				'curr_month': 					'Ce mois-ci',
+				'last_month': 					'Le mois dernier',
+				'monthMoins2': 					'Mois M-2',
+				'monthMoins3': 					'Mois M-3',
+				'monthMoins4': 					'Mois M-4',
+				'monthMoins5': 					'Mois M-5',
+				'monthMoins6': 					'Mois M-6',
+				'same_month_last_year': 		'Même mois l’année dernière',
+				'same_month_least_2_years': 	'Même mois l’année A-2',
+			}},
+			'3m': {label: '3 mois', list: { // 3 mois
+				'last_3_month': 				'Les 3 derniers mois',
+				'last_3_month_before': 			'Les 3 mois avant',
+				'last_3_month_least_1_year': 	'Les mêmes 3 mois l’année dernière',
+				'last_3_month_least_2_years': 	'Les mêmes 3 mois l’année A-2',
+			}},
+			'6m': {label: '6 mois', list: { // 6 mois
+				'last_6_month': 				'Les 6 derniers mois',
+				'last_6_month_before': 			'Les 6 mois avant',
+				'last_6_month_least_1_year': 	'Les mêmes 6 mois l’année dernière',
+				'last_6_month_least_2_years': 	'Les mêmes 6 mois l’année A-2',
+			}},
+			'12m': {label: '12 mois', list: { // 12 mois
+				'last_12_month': 				'Les 12 derniers mois',
+				'last_12_month_before': 		'Les 12 mois avant',
+				'last_12_month_least_1_year': 	'Les mêmes 12 mois l’année dernière',
+				'last_12_month_least_2_years': 	'Les mêmes 12 mois l’année A-2',
+			}},
+			'24m': {label: '24 mois', list: { // 24 mois
+				'last_24_month': 				'Les 24 derniers mois',
+				'last_24_month_before': 		'Les 24 mois avant',
+				'last_24_month_least_1_year': 	'Les mêmes 24 mois l’année dernière',
+				'last_24_month_least_2_years': 	'Les mêmes 24 mois l’année A-2',
+			}},
+			'1y': {label: 'Une année', list: { // 1 année
+				'curr_year': 					'Cette année',
+				'last_year': 					'L’année dernière',
+				'yearMoins2': 					'Année A-2',
+				'yearMoins3': 					'Année A-3',
+				'yearMoins4': 					'Année A-4',
+			}},
+		};
 	}
-	
 	static setTodaySelected(periodFormGroup) {
 		let date = new Date();
 		FormDate.setSelectedDate(periodFormGroup, date.getDate(), (date.getMonth() + 1), date.getFullYear());
@@ -241,7 +479,7 @@ class FormDate {
 		}
 		return new Date();
 	}
-	
+
 	static setSelectedDate(periodFormGroup, day, month, year) {
 		periodFormGroup.find('select.day').val(day);
 		periodFormGroup.find('select.month').val(month);
@@ -250,24 +488,9 @@ class FormDate {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+	/*
 	// deprecated
 
-	/** @deprecated */
 	static majSelectPeriode(select) {
 		if (select.find(':selected').attr('value') === 'perso') {
 			select.parent().parent().next().removeClass('hide');
@@ -277,7 +500,6 @@ class FormDate {
 		}
 	}
 
-	/** @deprecated */
 	static majSelectCompare() {
 		if ($('form select#periodeCompare').length === 0) {
 			return;
@@ -315,53 +537,38 @@ class FormDate {
 		FormDate.majSelectPeriode(selectCompare);
 	}
 
-	/** @deprecated */
 	static selectFormDateToday(lien) {
 		let date = new Date();
 		FormDate.selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
 	}
-
-	/** @deprecated */
 	static selectFormDateDayMoinsNb(lien, nbJoursMoins) {
 		let date = new Date();
 		date.setDate(date.getDate() - nbJoursMoins);
 		FormDate.selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
 	}
-
-	/** @deprecated */
 	static selectFormDateCurrentMonth(lien) {
 		let date = new Date();
 		FormDate.selectFormDate(lien, -1, (date.getMonth() + 1), date.getFullYear());
 	}
-
-	/** @deprecated */
 	static selectFormDateMonthMoinsNb(lien, nbMoisMoins) {
 		let date = new Date();
 		date.setDate(1);
 		date.setMonth(date.getMonth() - nbMoisMoins);
 		FormDate.selectFormDate(lien, -1, (date.getMonth() + 1), date.getFullYear());
 	}
-
-	/** @deprecated */
 	static selectFormDateCurrentYear(lien) {
 		let today = new Date();
 		FormDate.selectFormDate(lien, -1, -1, today.getFullYear());
 	}
-
-	/** @deprecated */
 	static selectFormDateYearMoinsNb(lien, nbAnneesMoins) {
 		let today = new Date();
 		FormDate.selectFormDate(lien, -1, -1, today.getFullYear() - nbAnneesMoins);
 	}
-
-	/** @deprecated */
 	static selectFormDateAddDayFromSelectedDay(lien, nbDaysAdded) {
 		let date = FormDate.getDateObjectSelected(lien);
 		date.setDate(date.getDate() + nbDaysAdded);
 		FormDate.selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
 	}
-
-	/** @deprecated */
 	static getDateObjectSelected(lien) {
 		let selectorDay = '#' + (lien.parent().prev().prev().prev().prev().attr('id')) + ' option:selected';
 		let selectorMonth = '#' + (lien.parent().prev().prev().prev().attr('id')) + ' option:selected';
@@ -371,8 +578,6 @@ class FormDate {
 		}
 		return new Date();
 	}
-
-	/** @deprecated */
 	static selectFormDate(lien, day, month, year) {
 		let selectorDay = '#' + (lien.parent().prev().prev().prev().prev().attr('id')) + ' option[value=' + day + ']';
 		let selectorMonth = '#' + (lien.parent().prev().prev().prev().attr('id')) + ' option[value=' + month + ']';
@@ -381,7 +586,7 @@ class FormDate {
 		if ($(selectorMonth).length > 0) $(selectorMonth).prop('selected', 'selected');
 		if ($(selectorYear).length > 0) $(selectorYear).prop('selected', 'selected');
 	}
-
+	*/
 }
 
-module.exports = { FormDate };
+module.exports = { FormDate, InputPeriod };

package/index.js

@@ -11,7 +11,7 @@ const { HTTPRequest, Cookie, UrlAndQueryString } = require('./network');
 const { IBAN, BankCard } = require('./bank');
 const { AudioMedia, UserMedia } = require('./media');
 const { PersonName, Email, TelephoneNumber } = require('./contact_details');
-const { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, InputPeriod } = require('./date_time');
+const { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime } = require('./date_time');
 const { Duration } = require('./duration');
 const { File, CSV, Img } = require('./file');
 const { FormHelper } = require('./form_helper');
@@ -19,7 +19,6 @@ const { Country, PostalAddress, Location } = require('./location');
 const { SocialNetwork } = require('./social_network');
 const { sleep, refresh } = require('./util');
 const { chr, ord, trim, empty } = require('./php.min');
-const { FormDate } = require('./form_date');
 
 // exports plugins "maison"
 const { DataTable } = require('./data_table');
@@ -27,6 +26,7 @@ const { Pagination, Navigation } = require('./paging');
 const { DetailsSubArray } = require('./details_sub_array');
 const { SelectAll } = require('./select_all');
 const { MultipleActionInTable } = require('./multiple_action_in_table');
+const { FormDate, InputPeriod } = require('./form_date');
 const { ShoppingCart } = require('./shopping_cart');
 const { FlashMessage } = require('./flash_message');
 const { CountDown } = require('./count_down');
@@ -43,9 +43,9 @@ 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, InputPeriod, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, Location, SocialNetwork, FormDate,
-    DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox,
-    sleep, refresh, chr, ord, trim, empty,
-    GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
+	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,
+	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/media.js

@@ -81,9 +81,9 @@ class UserMedia {
 	}
 
 	/** SystemPermissionDenied => (macOS) browser does not have permission to access cam/mic */
-    /** UserPermissionDenied => user denied permission for site to access cam/mic */
-    /** CouldNotStartVideoSource = > (Windows) browser does not have permission to access cam/mic OR camera is in use by another application or browser tab */
-    /** Generic => all other errors */
+	/** UserPermissionDenied => user denied permission for site to access cam/mic */
+	/** CouldNotStartVideoSource = > (Windows) browser does not have permission to access cam/mic OR camera is in use by another application or browser tab */
+	/** Generic => all other errors */
 
 	static requestMediaPermissions(constraints) {
 		/*try {
@@ -95,7 +95,7 @@ class UserMedia {
 		return new Promise((resolve, reject) => {	
 			const bowser = require('bowser');
 			const browser = bowser.getParser(window.navigator.userAgent);
-            const browserName = browser.getBrowserName();
+			const browserName = browser.getBrowserName();
 
 			navigator.mediaDevices.getUserMedia(constraints !== 'undefined' ? constraints : { audio: true, video: true })
 			.then((stream) => resolve(stream))

package/network.js

@@ -1,20 +1,55 @@
 
 class HTTPRequest {
-	static async get(url, data, successCallback, errorCallback) {
+	static setRefreshTokenUrl(url) {
+		this.refreshTokenUrl = url;
+	}
+	static setRefreshTokenCallback(callback) {
+		this.refreshTokenCallback = callback;
+	}
+
+	static setHeader(key, value) {
+		if (typeof this.headers == 'undefined') {
+			this.headers = {};
+		}
+		this.headers[key] = value;
+	}
+
+	static getHeaders() {
+		//if (typeof httpHeaders != 'undefined') {
+		//	return httpHeaders;
+		//}
+
+		if (typeof this.headers == 'undefined') {
+			this.headers = {};
+		}
+
+		let httpHeaders = new Headers();
+		Object.entries(this.headers).forEach(([key, value]) => {
+			httpHeaders.append(key, value);
+		});
+		return httpHeaders;
+	}
+
+	static formatQueryString(data) {
 		if (data == null) {
-			data = '';
+			return '';
 		}
-		else if (typeof data == 'object') {
+		if (typeof data == 'object') {
 			data = UrlAndQueryString.buildQuery(data);
 		}
 		if (data !== '' && data.substring(0, 1) !== '&') {
 			data = '&' + data;
 		}
+		return data;
+	}
+
+	static async get(url, data, successCallback, errorCallback) {
+		data = this.formatQueryString(data);
 
 		if (window.fetch) {
 			let requestInit = {
 				method: 'GET',
-				headers: _httpHeaders,		
+				headers: HTTPRequest.getHeaders(),
 				mode: 'cors',
 				cache: 'no-cache'
 			}
@@ -24,9 +59,10 @@ class HTTPRequest {
 			try {
 				jsonData = await response.json();
 				//console.log(url, jsonData);
+				//console.log(response.status, response.statusText, jsonData['error']);
 
-				if (response.status == 401 && response.statusText == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.get(url, data, successCallback, errorCallback));
+				if (response.status == 401 && (response.statusText === "Expired JWT Token" || typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token')) {
+					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
 					return;
 				}
 
@@ -37,10 +73,14 @@ class HTTPRequest {
 			}
 			catch (e) {
 				console.log(e);
-				errorCallback(response, response.status, e);
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+					errorCallback(response, response.status, e);
+				}
 				return;
 			}
-			errorCallback(response, response.status, null, jsonData);
+			if (typeof errorCallback != 'undefined' && errorCallback != null) {
+				errorCallback(response, response.status, null, jsonData);
+			}
 			return;
 		}
 
@@ -49,14 +89,16 @@ class HTTPRequest {
 		$.ajax({
 			type: 'GET',
 			url: url + (!url.includes('?') ? '?' : '') + data,
-			headers: httpHeaders,
+			headers: HTTPRequest.getHeaders(),
 			dataType: 'json',
 			cache: false,
 			success: (data) => successCallback(data),
 			error: (jqxhr, status, exception) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && jqxhr.responseJSON.message == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.get(url, data, successCallback, errorCallback));
-				} else {
+				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' ))) {
+					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
+					return;
+				}
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
 					errorCallback(jqxhr, status, exception);
 				}
 			}
@@ -64,21 +106,12 @@ class HTTPRequest {
 	}
 
 	static async download(url, data, errorCallback, completeCallback) {
-		if (data == null) {
-			data = '';
-		}
-		else if (typeof data == 'object') {
-			data = UrlAndQueryString.buildQuery(data);
-		}
-		if (data !== '' && data.substring(0, 1) !== '&') {
-			data = '&' + data;
-		}
-
+		data = this.formatQueryString(data);
 
 		if (window.fetch) {
 			let requestInit = {
 				method: 'GET',
-				headers: _httpHeaders,
+				headers: HTTPRequest.getHeaders(),
 				mode: 'cors',
 				cache: 'no-cache'
 			}
@@ -89,8 +122,8 @@ class HTTPRequest {
 				/*console.log(url);
 				console.log(blobData);*/
 
-				if (response.status == 401 && response.statusText == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.download(url, data, errorCallback, completeCallback));
+				if (response.status == 401 && response.statusText === "Expired JWT Token") {
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback));
 					return;
 				}
 
@@ -118,16 +151,18 @@ class HTTPRequest {
 		$.ajax({
 			type: 'GET',
 			url: url + (!url.includes('?') ? '?' : '') + data,
-			headers: httpHeaders,
+			headers: HTTPRequest.getHeaders(),
 			cache: false,
 			xhrFields: {
 				responseType: 'blob'
 			},
 			success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
 			error: (jqxhr, status, exception) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && jqxhr.responseJSON.message == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.download(url, data, errorCallback, completeCallback));
-				} else if (typeof errorCallback != 'undefined' && errorCallback != null) {
+				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' ))) {
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback));
+					return;
+				}
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
 					errorCallback(jqxhr, status, exception);
 				}
 			},
@@ -140,11 +175,17 @@ class HTTPRequest {
 	}
 
 	static async post(url, formData, successCallback, errorCallback, formErrorCallback) {
+		if (!(formData instanceof FormData)) {
+			let formDataObject = new FormData();
+			Object.entries(formData).forEach(([key, value]) => formDataObject.append(key, value));
+			formData = formDataObject;
+		}
+
 		if (window.fetch && false) {
 			let requestInit = {
 				method: 'POST',
 				body: formData,
-				headers: _httpHeaders,		
+				headers: HTTPRequest.getHeaders(),
 				mode: 'cors',
 				cache: 'no-cache'
 			};
@@ -156,8 +197,8 @@ class HTTPRequest {
 				jsonData = await response.json();
 				//console.log(url, jsonData);
 
-				if (response.status == 401 && response.statusText == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
+				if (response.status == 401 && (response.statusText === "Expired JWT Token" || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
+					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
 
@@ -173,11 +214,15 @@ class HTTPRequest {
 			}
 			catch (e) {
 				console.log(e);
-				errorCallback(response, response.status, e);
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+					errorCallback(response, response.status, e);
+				}
 				return;
 			}
 
-			errorCallback(response, response.status, null, jsonData);
+			if (typeof errorCallback != 'undefined' && errorCallback != null) {
+				errorCallback(response, response.status, null, jsonData);
+			}
 			return;
 		}
 
@@ -186,7 +231,7 @@ class HTTPRequest {
 		$.ajax({
 			type: 'POST',
 			url: url,
-			headers: httpHeaders,
+			headers: HTTPRequest.getHeaders(),
 			dataType: 'json', // 22/09/2020 : à voir si cette ligne pose pb (utilisé pour requete import et peut être d'autres
 			data: formData,
 			cache: false,
@@ -194,27 +239,42 @@ class HTTPRequest {
 			processData: false,
 			success: (data) => successCallback(data),
 			error: (jqxhr, status, exception) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && jqxhr.responseJSON.message == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
-				} else if (jqxhr.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
+				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' ))) {
+					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
+					return;
+				}
+				if (jqxhr.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
 					formErrorCallback(jqxhr, status, exception);
-				} else {
+					return;
+				}
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
 					errorCallback(jqxhr, status, exception);
 				}
 			}
 		});
 	}
 
-	static refreshToken(url, onCompleteCallback) {
+	static refreshToken(onCompleteCallback) {
+		if (typeof this.refreshTokenCallback == 'function') {
+			this.refreshTokenCallback(onCompleteCallback);
+			return;
+		}
+
+		if (typeof this.refreshTokenUrl == 'undefined') {
+			console.error('URL refresh token non définie. Appeler HTTPRequest.setRefreshTokenUrl(url)');
+			return;
+		}
+
 		let payload = new FormData();
 		payload.append('refresh_token', JwtSession.getRefreshToken());
 
-		HTTPRequest.post(url, payload,
+		HTTPRequest.post(this.refreshTokenUrl, payload,
 			(data) => {
 				JwtSession.setToken(data.token);
 				JwtSession.setRefreshToken(data.refresh_token);
 				onCompleteCallback();
-			}, (jqxhr, status, exception) => {
+			}, 
+			(jqxhr, status, exception) => {
 				console.log(exception);
 				JwtSession.logout();
 			}

package/package.json

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