feat : suite refactoring

This commit is contained in:
Christophe 2023-01-12 12:11:05 +01:00
parent 910cf503d8
commit 778f9a2c44
3 changed files with 297 additions and 339 deletions

File diff suppressed because it is too large Load diff

View file

@ -45,7 +45,7 @@
includespip="#ENV{includespip}" includespip="#ENV{includespip}"
ref="montableau" ref="montableau"
filtrer="#ENV{filtrer}" filtrer="#ENV{filtrer}"
_id="#ENV{_id}" :_id="[(#ENV{_id}|intval)]"
filtreselect="[(#ENV{filtrerselect})]" filtreselect="[(#ENV{filtrerselect})]"
></gamu-table> ></gamu-table>
</div> </div>
@ -76,7 +76,7 @@
includespip="#ENV{includespip}" includespip="#ENV{includespip}"
ref="montableau_deux" ref="montableau_deux"
filtrer="#ENV{filtrer}" filtrer="#ENV{filtrer}"
_id="#ENV{_id}" :_id="[(#ENV{_id}|intval)]"
filtreselect="[(#ENV{filtrerselect_deux})]" filtreselect="[(#ENV{filtrerselect_deux})]"
></gamu-table> ></gamu-table>
</div> </div>

View file

@ -653,6 +653,45 @@ function gererConfig(config) {
} }
return filtreCol; return filtreCol;
} }
function gererData(filtreColRecup, data, id = null) {
if (parseInt(id) > 0) {
if (data.length > 0) {
let i = trouver_index(table.value, id);
table.value[i] = data[0];
} else {
let i = trouver_index(table.value, id);
table.value.splice(i, 1);
}
localforage.setItem(
nameLocalStorage.value,
JSON.stringify(table.value)
);
} else {
table.value = data;
if (data[0] && data[0].search) {
champ_search.value = "search";
}
}
if (filtreColRecup !== undefined) {
filtreColType.value = filtreColRecup;
filtreCol.value = [];
Object.keys(filtreColType.value).forEach((col) => {
let Tval = [];
table.value.forEach((t) => {
let valCol = t[champ_search.value][col];
if (valCol) {
if (Tval.indexOf(valCol) === -1) {
Tval.push(valCol);
}
}
});
filtreCol.value.push(col);
filtreColVal.value[col] = Tval.sort();
filtreColSelected.value[col] = [];
});
}
}
function chargerJson(id) { function chargerJson(id) {
console.log("chargerJson pour ", id); console.log("chargerJson pour ", id);
chargement.value = true; chargement.value = true;
@ -670,28 +709,7 @@ function chargerJson(id) {
.getItem(nameLocalStorage.value) .getItem(nameLocalStorage.value)
.then(function (data) { .then(function (data) {
data = recupJson(data); data = recupJson(data);
if (data && data.length) { gererData(filtreColRecup, data, id);
table.value = data;
if (data[0].search) {
champ_search.value = "search";
}
if (filtreColRecup !== undefined) {
filtreColType.value = filtreColRecup;
Object.keys(filtreColType.value).forEach((col) => {
let Tval = [];
// let Tval = [''];
table.value.forEach((t) => {
let valCol = t[champ_search.value][col];
if (Tval.indexOf(valCol) === -1) {
Tval.push(valCol);
}
});
// filtreCol.value.push(col);
filtreColVal.value[col] = Tval.sort();
filtreColSelected.value[col] = [];
});
}
}
if (props.nomblocajaxreload) { if (props.nomblocajaxreload) {
ajaxReload(props.nomblocajaxreload); ajaxReload(props.nomblocajaxreload);
} }
@ -706,67 +724,7 @@ function chargerJson(id) {
.then((data) => { .then((data) => {
let config = data.shift(); let config = data.shift();
let filtreColRecup = gererConfig(config); let filtreColRecup = gererConfig(config);
// header.value = config.header; gererData(filtreColRecup, data, id);
// if (config.maj !== undefined) {
// maj.value = config.maj?.lastMAJ;
// }
// if (config.crayons !== undefined) {
// crayons.value = config.crayons;
// } else {
// crayons.value = [];
// }
// if (config.classes !== undefined) {
// classes.value = config.classes;
// } else {
// classes.value = [];
// }
// 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;
// } else {
// ordreCol.value = [];
// }
if (parseInt(id) > 0) {
if (data.length > 0) {
let i = trouver_index(table.value, id);
table.value[i] = data[0];
} else {
let i = trouver_index(table.value, id);
table.value.splice(i, 1);
}
localforage.setItem(
nameLocalStorage.value,
JSON.stringify(table.value)
);
} else {
table.value = data;
if (data[0] && data[0].search) {
champ_search.value = "search";
}
}
if (filtreColRecup !== undefined) {
filtreColType.value = filtreColRecup;
filtreCol.value = [];
Object.keys(filtreColType.value).forEach((col) => {
let Tval = [];
table.value.forEach((t) => {
let valCol = t[champ_search.value][col];
if (valCol) {
if (Tval.indexOf(valCol) === -1) {
Tval.push(valCol);
}
}
});
filtreCol.value.push(col);
filtreColVal.value[col] = Tval.sort();
filtreColSelected.value[col] = [];
});
}
nextTick(() => { nextTick(() => {
chargement.value = false; chargement.value = false;