Ajout BTN Clear All Filtres
This commit is contained in:
parent
415d04537d
commit
cdf9a13d12
|
|
@ -23,6 +23,9 @@ function getRequestAndSessionSave($requestName, $sessionName, $smartyName=false,
|
||||||
else $val = $v;
|
else $val = $v;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CLEAR FILTRES
|
||||||
|
if(isset($_REQUEST["clear_filtres"])) $val = $default;
|
||||||
|
|
||||||
// SAVE SESSION VAL
|
// SAVE SESSION VAL
|
||||||
$_SESSION[$sessionName] = $val;
|
$_SESSION[$sessionName] = $val;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,11 @@ switch($action) {
|
||||||
"lieu" => getRequestAndSessionSave("lieu", "livraisons_filtre_lieu", "lieu", "int", 0, $lieuxList, true),
|
"lieu" => getRequestAndSessionSave("lieu", "livraisons_filtre_lieu", "lieu", "int", 0, $lieuxList, true),
|
||||||
"archive" => getRequestAndSessionSave("archive", "livraisons_filtre_archive", "archive", "int", 0, array(-1,0,1))
|
"archive" => getRequestAndSessionSave("archive", "livraisons_filtre_archive", "archive", "int", 0, array(-1,0,1))
|
||||||
);
|
);
|
||||||
|
$GLOBALS['smarty'] -> assign('hasFiltres', $filtres["groupe"]>0
|
||||||
|
|| $filtres["frequence"]!= ""
|
||||||
|
|| $filtres["panier"]>0
|
||||||
|
|| $filtres["lieu"]>0
|
||||||
|
|| $filtres["archive"]!=0);
|
||||||
|
|
||||||
// SEARCH
|
// SEARCH
|
||||||
$search = getSearch("contrats_search");
|
$search = getSearch("contrats_search");
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,9 @@ switch($action) {
|
||||||
"frequence" => getRequestAndSessionSave("frequence", "contrats_types_filtre_frequence", "frequence", "txt", 0, array("hebdo", "quinz", "quinz_A", "quinz_B")),
|
"frequence" => getRequestAndSessionSave("frequence", "contrats_types_filtre_frequence", "frequence", "txt", 0, array("hebdo", "quinz", "quinz_A", "quinz_B")),
|
||||||
"panier" => getRequestAndSessionSave("panier", "contrats_types_filtre_panier", "panier", "int", 0, $paniersTypesList, true)
|
"panier" => getRequestAndSessionSave("panier", "contrats_types_filtre_panier", "panier", "int", 0, $paniersTypesList, true)
|
||||||
);
|
);
|
||||||
|
$GLOBALS['smarty'] -> assign('hasFiltres', $filtres["groupe"]>0
|
||||||
|
|| $filtres["frequence"]!= ""
|
||||||
|
|| $filtres["panier"]>0);
|
||||||
|
|
||||||
// LIMITS
|
// LIMITS
|
||||||
$limits = array("start" => 0, "end" => LIST_NB_LIGNES_PAR_PAGE, "nbItemsByPage" => LIST_NB_LIGNES_PAR_PAGE, "max" => getNbContratsTypesInList($filtres));
|
$limits = array("start" => 0, "end" => LIST_NB_LIGNES_PAR_PAGE, "nbItemsByPage" => LIST_NB_LIGNES_PAR_PAGE, "max" => getNbContratsTypesInList($filtres));
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,10 @@ div.intl-tel-input { display: block; }
|
||||||
|
|
||||||
div.main-navbar { margin-bottom: 0; }
|
div.main-navbar { margin-bottom: 0; }
|
||||||
|
|
||||||
|
div.main-navbar div.container-fluid { padding-right: 0; }
|
||||||
|
|
||||||
|
div.main-navbar .navbar-collapse { padding-right: 5px; }
|
||||||
|
|
||||||
div.main-navbar a.brand img {
|
div.main-navbar a.brand img {
|
||||||
height: 46px;
|
height: 46px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
@ -63,6 +67,7 @@ div.secondbar {
|
||||||
border-top : none;
|
border-top : none;
|
||||||
background-color: #e7e7e7;
|
background-color: #e7e7e7;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.secondbar button.navbar-toggle {
|
div.secondbar button.navbar-toggle {
|
||||||
|
|
@ -87,6 +92,8 @@ div.secondbar a.brand > span {
|
||||||
top: -13px;
|
top: -13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.secondbar div.container-fluid { padding-right: 5px; }
|
||||||
|
|
||||||
div.secondbar ul.navbar-nav li > a:hover,
|
div.secondbar ul.navbar-nav li > a:hover,
|
||||||
div.secondbar ul.navbar-nav li.active > a:hover,
|
div.secondbar ul.navbar-nav li.active > a:hover,
|
||||||
div.secondbar ul.navbar-nav li.active > a {
|
div.secondbar ul.navbar-nav li.active > a {
|
||||||
|
|
@ -94,10 +101,17 @@ div.secondbar ul.navbar-nav li.active > a {
|
||||||
color: #3296C8;
|
color: #3296C8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.secondbar button.btnClearFiltres { padding: 4px; background-color: #5bc0de; }
|
||||||
|
div.secondbar button.btnClearFiltres > img { height: 24px; }
|
||||||
|
div.secondbar button.btnClearFiltres > span.txt { display: none; vertical-align: middle; }
|
||||||
|
|
||||||
div.secondbar .form-filtre-search { padding-right: 0; }
|
div.secondbar .form-filtre-search { padding-right: 0; }
|
||||||
|
|
||||||
div.secondbar .form-filtre-search i.btnClearSearch { cursor: pointer; }
|
div.secondbar .form-filtre-search i.btnClearSearch { cursor: pointer; }
|
||||||
|
|
||||||
|
div.secondbar .form-filtre-search .input-group-addon { padding: 6px; }
|
||||||
|
div.secondbar:not(.collapsed) .form-filtre-search select.form-control { padding-left: 4px!important; max-width: 120px; }
|
||||||
|
|
||||||
div.secondbar .form-filtre-search span.separator {
|
div.secondbar .form-filtre-search span.separator {
|
||||||
display: inline-table;
|
display: inline-table;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
|
@ -105,36 +119,68 @@ div.secondbar .form-filtre-search span.separator {
|
||||||
margin: 0 5px;
|
margin: 0 5px;
|
||||||
border-left: 1px solid #CCCCCC;
|
border-left: 1px solid #CCCCCC;
|
||||||
}
|
}
|
||||||
|
div.secondbar .form-filtre-search span.clearFiltresSeparator { display: none; }
|
||||||
|
|
||||||
div.secondbar .form-filtre-search button.btnPrint span.txt { display: none; }
|
div.secondbar .form-filtre-search button.btnPrint span.txt { display: none; }
|
||||||
|
|
||||||
|
/* SECOND BAR - COLLASPED */
|
||||||
|
|
||||||
|
div.secondbar.collapsed { min-height: 0; }
|
||||||
|
div.secondbar.collapsed div.container-fluid { padding-right: 0; }
|
||||||
|
div.secondbar.collapsed a.brand { height: 40px; padding: 10px; }
|
||||||
|
div.secondbar.collapsed a.brand img { height: 34px; }
|
||||||
|
|
||||||
|
div.secondbar.collapsed div.navbar-collapse.collapse { display: none!important; }
|
||||||
|
div.secondbar.collapsed div.navbar-collapse {
|
||||||
|
border-top: 1px solid #ccc;
|
||||||
|
padding: 0;
|
||||||
|
margin-left: -15px;
|
||||||
|
margin-right: -15px;
|
||||||
|
}
|
||||||
|
div.secondbar.collapsed div.navbar-header { float: none; }
|
||||||
|
div.secondbar.collapsed button.navbar-toggle { display: block; float: right; }
|
||||||
|
|
||||||
|
div.secondbar.collapsed .navbar-right {
|
||||||
|
margin: 0;
|
||||||
|
padding: 10px 15px;
|
||||||
|
float: none!important;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.secondbar.collapsed .form-filtre-search .input-group { display: table; width: 100%; }
|
||||||
|
div.secondbar.collapsed .form-filtre-search .input-group .input-group-addon { width: 1%; }
|
||||||
|
|
||||||
|
div.secondbar.collapsed div.navbar-filtre-search { border-top: 1px solid #CCCCCC; padding: 0 5px; }
|
||||||
|
div.secondbar.collapsed .form-filtre-search { padding: 5px 0; margin: 0; }
|
||||||
|
div.secondbar.collapsed .form-filtre-search > *:not(:last-child) { padding-bottom: 7px; }
|
||||||
|
|
||||||
|
div.secondbar.collapsed .form-filtre-search span.separator {
|
||||||
|
display: block;
|
||||||
|
width: 100%; height: 0px;
|
||||||
|
border-left: none;
|
||||||
|
border-top: 1px solid #CCCCCC;
|
||||||
|
margin: 0 0 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.secondbar.collapsed button.btnClearFiltres { width: 100%; }
|
||||||
|
div.secondbar.collapsed button.btnClearFiltres > span.txt { display: inline; }
|
||||||
|
div.secondbar.collapsed .form-filtre-search span.clearFiltresSeparator { display: inline-table; }
|
||||||
|
|
||||||
|
div.secondbar.collapsed .form-filtre-search button.btnPrint { width: 100%; margin-top: -5px; }
|
||||||
|
div.secondbar.collapsed .form-filtre-search button.btnPrint span.txt { display: inline; }
|
||||||
|
|
||||||
@media (max-width: 767px) {
|
@media (max-width: 767px) {
|
||||||
div.main-navbar a.brand img { height: 40px; }
|
div.main-navbar a.brand img { height: 40px; }
|
||||||
|
div.main-navbar div.container-fluid { padding-right: 15px; }
|
||||||
|
|
||||||
div.secondbar { min-height: 0; }
|
div.secondbar a.brand img { height: 24px!important; margin-right: 2px; margin-top: -2px; }
|
||||||
div.secondbar a.brand { height: 40px; padding: 10px; }
|
div.secondbar.collapsed div.container-fluid { padding-right: 15px; }
|
||||||
|
|
||||||
div.secondbar div.navbar-filtre-search { border-top: 1px solid #CCCCCC; padding: 0 5px; }
|
|
||||||
div.secondbar .form-filtre-search { padding: 5px 0; margin: 0; }
|
|
||||||
div.secondbar .form-filtre-search > *:not(:last-child) { padding-bottom: 7px; }
|
|
||||||
|
|
||||||
div.secondbar .form-filtre-search span.separator {
|
|
||||||
width: 100%; height: 0px;
|
|
||||||
margin: 0;
|
|
||||||
border-left: none;
|
|
||||||
border-top: 1px solid #CCCCCC;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.secondbar .form-filtre-search button.btnPrint { width: 100%; }
|
|
||||||
div.secondbar .form-filtre-search button.btnPrint span.txt { display: inline; }
|
|
||||||
div.secondbar div.input-group.order {
|
div.secondbar div.input-group.order {
|
||||||
display: table!important;
|
display: table!important;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-top: 1px solid #ccc;
|
border-top: 1px solid #ccc;
|
||||||
padding: 7px 0 0 0;
|
padding: 7px 0 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.secondbar button.btnPrint { margin-top: -5px; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* LIST */
|
/* LIST */
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
|
||||||
|
<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
|
||||||
|
<g><g><g><path fill="#000000" d="M223.5,14c-1.1,0.3-3,1.2-4.1,1.9c-1.2,0.7-20.4,19.5-42.7,41.9L136,98.5l-2.1-1.6c-2.7-2.1-5-2.8-8.6-2.8c-3.3,0-4.3,0.5-11.9,5c-15.4,9.1-36.6,14.1-55.5,13.2c-12.5-0.6-22.6-2.4-35.5-6.6c-11-3.5-11.5-3.2-12.2,7.4c-2.2,32.6,12.4,67.4,39.8,94.7c20.7,20.7,44.5,33.3,65.4,34.8c5.7,0.4,12.3-0.5,13.8-1.9c0.8-0.7,4.6-10.8,14.3-38.4c7.2-20.6,15.3-43.5,18-51c4.3-12,4.8-14,4.8-16.8c0-3.7-1.4-7-4.1-9.6l-1.7-1.6L201.7,82c44.2-44.2,43.1-43,44.1-48.9c1.1-7.5-2.8-15-9.5-18.3C233.1,13.3,226.8,12.8,223.5,14z M231.2,22c2.5,0.7,5.2,3.5,6,6.1c0.7,2.4,0.1,5.6-1.5,7.7c-0.5,0.7-19.1,19.2-41.2,41.2l-40.2,40l-6.2-6.2l-6.2-6.2l41.1-41c35.9-35.9,41.3-41.1,43-41.5C228.6,21.3,229,21.3,231.2,22z M128,103.2c2.1,1.4,28.8,28.1,29.6,29.6c0.4,0.8,0.6,1.9,0.4,2.6c-0.6,2.3-8.5,24.7-9,25.2c-0.2,0.3-9.5-8.7-23.9-23c-12.9-12.9-23.3-23.6-23.1-23.7c0.2-0.1,1.6-0.8,3.2-1.4c4.1-1.6,11.7-5.4,15.7-7.9C124.7,102.2,126.2,101.9,128,103.2z M34.9,117.9c17.7,3.7,36.5,3.8,52.7,0.1l4.8-1.1l26.6,26.6l26.6,26.6l-11.1,31.4c-6.1,17.2-11.4,31.6-11.6,32c-0.4,0.5-1.8,0.6-6.6,0.4c-3.3-0.1-6.9-0.5-7.9-0.8c-1.1-0.2-2.7-0.7-3.7-1l-1.8-0.5l1.4-1.8c6.8-8.6,15.9-26.7,16.1-31.8c0-2.4-1.6-4.2-4-4.2c-2.6,0-3.6,1-5,5.4c-2.6,7.9-10.1,21.3-15.5,27.6l-1.4,1.7l-2.6-1.1c-2.9-1.2-11.5-6.1-14.7-8.3l-2-1.4l5.3-5.1c8.3-8,16.7-19.1,16.7-22c0-1.7-2.5-3.9-4.4-3.9c-2.1,0-2.6,0.5-5.2,4.6c-3.1,4.7-8.9,11.5-13.7,16.1c-5.8,5.4-5.7,5.4-9.1,2.5c-1.5-1.3-5.5-4.9-8.7-8.1l-5.9-5.8l5.1-2.4c6.3-3,12.7-6.9,14.9-8.9c2.1-2,2.3-4.5,0.5-6.3c-1.9-1.9-3.6-1.6-8.8,1.7c-5.1,3.4-16,8.7-17.2,8.5c-1-0.2-6.3-7.6-10.2-14c-4.1-6.9-4.4-6.3,2.2-6.6c9.7-0.5,20.8-2.8,22.7-4.7c1.2-1.2,1.2-4.3,0-5.7c-1.1-1.4-3-1.4-10.3,0.2c-4.5,1-7.5,1.3-13.9,1.6l-8.2,0.3l-1.5-3.8c-1.8-4.7-3.7-10.9-4.2-13.3c-0.3-1.8-0.3-1.9,0.8-1.6c8.6,2.1,33.2,1.2,38.3-1.3c2.8-1.4,2.9-5.2,0.3-7.1c-1.2-0.9-1.3-0.9-6.2,0c-6.2,1.1-25.7,1.2-31.5,0.1c-3.5-0.7-3.5-0.7-3.9-2.3c-0.5-2.5-1-14.1-0.7-15.4l0.3-1.2l5.2,1.6C26.8,116,31.7,117.2,34.9,117.9z"/></g></g></g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.4 KiB |
|
|
@ -8,6 +8,7 @@ var contratsConf = {
|
||||||
// SEARCH
|
// SEARCH
|
||||||
search_selector : "#contratsSearch .searchGrp",
|
search_selector : "#contratsSearch .searchGrp",
|
||||||
filtres_selector : "#contratsSearch select",
|
filtres_selector : "#contratsSearch select",
|
||||||
|
clear_filtres_selector : "#contratsSearch button.btnClearFiltres",
|
||||||
// VIEW
|
// VIEW
|
||||||
view_modalSelector : "#modalViewContrat",
|
view_modalSelector : "#modalViewContrat",
|
||||||
view_btnSelector : ".btnViewContrat",
|
view_btnSelector : ".btnViewContrat",
|
||||||
|
|
@ -46,6 +47,7 @@ $(document).ready( function() {
|
||||||
// SEARCH / FILTRES
|
// SEARCH / FILTRES
|
||||||
$(contratsConf.search_selector).initSearchGroup();
|
$(contratsConf.search_selector).initSearchGroup();
|
||||||
$(contratsConf.filtres_selector).initFiltreSelect();
|
$(contratsConf.filtres_selector).initFiltreSelect();
|
||||||
|
initBtnClearFiltres( $(contratsConf.clear_filtres_selector) );
|
||||||
|
|
||||||
// VIEW
|
// VIEW
|
||||||
modalViewContrat = $(contratsConf.view_modalSelector);
|
modalViewContrat = $(contratsConf.view_modalSelector);
|
||||||
|
|
@ -247,7 +249,7 @@ function modalFormContrat_init(modal) {
|
||||||
modalFormContrat_clear(modal);
|
modalFormContrat_clear(modal);
|
||||||
}
|
}
|
||||||
|
|
||||||
function modalFormContrat_loadDatas(modal,id) {
|
function modalFormContrat_loadDatas(modal,id,copy) {
|
||||||
$.post(contratsConf.baseURL, { 'ref' : id, 'action' : 'getDatas' }, function(jsonTxt) {
|
$.post(contratsConf.baseURL, { 'ref' : id, 'action' : 'getDatas' }, function(jsonTxt) {
|
||||||
var datas = JSON.parse(jsonTxt);
|
var datas = JSON.parse(jsonTxt);
|
||||||
|
|
||||||
|
|
@ -274,7 +276,7 @@ function modalFormContrat_loadDatas(modal,id) {
|
||||||
|
|
||||||
modal.find("input[name=nb_cheque]").val(datas.nb_cheque);
|
modal.find("input[name=nb_cheque]").val(datas.nb_cheque);
|
||||||
modal.find("input[name=np_paniers_distrib_avt_saisie]").val(datas.np_paniers_distrib_avt_saisie);
|
modal.find("input[name=np_paniers_distrib_avt_saisie]").val(datas.np_paniers_distrib_avt_saisie);
|
||||||
modal.find("input[name=complement_avt_saisie]").val(datas.complement_avt_saisie);
|
if(copy!==true) modal.find("input[name=complement_avt_saisie]").val(datas.complement_avt_saisie);
|
||||||
modal.find("input[type=checkbox][name=force_eligible]").prop("checked",datas.force_eligible>0);
|
modal.find("input[type=checkbox][name=force_eligible]").prop("checked",datas.force_eligible>0);
|
||||||
modal.find("input[type=checkbox][name=ignore_warning]").prop("checked",datas.ignore_warning>0);
|
modal.find("input[type=checkbox][name=ignore_warning]").prop("checked",datas.ignore_warning>0);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ var contratsTypesConf = {
|
||||||
list_selector : "#contratsTypesList",
|
list_selector : "#contratsTypesList",
|
||||||
// FILTRES
|
// FILTRES
|
||||||
filtres_selector : "#contratsTypesSearch select",
|
filtres_selector : "#contratsTypesSearch select",
|
||||||
|
clear_filtres_selector : "#contratsTypesSearch button.btnClearFiltres",
|
||||||
// VIEW
|
// VIEW
|
||||||
view_modalSelector : "#modalViewContratsType",
|
view_modalSelector : "#modalViewContratsType",
|
||||||
view_btnSelector : ".btnViewContratsType",
|
view_btnSelector : ".btnViewContratsType",
|
||||||
|
|
@ -32,6 +33,7 @@ $(document).ready( function() {
|
||||||
|
|
||||||
// FILTRES
|
// FILTRES
|
||||||
$(contratsTypesConf.filtres_selector).initFiltreSelect();
|
$(contratsTypesConf.filtres_selector).initFiltreSelect();
|
||||||
|
initBtnClearFiltres( $(contratsTypesConf.clear_filtres_selector) );
|
||||||
|
|
||||||
// VIEW
|
// VIEW
|
||||||
modalViewContratsType = $(contratsTypesConf.view_modalSelector);
|
modalViewContratsType = $(contratsTypesConf.view_modalSelector);
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,29 @@ function isDefined(val){
|
||||||
return (val === undefined || val == null || val.length <= 0) ? false : true;
|
return (val === undefined || val == null || val.length <= 0) ? false : true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* COLLAPSE BAR */
|
||||||
|
function initCollapseBars(elem) {
|
||||||
|
if(!elem.length>0) return;
|
||||||
|
|
||||||
|
elem.each(function(n,e) {
|
||||||
|
if(!$(this).hasClass("collapse_initialized")) {
|
||||||
|
var bar = $(this);
|
||||||
|
bar.addClass("collapse_initialized");
|
||||||
|
|
||||||
|
var limit = parseInt(bar.attr("collapse-limit"));
|
||||||
|
if(!limit>0) limit = 768;
|
||||||
|
|
||||||
|
$( window ).on( "resize", function() { collapseBar_resize(bar, limit); });
|
||||||
|
collapseBar_resize(bar, limit);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function collapseBar_resize(bar, limit) {
|
||||||
|
if(window.innerWidth >= limit) bar.removeClass("collapsed");
|
||||||
|
else bar.addClass("collapsed");
|
||||||
|
}
|
||||||
|
|
||||||
/* MODAL FORM UTIL */
|
/* MODAL FORM UTIL */
|
||||||
|
|
||||||
function modalForm_initBtnView(btn, modal, clearFormFct, loadFormDatasFct) {
|
function modalForm_initBtnView(btn, modal, clearFormFct, loadFormDatasFct) {
|
||||||
|
|
@ -624,6 +647,18 @@ $.fn.initSearchGroup = function() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function initBtnClearFiltres(btn) {
|
||||||
|
if(!btn.length>0) return;
|
||||||
|
btn.initBtnClearFiltres();
|
||||||
|
}
|
||||||
|
|
||||||
|
$.fn.initBtnClearFiltres = function() {
|
||||||
|
$(this).unbind("click").click(function(e) {
|
||||||
|
e.preventDefault(); $(this).blur();
|
||||||
|
document.location = "?clear_filtres=1";
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
$.fn.initFiltreSelect = function() {
|
$.fn.initFiltreSelect = function() {
|
||||||
// LOAD VALUE
|
// LOAD VALUE
|
||||||
$(this).each(function(n,e) {
|
$(this).each(function(n,e) {
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ var livraisonsConf = {
|
||||||
list_selector : "#livraisonsList",
|
list_selector : "#livraisonsList",
|
||||||
// FILTRES
|
// FILTRES
|
||||||
filtres_selector : "#livraisonsSearch select",
|
filtres_selector : "#livraisonsSearch select",
|
||||||
|
clear_filtres_selector : "#livraisonsSearch button.btnClearFiltres",
|
||||||
// VIEW
|
// VIEW
|
||||||
view_modalSelector : "#modalViewLivraison",
|
view_modalSelector : "#modalViewLivraison",
|
||||||
view_btnSelector : ".btnViewLivraison",
|
view_btnSelector : ".btnViewLivraison",
|
||||||
|
|
@ -43,6 +44,7 @@ $(document).ready( function() {
|
||||||
|
|
||||||
// SEARCH / FILTRES
|
// SEARCH / FILTRES
|
||||||
$(livraisonsConf.filtres_selector).initFiltreSelect();
|
$(livraisonsConf.filtres_selector).initFiltreSelect();
|
||||||
|
initBtnClearFiltres( $(livraisonsConf.clear_filtres_selector) );
|
||||||
|
|
||||||
// VIEW
|
// VIEW
|
||||||
modalViewLivraison = $(livraisonsConf.view_modalSelector);
|
modalViewLivraison = $(livraisonsConf.view_modalSelector);
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,9 @@ var secondBarCollapse = false;
|
||||||
var iptGrpOrder = false;
|
var iptGrpOrder = false;
|
||||||
|
|
||||||
$(document).ready( function() {
|
$(document).ready( function() {
|
||||||
|
// SECOND BAR
|
||||||
|
initCollapseBars( $("div.secondbar") );
|
||||||
|
|
||||||
// COLLAPSE
|
// COLLAPSE
|
||||||
secondBar = $("div.secondbar");
|
secondBar = $("div.secondbar");
|
||||||
btnCollapseSecondBar = $("div.secondbar button.navbar-toggle");
|
btnCollapseSecondBar = $("div.secondbar button.navbar-toggle");
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ var paniersConf = {
|
||||||
// SEARCH / FILTRES
|
// SEARCH / FILTRES
|
||||||
search_selector : "#paniersSearch .searchGrp",
|
search_selector : "#paniersSearch .searchGrp",
|
||||||
filtres_selector : "#paniersSearch select",
|
filtres_selector : "#paniersSearch select",
|
||||||
|
clear_filtres_selector : "#paniersSearch button.btnClearFiltres",
|
||||||
// VIEW
|
// VIEW
|
||||||
view_modalSelector : "#modalViewPanier",
|
view_modalSelector : "#modalViewPanier",
|
||||||
view_btnSelector : ".btnViewPanier",
|
view_btnSelector : ".btnViewPanier",
|
||||||
|
|
@ -34,6 +35,7 @@ $(document).ready( function() {
|
||||||
// SEARCH / FILTRES
|
// SEARCH / FILTRES
|
||||||
$(paniersConf.search_selector).initSearchGroup();
|
$(paniersConf.search_selector).initSearchGroup();
|
||||||
$(paniersConf.filtres_selector).initFiltreSelect();
|
$(paniersConf.filtres_selector).initFiltreSelect();
|
||||||
|
initBtnClearFiltres( $(paniersConf.clear_filtres_selector) );
|
||||||
|
|
||||||
// VIEW
|
// VIEW
|
||||||
modalViewPanier = $(paniersConf.view_modalSelector);
|
modalViewPanier = $(paniersConf.view_modalSelector);
|
||||||
|
|
|
||||||
|
|
@ -188,6 +188,9 @@ switch($action) {
|
||||||
// ARCHIVE
|
// ARCHIVE
|
||||||
$archive = getRequestAndSessionSave("archive", "livraisons_list_archive", "archive", "int", 0);
|
$archive = getRequestAndSessionSave("archive", "livraisons_list_archive", "archive", "int", 0);
|
||||||
|
|
||||||
|
// HAS FILTRES
|
||||||
|
$GLOBALS['smarty'] -> assign('hasFiltres', $groupe>0 || $archive!=0);
|
||||||
|
|
||||||
// LIMITS
|
// LIMITS
|
||||||
$limits = array("start" => 0, "end" => LIST_NB_LIGNES_PAR_PAGE, "nbItemsByPage" => LIST_NB_LIGNES_PAR_PAGE, "max" => getNbLivraisonsInList($groupe, $archive));
|
$limits = array("start" => 0, "end" => LIST_NB_LIGNES_PAR_PAGE, "nbItemsByPage" => LIST_NB_LIGNES_PAR_PAGE, "max" => getNbLivraisonsInList($groupe, $archive));
|
||||||
if(isset($_REQUEST['startListAt']) && (int)$_REQUEST['startListAt']>0) {
|
if(isset($_REQUEST['startListAt']) && (int)$_REQUEST['startListAt']>0) {
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,9 @@ switch($action) {
|
||||||
$groupesList = getPaniersGroupesList();
|
$groupesList = getPaniersGroupesList();
|
||||||
$groupe = getRequestAndSessionSave("groupe", "paniers_filtre_groupe", "groupe", "int", 0, $groupesList, true);
|
$groupe = getRequestAndSessionSave("groupe", "paniers_filtre_groupe", "groupe", "int", 0, $groupesList, true);
|
||||||
|
|
||||||
|
// HAS FILTRES
|
||||||
|
$GLOBALS['smarty'] -> assign('hasFiltres', $groupe>0);
|
||||||
|
|
||||||
// SEARCH
|
// SEARCH
|
||||||
$search = getSearch("paniers_search");
|
$search = getSearch("paniers_search");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<div class="navbar navbar-default secondbar" role="navigation">
|
<div class="navbar navbar-default secondbar collapsed" role="navigation">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
||||||
<a class="navbar-brand brand">
|
<a class="navbar-brand brand">
|
||||||
<img src="img/clients.svg" class="hidden-xs">
|
<img src="img/clients.svg">
|
||||||
<span>{$list_limits.max} CLIENT{if $list_limits.max>1}S{/if}</span>
|
<span>{$list_limits.max} CLIENT{if $list_limits.max>1}S{/if}</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,20 @@
|
||||||
<div class="navbar navbar-default secondbar" role="navigation">
|
<div class="navbar navbar-default secondbar" role="navigation" collapse-limit="1300">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
||||||
<a class="navbar-brand brand">
|
<a class="navbar-brand brand">
|
||||||
<img src="img/contrat.svg" class="hidden-xs">
|
<img src="img/contrat.svg">
|
||||||
<span>{$list_limits.max} CONTRAT{if $list_limits.max>1}S{/if}</span>
|
<span>{$list_limits.max} CONTRAT{if $list_limits.max>1}S{/if}</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse navbar-filtre-search">
|
<div class="collapse navbar-collapse navbar-filtre-search">
|
||||||
<div class="navbar-form navbar-right form-filtre-search" role="search" id="contratsSearch">
|
<div class="navbar-form navbar-right form-filtre-search" role="search" id="contratsSearch">
|
||||||
|
<!-- BTN CLEAR ALL -->
|
||||||
|
<button type="button" class="btn btn-default btnClearFiltres{if !$hasFiltres} hide{/if}">
|
||||||
|
<img class="icon" src="img/clear.svg">
|
||||||
|
<span class="txt">Réinitialiser tous les filtres...</span>
|
||||||
|
</button>
|
||||||
|
<span class="separator clearFiltresSeparator{if !$hasFiltres} hide{/if}"></span>
|
||||||
<!-- GROUPE -->
|
<!-- GROUPE -->
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
|
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,18 @@
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
||||||
<a class="navbar-brand brand">
|
<a class="navbar-brand brand">
|
||||||
<img src="img/contrat.svg" class="hidden-xs">
|
<img src="img/contrat.svg">
|
||||||
<span>{$list_limits.max} TYPE{if $list_limits.max>1}S{/if} DE CONTRATS</span>
|
<span>{$list_limits.max} TYPE{if $list_limits.max>1}S{/if} DE CONTRATS</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse navbar-filtre-search">
|
<div class="collapse navbar-collapse navbar-filtre-search">
|
||||||
<div class="navbar-form navbar-right form-filtre-search" role="search" id="contratsTypesSearch">
|
<div class="navbar-form navbar-right form-filtre-search" role="search" id="contratsTypesSearch">
|
||||||
|
<!-- BTN CLEAR ALL -->
|
||||||
|
<button type="button" class="btn btn-default btnClearFiltres{if !$hasFiltres} hide{/if}">
|
||||||
|
<img class="icon" src="img/clear.svg">
|
||||||
|
<span class="txt">Réinitialiser tous les filtres...</span>
|
||||||
|
</button>
|
||||||
|
<span class="separator clearFiltresSeparator{if !$hasFiltres} hide{/if}"></span>
|
||||||
<!-- GROUPE -->
|
<!-- GROUPE -->
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
|
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
||||||
<a class="navbar-brand brand">
|
<a class="navbar-brand brand">
|
||||||
<img src="img/legumes.svg" class="hidden-xs">
|
<img src="img/legumes.svg">
|
||||||
<span>{$list_limits.max} LÉGUME{if $list_limits.max>1}S{/if}</span>
|
<span>{$list_limits.max} LÉGUME{if $list_limits.max>1}S{/if}</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
||||||
<a class="navbar-brand brand">
|
<a class="navbar-brand brand">
|
||||||
<img src="img/lieux.svg" class="hidden-xs">
|
<img src="img/lieux.svg">
|
||||||
<span>{$list_limits.max} LIEU{if $list_limits.max>1}X{/if}</span>
|
<span>{$list_limits.max} LIEU{if $list_limits.max>1}X{/if}</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -3,16 +3,24 @@
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
<button type="button" class="navbar-toggle"><span class="glyphicon glyphicon-filter"></span></button>
|
||||||
<a class="navbar-brand brand">
|
<a class="navbar-brand brand">
|
||||||
<img src="img/livraison.svg" class="hidden-xs">
|
<img src="img/livraison.svg">
|
||||||
<span>{$list_limits.max} LIVRAISON{if $list_limits.max>1}S{/if}</span>
|
<span>{$list_limits.max} LIVRAISON{if $list_limits.max>1}S{/if}</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse navbar-filtre-search">
|
<div class="collapse navbar-collapse navbar-filtre-search">
|
||||||
<div class="navbar-form navbar-right form-filtre-search" role="search" id="livraisonsSearch">
|
<div class="navbar-form navbar-right form-filtre-search" role="search" id="livraisonsSearch">
|
||||||
|
<!-- BTN CLEAR ALL -->
|
||||||
|
<button type="button" class="btn btn-default btnClearFiltres{if !$hasFiltres} hide{/if}">
|
||||||
|
<img class="icon" src="img/clear.svg">
|
||||||
|
<span class="txt">Réinitialiser tous les filtres...</span>
|
||||||
|
</button>
|
||||||
|
<span class="separator clearFiltresSeparator{if !$hasFiltres} hide{/if}"></span>
|
||||||
|
<!-- GROUPE -->
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
|
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
|
||||||
<select class="form-control" name="groupe" load_value="{$groupe}" filtre_request="groupe">{include file='paniers_groupes/paniers_groupes_select_list.tpl'}</select>
|
<select class="form-control" name="groupe" load_value="{$groupe}" filtre_request="groupe">{include file='paniers_groupes/paniers_groupes_select_list.tpl'}</select>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- ARCHIVE -->
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-addon{if $archive!=0} active{/if}">archive :</span>
|
<span class="input-group-addon{if $archive!=0} active{/if}">archive :</span>
|
||||||
<select class="form-control" name="archive" load_value="{$archive}" filtre_request="archive">
|
<select class="form-control" name="archive" load_value="{$archive}" filtre_request="archive">
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,12 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse navbar-filtre-search">
|
<div class="collapse navbar-collapse navbar-filtre-search">
|
||||||
<div class="navbar-form navbar-right form-filtre-search" role="search" id="paniersSearch">
|
<div class="navbar-form navbar-right form-filtre-search" role="search" id="paniersSearch">
|
||||||
|
<!-- BTN CLEAR ALL -->
|
||||||
|
<button type="button" class="btn btn-default btnClearFiltres{if !$hasFiltres} hide{/if}">
|
||||||
|
<img class="icon" src="img/clear.svg">
|
||||||
|
<span class="txt">Réinitialiser tous les filtres...</span>
|
||||||
|
</button>
|
||||||
|
<span class="separator clearFiltresSeparator{if !$hasFiltres} hide{/if}"></span>
|
||||||
<!-- GROUPE -->
|
<!-- GROUPE -->
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
|
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue