arenard
/
paniers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Debug last commit

This commit is contained in:
Adrien RENARD 2024-02-03 19:20:45 +01:00
parent 2e0ab9710b
commit cf5d9b58bb
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public_html_admin/js/livraisons.js
View File

@ -325,6 +325,7 @@ function modalFormLivraison_clear(modal) {
modal.removeAttr("edit_id"); modal.removeAttr("edit_id");
modal.find("div.modaLoader").removeClass("show"); modal.find("div.modaLoader").removeClass("show");
modalForm_resetTabs(modal); modalForm_resetTabs(modal);
modal.find("ul.formTabsBtns li:not(.general)").addClass("hide");
modal.find("select[name=paniers_groupe]").val(""); modal.find("select[name=paniers_groupe]").val("");
modal.find("input[name=date]").val(getTodayDate("yyyy-mm-dd")); modal.find("input[name=date]").val(getTodayDate("yyyy-mm-dd"));
@ -351,19 +352,24 @@ function modalFormLivraison_loadNextGroupe(modal) {
} }
function modalFormLivraison_loadPaniers(modal, paniers) { function modalFormLivraison_loadPaniers(modal, paniers) {
var oldPaniersStates = {};
modal.find("div.tabPaniers table.panier tbody tr.panier").each(function(e) {
oldPaniersStates[ $(this).attr("contrat") ] = $(this).find("input[name=status]").prop("checked");
});
modalFormLivraison_clearPaniers(modal);
datas = { datas = {
'action' : 'paniers_eligibles', 'action' : 'paniers_eligibles',
'paniers_groupe' : parseInt( modal.find("select[name=paniers_groupe]").val() ), 'paniers_groupe' : parseInt( modal.find("select[name=paniers_groupe]").val() ),
'date' : modal.find("input[name=date]").val(), 'date' : modal.find("input[name=date]").val(),
'quinz_groupe' : modal.find("select[name=quinz_groupe]").val() 'quinz_groupe' : modal.find("select[name=quinz_groupe]").val()
}; };
if(datas.paniers_groupe>0 && datas.date != "" && datas.quinz_groupe!="") { if(datas.paniers_groupe>0 && datas.date != "" && datas.quinz_groupe!="") {
// OLD PANIERS
var oldPaniersStates = {};
modal.find("div.tabPaniers table.panier tbody tr.panier").each(function(e) {
oldPaniersStates[ $(this).attr("contrat") ] = $(this).find("input[name=status]").prop("checked");
});
modalFormLivraison_clearPaniers(modal);
// SHOW TABS
modal.find("ul.formTabsBtns li:not(.general)").removeClass("hide");
$.post(livraisonsConf.baseURL, datas, function(result) { $.post(livraisonsConf.baseURL, datas, function(result) {
modal.find("div.tabPaniers").html(result); modal.find("div.tabPaniers").html(result);
$('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="tooltip"]').tooltip();
@ -401,6 +407,8 @@ function modalFormLivraison_loadPaniers(modal, paniers) {
}).fail(function() { alert("ERREUR SERVEUR (modal form livraison - load paniers eligibles)"); }); }).fail(function() { alert("ERREUR SERVEUR (modal form livraison - load paniers eligibles)"); });
} }
// HIDE TABS
else modal.find("ul.formTabsBtns li:not(.general)").addClass("hide");
} }
function modalFormLivraison_clearPaniers(modal) { function modalFormLivraison_clearPaniers(modal) {

2
public_html_admin/templates/livraisons/livraison_form.tpl
View File

@ -1,6 +1,6 @@
<div class="modaLoader"></div> <div class="modaLoader"></div>
<ul class="nav nav-tabs formTabsBtns"> <ul class="nav nav-tabs formTabsBtns">
<li role="presentation" class="active"><a href="#" class="formTabBtn" tab="tabGeneral">Général</a></li> <li role="presentation" class="active general"><a href="#" class="formTabBtn" tab="tabGeneral">Général</a></li>
<li role="presentation"><a href="#" class="formTabBtn" tab="tabPaniers">Paniers</a></li> <li role="presentation"><a href="#" class="formTabBtn" tab="tabPaniers">Paniers</a></li>
<li role="presentation"><a href="#" class="formTabBtn" tab="tabCompo"><span class="visible-xs">Compo</span><span class="hidden-xs">Composition</span></a></li> <li role="presentation"><a href="#" class="formTabBtn" tab="tabCompo"><span class="visible-xs">Compo</span><span class="hidden-xs">Composition</span></a></li>
<li role="presentation"><a href="#" class="formTabBtn" tab="tabLegumes"><span class="visible-xs">Légumes</span><span class="hidden-xs">Total Légumes</span></a></li> <li role="presentation"><a href="#" class="formTabBtn" tab="tabLegumes"><span class="visible-xs">Légumes</span><span class="hidden-xs">Total Légumes</span></a></li>