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

Debug last commit

This commit is contained in:
Adrien RENARD 2023-12-22 22:38:56 +01:00
parent 79fcfc33bc
commit 269b6dd2b0
9 changed files with 174 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
functions/functions_contrats.php
View File

@ -119,6 +119,8 @@ function getContratDatas($id) {
$i["frequence_print"] = CONTRATS_FREQUENCES[$i["frequence"]];
if($i["frequence"] == "quinz") $i["frequence_print"] .= " (groupe ".$i["quinz_groupe"].')';
$i["paniers_livres"] = getContratPaniersLivres($id);
}
else {
$er = "</br>sql: ".$sql."</br>error: ".getReadableVar($r['erreur']);
@ -128,6 +130,29 @@ function getContratDatas($id) {
return $i;
}
function getContratPaniersLivres($id) {
$list = array();
$sql = getLivraisonsPaniersSelectBaseSQL()
." WHERE ".LIVRAISONS_PANIERS_TABLE.".`contrat`=".intval($id)
." ORDER BY ".LIVRAISONS_TABLE.".`date` ASC";
$r = $GLOBALS['db_admin']['man']->select($sql);
if(!$r['erreur']) {
foreach($r['datas'] as $i) {
$i["livraison_date_print"] = formatDate($i["livraison_date"], "mysql_date", "print_date");
$list[$i['livraison_ref']] = $i;
}
}
else {
$er = "</br>sql: ".$sql."</br>error: ".getReadableVar($r['erreur']);
$GLOBALS['errors'][] = "Une erreur est survenue durant la récupération de la liste des paniers livrés du contrat dans le base de données !".$er;
}
return $list;
}
function getContratLastPanier($id) {
$i = false;

10
public_html_admin/contrats.php
View File

@ -37,6 +37,15 @@ if(isset($_REQUEST["ref"]) && (int)$_REQUEST["ref"]>0 && $action) {
switch($action) {
// AJAX GET DATAS
case "getDatas": die(json_encode($infos)); break;
// MODAL VIEW - GET TAB
case "modalView_getTab": {
$GLOBALS['smarty'] -> assign('infos', $infos);
$tabs = array(
"paniers" => "contrats/contrat_modal_view_tab_paniers.tpl"
);
if(isset($_REQUEST['tab']) && array_key_exists($_REQUEST['tab'], $tabs)) die( $GLOBALS['smarty']->fetch($tabs[$_REQUEST['tab']]) );
die("NO TAB");
} break;
// EDIT
case "edit": {
$datas = getContratDatasFromRequest();
@ -140,6 +149,7 @@ switch($action) {
// TEMPLATE
$GLOBALS['template'] = 'contrats/contrats_list.tpl';
$jsFiles[] = PUBLIC_HTML_ADMIN.'js/contrats.js';
$cssFiles[] = PUBLIC_HTML_ADMIN.'css/contrats.css';
// REQUIRED LISTS
$GLOBALS['smarty'] -> assign('paniers_groupes_list', $groupesList);

36
public_html_admin/css/contrats.css Normal file
View File

@ -0,0 +1,36 @@
/* MODAL & FORM LIVRAISON */
#modalViewContrat { overflow: hidden; }
#modalViewContrat div.modal-header { border-bottom: none; padding-bottom: 5px; }
#modalViewContrat .formContrat { margin: -15px; }
/* NAV TABS */
.formContrat ul.nav.nav-tabs { padding-left: 10px; }
div.formContratTabs > div.tab {
display: none;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
overflow-y: scroll;
}
div.formContratTabs > div.tab.active { display: block; }
div.formContratTabs > div.tab span.nullChild { display: block; padding: 10px; }
div.formContratTabs > div.tab span.nullChild { display: block; padding: 10px; }
/* TAB INFOS */
div.formContratTabs > div.tabInfos table tr:first-child > th,
div.formContratTabs > div.tabInfos table tr:first-child > td { border-top: none; }
div.formContratTabs > div.tabInfos table { margin-bottom: 0; }
div.formContratTabs > div.tabInfos table th { width: 200px; }
/* TAB PANIERS */
div.formContratTabs > div.tabPaniers table { margin-bottom: 0; }

6
public_html_admin/js/clients.js
View File

@ -160,9 +160,13 @@ function loadDatasInViewClientModal(id) {
}
function clearViewClientModal() {
currentViewClient = 0;
modalViewClient.find("small.db_ref > span").html("");
modalViewClient.find("ul.formClientTabs > li").removeClass('active hide');
modalViewClient.find("ul.formClientTabs > li:first-child").addClass('active');
modalViewClient.find("div.formClientTabs > div.tab").removeClass("active");
modalViewClient.find("div.formClientTabs > div.tab:first-child").addClass("active");
modalViewClient.find("td.nom").html("");
modalViewClient.find("td.tel").html("");
modalViewClient.find("td.email").html("");

43
public_html_admin/js/contrats.js
View File

@ -138,6 +138,31 @@ function initViewContrat() {
loadDatasInViewContratModal(id);
});
var form = modalViewContrat.find("div.formContrat");
// TABS
form.find("a.formContratTabBtn").click(function(e) {
e.preventDefault();
// BTN
if(!$(this).parent().hasClass("active")) {
form.find("ul.formContratTabs > li").removeClass('active');
$(this).parent().addClass("active");
}
// TAB
var tab = form.find("div.tab."+$(this).attr("tab"));
if(tab.length>0) {
if(tab.hasClass("active")) return;
form.find("div.formContratTabs > div.tab").removeClass("active");
tab.addClass("active");
}
});
resizeFormContrat(form);
$( window ).on( "resize", function() { resizeFormContrat(form) });
// CANCEL
modalViewContrat.on('hidden.bs.modal', function (e) {
clearViewContratModal();
@ -145,6 +170,11 @@ function initViewContrat() {
});
}
function resizeFormContrat(form) {
var wh = window.innerHeight;
form.find("div.formContratTabs div.tab").css("max-height", (wh-180)+"px");
}
function loadDatasInViewContratModal(id) {
datas = {
'ref' : id,
@ -152,6 +182,7 @@ function loadDatasInViewContratModal(id) {
};
$.post( contratsBaseURL, datas, function( result ) {
var datas = JSON.parse(result);
console.log(datas);
modalViewContrat.find("small.db_ref > span").html(datas.ref);
@ -187,6 +218,11 @@ function loadDatasInViewContratModal(id) {
modalViewContrat.find("td.nb_panier_livre").html(nb_panier_livre);
modalViewContrat.find("td.nb_panier_restant").html(datas.nb_paniers_restants + " / " + datas.nb_paniers);
// PANIERS
$.post(contratsBaseURL, { 'ref' : id, 'action' : 'modalView_getTab', 'tab' : 'paniers' }, function(result) {
modalViewContrat.find("div.tabPaniers").html(result);
}).fail(function() { alert(srvErrorMsg+" (load modal view client - tab paniers)"); });
modalViewContrat.modal('show');
}).fail(function() { alert(srvErrorMsg+" (load modal view contrat)"); });
}
@ -194,6 +230,11 @@ function loadDatasInViewContratModal(id) {
function clearViewContratModal() {
modalViewContrat.find("small.db_ref > span").html("");
modalViewContrat.find("ul.formContratTabs > li").removeClass('active hide');
modalViewContrat.find("ul.formContratTabs > li:first-child").addClass('active');
modalViewContrat.find("div.formContratTabs > div.tab").removeClass("active");
modalViewContrat.find("div.formContratTabs > div.tab:first-child").addClass("active");
modalViewContrat.find("td.nom").html("");
modalViewContrat.find("td.tel").html("");
modalViewContrat.find("td.email").html("");
@ -207,6 +248,8 @@ function clearViewContratModal() {
modalViewContrat.find("td.nb_panier_livre").html("");
modalViewContrat.find("td.nb_panier_restant").html("");
modalViewContrat.find("div.tabPaniers").html("");
}
/***** FORM CONTRAT *****/

6
public_html_admin/js/livraisons.js
View File

@ -77,15 +77,17 @@ $(document).ready( function() {
function initFiltresLivraisons() {
// console.log("INIT FILTRES LIVRAISONS");
loadValue = filtreLivraisonGroupe.attr("load_value");
filtreLivraisonGroupe.change(function(e) {
$(this).blur();
document.location = "?groupe="+parseInt($(this).val());
});
}).val(loadValue);
loadValue = filtreLivraisonArchive.attr("load_value");
filtreLivraisonArchive.change(function(e) {
$(this).blur();
document.location = "?archive="+parseInt($(this).val());
});
}).val(loadValue);
}
/***** VIEW LIVRAISON *****/

15
public_html_admin/templates/contrats/contrat_modal_view.tpl
View File

@ -10,7 +10,14 @@
Fiche contrat
</h2>
</div>
<table class="table modal-body">
<div class="modal-body formContrat">
<ul class="nav nav-tabs formContratTabs">
<li role="presentation" class="active"><a href="#" class="formContratTabBtn" tab="tabInfos">Informations</a></li>
<li role="presentation"><a href="#" class="formContratTabBtn" tab="tabPaniers">Paniers Livrés</a></li>
</ul>
<div class="formContratTabs">
<div class="tab tabInfos active">
<table class="table">
<tr><th>type de contrat :</th><td class="type"></td></tr>
<tr><th>client :</th><td class="client"></td></tr>
<tr><th>date de début :</th><td class="date"></td></tr>
@ -20,6 +27,12 @@
<tr><th>nb. de panier(s) restant(s) :</th><td class="nb_panier_restant"></td></tr>
</table>
</div>
<div class="tab tabPaniers">
<span class="nullChild">aucun panier livré</span>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- end MODAL VIEW CONTRAT -->

22
public_html_admin/templates/contrats/contrat_modal_view_tab_paniers.tpl Normal file
View File

@ -0,0 +1,22 @@
<table class="table">
<thead>
<tr class="head">
<th>date</th>
<th>panier</th>
<th>lieu</th>
</tr>
</thead>
<tbody>
{foreach from=$infos.paniers_livres item=i}
<tr>
<td>{$i.livraison_date_print}</td>
<td>{$i.panier_type_nom}</td>
<td>{$i.lieu_depot_nom}</td>
</tr>
{foreachelse}
<tr>
<td colspan="3">aucun panier</td>
</tr>
{/foreach}
</tbody>
</table>

14
public_html_admin/templates/livraisons/livraisons_secondbar.tpl
View File

@ -10,15 +10,15 @@
<div class="collapse navbar-collapse">
<form class="navbar-form navbar-right" role="search" id="livraisonsFiltre">
<div class="input-group">
<span class="input-group-addon">groupe :</span>
<select class="form-control" name="groupe">{include file='paniers_groupes/paniers_groupes_select_list.tpl'}</select>
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
<select class="form-control" name="groupe" load_value="{$groupe}">{include file='paniers_groupes/paniers_groupes_select_list.tpl'}</select>
</div>
<div class="input-group">
<span class="input-group-addon">archive :</span>
<select class="form-control" name="archive">
<option value="-1"{if $archive==-1} selected{/if}>tous</option>
<option value="0"{if $archive==0} selected{/if}>non</option>
<option value="1"{if $archive==1} selected{/if}>oui</option>
<span class="input-group-addon{if $archive!=0} active{/if}">archive :</span>
<select class="form-control" name="archive" load_value="{$archive}">
<option value="-1">tous</option>
<option value="0">non</option>
<option value="1">oui</option>
</select>
</div>
</form>