améliorations mineures

This commit is contained in:
Jean-Christophe Engel 2024-11-18 20:47:48 +01:00
parent 6757757f63
commit 79a3719892
3 changed files with 11 additions and 9 deletions

View File

@ -15,6 +15,7 @@
<li {{if $subcurrent == 'proprio'}} class="current"{{/if}}><a href="{{$module.url}}index.html?prop=1">Matériels permanents</a></li>
<li {{if $subcurrent == 'nonproprio'}} class="current"{{/if}}><a href="{{$module.url}}index.html?prop=0">Matériels temporaires</a></li>
</ul>
{{if $subsubcurrent == 'mouvements'}}
<ul class="sub">
<li class="title"><strong>{{$eqpmt}} ({{$category}})</strong></li>

View File

@ -7,18 +7,18 @@
*}}
{{* Extraire et compiler les infos de la base *}}
{{:include file="./_calcul_dispo.html" keep="cumul_mvt,category_keys,equipments"}}
{{:include file="./_calcul_dispo.html" keep="cumul_mvt,equipments"}}
{{* Vérifier s'il y a au moins un matériel propriété de l'asso *}}
{{:assign mat_prop=false}}
{{:assign mat_present=false}}
{{#foreach from=$equipments key=key item=eqpmt}}
{{if $eqpmt|has_key:"stock"}}
{{:assign mat_prop=true}}
{{:assign mat_present=true}}
{{:break}}
{{/if}}
{{/foreach}}
{{if $mat_prop}}
{{if $mat_present}}
{{* Sélecteur catégories *}}
<fieldset class="shortForm" style="width: 30%;">
@ -39,6 +39,7 @@
</fieldset>
<h2>Matériels propriété de l'association</h2>
{{#list
select="
$$.date AS 'Date' ;

View File

@ -7,18 +7,18 @@
*}}
{{* Extraire et compiler les infos de la base *}}
{{:include file="./_calcul_dispo.html" keep="cumul_mvt,category_keys,equipments"}}
{{:include file="./_calcul_dispo.html" keep="cumul_mvt,equipments"}}
{{* Vérifier s'il y a au moins un matériel non propriété de l'asso *}}
{{:assign mat_non_prop=false}}
{{:assign mat_present=false}}
{{#foreach from=$equipments key=key item=eqpmt}}
{{if $eqpmt|has_key:"nonproprio"}}
{{:assign mat_non_prop=true}}
{{:assign mat_present=true}}
{{:break}}
{{/if}}
{{/foreach}}
{{if $mat_non_prop}}
{{if $mat_present}}
{{* Sélecteur catégories *}}
<fieldset class="shortForm" style="width: 30%;">
@ -90,7 +90,7 @@
shape="table"}}
{{:linkbutton
label="Modifier"
href="modifier_materiel.html?key=%s&prop=0"|args:$equipment
href="%smodifier_materiel.html?key=%s&prop=0"|args:$module.url:$equipment
shape="edit"
target="_dialog"}}
</td>