@osimatic/helpers-js 1.1.7 → 1.1.9

package/location.js

@@ -345,6 +345,9 @@ class PostalAddress {
 			addressDataForPluging['locality'] = addressData['stateDistrict'];
 		}
 
+		//var Address = require("ilib/js/lib/Address");
+		//var AddressFmt = require("ilib/lib/AddressFmt");
+
 		let af = new AddressFmt();
 		let formattedAddress = af.format(new Address(addressDataForPluging));
 		return formattedAddress.replace(/\n+/g, separator);

package/package.json

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

package/package.json.bak

@@ -0,0 +1,15 @@
+{
+  "name": "@osimatic/helpers-js",
+  "version": "1.1.7",
+  "main": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "ilib": "^14.16.0"
+  }
+}

package/paging.js

@@ -2,15 +2,15 @@
 //Bootstrap class pagination https://getbootstrap.com/docs/3.3/components/#pagination
 
 class Pagination {
-	static paginateCards(div, nbItemsPerPage) {
-		Pagination.paginate(div, div.find('.pagination_item'), nbItemsPerPage);
+	static paginateCards(div, nbItemsPerPage, doublePagination) {
+		Pagination.paginate(div, div.find('.pagination_item'), nbItemsPerPage, undefined, doublePagination);
 	}
 
-	static paginateTable(table, select) {
-		Pagination.paginate(table, table.find('tbody tr:not(.hide)'), parseInt(table.data('max_rows')), select);
+	static paginateTable(table, select, doublePagination) {
+		Pagination.paginate(table, table.find('tbody tr:not(.hide)'), parseInt(table.data('max_rows')), select, doublePagination);
 	}
 
-	static paginate(div, items, nbItemsPerPage, select) {
+	static paginate(div, items, nbItemsPerPage, select, doublePagination) {
 		let maxItems = nbItemsPerPage;
 
 		if (typeof div == 'undefined' || !div.length) {
@@ -35,65 +35,83 @@ class Pagination {
 			select.change(update);
 		}
 
-		let paginationUl = $('ul.pagination');
-		if (!paginationUl.length) {
-			paginationUl = $('<ul class="pagination"></ul>');
+		const ulPagination = $('ul.pagination');
+		if (doublePagination) {
+			ulPagination.each((index, ul) => $(ul).remove());
+			Pagination.initPaginationDiv(div, ulPagination, true, true); //top
+			Pagination.initPaginationDiv(div, ulPagination, false, true); //bottom
+		} else {
+			Pagination.initPaginationDiv(div, ulPagination, false, false); //bottom
+		}
+
+		Pagination.initPaginationItems(items, maxItems, doublePagination);
+	}
+
+	static initPaginationDiv(div, ulDiv, onTop, doublePagination) {
+		if (!ulDiv.length || doublePagination) {
+			ulDiv = $('<ul class="pagination"></ul>');
 			if (div.find('.pagination_links').length) {
-				div.find('.pagination_links').append(paginationUl);
-			}
-			else {
-				div.after(paginationUl);
+				(onTop ? div.find('.pagination_links').prepend(ulDiv) : div.find('.pagination_links').append(ulDiv))
+			} else {
+				(onTop ? div.before(ulDiv) : div.after(ulDiv));
 			}
 		}
+	}
 
-		function update() {
-			let totalItems = items.length;
+	static initPaginationItems(items, maxItems, doublePagination) {
+		const paginationUl = $('ul.pagination');
 
-			let lineNum = 0;
-			items.each(function () {
-				lineNum++;
-				if (0 === maxItems || lineNum <= maxItems) {
-					$(this).show();
-				}
-				else {
-					$(this).hide();
-				}
-			});
-			paginationUl.find('li').remove();
+		let totalItems = items.length;
 
-			if (0 === maxItems || totalItems < maxItems) {
-				paginationUl.addClass('hide');
-				return;
+		let lineNum = 0;
+		items.each(function () {
+			lineNum++;
+			if (0 === maxItems || lineNum <= maxItems) {
+				$(this).show();
 			}
-
-			let nbPages = Math.ceil(totalItems/maxItems);
-			for (let i=1; i <= nbPages; i++) {
-				paginationUl.append('<li class="page-item" data-page="'+i+'"><a href="#" class="page-link">'+i+'<span class="sr-only">(current)</span></a></li>').show();
+			else {
+				$(this).hide();
 			}
-			paginationUl.removeClass('hide');
+		});
 
-			paginationUl.find('li:first-child').addClass('active');
-			paginationUl.find('li').click(function () {
-				paginationUl.find('li').removeClass('active');
+		paginationUl.each((index, ul) => $(ul).find('li').remove());
 
-				let pageNum = $(this).data('page');
-				let trIndex = 0;
+		if (0 === maxItems || totalItems < maxItems) {
+			paginationUl.each((index, ul) => $(ul).addClass('hide'));
+			return;
+		}
+
+		let nbPages = Math.ceil(totalItems/maxItems);
+		for (let i=1; i <= nbPages; i++) {
+			paginationUl.each((index, ul) => $(ul).append('<li class="page-item" data-page="'+i+'"><a href="#" class="page-link">'+i+'<span class="sr-only">(current)</span></a></li>').show());
+		}
+
+		paginationUl.each((index, ul) => $(ul).removeClass('hide'));
+		paginationUl.each((index, ul) => $(ul).find('li:first-child').addClass('active'));
+		paginationUl.each((index, ul) => $(ul).find('li').click(function () {
+			paginationUl.each((index, ul) => $(ul).find('li').removeClass('active'));
+
+			let pageNum = $(this).data('page');
+			let trIndex = 0;
+
+			if (doublePagination) {
+				$('li[data-page="' + pageNum + '"]').each((index, li) => $(li).addClass('active'));
+			} else {
 				$(this).addClass('active');
-				items.each(function () {
-					trIndex++;
-					if (trIndex > (maxItems*pageNum) || trIndex <= ((maxItems*pageNum)-maxItems)) {
-						$(this).hide();
-					}
-					else{
-						$(this).show();
-					}
-				});
+			}
 
-				return false;
+			items.each(function () {
+				trIndex++;
+				if (trIndex > (maxItems*pageNum) || trIndex <= ((maxItems*pageNum)-maxItems)) {
+					$(this).hide();
+				}
+				else{
+					$(this).show();
+				}
 			});
-		}
 
-		update();
+			return false;
+		}));
 	}
 }
 

package/paging.js.bak

@@ -0,0 +1,258 @@
+// Fonction commune de pagination
+//Bootstrap class pagination https://getbootstrap.com/docs/3.3/components/#pagination
+
+class Pagination {
+	static paginateCards(div, nbItemsPerPage, doublePagination) {
+		Pagination.paginate(div, div.find('.pagination_item'), nbItemsPerPage, undefined, doublePagination);
+	}
+
+	static paginateTable(table, select, doublePagination) {
+		Pagination.paginate(table, table.find('tbody tr:not(.hide)'), parseInt(table.data('max_rows')), select, doublePagination);
+	}
+
+	static paginate(div, items, nbItemsPerPage, select, doublePagination) {
+		let maxItems = nbItemsPerPage;
+
+		if (typeof div == 'undefined' || !div.length) {
+			return;
+		}
+
+		if (typeof select != 'undefined' && select.length) {
+			if (!select.children().length) {
+				select.append('<option value="0">'+labelDisplayAll+'</option>');
+				let nbRowsList = select.data('nb_rows_list') ? select.data('nb_rows_list').split(',') : [5, 10, 25, 50];
+				$.each(nbRowsList, function(idx, nbRows) {
+					select.append('<option value="'+nbRows+'">'+nbRows+'</option>');
+				});
+
+				if (select.data('default_nb_rows')) {
+					select.val(select.data('default_nb_rows'))
+				}
+			}
+
+			maxItems = parseInt(select.val());
+
+			select.change(update);
+		}
+
+		if (doublePagination) {
+			Pagination.initPaginationDiv(div, $('ul.pagination'), true, true); //top
+			Pagination.initPaginationDiv(div, $('ul.pagination'), false, true); //bottom
+		} else {
+			Pagination.initPaginationDiv(div, $('ul.pagination'), false, false); //bottom
+		}
+
+		Pagination.initPaginationItems(items, maxItems, doublePagination);
+	}
+
+	static initPaginationDiv(div, ulDiv, onTop, doublePagination) {
+		if (!ulDiv.length || doublePagination) {
+			ulDiv = $('<ul class="pagination"></ul>');
+			if (div.find('.pagination_links').length) {
+				(onTop ? div.find('.pagination_links').prepend(ulDiv) : div.find('.pagination_links').append(ulDiv))
+			} else {
+				(onTop ? div.before(ulDiv) : div.after(ulDiv));
+			}
+		}
+	}
+
+	static initPaginationItems(items, maxItems, doublePagination) {
+		const paginationUl = $('ul.pagination');
+
+		let totalItems = items.length;
+
+		let lineNum = 0;
+		items.each(function () {
+			lineNum++;
+			if (0 === maxItems || lineNum <= maxItems) {
+				$(this).show();
+			}
+			else {
+				$(this).hide();
+			}
+		});
+
+		paginationUl.each((index, ul) => $(ul).find('li').remove());
+
+		if (0 === maxItems || totalItems < maxItems) {
+			paginationUl.each((index, ul) => $(ul).addClass('hide'));
+			return;
+		}
+
+		let nbPages = Math.ceil(totalItems/maxItems);
+		for (let i=1; i <= nbPages; i++) {
+			paginationUl.each((index, ul) => $(ul).append('<li class="page-item" data-page="'+i+'"><a href="#" class="page-link">'+i+'<span class="sr-only">(current)</span></a></li>').show());
+		}
+
+		paginationUl.each((index, ul) => $(ul).removeClass('hide'));
+		paginationUl.each((index, ul) => $(ul).find('li:first-child').addClass('active'));
+		paginationUl.each((index, ul) => $(ul).find('li').click(function () {
+			paginationUl.each((index, ul) => $(ul).find('li').removeClass('active'));
+
+			let pageNum = $(this).data('page');
+			let trIndex = 0;
+
+			if (doublePagination) {
+				$('li[data-page="' + pageNum + '"]').each((index, li) => $(li).addClass('active'));
+			} else {
+				$(this).addClass('active');
+			}
+
+			items.each(function () {
+				trIndex++;
+				if (trIndex > (maxItems*pageNum) || trIndex <= ((maxItems*pageNum)-maxItems)) {
+					$(this).hide();
+				}
+				else{
+					$(this).show();
+				}
+			});
+
+			return false;
+		}));
+	}
+}
+
+class Navigation {
+	static activateTab(a) {
+		//console.log(a);
+		//a.click();
+		let ulNav = a.closest('.nav');
+		let tabContent = ulNav.parent().find('.tab-content');
+
+		// déselection éventuel des onglets
+		ulNav.find('a.nav-link').each(function(idx, navLink) {
+			$(navLink).removeClass('active');
+			let id = $(navLink).attr('href');
+			if (id.substr(0, 1) === '#') {
+				tabContent.find(id).removeClass('active').removeClass('show');
+			}
+		});
+
+		// sélection de l'onglet correspondant au navLink passé en paramètre
+		a.addClass('active');
+		tabContent.find(a.attr('href')).addClass('active').addClass('show');
+	}
+}
+
+module.exports = { Pagination, Navigation };
+
+// deprecated
+/*
+function paginationAsList(nbResultatsTotal, nbResultatsParPage, urlPage, nomParamPage) {
+	var currentUrl = urlPage || window.location.href;
+	var afficherLienFirstLastPage = true;
+	var afficherLienPagePrecedenteSuivante = true;
+	var emptyStringIfOnlyOnePage = true;
+	var nbLiensPageDebutFin = 3;
+	var nbLiensPageAvantApresPageCourante = 2;
+	var strEntreLiensPageDebutFinEtAvantApresPageCourante = '…';
+	nomParamPage = nomParamPage || 'page';
+
+	// Si le nombre de résultat total est inférieur au nombre d'affichage par page, il n'y a qu'une seule page.
+	if (nbResultatsTotal < nbResultatsParPage && emptyStringIfOnlyOnePage) {
+		return '';
+	}
+
+	// Initialisation du nombre de pages
+	var nbPages = Math.ceil(nbResultatsTotal/nbResultatsParPage);
+
+	// Initialisation du numéro de la page courante
+	//var query = window.location.search.substring(1).query.split("&");
+	
+	var url = new URL(currentUrl);
+	var params = url.searchParams;
+
+	var numPageCourante = 1;
+	if (typeof params.get(nomParamPage) != 'undefined' && params.get(nomParamPage) != null) {
+		numPageCourante = parseInt(params.get(nomParamPage));
+	}
+	if (numPageCourante < 0) {
+		numPageCourante = 1;
+	}
+	if (numPageCourante > nbPages) {
+		numPageCourante = nbPages;
+	}
+
+	var strPagination = '<ul class="pagination">';
+
+	// Lien pour la première page
+	if (afficherLienFirstLastPage) {
+		var strLienFirstPage = '&lt;&lt;';
+		if (numPageCourante > 1) {
+			strPagination += '<li class="page-item"><a class="page-link" href="'+UrlAndQueryString.setParamOfUrl(nomParamPage, 1, currentUrl)+'">'+strLienFirstPage+'</a></li>';
+		}
+		else {
+			strPagination += '<li class="page-item disabled"><a class="page-link" href="#">'+strLienFirstPage+'</a></li>';
+		}
+	}
+
+	// Lien pour la page précédente
+	if (afficherLienPagePrecedenteSuivante) {
+		var strLienPagePrecedente = '&lt;';
+		if (numPageCourante > 1) {
+			strPagination += '<li class="page-item"><a class="page-link" href="'+UrlAndQueryString.setParamOfUrl(nomParamPage, (numPageCourante - 1), currentUrl)+'">'+strLienPagePrecedente+'</a></li>';
+		}
+		else {
+			strPagination += '<li class="page-item disabled"><a class="page-link" href="#">'+strLienPagePrecedente+'</a></li>';
+		}
+	}
+
+	var strEntreLiensPageDebutEtAvantPageCouranteDejaAffiche = false;
+	var strEntreLiensPageFinEtApresPageCouranteDejaAffiche = false;
+
+	for (var numPage=1; numPage<=nbPages; numPage++) {
+		if (numPage < numPageCourante) {
+			if (numPage <= nbLiensPageDebutFin || numPage >= (numPageCourante-nbLiensPageAvantApresPageCourante)) {
+				strPagination += '<li class="page-item"><a class="page-link" href="'+UrlAndQueryString.setParamOfUrl(nomParamPage, numPage, currentUrl)+'">'+numPage+'</a></li>';
+			}
+			else {
+				if (!strEntreLiensPageDebutEtAvantPageCouranteDejaAffiche) {
+					strPagination += '<li class="page-item disabled"><a class="page-link" href="#">'+strEntreLiensPageDebutFinEtAvantApresPageCourante+'</a></li>';
+					strEntreLiensPageDebutEtAvantPageCouranteDejaAffiche = true;
+				}
+			}
+		}
+		else if (numPage > numPageCourante) {
+			if (numPage >= (nbPages-(nbLiensPageDebutFin-1)) || numPage <= (numPageCourante+nbLiensPageAvantApresPageCourante)) {
+				strPagination += '<li class="page-item"><a class="page-link" href="'+UrlAndQueryString.setParamOfUrl(nomParamPage, numPage, currentUrl)+'">'+numPage+'</a></li>';
+			}
+			else {
+				if (!strEntreLiensPageFinEtApresPageCouranteDejaAffiche) {
+					strPagination += '<li class="page-item disabled"><a class="page-link" href="#">'+strEntreLiensPageDebutFinEtAvantApresPageCourante+'</a></li>';
+					strEntreLiensPageFinEtApresPageCouranteDejaAffiche = true;
+				}
+			}
+		}
+		else {
+			strPagination += '<li class="page-item active"><a class="page-link" href="#">'+numPage+'</a></li>';
+		}
+	}
+
+	// Lien pour la page suivante
+	if (afficherLienPagePrecedenteSuivante) {
+		var strLienPageSuivante = '&gt;';
+		if (numPageCourante < nbPages) {
+			strPagination += '<li class="page-item"><a class="page-link" href="'+UrlAndQueryString.setParamOfUrl(nomParamPage, (numPageCourante + 1), currentUrl)+'">'+strLienPageSuivante+'</a></li>';
+		}
+		else {
+			strPagination += '<li class="page-item disabled"><a class="page-link" href="#">'+strLienPageSuivante+'</a></li>';
+		}
+	}
+
+	// Lien pour la dernière page
+	if (afficherLienFirstLastPage) {
+		var strLienLastPage = '&gt;&gt;';
+		if (numPageCourante < nbPages) {
+			strPagination += '<li class="page-item"><a class="page-link" href="'+UrlAndQueryString.setParamOfUrl(nomParamPage, nbPages, currentUrl)+'">'+strLienLastPage+'</a></li>';
+		}
+		else {
+			strPagination += '<li class="page-item disabled"><a class="page-link" href="#">'+strLienLastPage+'</a></li>';
+		}
+	}
+
+	strPagination += '</ul>';
+
+	return strPagination;
+}
+*/