@osimatic/helpers-js 1.0.23 → 1.0.24

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/changelog.txt

@@ -26,3 +26,8 @@ getValuesByKeyInArrayOfArrays(array, ...) -> array.getValuesByKeyInArrayOfArrays
 hasGetUserMedia() -> non remplacé
 
 paginationAsList(...) -> Pagination.paginate(...)
+
+getDateObjectSelected(lien) -> getSelectedDate(lien.closest('.form-group')
+selectFormDate(lien) -> setSelectedDate(lien.closest('.form-group')
+majSelectPeriode() / majSelectCompare() -> updatePeriodSelect(form)
+

package/form_date.js

@@ -1,28 +1,299 @@
-class FormDate {
+const {Object} = require('./index');
+
+class FormDate {
+	static initForm(form) {
+		// ---------- Choix période (new) ----------
+
+		// Formulaire de sélection de période
+		if (form.find('select.periode').length > 0) {
+			form.find('select.periode').change(function() {
+				FormDate.updatePeriodSelect($(this).closest('form'));
+			});
+			FormDate.updatePeriodSelect($(this).closest('form'));
+		}
+
+
+		// ---------- Choix période (old) ----------
+
+		if (form.find('select.day').length > 0 && form.find('select.month').length > 0 && form.find('select.year').length > 0) {
+			form.find('select.year').after(
+				'<br/>'+
+				'<p class="select_date_fastly">'+
+				'	<a href="#" class="lien_form_today">Auj.</a> - '+
+				'	<a href="#" class="lien_form_yesterday">Hier</a> - '+
+				'	<a href="#" class="lien_form_current_month">Ce mois-ci</a> - '+
+				'	<a href="#" class="lien_form_last_month">Le mois dernier</a> - '+
+				'	<a href="#" class="lien_form_current_year">Cette année</a>'+
+				'	- '+
+				'	<a href="#" class="lien_form_date_prev_day">Jour précédent</a>'+
+				'	- '+
+				'	<a href="#" class="lien_form_date_next_day">Jour suivant</a>'+
+				'</p>'
+			);
+		}
+		else if (form.find('select.month').length > 0 && form.find('select.year').length > 0) {
+			form.find('select.year').after(
+				'<br/>'+
+				'<p class="select_date_fastly">'+
+				'	<a href="#" class="lien_form_current_month">Ce mois-ci</a> - '+
+				'	<a href="#" class="lien_form_last_month">Le mois dernier</a> - '+
+				'	<a href="#" class="lien_form_current_year">Cette année</a>'+
+				'</p>'
+			);
+		}
+
+		if (form.find('select.dayCompare').length > 0 && form.find('select.monthCompare').length > 0 && form.find('select.yearCompare').length > 0) {
+			form.find('select.yearCompare').after(
+				'<br/>'+
+				'<p class="select_date_fastly">'+
+				'	<a href="#" class="lien_form_yesterday">Hier</a> - '+
+				'	<a href="#" class="lien_form_day_moins_7">J-7</a> - '+
+				'	<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>'+
+				'</p>'
+			);
+		}
+
+		// Lien de sélection de date
+
+		if (form.find('a.lien_form_today').length > 0) {
+			form.find('a.lien_form_today').click(function() {
+				FormDate.setTodaySelected($(this).closest('.form-group'));
+				return false;
+			});
+		}
+		if (form.find('a.lien_form_yesterday').length > 0) {
+			form.find('a.lien_form_yesterday').click(function() {
+				FormDate.addNbDaysToToday($(this).closest('.form-group'), -1);
+				return false;
+			});
+		}
+		if (form.find('a.lien_form_day_moins_7').length > 0) {
+			form.find('a.lien_form_day_moins_7').click(function() {
+				FormDate.addNbDaysToToday($(this).closest('.form-group'), -7);
+				return false;
+			});
+		}
+		if (form.find('a.lien_form_day_moins_8').length > 0) {
+			form.find('a.lien_form_day_moins_8').click(function() {
+				FormDate.addNbDaysToToday($(this).closest('.form-group'), -8);
+				return false;
+			});
+		}
+
+		if (form.find('a.lien_form_current_month').length > 0) {
+			form.find('a.lien_form_current_month').click(function() {
+				FormDate.setCurrentMonthSelected($(this).closest('.form-group'));
+				return false;
+			});
+		}
+		if (form.find('a.lien_form_last_month').length > 0) {
+			form.find('a.lien_form_last_month').click(function() {
+				FormDate.addNbMonthsToToday($(this).closest('.form-group'), -1);
+				return false;
+			});
+		}
+		if (form.find('a.lien_form_month_moins_2').length > 0) {
+			form.find('a.lien_form_month_moins_2').click(function() {
+				FormDate.addNbMonthsToToday($(this).closest('.form-group'), -2);
+				return false;
+			});
+		}
+
+		if (form.find('a.lien_form_current_year').length > 0) {
+			form.find('a.lien_form_current_year').click(function() {
+				FormDate.setCurrentYearSelected($(this).closest('.form-group'));
+				return false;
+			});
+		}
+		if (form.find('a.lien_form_last_year').length > 0) {
+			form.find('a.lien_form_last_year').click(function() {
+				FormDate.addNbYearsToToday($(this).closest('.form-group'), -1);
+				return false;
+			});
+		}
+
+		if (form.find('a.lien_form_date_prev_day').length > 0) {
+			form.find('a.lien_form_date_prev_day').click(function() {
+				FormDate.addNbDaysToSelectedDate($(this).closest('.form-group'), -1);
+				return false;
+			});
+		}
+		if (form.find('a.lien_form_date_next_day').length > 0) {
+			form.find('a.lien_form_date_next_day').click(function() {
+				FormDate.addNbDaysToSelectedDate($(this).closest('.form-group'), 1);
+				return false;
+			});
+		}
+
+		//if ($('form select[name=select_date_fastly]').length > 0) {
+		//	$('form select[name=select_date_fastly]').change(function() {
+		//		valueOptionSelected = $('form select[name=select_date_fastly] option:selected').attr('value');
+		//		if (valueOptionSelected == 'today') {
+		//			selectFormDateToday();
+		//		}
+		//		else if (valueOptionSelected == 'current_month') {
+		//			selectFormDateCurrentMonth();
+		//		}
+		//	});
+		//}
+	}
+
+	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 setTodaySelected(periodFormGroup) {
+		let date = new Date();
+		FormDate.setSelectedDate(periodFormGroup, date.getDate(), (date.getMonth() + 1), date.getFullYear());
+	}
+	static setCurrentMonthSelected(periodFormGroup) {
+		let date = new Date();
+		FormDate.setSelectedDate(periodFormGroup, -1, (date.getMonth() + 1), date.getFullYear());
+	}
+	static setCurrentYearSelected(periodFormGroup) {
+		let today = new Date();
+		FormDate.setSelectedDate(periodFormGroup, -1, -1, today.getFullYear());
+	}
+
+	static addNbDaysToToday(periodFormGroup, nbDays) {
+		FormDate.addNbDaysToSelectedDate(periodFormGroup, nbDays, false);
+	}
+	static addNbMonthsToToday(periodFormGroup, nbMonths) {
+		FormDate.addNbMonthsToSelectedDate(periodFormGroup, nbMonths, false);
+	}
+	static addNbYearsToToday(periodFormGroup, nbYears) {
+		FormDate.addNbYearsToSelectedDate(periodFormGroup, nbYears, false);
+	}
+
+	static addNbDaysToSelectedDate(periodFormGroup, nbDays, fromSelectedDate) {
+		let date = typeof fromSelectedDate == 'undefined' || fromSelectedDate ? FormDate.getSelectedDate(periodFormGroup) : new Date();
+		date.setDate(date.getDate() + nbDays);
+		FormDate.setSelectedDate(periodFormGroup, date.getDate(), (date.getMonth() + 1), date.getFullYear());
+	}
+	static addNbMonthsToSelectedDate(periodFormGroup, nbMonths, fromSelectedDate) {
+		let date = typeof fromSelectedDate == 'undefined' || fromSelectedDate ? FormDate.getSelectedDate(periodFormGroup) : new Date();
+		date.setDate(1);
+		date.setMonth(date.getMonth() - nbMonths);
+		FormDate.setSelectedDate(periodFormGroup, -1, (date.getMonth() + 1), date.getFullYear());
+	}
+	static addNbYearsToSelectedDate(periodFormGroup, nbYears, fromSelectedDate) {
+		let date = typeof fromSelectedDate == 'undefined' || fromSelectedDate ? FormDate.getSelectedDate(periodFormGroup) : new Date();
+		FormDate.setSelectedDate(periodFormGroup, -1, -1, date.getFullYear() - nbYears);
+	}
+
+	static getSelectedDate(periodFormGroup) {
+		let day = periodFormGroup.find('select.day').val();
+		let month = periodFormGroup.find('select.month').val();
+		let year = periodFormGroup.find('select.year').val();
+		if (null != day && null != month && null != year) {
+			return new Date(year, month - 1, day);
+		}
+		return new Date();
+	}
+	
+	static setSelectedDate(periodFormGroup, day, month, year) {
+		periodFormGroup.find('select.day').val(day);
+		periodFormGroup.find('select.month').val(month);
+		periodFormGroup.find('select.year').val(year);
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	// deprecated
+
+	/** @deprecated */
 	static majSelectPeriode(select) {
-		if (select.find(':selected').attr('value') == 'perso') {
+		if (select.find(':selected').attr('value') === 'perso') {
 			select.parent().parent().next().removeClass('hide');
 		}
 		else {
 			select.parent().parent().next().addClass('hide');
 		}
 	}
-	
+
+	/** @deprecated */
 	static majSelectCompare() {
-		if ($('form select#periodeCompare').length == 0) {
+		if ($('form select#periodeCompare').length === 0) {
 			return;
 		}
-	
-		var listValues = [];
-		periodeSelected = $('form select.periode :selected').attr('value');
-		selectCompare = $('form select#periodeCompare');
-		periodeCompareSelected = selectCompare.find(':selected').attr('value');
-	
+
+		let listValues = [];
+		let periodeSelected = $('form select.periode :selected').attr('value');
+		let selectCompare = $('form select#periodeCompare');
+		let periodeCompareSelected = selectCompare.find(':selected').attr('value');
+		let valueDefault = null;
+
 		selectCompare.find('option').removeAttr('disabled');
-	
+
 		$.each(listePeriodeCompare, function (idx, tabListPeriode) {
 			if (idx != 0) {
-				listKeyPeriode = array_keys(tabListPeriode.list);
+				let listKeyPeriode = array_keys(tabListPeriode.list);
 				if (in_array(periodeSelected, listKeyPeriode)) {
 					listValues = listKeyPeriode;
 					valueDefault = listKeyPeriode[1];
@@ -32,234 +303,85 @@
 				}
 			}
 		});
-	
-		if (periodeSelected == 'perso') {
+
+		if (periodeSelected === 'perso') {
 			valueDefault = 'perso';
 		}
-		else if (periodeCompareSelected != 'perso' && in_array(periodeCompareSelected, listValues)) {
+		else if (periodeCompareSelected !== 'perso' && in_array(periodeCompareSelected, listValues)) {
 			valueDefault = periodeCompareSelected;
 		}
 		selectCompare.find('option[value="' + valueDefault + '"]').attr('selected', 'selected');
-	
-		majSelectPeriode(selectCompare);
+
+		FormDate.majSelectPeriode(selectCompare);
 	}
-	
+
+	/** @deprecated */
 	static selectFormDateToday(lien) {
-		date = new Date();
-		selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
+		let date = new Date();
+		FormDate.selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
 	}
-	
+
+	/** @deprecated */
 	static selectFormDateDayMoinsNb(lien, nbJoursMoins) {
-		date = new Date();
+		let date = new Date();
 		date.setDate(date.getDate() - nbJoursMoins);
-		selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
+		FormDate.selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
 	}
-	
+
+	/** @deprecated */
 	static selectFormDateCurrentMonth(lien) {
-		date = new Date();
-		selectFormDate(lien, -1, (date.getMonth() + 1), date.getFullYear());
+		let date = new Date();
+		FormDate.selectFormDate(lien, -1, (date.getMonth() + 1), date.getFullYear());
 	}
-	
+
+	/** @deprecated */
 	static selectFormDateMonthMoinsNb(lien, nbMoisMoins) {
-		date = new Date();
+		let date = new Date();
 		date.setDate(1);
 		date.setMonth(date.getMonth() - nbMoisMoins);
-		selectFormDate(lien, -1, (date.getMonth() + 1), date.getFullYear());
+		FormDate.selectFormDate(lien, -1, (date.getMonth() + 1), date.getFullYear());
 	}
-	
+
+	/** @deprecated */
 	static selectFormDateCurrentYear(lien) {
-		today = new Date();
-		selectFormDate(lien, -1, -1, today.getFullYear());
+		let today = new Date();
+		FormDate.selectFormDate(lien, -1, -1, today.getFullYear());
 	}
-	
+
+	/** @deprecated */
 	static selectFormDateYearMoinsNb(lien, nbAnneesMoins) {
-		today = new Date();
-		selectFormDate(lien, -1, -1, today.getFullYear() - nbAnneesMoins);
+		let today = new Date();
+		FormDate.selectFormDate(lien, -1, -1, today.getFullYear() - nbAnneesMoins);
 	}
-	
+
+	/** @deprecated */
 	static selectFormDateAddDayFromSelectedDay(lien, nbDaysAdded) {
-		date = getDateObjectSelected(lien);
+		let date = FormDate.getDateObjectSelected(lien);
 		date.setDate(date.getDate() + nbDaysAdded);
-		selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
+		FormDate.selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
 	}
-	
+
+	/** @deprecated */
 	static getDateObjectSelected(lien) {
-		selectorDay = '#' + (lien.parent().prev().prev().prev().prev().attr('id')) + ' option:selected';
-		selectorMonth = '#' + (lien.parent().prev().prev().prev().attr('id')) + ' option:selected';
-		selectorYear = '#' + (lien.parent().prev().prev().attr('id')) + ' option:selected';
+		let selectorDay = '#' + (lien.parent().prev().prev().prev().prev().attr('id')) + ' option:selected';
+		let selectorMonth = '#' + (lien.parent().prev().prev().prev().attr('id')) + ' option:selected';
+		let selectorYear = '#' + (lien.parent().prev().prev().attr('id')) + ' option:selected';
 		if ($(selectorDay).length > 0 && $(selectorMonth).length > 0 && $(selectorYear).length > 0) {
 			return new Date($(selectorYear).attr('value'), $(selectorMonth).attr('value') - 1, $(selectorDay).attr('value'));
 		}
 		return new Date();
 	}
-	
+
+	/** @deprecated */
 	static selectFormDate(lien, day, month, year) {
-		selectorDay = '#' + (lien.parent().prev().prev().prev().prev().attr('id')) + ' option[value=' + day + ']';
-		selectorMonth = '#' + (lien.parent().prev().prev().prev().attr('id')) + ' option[value=' + month + ']';
-		selectorYear = '#' + (lien.parent().prev().prev().attr('id')) + ' option[value=' + 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 + ']';
+		let selectorYear = '#' + (lien.parent().prev().prev().attr('id')) + ' option[value=' + year + ']';
 		if ($(selectorDay).length > 0) $(selectorDay).prop('selected', 'selected');
 		if ($(selectorMonth).length > 0) $(selectorMonth).prop('selected', 'selected');
 		if ($(selectorYear).length > 0) $(selectorYear).prop('selected', 'selected');
 	}
+
 }
 
 module.exports = { FormDate };
-
-
-//A DEPLACER DANS LE PROJET MYTIME
-/*$(function() {
-	// ---------- Choix période (new) ----------
-
-	// Formulaire de sélection de période
-	
-	if ($('form select.periode').length > 0) {
-		$('form select.periode').change(function() {
-			majSelectPeriode($(this));
-			
-			if ($(this).attr('id') == 'periode') {
-				majSelectCompare();
-			}
-		});
-	}	
-
-	majSelectCompare();
-	// majSelectPeriode($('form select#periodeCompare'));
-	
-
-	// ---------- Choix période (old) ----------
-	
-	if ($('form #day').length > 0 && $('form #month').length > 0 && $('form #year').length > 0) {
-		$('form #year').after(
-			'<br/>'+
-			'<p class="select_date_fastly">'+
-			'	<a href="#" class="lien_form_today">Auj.</a> - '+
-			'	<a href="#" class="lien_form_yesterday">Hier</a> - '+
-			'	<a href="#" class="lien_form_current_month">Ce mois-ci</a> - '+
-			'	<a href="#" class="lien_form_last_month">Le mois dernier</a> - '+
-			'	<a href="#" class="lien_form_current_year">Cette année</a>'+
-			'	- '+
-			'	<a href="#" class="lien_form_date_prev_day">Jour précédent</a>'+
-			'	- '+
-			'	<a href="#" class="lien_form_date_next_day">Jour suivant</a>'+
-			'</p>'+
-			''
-		);
-	}
-	else if ($('form #month').length > 0 && $('form #year').length > 0) {
-		$('form #year').after(
-			'<br/>'+
-			'<p class="select_date_fastly">'+
-			'	<a href="#" class="lien_form_current_month">Ce mois-ci</a> - '+
-			'	<a href="#" class="lien_form_last_month">Le mois dernier</a> - '+
-			'	<a href="#" class="lien_form_current_year">Cette année</a>'+
-			'</p>'+
-			''
-		);
-	}
-
-	if ($('form #dayCompare').length > 0 && $('form #monthCompare').length > 0 && $('form #yearCompare').length > 0) {
-		$('form #yearCompare').after(
-			'<br/>'+
-			'<p class="select_date_fastly">'+
-			'	<a href="#" class="lien_form_yesterday">Hier</a> - '+
-			'	<a href="#" class="lien_form_day_moins_7">J-7</a> - '+
-			'	<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>'+
-			'</p>'+
-			''
-		);
-	}
-
-	// Lien de sélection de date
-	
-	if ($('form a.lien_form_today').length > 0) {
-		$('form a.lien_form_today').click(function() {
-			selectFormDateToday($(this));
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_yesterday').length > 0) {
-		$('form a.lien_form_yesterday').click(function() {
-			selectFormDateDayMoinsNb($(this), 1);
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_day_moins_7').length > 0) {
-		$('form a.lien_form_day_moins_7').click(function() {
-			selectFormDateDayMoinsNb($(this), 7);
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_day_moins_8').length > 0) {
-		$('form a.lien_form_day_moins_8').click(function() {
-			selectFormDateDayMoinsNb($(this), 8);
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_current_month').length > 0) {
-		$('form a.lien_form_current_month').click(function() {
-			selectFormDateCurrentMonth($(this));
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_last_month').length > 0) {
-		$('form a.lien_form_last_month').click(function() {
-			selectFormDateMonthMoinsNb($(this), 1);
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_month_moins_2').length > 0) {
-		$('form a.lien_form_month_moins_2').click(function() {
-			selectFormDateMonthMoinsNb($(this), 2);
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_current_year').length > 0) {
-		$('form a.lien_form_current_year').click(function() {
-			selectFormDateCurrentYear($(this));
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_last_year').length > 0) {
-		$('form a.lien_form_last_year').click(function() {
-			selectFormDateYearMoinsNb($(this), 1);
-			return false;
-		});
-	}
-	
-	if ($('form a.lien_form_date_prev_day').length > 0) {
-		$('form a.lien_form_date_prev_day').click(function() {
-			selectFormDateAddDayFromSelectedDay($(this), -1);
-			return false;
-		});
-	}
-	if ($('form a.lien_form_date_next_day').length > 0) {
-		$('form a.lien_form_date_next_day').click(function() {
-			selectFormDateAddDayFromSelectedDay($(this), 1);
-			return false;
-		});
-	}
-
-	//if ($('form select[name=select_date_fastly]').length > 0) {
-	//	$('form select[name=select_date_fastly]').change(function() {
-	//		valueOptionSelected = $('form select[name=select_date_fastly] option:selected').attr('value');
-	//		if (valueOptionSelected == 'today') {
-	//			selectFormDateToday();
-	//		}
-	//		else if (valueOptionSelected == 'current_month') {
-	//			selectFormDateCurrentMonth();
-	//		}
-	//	});
-	//}
-	
-});*/

package/form_helper.js

@@ -72,7 +72,7 @@ class FormHelper {
 
 			var input = form.find('[name="'+key+'"]');
 
-			if (input.prop('type') == 'radio' || input.prop('type') == 'checkbox') {
+			if (input.prop('type') === 'radio' || input.prop('type') === 'checkbox') {
 				input.prop('checked', false);
 				input.filter('[value="'+value+'"]').prop('checked', true);
 				return;
@@ -187,8 +187,8 @@ class FormHelper {
 	}
 
 	static getFormErrorText(errors) {
-		var errorLabels = '';
-		for (var property in errors) {
+		let errorLabels = '';
+		for (let property in errors) {
 			if (typeof errors[property] != 'function') {
 				errorLabels += '<span>' + errors[property] + '</span><br>';
 			}
@@ -197,8 +197,8 @@ class FormHelper {
 	}
 
 	static getFormErrorTextBis(errors) {
-		var errorLabels = '';
-		for (var property in errors) {
+		let errorLabels = '';
+		for (let property in errors) {
 			// console.log(property);
 			if (typeof errors[property] != 'function') {
 				if (typeof errors[property]['error_description'] === 'undefined') {
@@ -211,8 +211,8 @@ class FormHelper {
 		return errorLabels;
 	}
 
-	static displayFormErrors(form, btnSubmit, errors) {
-		this.displayFormErrorsFromText(form, this.getFormErrorTextBis(errors));
+	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv) {
+		this.displayFormErrorsFromText(form, this.getFormErrorTextBis(errors), errorWrapperDiv);
 		if (btnSubmit != null) {
 			if (btnSubmit.buttonLoader != null) {
 				btnSubmit.buttonLoader('reset');
@@ -226,20 +226,25 @@ class FormHelper {
 		this.displayFormErrors(form, btnSubmit, xhr.responseJSON);
 	}
 
-	static displayFormErrorsFromText(form, errorLabels) {
-		var errorDiv = '<div class="alert alert-danger form_errors">'+errorLabels+'</div>';
-		var errorsParentDiv = form;
+	static displayFormErrorsFromText(form, errorLabels, errorWrapperDiv) {
+		let errorDiv = '<div class="alert alert-danger form_errors">'+errorLabels+'</div>';
+
+		if (typeof errorWrapperDiv != 'undefined' && errorWrapperDiv != null) {
+			errorWrapperDiv.append(errorDiv);
+			return;
+		}
 
 		if (form.find('.form_errors_content').length) {
 			form.find('.form_errors_content').append(errorDiv);
 			return;
 		}
 
+		let errorsParentDiv = form;
 		if (form.find('.modal-body').length) {
 			errorsParentDiv = form.find('.modal-body');
 		}
 
-		var firstFormGroup = errorsParentDiv.find('.form-group:first');
+		let firstFormGroup = errorsParentDiv.find('.form-group:first');
 		if (firstFormGroup.length) {
 			if (firstFormGroup.parent().parent().hasClass('row')) {
 				firstFormGroup.parent().parent().before(errorDiv);

package/index.js

@@ -4,6 +4,7 @@
 // rien à exporter (que des extensions d'objet natif)
 require('./string');
 require('./array');
+require('./number');
 
 // exports d'ojets non natif
 const { HTTPRequest, Cookie, UrlAndQueryString } = require('./network');
@@ -40,11 +41,10 @@ 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, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, InputPeriod, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, Location, SocialNetwork, NumberValue, FormDate,
+    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

package/media.js

@@ -75,13 +75,23 @@ class AudioMedia {
 }
 
 //Source : https://www.npmjs.com/package/mic-check
-class UserMedia { 
+class UserMedia {
+	static hasGetUserMedia() {
+		return !!(navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia);
+	}
+
 	/** 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 */
 
 	static requestMediaPermissions(constraints) {
+		/*try {
+			console.log(require.resolve("bowser"));
+		} catch(e) {
+			return;
+		}*/
+
 		return new Promise((resolve, reject) => {	
 			const bowser = require('bowser');
 			const browser = bowser.getParser(window.navigator.userAgent);
@@ -146,8 +156,3 @@ class UserMedia {
 }
 
 module.exports = { AudioMedia, UserMedia };
-
-//deprecated
-function hasGetUserMedia() {
-	return !!(navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia);
-}

package/number.js

@@ -1,68 +1,4 @@
 
-/** @deprecated */
-class NumberValue {
-	/** @deprecated */
-	static isNumeric(sText) {
-		var ValidChars = "0123456789.";
-		var IsNumber=true;
-		var Char;
-		for (i = 0; i < sText.length && IsNumber == true; i++){
-			Char = sText.charAt(i);
-			if (ValidChars.indexOf(Char) == -1){
-				IsNumber = false;
-			}
-		}
-		return IsNumber;
-	}
-
-	/** @deprecated */
-	static format(number, nbDecimal, locale) {
-		nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
-		return new Intl.NumberFormat(locale, {
-			minimumFractionDigits: nbDecimal,
-			maximumFractionDigits: nbDecimal
-		}).format(number);
-	}
-
-	/** @deprecated */
-	static formatCurrency(montant, currency, nbDecimal, locale) {
-		nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
-		return new Intl.NumberFormat(locale, {
-			style: 'currency',
-			currency: currency,
-			minimumFractionDigits: nbDecimal,
-			maximumFractionDigits: nbDecimal
-		}).format(montant);
-	}
-
-	/** @deprecated */
-	static formatPercent(number, nbDecimal, locale) {
-		nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
-		return new Intl.NumberFormat(locale, {
-			style: 'percent',
-			minimumFractionDigits: nbDecimal,
-			maximumFractionDigits: nbDecimal
-		}).format(number);
-	}
-
-	/** @deprecated */
-	static random(min, max) {
-		return Math.floor(Math.random() * (max - min + 1)) + min;
-	}
-
-	/** @deprecated */
-	static padLeft2(n) {
-		return n > 9 ? "" + n: "0" + n;
-	}
-
-	/** @deprecated */
-	static roundDecimal(nombre, precision) {
-		precision = precision || 2;
-		var tmp = Math.pow(10, precision);
-		return Math.round(nombre*tmp) / tmp;
-	}
-}
-
 Number.prototype.format = Number.prototype.format || function(nbDecimal, locale) {
 	nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
 	return new Intl.NumberFormat(locale, {
@@ -150,5 +86,3 @@ Number.prototype.formatAsPercent = function(locale, minimumFractionDigits) {
 	minimumFractionDigits = (typeof minimumFractionDigits != 'undefined'?minimumFractionDigits:0);
 	return new Intl.NumberFormat(locale, {style: 'percent', minimumFractionDigits:minimumFractionDigits}).format(this);
 };
-
-module.exports = { NumberValue };

package/package.json

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