From e9f70ec13ef92596e36cb4fcef2cf3a266492458 Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Sun, 24 Jan 2021 22:35:22 +0100
Subject: [PATCH] on utilise vue select pour les tetes de colonnes

---
 js/gamutable.es6.js | 53 +++++++++++++++++++++------------------------
 js/gamutable.js     | 27 +++++++++++++++++++++--
 2 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/js/gamutable.es6.js b/js/gamutable.es6.js
index fbaad4a..25e264d 100644
--- a/js/gamutable.es6.js
+++ b/js/gamutable.es6.js
@@ -190,7 +190,7 @@ let monTableau = {
 			crayons: [],
 			classes: [],
 			filtreCol: [],
-			filtreColSelected: [],
+			filtreColSelected: { gestionnaire: [] },
 			filtreColModif: 0,
 			filtreColVal: {},
 			search: '',
@@ -239,6 +239,7 @@ let monTableau = {
 						return false;
 					}
 					Object.keys(this.filtreColSelected).forEach((colName) => {
+						console.log('coucou');
 						if (rsearch) {
 							let colValue = this.filtreColSelected[colName];
 							if (!Array.isArray(colValue)) {
@@ -341,6 +342,20 @@ let monTableau = {
 					if (config.classes !== undefined) {
 						this.classes = config.classes;
 					}
+					if (config.filtreCol !== undefined) {
+						this.filtreCol = config.filtreCol;
+						this.filtreCol.forEach((col) => {
+							let Tval = [''];
+							this.table.forEach((t) => {
+								let valCol = t.html[col];
+								if (Tval.indexOf(valCol) === -1) {
+									Tval.push(valCol);
+								}
+							});
+							this.filtreColVal[col] = Tval;
+							this.filtreColSelected[col] = [];
+						});
+					}
 					this.table = data;
 					if (data.length && data[0].search) {
 						this.champ_search = 'search';
@@ -384,6 +399,7 @@ let monTableau = {
 								}
 							});
 							this.filtreColVal[col] = Tval;
+							this.filtreColSelected[col] = [];
 						});
 					}
 					Vue.nextTick(() => {
@@ -487,15 +503,6 @@ let monTableau = {
 	},
 	template: `
 	<div class="gamutable">
-<div>
-	<vue-select
-	  v-model="model"
-	  :options="options"
-	  hide-selected
-	  multiple
-	taggable
-	></vue-select>
-</div>
 		<div class="gamutable--surTable">
 			<select id="parPage" v-model="parPageSelect">
 				<option v-for="v in tparpage" :key="v">{{v}}</option>
@@ -560,24 +567,14 @@ let monTableau = {
 				<tr v-if="filtreCol.length" class="filtreColonne">
 					<th v-for="(label,head,i) in header" :key="'filtreCol_'+i">
 						<div v-if="filtreCol.indexOf(head) !== -1" :id="'filtreCol_'+head">
-							<select class="filtrerCol" v-model="filtreColSelected[head]" v-if="filtrecolmulti !== 'non'" multiple>
-								<option
-								v-for="(option,j) in filtreColVal[head]"
-								:value="option"
-								@click="selectValCol"
-								>
-								{{j === 0 ? "Tous" : option}}
-								</option>
-							</select>
-							<select class="filtrerCol" v-model="filtreColSelected[head]" v-else>
-								<option
-								v-for="(option,j) in filtreColVal[head]"
-								:value="option"
-								@click="selectValCol"
-								>
-								{{j === 0 ? "Tous" : option}}
-								</option>
-							</select>
+							<vue-select
+								v-model="filtreColSelected[head]"
+								:options="filtreColVal[head]"
+								hide-selected
+								multiple
+								taggable
+								@selected="selectValCol"
+							></vue-select>
 						</div>
 					</th>
 				</tr>
diff --git a/js/gamutable.js b/js/gamutable.js
index b9cc100..47129e7 100644
--- a/js/gamutable.js
+++ b/js/gamutable.js
@@ -239,7 +239,9 @@ var monTableau = {
       crayons: [],
       classes: [],
       filtreCol: [],
-      filtreColSelected: [],
+      filtreColSelected: {
+        gestionnaire: []
+      },
       filtreColModif: 0,
       filtreColVal: {},
       search: '',
@@ -290,6 +292,8 @@ var monTableau = {
         }
 
         Object.keys(_this2.filtreColSelected).forEach(function (colName) {
+          console.log('coucou');
+
           if (rsearch) {
             var colValue = _this2.filtreColSelected[colName];
 
@@ -404,6 +408,24 @@ var monTableau = {
             this.classes = config.classes;
           }
 
+          if (config.filtreCol !== undefined) {
+            this.filtreCol = config.filtreCol;
+            this.filtreCol.forEach(function (col) {
+              var Tval = [''];
+
+              _this4.table.forEach(function (t) {
+                var valCol = t.html[col];
+
+                if (Tval.indexOf(valCol) === -1) {
+                  Tval.push(valCol);
+                }
+              });
+
+              _this4.filtreColVal[col] = Tval;
+              _this4.filtreColSelected[col] = [];
+            });
+          }
+
           this.table = data;
 
           if (data.length && data[0].search) {
@@ -460,6 +482,7 @@ var monTableau = {
             });
 
             _this4.filtreColVal[col] = Tval;
+            _this4.filtreColSelected[col] = [];
           });
         }
 
@@ -581,7 +604,7 @@ var monTableau = {
       this.quelleVue = vue;
     }
   },
-  template: "\n\t<div class=\"gamutable\">\n<div>\n\t<vue-select\n\t  v-model=\"model\"\n\t  :options=\"options\"\n\t  hide-selected\n\t  multiple\n\ttaggable\n\t></vue-select>\n</div>\n\t\t<div class=\"gamutable--surTable\">\n\t\t\t<select id=\"parPage\" v-model=\"parPageSelect\">\n\t\t\t\t<option v-for=\"v in tparpage\" :key=\"v\">{{v}}</option>\n\t\t\t</select>\n\t\t\t<input class=\"gamutable--rechercher\" type=\"text\" v-model=\"search\" placeholder=\"Rechercher\">\n\n\t\t\t<button class=\"btn gamutable--resetOrderBy\" type=\"button\" @click.stop=\"resetTri()\"\n\t\t\t\ttitle=\"R\xE9initialiser les tris des colonnes\">\n\t\t\t\t<i class=\"fa fa-repeat fas fa-redo\">\n\t\t\t</button>\n\n\t\t\t<button class=\"btn gamutable--vueTable\" title=\"Switcher en Vue tableau\"\n\t\t\t\t@click.stop=\"changerVue('tableau')\"\n\t\t\t\tv-if=\"this.vuebloc\"\n\t\t\t\tv-show=\"this.quelleVue === 'bloc'\">\n\t\t\t\t<i class=\"fas fa fa-table\">\n\t\t\t</button>\n\n\t\t\t<button class=\"btn gamutable--vueBloc\" title=\"Switcher en Vue Bloc\"\n\t\t\t\t@click.stop=\"changerVue('bloc')\"\n\t\t\t\tv-if=\"this.vuebloc\"\n\t\t\t\tv-show=\"this.quelleVue === 'tableau'\">\n\t\t\t\t<i class=\"fas fa fa-th-large\">\n\t\t\t</button>\n\t\t\t<button class=\"btn gamutable--exportCSV\" type=\"button\" @click.stop=\"exportCSV()\"\n\t\t\t\tv-show=\"this.namecsv\"\n\t\t\t\ttitle=\"Exporter le tableau affich\xE9 en csv\"\n\t\t\t>\n\t\t\t\t<i class=\"fa fa-file-excel-o fas fa-file-csv\" aria-hidden=\"true\"></i>\n\t\t\t</button>\n\t\t\t<span v-show=\"chargement\" class=\"rouge\">\n\t\t\t\t<i class=\"fa fa-refresh fa-spin fa-fw rouge fas fa-sync fa-spin\"></i>\n\t\t\t\t<span class=\"texteMajBDD\">\n\t\t\t\t\tMise \xE0 jour de la base de donn\xE9e\n\t\t\t\t</span>\n\t\t\t</span>\n\t\t\t<span v-show=\"!chargement\" class=\"btn verte\" style=\"cursor:auto;\"\n\t\t\t\ttitle=\"Base de donn\xE9e synchronis\xE9e !\"\n\t\t\t>\n\t\t\t\t<i class=\"fa fas fa-database\"></i>\n\t\t\t</span>\n\t\t</div>\n\t\t<div class=\"vueBlocs\" v-if=\"quelleVue === 'bloc'\">\n\t\t\t<div class=\"vueBlocs-unbloc\"\n\t\t\tv-for=\"(ligne) in tableau\"\n\t\t\t:key=ligne.id\n\t\t\tv-html=replaceBloc(ligne.html)\n\t\t\t>\n\t\t\t</div>\n\t\t</div>\n\t\t<table class=\"table table--zebra\" v-if=\"quelleVue === 'tableau'\">\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th v-for=\"(label,head,i) in header\" :key=\"'head_'+i\" :class=\"[head,classes[head]]\">\n\t\t\t\t\t\t<span class=\"iconeTri\">\n\t\t\t\t\t\t\t<i class=\"fa fa-sort-asc fa-sort-up\" :class=\"ordreActif(head, 'asc')\" aria-hidden=\"true\" @click.stop=\"tri(head,'asc')\"></i>\n\t\t\t\t\t\t\t<i class=\"fa fa-sort-desc fa-sort-down\":class=\"ordreActif(head, 'desc')\" aria-hidden=\"true\" @click.stop=\"tri(head,'desc')\" ></i>\n\t\t\t\t\t\t</span>\n\t\t\t\t\t\t<span v-html=\"label\"></span>\n\t\t\t\t\t</th>\n\t\t\t\t</tr>\n\t\t\t\t<tr v-if=\"filtreCol.length\" class=\"filtreColonne\">\n\t\t\t\t\t<th v-for=\"(label,head,i) in header\" :key=\"'filtreCol_'+i\">\n\t\t\t\t\t\t<div v-if=\"filtreCol.indexOf(head) !== -1\" :id=\"'filtreCol_'+head\">\n\t\t\t\t\t\t\t<select class=\"filtrerCol\" v-model=\"filtreColSelected[head]\" v-if=\"filtrecolmulti !== 'non'\" multiple>\n\t\t\t\t\t\t\t\t<option\n\t\t\t\t\t\t\t\tv-for=\"(option,j) in filtreColVal[head]\"\n\t\t\t\t\t\t\t\t:value=\"option\"\n\t\t\t\t\t\t\t\t@click=\"selectValCol\"\n\t\t\t\t\t\t\t\t>\n\t\t\t\t\t\t\t\t{{j === 0 ? \"Tous\" : option}}\n\t\t\t\t\t\t\t\t</option>\n\t\t\t\t\t\t\t</select>\n\t\t\t\t\t\t\t<select class=\"filtrerCol\" v-model=\"filtreColSelected[head]\" v-else>\n\t\t\t\t\t\t\t\t<option\n\t\t\t\t\t\t\t\tv-for=\"(option,j) in filtreColVal[head]\"\n\t\t\t\t\t\t\t\t:value=\"option\"\n\t\t\t\t\t\t\t\t@click=\"selectValCol\"\n\t\t\t\t\t\t\t\t>\n\t\t\t\t\t\t\t\t{{j === 0 ? \"Tous\" : option}}\n\t\t\t\t\t\t\t\t</option>\n\t\t\t\t\t\t\t</select>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\t\t\t<tbody>\n\t\t\t\t<tr v-for=\"l in tableau\" :key=\"l.html.id\" :class=\"selectTr.indexOf(l.html.id) !== -1 ? 'select' : ''\" >\n\t\t\t\t\t<td v-for=\"(td,name, i) in l.html\" :key=\"'td_'+i\" :class=\"[afficher_crayons(name,l.html.id), name, classes[name]]\" v-html=\"td\" @click=\"selectLigne(l.html.id,name)\">\n\t\t\t\t\t</td>\n\t\t\t\t</tr>\n\t\t\t</tbody>\n\t\t</table>\n\t\t<div class=\"gamutable--sousTable\">\n\t\t\t<div class=\"gamutable-nbrMax\">{{tableau.length}} / {{table.length}} \xE9l\xE9ments</div>\n\t\t\t<div class=\"gamutable--pagination\">\n\t\t\t\t<div class=\"page-item\">\n\t\t\t\t\t<button type=\"button\" class=\"page-link\" v-if=\"page != 1\" @click=\"page=1\"> Premier </button>\n\t\t\t\t\t<button type=\"button\" class=\"page-link\" v-if=\"page != 1\" @click=\"page--\"> Pr\xE9c\xE9dent </button>\n\t\t\t\t</div>\n\t\t\t\t<div class=\"page-item\">\n\t\t\t\t\t<button type=\"button\" class=\"page-link\" v-for=\"pageNumber in pages.slice(page-1, page+5)\" @click=\"page = pageNumber\"> {{pageNumber}} </button>\n\t\t\t\t</div>\n\t\t\t\t<div class=\"page-item\">\n\t\t\t\t\t<button type=\"button\" @click=\"page++\" v-if=\"page < pages.length\" class=\"page-link\"> Suivant </button>\n\t\t\t\t\t<button type=\"button\" @click=\"page=pages.length\" v-if=\"page < pages.length\" class=\"page-link\"> Dernier </button>\n\t\t\t\t</div>\n\t\t\t</div>\n\t\t</div>\n\t</div>"
+  template: "\n\t<div class=\"gamutable\">\n\t\t<div class=\"gamutable--surTable\">\n\t\t\t<select id=\"parPage\" v-model=\"parPageSelect\">\n\t\t\t\t<option v-for=\"v in tparpage\" :key=\"v\">{{v}}</option>\n\t\t\t</select>\n\t\t\t<input class=\"gamutable--rechercher\" type=\"text\" v-model=\"search\" placeholder=\"Rechercher\">\n\n\t\t\t<button class=\"btn gamutable--resetOrderBy\" type=\"button\" @click.stop=\"resetTri()\"\n\t\t\t\ttitle=\"R\xE9initialiser les tris des colonnes\">\n\t\t\t\t<i class=\"fa fa-repeat fas fa-redo\">\n\t\t\t</button>\n\n\t\t\t<button class=\"btn gamutable--vueTable\" title=\"Switcher en Vue tableau\"\n\t\t\t\t@click.stop=\"changerVue('tableau')\"\n\t\t\t\tv-if=\"this.vuebloc\"\n\t\t\t\tv-show=\"this.quelleVue === 'bloc'\">\n\t\t\t\t<i class=\"fas fa fa-table\">\n\t\t\t</button>\n\n\t\t\t<button class=\"btn gamutable--vueBloc\" title=\"Switcher en Vue Bloc\"\n\t\t\t\t@click.stop=\"changerVue('bloc')\"\n\t\t\t\tv-if=\"this.vuebloc\"\n\t\t\t\tv-show=\"this.quelleVue === 'tableau'\">\n\t\t\t\t<i class=\"fas fa fa-th-large\">\n\t\t\t</button>\n\t\t\t<button class=\"btn gamutable--exportCSV\" type=\"button\" @click.stop=\"exportCSV()\"\n\t\t\t\tv-show=\"this.namecsv\"\n\t\t\t\ttitle=\"Exporter le tableau affich\xE9 en csv\"\n\t\t\t>\n\t\t\t\t<i class=\"fa fa-file-excel-o fas fa-file-csv\" aria-hidden=\"true\"></i>\n\t\t\t</button>\n\t\t\t<span v-show=\"chargement\" class=\"rouge\">\n\t\t\t\t<i class=\"fa fa-refresh fa-spin fa-fw rouge fas fa-sync fa-spin\"></i>\n\t\t\t\t<span class=\"texteMajBDD\">\n\t\t\t\t\tMise \xE0 jour de la base de donn\xE9e\n\t\t\t\t</span>\n\t\t\t</span>\n\t\t\t<span v-show=\"!chargement\" class=\"btn verte\" style=\"cursor:auto;\"\n\t\t\t\ttitle=\"Base de donn\xE9e synchronis\xE9e !\"\n\t\t\t>\n\t\t\t\t<i class=\"fa fas fa-database\"></i>\n\t\t\t</span>\n\t\t</div>\n\t\t<div class=\"vueBlocs\" v-if=\"quelleVue === 'bloc'\">\n\t\t\t<div class=\"vueBlocs-unbloc\"\n\t\t\tv-for=\"(ligne) in tableau\"\n\t\t\t:key=ligne.id\n\t\t\tv-html=replaceBloc(ligne.html)\n\t\t\t>\n\t\t\t</div>\n\t\t</div>\n\t\t<table class=\"table table--zebra\" v-if=\"quelleVue === 'tableau'\">\n\t\t\t<thead>\n\t\t\t\t<tr>\n\t\t\t\t\t<th v-for=\"(label,head,i) in header\" :key=\"'head_'+i\" :class=\"[head,classes[head]]\">\n\t\t\t\t\t\t<span class=\"iconeTri\">\n\t\t\t\t\t\t\t<i class=\"fa fa-sort-asc fa-sort-up\" :class=\"ordreActif(head, 'asc')\" aria-hidden=\"true\" @click.stop=\"tri(head,'asc')\"></i>\n\t\t\t\t\t\t\t<i class=\"fa fa-sort-desc fa-sort-down\":class=\"ordreActif(head, 'desc')\" aria-hidden=\"true\" @click.stop=\"tri(head,'desc')\" ></i>\n\t\t\t\t\t\t</span>\n\t\t\t\t\t\t<span v-html=\"label\"></span>\n\t\t\t\t\t</th>\n\t\t\t\t</tr>\n\t\t\t\t<tr v-if=\"filtreCol.length\" class=\"filtreColonne\">\n\t\t\t\t\t<th v-for=\"(label,head,i) in header\" :key=\"'filtreCol_'+i\">\n\t\t\t\t\t\t<div v-if=\"filtreCol.indexOf(head) !== -1\" :id=\"'filtreCol_'+head\">\n\t\t\t\t\t\t\t<vue-select\n\t\t\t\t\t\t\t\tv-model=\"filtreColSelected[head]\"\n\t\t\t\t\t\t\t\t:options=\"filtreColVal[head]\"\n\t\t\t\t\t\t\t\thide-selected\n\t\t\t\t\t\t\t\tmultiple\n\t\t\t\t\t\t\t\ttaggable\n\t\t\t\t\t\t\t\t@selected=\"selectValCol\"\n\t\t\t\t\t\t\t></vue-select>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t</th>\n\t\t\t\t</tr>\n\t\t\t</thead>\n\t\t\t<tbody>\n\t\t\t\t<tr v-for=\"l in tableau\" :key=\"l.html.id\" :class=\"selectTr.indexOf(l.html.id) !== -1 ? 'select' : ''\" >\n\t\t\t\t\t<td v-for=\"(td,name, i) in l.html\" :key=\"'td_'+i\" :class=\"[afficher_crayons(name,l.html.id), name, classes[name]]\" v-html=\"td\" @click=\"selectLigne(l.html.id,name)\">\n\t\t\t\t\t</td>\n\t\t\t\t</tr>\n\t\t\t</tbody>\n\t\t</table>\n\t\t<div class=\"gamutable--sousTable\">\n\t\t\t<div class=\"gamutable-nbrMax\">{{tableau.length}} / {{table.length}} \xE9l\xE9ments</div>\n\t\t\t<div class=\"gamutable--pagination\">\n\t\t\t\t<div class=\"page-item\">\n\t\t\t\t\t<button type=\"button\" class=\"page-link\" v-if=\"page != 1\" @click=\"page=1\"> Premier </button>\n\t\t\t\t\t<button type=\"button\" class=\"page-link\" v-if=\"page != 1\" @click=\"page--\"> Pr\xE9c\xE9dent </button>\n\t\t\t\t</div>\n\t\t\t\t<div class=\"page-item\">\n\t\t\t\t\t<button type=\"button\" class=\"page-link\" v-for=\"pageNumber in pages.slice(page-1, page+5)\" @click=\"page = pageNumber\"> {{pageNumber}} </button>\n\t\t\t\t</div>\n\t\t\t\t<div class=\"page-item\">\n\t\t\t\t\t<button type=\"button\" @click=\"page++\" v-if=\"page < pages.length\" class=\"page-link\"> Suivant </button>\n\t\t\t\t\t<button type=\"button\" @click=\"page=pages.length\" v-if=\"page < pages.length\" class=\"page-link\"> Dernier </button>\n\t\t\t\t</div>\n\t\t\t</div>\n\t\t</div>\n\t</div>"
 };
 var gamuTable = {
   components: {