feat: factorisation de la geration des config

This commit is contained in:
Christophe 2023-01-12 11:48:45 +01:00
parent a28dcfa118
commit 910cf503d8

View file

@ -627,6 +627,32 @@ watch(filtreColSelected, () => {
//~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~
// les methodes // les methodes
//~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~
function gererConfig(config) {
header.value = config.header;
if (config.crayons !== undefined) {
crayons.value = config.crayons;
}
if (config.maj !== undefined) {
maj.value = config.maj?.lastMAJ;
}
if (config.classes !== undefined) {
classes.value = config.classes;
}
if (config.checkbox !== undefined) {
checkbox.value = config.checkbox;
Object.keys(checkbox.value).forEach((head) => {
Tcheckbox.value[head] = [];
});
}
if (config.ordreCol !== undefined) {
ordreCol.value = config.ordreCol;
}
let filtreCol = [];
if (config.filtreCol !== undefined) {
filtreCol = config.filtreCol;
}
return filtreCol;
}
function chargerJson(id) { function chargerJson(id) {
console.log("chargerJson pour ", id); console.log("chargerJson pour ", id);
chargement.value = true; chargement.value = true;
@ -639,29 +665,7 @@ function chargerJson(id) {
let config = localStorage.getItem("header_" + nameLocalStorage.value); let config = localStorage.getItem("header_" + nameLocalStorage.value);
config = recupJson(config); config = recupJson(config);
if (config && config.header !== undefined) { if (config && config.header !== undefined) {
header.value = config.header; let filtreColRecup = gererConfig(config);
if (config.crayons !== undefined) {
crayons.value = config.crayons;
}
if (config.maj !== undefined) {
maj.value = config.maj?.lastMAJ;
}
if (config.classes !== undefined) {
classes.value = config.classes;
}
if (config.checkbox !== undefined) {
checkbox.value = config.checkbox;
Object.keys(checkbox.value).forEach((head) => {
Tcheckbox.value[head] = [];
});
}
if (config.ordreCol !== undefined) {
ordreCol.value = config.ordreCol;
}
let filtreCol = [];
if (config.filtreCol !== undefined) {
filtreCol = config.filtreCol;
}
localforage localforage
.getItem(nameLocalStorage.value) .getItem(nameLocalStorage.value)
.then(function (data) { .then(function (data) {
@ -671,8 +675,8 @@ function chargerJson(id) {
if (data[0].search) { if (data[0].search) {
champ_search.value = "search"; champ_search.value = "search";
} }
if (filtreCol !== undefined) { if (filtreColRecup !== undefined) {
filtreColType.value = filtreCol; filtreColType.value = filtreColRecup;
Object.keys(filtreColType.value).forEach((col) => { Object.keys(filtreColType.value).forEach((col) => {
let Tval = []; let Tval = [];
// let Tval = ['']; // let Tval = [''];
@ -682,6 +686,7 @@ function chargerJson(id) {
Tval.push(valCol); Tval.push(valCol);
} }
}); });
// filtreCol.value.push(col);
filtreColVal.value[col] = Tval.sort(); filtreColVal.value[col] = Tval.sort();
filtreColSelected.value[col] = []; filtreColSelected.value[col] = [];
}); });
@ -700,31 +705,32 @@ function chargerJson(id) {
.then((response) => response.json()) .then((response) => response.json())
.then((data) => { .then((data) => {
let config = data.shift(); let config = data.shift();
header.value = config.header; let filtreColRecup = gererConfig(config);
if (config.maj !== undefined) { // header.value = config.header;
maj.value = config.maj?.lastMAJ; // if (config.maj !== undefined) {
} // maj.value = config.maj?.lastMAJ;
if (config.crayons !== undefined) { // }
crayons.value = config.crayons; // if (config.crayons !== undefined) {
} else { // crayons.value = config.crayons;
crayons.value = []; // } else {
} // crayons.value = [];
if (config.classes !== undefined) { // }
classes.value = config.classes; // if (config.classes !== undefined) {
} else { // classes.value = config.classes;
classes.value = []; // } else {
} // classes.value = [];
if (config.checkbox !== undefined) { // }
checkbox.value = config.checkbox; // if (config.checkbox !== undefined) {
Object.keys(checkbox.value).forEach((head) => { // checkbox.value = config.checkbox;
Tcheckbox.value[head] = []; // Object.keys(checkbox.value).forEach((head) => {
}); // Tcheckbox.value[head] = [];
} // });
if (config.ordreCol !== undefined) { // }
ordreCol.value = config.ordreCol; // if (config.ordreCol !== undefined) {
} else { // ordreCol.value = config.ordreCol;
ordreCol.value = []; // } else {
} // ordreCol.value = [];
// }
if (parseInt(id) > 0) { if (parseInt(id) > 0) {
if (data.length > 0) { if (data.length > 0) {
let i = trouver_index(table.value, id); let i = trouver_index(table.value, id);
@ -743,8 +749,8 @@ function chargerJson(id) {
champ_search.value = "search"; champ_search.value = "search";
} }
} }
if (config.filtreCol !== undefined) { if (filtreColRecup !== undefined) {
filtreColType.value = config.filtreCol; filtreColType.value = filtreColRecup;
filtreCol.value = []; filtreCol.value = [];
Object.keys(filtreColType.value).forEach((col) => { Object.keys(filtreColType.value).forEach((col) => {
let Tval = []; let Tval = [];