Merge branch 'fixes/fix-select-2-gestion-update' into staging

This commit is contained in:
Tiavina 2025-02-07 11:25:01 +03:00
commit 3f6a94b869
24 changed files with 102 additions and 96 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -157,23 +157,6 @@ export class Client {
selectElement.dataset.id = e.target.dataset.id; selectElement.dataset.id = e.target.dataset.id;
selectElement.dataset.old = e.target.innerHTML; selectElement.dataset.old = e.target.innerHTML;
selectElement.addEventListener("change", el=>{
if(el.target.value != 0){
updateDB(el.target.parentElement.dataset.table,
el.target.parentElement.dataset.column,
el.target.value,
el.target.parentElement.dataset.id
);
var parentElement = el.target.parentElement
parentElement.innerHTML = el.target.value + " " + el.target.options[el.target.selectedIndex].text;
parentElement.dataset.current = el.target.value;
}else{
var parentElement = el.target.parentElement
parentElement.innerHTML = el.target.dataset.old
}
});
var option = document.createElement("option"); var option = document.createElement("option");
option.value = 0; option.value = 0;
option.text = t('gestion', 'Cancel'); option.text = t('gestion', 'Cancel');
@ -193,6 +176,23 @@ export class Client {
e.target.innerHTML = '' e.target.innerHTML = ''
e.target.appendChild(selectElement); e.target.appendChild(selectElement);
$(selectElement).select2(); $(selectElement).select2();
$(selectElement).on("select2:select", function (event) {
var el = event.target;
if (el.value != 0) {
updateDB(el.parentElement.dataset.table,
el.parentElement.dataset.column,
el.value,
el.parentElement.dataset.id
);
var parentElement = el.parentElement;
parentElement.innerHTML = el.value + " " + el.options[el.selectedIndex].text;
parentElement.dataset.current = el.value;
} else {
var parentElement = el.parentElement;
parentElement.innerHTML = el.dataset.old;
}
});
}); });
} }

View File

@ -234,25 +234,6 @@ export class Devis {
selectElement.dataset.id = e.target.dataset.id; selectElement.dataset.id = e.target.dataset.id;
selectElement.dataset.old = e.target.innerHTML; selectElement.dataset.old = e.target.innerHTML;
selectElement.addEventListener("change", el=>{
if(el.target.value != 0){
updateDB(el.target.parentElement.dataset.table,
el.target.parentElement.dataset.column,
el.target.value,
el.target.parentElement.dataset.id
);
location.reload();
var parentElement = el.target.parentElement;
parentElement.innerHTML = el.target.options[el.target.selectedIndex].text;
parentElement.dataset.current = el.target.value;
}else{
var parentElement = el.target.parentElement
parentElement.innerHTML = el.target.dataset.old
}
});
var option = document.createElement("option"); var option = document.createElement("option");
option.value = 0; option.value = 0;
option.text = t('gestion', 'Cancel'); option.text = t('gestion', 'Cancel');
@ -274,6 +255,27 @@ export class Devis {
e.target.innerHTML = '' e.target.innerHTML = ''
e.target.appendChild(selectElement); e.target.appendChild(selectElement);
$(selectElement).select2(); $(selectElement).select2();
$(selectElement).on("select2:select", function (event) {
var el = event.target;
if (el.value != 0) {
updateDB(el.parentElement.dataset.table,
el.parentElement.dataset.column,
el.value,
el.parentElement.dataset.id
);
location.reload();
var parentElement = el.parentElement;
parentElement.innerHTML = el.options[el.selectedIndex].text;
parentElement.dataset.current = el.value;
} else {
var parentElement = el.parentElement;
parentElement.innerHTML = el.dataset.old;
}
});
}); });
} }
@ -284,25 +286,6 @@ export class Devis {
selectElement.dataset.id = e.target.dataset.id; selectElement.dataset.id = e.target.dataset.id;
selectElement.dataset.old = e.target.innerHTML; selectElement.dataset.old = e.target.innerHTML;
selectElement.addEventListener("change", el=>{
if(el.target.value != 0){
updateDB(el.target.parentElement.dataset.table,
el.target.parentElement.dataset.column,
el.target.value,
el.target.parentElement.dataset.id
);
location.reload();
var parentElement = el.target.parentElement;
parentElement.innerHTML = el.target.options[el.target.selectedIndex].text;
parentElement.dataset.current = el.target.value;
}else{
var parentElement = el.target.parentElement
parentElement.innerHTML = el.target.dataset.old
}
});
var option = document.createElement("option"); var option = document.createElement("option");
option.value = 0; option.value = 0;
option.text = t('gestion', 'Cancel'); option.text = t('gestion', 'Cancel');
@ -324,6 +307,28 @@ export class Devis {
e.target.innerHTML = '' e.target.innerHTML = ''
e.target.appendChild(selectElement); e.target.appendChild(selectElement);
$(selectElement).select2(); $(selectElement).select2();
$(selectElement).on("select2:select", function (event) {
var el = event.target;
if (el.value != 0) {
updateDB(el.parentElement.dataset.table,
el.parentElement.dataset.column,
el.value,
el.parentElement.dataset.id
);
location.reload();
var parentElement = el.parentElement;
parentElement.innerHTML = el.options[el.selectedIndex].text;
parentElement.dataset.current = el.value;
} else {
var parentElement = el.parentElement;
parentElement.innerHTML = el.dataset.old;
}
});
},mentionFilters); },mentionFilters);
} }
@ -334,25 +339,6 @@ export class Devis {
selectElement.dataset.id = e.target.dataset.id; selectElement.dataset.id = e.target.dataset.id;
selectElement.dataset.old = e.target.innerHTML; selectElement.dataset.old = e.target.innerHTML;
selectElement.addEventListener("change", el=>{
if(el.target.value != 0){
updateDB(el.target.parentElement.dataset.table,
el.target.parentElement.dataset.column,
el.target.value,
el.target.parentElement.dataset.id
);
location.reload();
var parentElement = el.target.parentElement;
parentElement.innerHTML = el.target.options[el.target.selectedIndex].text;
parentElement.dataset.current = el.target.value;
}else{
var parentElement = el.target.parentElement
parentElement.innerHTML = el.target.dataset.old
}
});
var option = document.createElement("option"); var option = document.createElement("option");
option.value = 0; option.value = 0;
option.text = t('gestion', 'Cancel'); option.text = t('gestion', 'Cancel');
@ -374,6 +360,26 @@ export class Devis {
e.target.innerHTML = '' e.target.innerHTML = ''
e.target.appendChild(selectElement); e.target.appendChild(selectElement);
$(selectElement).select2(); $(selectElement).select2();
$(selectElement).on("select2:select", function (event) {
var el = event.target;
var parentElement = el.parentElement;
if (el.value != 0) {
updateDB(parentElement.dataset.table,
parentElement.dataset.column,
el.value,
parentElement.dataset.id
);
location.reload();
parentElement.innerHTML = el.options[el.selectedIndex].text;
parentElement.dataset.current = el.value;
} else {
parentElement.innerHTML = el.dataset.old;
}
});
}); });
} }
} }