Réorganisation navigation

This commit is contained in:
Jean-Christophe Engel 2026-01-23 10:20:45 +01:00
parent 59b13e6e4c
commit 84b35adcfa
5 changed files with 11 additions and 17 deletions

View file

@ -7,20 +7,17 @@
{{* filtrer selon la catégorie *}} {{* filtrer selon la catégorie *}}
{{if $_GET.cat_key == null}} {{if $_GET.cat_key == null}}
{{:assign selected_category=$module.config.stock_cat_key}} {{:assign selected_category=$module.config.stock_cat_key}}
{{if $module.config.stock_cat_key != null}}
{{:assign cat_key=$selected_category|quote_sql}}
{{/if}}
{{elseif $_GET.cat_key == -1}} {{elseif $_GET.cat_key == -1}}
{{:assign selected_category=null}} {{:assign selected_category=null}}
{{:save key="config" stock_cat_key=null}} {{:save key="config" stock_cat_key=null}}
{{else}} {{else}}
{{:assign selected_category=$_GET.cat_key}} {{:assign selected_category=$_GET.cat_key}}
{{:assign cat_key=$selected_category|quote_sql}}
{{:save key="config" stock_cat_key=$selected_category}} {{:save key="config" stock_cat_key=$selected_category}}
{{/if}} {{/if}}
{{* condition de filtrage *}} {{* condition de filtrage *}}
{{if $selected_category != null}} {{if $selected_category != null}}
{{:assign cat_key=$selected_category|quote_sql}}
{{:assign cat_condition="$$.category = %s"|args:$cat_key}} {{:assign cat_condition="$$.category = %s"|args:$cat_key}}
{{else}} {{else}}
{{:assign cat_condition="1"}} {{:assign cat_condition="1"}}

View file

@ -13,25 +13,22 @@
<ul> <ul>
<li {{if $current == 'inventaire'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Inventaire</a></li> <li {{if $current == 'inventaire'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Inventaire</a></li>
<li {{if $current == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}global_history.html">Historique</a></li>
<li {{if $current == 'prêts'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html">Prêts</a></li>
<li {{if $current == 'archives'}} class="current"{{/if}}><a href="{{$module.url}}archives.html">Archives</a></li> <li {{if $current == 'archives'}} class="current"{{/if}}><a href="{{$module.url}}archives.html">Archives</a></li>
<li {{if $current == 'config'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Configuration</a></li> <li {{if $current == 'config'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Configuration</a></li>
</ul> </ul>
{{if $current == 'inventaire'}} {{if $current == 'inventaire'}}
<ul class="sub"> {{if $subcurrent == 'historique'}}
<li {{if $subcurrent == 'stock'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Stock</a></li>
<li {{if $subcurrent == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}global_history.html">Historique</a></li>
</ul>
{{if $subsubcurrent == 'historique'}}
<ul class="sub"> <ul class="sub">
<li class="title"><strong>Historique — {{$eqpmt}} ({{$category}})</strong></li> <li class="title"><strong>Historique — {{$eqpmt}} ({{$category}})</strong></li>
</ul> </ul>
{{/if}} {{/if}}
{{elseif $current == 'historique'}} {{elseif $current == 'prêts'}}
<ul class="sub"> <ul class="sub">
<li {{if $subcurrent == 'tous'}} class="current"{{/if}}><a href="{{$module.url}}global_history.html">Tous</a></li> <li {{if $subcurrent == 'encours'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html">En cours</a></li>
<li {{if $subcurrent == 'prêts'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html">Prêts</a></li> <li {{if $subcurrent == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}loan_movements.html">Historique</a></li>
</ul> </ul>
{{elseif $current == 'archives'}} {{elseif $current == 'archives'}}
{{if $subsubcurrent == 'historique'}} {{if $subsubcurrent == 'historique'}}

View file

@ -31,7 +31,7 @@
{{else}} {{else}}
{{:assign current="inventaire"}} {{:assign current="inventaire"}}
{{/if}} {{/if}}
{{:include file="./_nav.html" current=$current subcurrent="stock" subsubcurrent="historique" eqpmt=$equipment.name category=$category.name}} {{:include file="./_nav.html" current=$current subcurrent="historique" eqpmt=$equipment.name category=$category.name}}
{{if $_GET.ok}} {{if $_GET.ok}}
{{if $_GET.msg == "modification"}} {{if $_GET.msg == "modification"}}

View file

@ -8,7 +8,7 @@
{{:admin_header title="Historique des mouvements" custom_css="./style.css" current="module_equipment"}} {{:admin_header title="Historique des mouvements" custom_css="./style.css" current="module_equipment"}}
{{:include file="./_nav.html" current="inventaire" subcurrent="historique"}} {{:include file="./_nav.html" current="historique"}}
{{* récupérer la config des entrées/sorties *}} {{* récupérer la config des entrées/sorties *}}
{{:include file="./_get_config.html" keep="config"}} {{:include file="./_get_config.html" keep="config"}}

View file

@ -3,7 +3,7 @@
{{#restrict block=true section="accounting" level="write"}}{{/restrict}} {{#restrict block=true section="accounting" level="write"}}{{/restrict}}
{{:admin_header title="Matériels hors de l'asso" custom_css="../style.css" current="module_equipment"}} {{:admin_header title="Matériels hors de l'asso" custom_css="../style.css" current="module_equipment"}}
{{:include file="./_nav.html" current="historique" subcurrent="prêts"}} {{:include file="./_nav.html" current="prêts" subcurrent="encours"}}
{{* {{*
vérifier l'existence de la table du module vérifier l'existence de la table du module
@ -32,7 +32,7 @@
{{/if}} {{/if}}
<div class="shortFormLeft"> <div class="shortFormLeft">
<p class="help">Historique des prêts de matériel</p> <p class="help">Prêts de matériel en cours</p>
</div> </div>
{{* lecture config (défaut ou enregistrée) *}} {{* lecture config (défaut ou enregistrée) *}}