@osimatic/helpers-js 1.0.20 → 1.0.23

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

@@ -1,20 +1,5 @@
-
-$(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();
-			}
-		});
-	}
-	
-	function majSelectPeriode(select) {
+class FormDate {
+	static majSelectPeriode(select) {
 		if (select.find(':selected').attr('value') == 'perso') {
 			select.parent().parent().next().removeClass('hide');
 		}
@@ -23,19 +8,19 @@ $(function() {
 		}
 	}
 	
-	function majSelectCompare() {
+	static majSelectCompare() {
 		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');
-		
+	
 		selectCompare.find('option').removeAttr('disabled');
-		
-		$.each(listePeriodeCompare, function(idx, tabListPeriode) {
+	
+		$.each(listePeriodeCompare, function (idx, tabListPeriode) {
 			if (idx != 0) {
 				listKeyPeriode = array_keys(tabListPeriode.list);
 				if (in_array(periodeSelected, listKeyPeriode)) {
@@ -43,22 +28,100 @@ $(function() {
 					valueDefault = listKeyPeriode[1];
 				}
 				else {
-					selectCompare.find('option[value="'+listKeyPeriode[0]+'"]').parent().children().attr('disabled', 'disabled');
+					selectCompare.find('option[value="' + listKeyPeriode[0] + '"]').parent().children().attr('disabled', 'disabled');
 				}
 			}
 		});
-		
+	
 		if (periodeSelected == 'perso') {
 			valueDefault = 'perso';
 		}
 		else if (periodeCompareSelected != 'perso' && in_array(periodeCompareSelected, listValues)) {
 			valueDefault = periodeCompareSelected;
 		}
-		selectCompare.find('option[value="'+valueDefault+'"]').attr('selected', 'selected');
-		
+		selectCompare.find('option[value="' + valueDefault + '"]').attr('selected', 'selected');
+	
 		majSelectPeriode(selectCompare);
 	}
 	
+	static selectFormDateToday(lien) {
+		date = new Date();
+		selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
+	}
+	
+	static selectFormDateDayMoinsNb(lien, nbJoursMoins) {
+		date = new Date();
+		date.setDate(date.getDate() - nbJoursMoins);
+		selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
+	}
+	
+	static selectFormDateCurrentMonth(lien) {
+		date = new Date();
+		selectFormDate(lien, -1, (date.getMonth() + 1), date.getFullYear());
+	}
+	
+	static selectFormDateMonthMoinsNb(lien, nbMoisMoins) {
+		date = new Date();
+		date.setDate(1);
+		date.setMonth(date.getMonth() - nbMoisMoins);
+		selectFormDate(lien, -1, (date.getMonth() + 1), date.getFullYear());
+	}
+	
+	static selectFormDateCurrentYear(lien) {
+		today = new Date();
+		selectFormDate(lien, -1, -1, today.getFullYear());
+	}
+	
+	static selectFormDateYearMoinsNb(lien, nbAnneesMoins) {
+		today = new Date();
+		selectFormDate(lien, -1, -1, today.getFullYear() - nbAnneesMoins);
+	}
+	
+	static selectFormDateAddDayFromSelectedDay(lien, nbDaysAdded) {
+		date = getDateObjectSelected(lien);
+		date.setDate(date.getDate() + nbDaysAdded);
+		selectFormDate(lien, date.getDate(), (date.getMonth() + 1), date.getFullYear());
+	}
+	
+	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';
+		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();
+	}
+	
+	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 + ']';
+		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'));
 	
@@ -187,76 +250,16 @@ $(function() {
 		});
 	}
 
-	/*
-	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();
-			}
-		});
-	}
-	*/
-
-	function selectFormDateToday(lien) {
-		date = new Date();
-		selectFormDate(lien, date.getDate(), (date.getMonth()+1), date.getFullYear());
-	}
-	
-	function selectFormDateDayMoinsNb(lien, nbJoursMoins) {
-		date = new Date();
-		date.setDate(date.getDate() - nbJoursMoins);
-		selectFormDate(lien, date.getDate(), (date.getMonth()+1), date.getFullYear());
-	}
-	
-	function selectFormDateCurrentMonth(lien) {
-		date = new Date();
-		selectFormDate(lien, -1, (date.getMonth()+1), date.getFullYear());
-	}
-	
-	function selectFormDateMonthMoinsNb(lien, nbMoisMoins) {
-		date = new Date();
-		date.setDate(1);
-		date.setMonth(date.getMonth() - nbMoisMoins);
-		selectFormDate(lien, -1, (date.getMonth()+1), date.getFullYear());
-	}
-	
-	function selectFormDateCurrentYear(lien) {
-		today = new Date();
-		selectFormDate(lien, -1, -1, today.getFullYear());
-	}
-	
-	function selectFormDateYearMoinsNb(lien, nbAnneesMoins) {
-		today = new Date();
-		selectFormDate(lien, -1, -1, today.getFullYear()-nbAnneesMoins);
-	}
-	
-	function selectFormDateAddDayFromSelectedDay(lien, nbDaysAdded) {
-		date = getDateObjectSelected(lien);
-		date.setDate(date.getDate() + nbDaysAdded);
-		selectFormDate(lien, date.getDate(), (date.getMonth()+1), date.getFullYear());
-	}
-
-	function 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';
-		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();
-	}
-
-	function 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+']';
-		if ($(selectorDay).length > 0) 		$(selectorDay).prop('selected', 'selected');
-		if ($(selectorMonth).length > 0) 	$(selectorMonth).prop('selected', 'selected');
-		if ($(selectorYear).length > 0) 	$(selectorYear).prop('selected', 'selected');
-	}
+	//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/index.js

@@ -18,6 +18,7 @@ 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');
@@ -43,7 +44,7 @@ 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,
+    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,
     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

@@ -88,10 +88,8 @@ class UserMedia {
             const browserName = browser.getBrowserName();
 
 			navigator.mediaDevices.getUserMedia(constraints !== 'undefined' ? constraints : { audio: true, video: true })
-			.then((stream) => {
-				stream.getTracks().forEach((track) => track.stop());
-				resolve(stream);
-			}).catch((error) => {
+			.then((stream) => resolve(stream))
+			.catch((error) => {
 				const errName = error.name;
 				const errMessage = error.message;
 				let errorType = "Generic";

package/package.json

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

package/todos/graphiques.js

@@ -1,281 +0,0 @@
-
-// --------------------------------------------------------------------------------
-// Graphiques (new)
-// --------------------------------------------------------------------------------
-
-google.load("visualization", "1", {packages:["corechart"]});
-
-$(function() {
-	if (typeof(listeAllGraphiqueStats) != 'undefined'  && listeAllGraphiqueStats.length > 0) {
-		loadListAllGraphStats(listeAllGraphiqueStats);
-	}
-});
-
-function loadListAllGraphStats(listeAllGraphiqueStats) {
-	$.each(listeAllGraphiqueStats, function(idx, listGraphStats) {
-		loadAllGraphStats(listGraphStats);
-	});
-}
-
-function loadAllGraphStats(listGraphStats) {
-	if (typeof(initWidth) == 'undefined' || initWidth) {
-		console.log('ok');
-		var width = 0;
-		$.each(listGraphStats, function(idx, tabGraph) {
-			if ($('#'+tabGraph.id).length) {
-				if ($('#'+tabGraph.id).width() > 0) {
-					width = $('#'+tabGraph.id).width();
-				}
-			}
-		});
-	}
-
-	$.each(listGraphStats, function(idx, tabGraph) {
-		// console.log(width + ' ' + height);
-		drawGraphiqueStat(tabGraph.type_graph, tabGraph.id, tabGraph.title, tabGraph.libelle_abs, tabGraph.tab_data_abs, tabGraph.liste_libelle_ord, tabGraph.liste_tab_data_ord, tabGraph.list_color, tabGraph.format_ord, tabGraph.height, width);
-	});
-}
-
-function drawGraphiqueStat(typeGraph, idDiv, titre, libelleAbs, tabDataAbsParam, listeLibelleOrd, listeTabDataOrd, tabColor, formatData, height, width) {
-	if ($('#'+idDiv).length == 0) {
-		return;
-	}
-
-	var afficherLibelleOrd = false;
-
-	isStacked = false;
-	if (typeGraph == 'stacked_bar_chart') {
-		typeGraph = 'bar_chart';
-		isStacked = true;
-	}
-	if (typeGraph == 'stacked_column_chart') {
-		typeGraph = 'column_chart';
-		isStacked = true;
-	}
-	if (typeGraph == 'stacked_combo_chart') {
-		typeGraph = 'combo_chart';
-		isStacked = true;
-	}
-
-	isDualChart = false;
-	if (typeGraph == 'dual_column_chart') {
-		typeGraph = 'column_chart';
-		isDualChart = true;
-	}
-	if (typeGraph == 'dual_bar_chart') {
-		typeGraph = 'bar_chart';
-		isDualChart = true;
-	}
-
-	// Déclaration du tableau de données
-	var data = new google.visualization.DataTable();
-	data.addColumn('string', libelleAbs);
-	$.each(listeLibelleOrd, function(idx, libelleOrd) {
-		data.addColumn('number', libelleOrd);
-	});
-	
-	// Remplissage des données
-	var nbCells = 0;
-	var numRow = 0;
-	$.each(tabDataAbsParam, function(idx, dataAbs) {
-		// dataOrd = tabDataOrd[idx];
-		// data.addRow([dataAbs, dataOrd]);
-		data.addRows(1);
-		
-		data.setCell(numRow, 0, dataAbs);
-		
-		var numCell = 1;
-		$.each(listeTabDataOrd, function(idx2, tabDataOrd) {
-			data.setCell(numRow, numCell, tabDataOrd[idx]);
-			numCell++;
-		});
-
-		nbCells = numCell;
-		numRow++;
-	});
-	nbCells -= 2;
-
-	// console.log(data);
-	// console.log('drawGraph : '+idDiv+' ; type : '+typeGraph);
-	
-	// Options générales
-	var options = {
-		colors: tabColor,
-		fontName: 'Trebuchet MS',
-		fontSize: 12,
-		hAxis: {maxAlternation: 1},
-		vAxis: {minValue: 0, textPosition: 'out'},
-		//gridlines: {color: '#333', count: 1}
-	};
-	
-	if (formatData != null) {
-		options.vAxis.format = formatData;
-	}
-	
-	// Options sur le titre du graphique
-	options.title = titre;
-	if (typeGraph == 'pie_chart') {
-		// options.titlePosition = 'none';
-	}
-	else {
-		options.titlePosition = 'none';
-	}
-	
-	// Options sur la taille du graphique
-	if (typeGraph == 'bar_chart') {
-		options.chartArea = {left:120, top:30};
-		options.chartArea.height = (height-60);
-		options.chartArea.width = "85%";
-	}
-	else {
-		options.chartArea = {left:"auto", top:"auto"};
-		if (height != null) {
-			options.chartArea.height = height+"%";
-		}
-		else {
-			options.chartArea.height = "80%";
-		}
-		options.chartArea.width = "85%";
-	}
-	// options.chartArea = {};
-	// options.chartArea.height = "100%";
-	// options.chartArea.width = "100%";
-
-
-	// console.log($('#'+idDiv).width());
-	// options.height = $('#'+idDiv).height();
-	// options.width = $('#'+idDiv).width();
-	// options.height = height;
-	// console.log(height);
-	options.width = width;
-
-
-
-	// Options sur la légende
-	options.legend = {};
-	if (typeGraph == 'pie_chart') {
-		options.legend.position = 'right';
-	}
-	else {
-		options.legend.position = 'top';
-	}
-	
-	// Options sur l'affichage des labels en absisse / ordonnée
-	if (typeGraph == 'bar_chart') {
-		// options.hAxis.title = libelleOrd;
-		options.vAxis.title = libelleAbs;
-	}
-	else {
-		options.hAxis.title = libelleAbs;
-		// options.vAxis.title = libelleOrd;
-	}
-	
-	// Options sur les graphiques "dual bar chart / dual column chart"
-	if (isDualChart) {
-		options.series = {};
-		options.axes = {};
-		if (typeGraph == 'column_chart') {
-			options.axes.y = {};
-		}
-		else {
-			options.axes.x = {};
-		}
-		$.each(listeLibelleOrd, function(idx, libelleOrd) {
-			console.log(idx);
-			if (idx <= 1) {
-				key = 'series_'+idx;
-				options.series[idx] = {axis: key};
-				if (typeGraph == 'column_chart') {
-					options.axes.y[key] = {label: libelleOrd};
-					if (idx == 1) {
-						options.axes.y[key].side = 'right';
-					}
-				}
-				else {
-					options.axes.x[key] = {label: libelleOrd};
-					if (idx == 1) {
-						options.axes.x[key].side = 'top';
-					}
-				}
-			}
-		});
-		console.log(options.series);
-		console.log(options.axes.y);
-	}
-
-	// Options sur les graphiques "combo chart"
-	if (typeGraph == 'combo_chart') {
-		options.seriesType = "bars";
-		options.series = {};
-		options.series[nbCells] = {type: "line"};
-	}
-
-	// Options sur le style des lignes pour les "line chart"
-	if (typeGraph == 'line_chart') {
-		options.series =  [{lineWidth: 3}, {lineWidth: 1.5}];
-		options.curveType = 'function';
-	}
-	
-	// Options sur le style pour les "pie chart"
-	if (typeGraph == 'pie_chart') {
-		options.is3D = false;
-		options.pieResidueSliceLabel = 'Autre';
-	}
-	
-	if (isStacked) {
-		options.isStacked = true;
-	}
-
-	// console.log(options);
-	
-	// Création du graphique
-	var errorChart = false;
-	if (typeGraph == 'column_chart') {
-		var chart = new google.visualization.ColumnChart(document.getElementById(idDiv));
-	}
-	else if (typeGraph == 'bar_chart') {
-		var chart = new google.visualization.BarChart(document.getElementById(idDiv));
-	}
-	else if (typeGraph == 'line_chart') {
-		var chart = new google.visualization.LineChart(document.getElementById(idDiv));
-	}
-	else if (typeGraph == 'combo_chart') {
-		var chart = new google.visualization.ComboChart(document.getElementById(idDiv));
-	}
-	else if (typeGraph == 'pie_chart') {
-		var chart = new google.visualization.PieChart(document.getElementById(idDiv));
-	}
-	else {
-		errorChart = true;
-	}
-	
-	$('#'+idDiv).removeClass('ajaxLoader');
-	$('#'+idDiv).removeClass('graphique_load');
-	
-	if (errorChart) {
-		console.log('erreur graphique');
-		$('#'+idDiv).addClass('graphique_error');
-		document.getElementById(idDiv).innerHTML = 'Une erreur s\'est produite lors du chargement du graphique.';
-	}
-	else {
-		$('#'+idDiv).addClass('graphique');
-		document.getElementById(idDiv).innerHTML = '';
-		
-		// $('#'+idDiv).
-		// document.getElementById(idDiv).style.display = 'block';
-		var hasClassActive = $('#'+idDiv).hasClass('active');
-		if (!hasClassActive) {
-			$('#'+idDiv).addClass('active');
-		}
-		google.visualization.events.addListener(chart, 'ready', function () {
-			// document.getElementById(idDiv).style.display = 'none';
-			// $('#'+idDiv).hide();
-			if (!hasClassActive) {
-				$('#'+idDiv).removeClass('active');
-			}
-		});
-		// console.log($("ul li.ui-state-active").index()
-
-		chart.draw(data, options);
-	}
-}

package/todos/jquery.js

@@ -1,5 +0,0 @@
-$.fn.filterByData = function(prop, val) {
-	return this.filter(
-		function() { return $(this).data(prop)==val; }
-	);
-};

package/todos/tree.js

@@ -1,71 +0,0 @@
-
-/*
- * SIDEBAR MENU
- * ------------
- * This is a custom plugin for the sidebar menu. It provides a tree view.
- *
- * Usage:
- * $(".sidebar).tree();
- *
- * Note: This plugin does not accept any options. Instead, it only requires a class added to the element that contains a sub-menu.
- *
- * When used with the sidebar, for example, it would look something like this:
- * <ul class='sidebar-menu'>
- * 	<li class="treeview active">
- * 		<a href="#>Menu</a>
- * 		<ul class='treeview-menu'>
- * 			<li class='active'><a href=#>Level 1</a></li>
- * 		</ul>
- * 	</li>
- * </ul>
- *
- * Add .active class to <li> elements if you want the menu to be open automatically
- * on page load. See above for an example.
- */
-(function($) {
-	"use strict";
-
-	$.fn.tree = function() {
-		return this.each(function() {
-			var btn = $(this).children("a").first();
-			// var btn = $('a.sidebar-toggle');
-			var menu = $(this).children(".treeview-menu").first();
-			var isActive = $(this).hasClass('active');
-			// isActive = true;
-
-			//initialize already active menus
-			// if (isActive) {
-			menu.show();
-			btn.children(".fa-angle-left").first().removeClass("fa-angle-left").addClass("fa-angle-down");
-			// }
-			// else {
-			// 	menu.show();
-			// }
-			//Slide open or close the menu on link click
-			btn.click(function(e) {
-				e.preventDefault();
-				if (isActive) {
-					// Slide up to close menu
-					menu.slideUp();
-					isActive = false;
-					btn.children(".fa-angle-down").first().removeClass("fa-angle-down").addClass("fa-angle-left");
-					btn.parent("li").removeClass("active");
-				} else {
-					// Slide down to open menu
-					menu.slideDown();
-					isActive = true;
-					btn.children(".fa-angle-left").first().removeClass("fa-angle-left").addClass("fa-angle-down");
-					btn.parent("li").addClass("active");
-				}
-			});
-
-			/* Add margins to submenu elements to give it a tree look */
-			menu.find("li > a").each(function() {
-				var pad = parseInt($(this).css("margin-left")) + 10;
-
-				$(this).css({"margin-left": pad + "px"});
-			});
-
-		});
-	};
-}(jQuery));