diff --git a/_get_config.html b/_get_config.html index 119a20b..671a20e 100644 --- a/_get_config.html +++ b/_get_config.html @@ -16,7 +16,7 @@ {{:assign var="nature" from="module.config.%s_nature"|args:$direction}} {{if $nature != null}} {{#foreach from=$nature item="elem"}} - {{:assign var="item" label=$label type=$type}} + {{:assign var="item" label=$label type=$type fee=$fee}} {{:assign var="config.%s_nature.%s"|args:$direction:$key value=$item}} {{/foreach}} {{else}} diff --git a/_nav.html b/_nav.html index 25db82c..8cd2262 100644 --- a/_nav.html +++ b/_nav.html @@ -15,6 +15,7 @@
| Date | +Mouvement | +Opération | +Matériel | +Quantité | +Dépositaire | +Stockage | +Documents | +Écritures | +Remarques | ++ | ||||||
| {{$date|date_short}} | -{{$col2}} | -{{$op_label}} | -{{$col4}} | +{{if $direction == "input"}}Entrée{{else}}Sortie{{/if}} | +{{$op_label}} | +{{$materiel}} | {{$amount}} | -{{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$col6}} | -{{$col7}} | +{{:link href="/admin/users/details.php?id=%s"|args:$user_id label="%s"|args:$user}} | +{{$stockage}} | +{{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}} | +{{if $transactions != null}}{{:icon shape="money"}}{{/if}} | {{$comment}} | -+ | + {{:linkbutton + label="Détails" + href="movements/movement_details.html?key=%s"|args:$key + shape="eye" + }} + |
Modification enregistrée
+ {{elseif $_GET.msg == "copie"}} +Mouvement copié
+ {{elseif $_GET.msg == "suppression"}} +Mouvement supprimé
+ {{/if}} +{{elseif $_GET.err}} + {{if $_GET.msg == "suppression"}} +Ce mouvement ne peut être supprimé
+ {{/if}} +{{/if}} + +Location de matériel en cours
+| Matériel | +Date prêt | +Quantité | +Membre | +Date retour | +Reste à rendre | +Remarque | ++ |
| {{$mat_name}} | +{{$out_date|date_short}} | +{{$out_amount}} | +{{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$nom}} | +{{$return_date|date_short}} | +{{$remain}} | ++ {{if $return_date != null}} + {{:assign jour="jour}} + {{if $nb_jours > 0}} + {{if $nb_jours > 1}}{{:assign jour="jours"}}{{/if}} + {{:tag color="darkred" label="Retard %s %s"|args:$nb_jours:$jour}} + {{elseif $nb_jours < 0}} + {{:assign delai="abs(%d)"|math:$nb_jours}} + {{if $nb_jours < -1}}{{:assign jour="jours"}}{{/if}} + {{"Reste %s %s"|args:$delai:$jour}} + {{else}} + {{:tag color="darkgreen" label="À rendre aujourd'hui"}} + {{/if}} + {{/if}} + | ++ {{:linkbutton + label="Retour" + href="movements/output_return.html?key=%s&prop=1"|args:$mvt_key + shape="reset" + target="_dialog"}} + {{:linkbutton + label="Détails" + href="movements/movement_details.html?key=%s&prop=1&from=lh"|args:$mvt_key + shape="eye" + }} + | +
Aucun mouvement.
+{{/if}} + +{{:admin_footer}} diff --git a/rent_movements.html b/rent_movements.html new file mode 100644 index 0000000..424e2ed --- /dev/null +++ b/rent_movements.html @@ -0,0 +1,181 @@ +{{* -*- brindille -*- *}} + +{{#restrict block=true section="accounting" level="write"}}{{/restrict}} + +{{* + Afficher l'historique des locations +*}} + +{{:admin_header title="Historique des locations" custom_css="./style.css" current="module_equipment"}} + +{{:include file="./_nav.html" current="location" subcurrent="historique"}} + +{{* récupérer la config des entrées/sorties *}} +{{:include file="./_get_config.html" keep="config"}} + +{{* filtrer selon la catégorie *}} +{{if $_GET.cat_key == null}} + {{:assign selected_category=$module.config.rent_cat_key}} +{{elseif $_GET.cat_key == -1}} + {{:assign selected_category=null}} + {{:save key="config" rent_cat_key=null}} +{{else}} + {{:assign selected_category=$_GET.cat_key}} + {{:save key="config" rent_cat_key=$selected_category}} +{{/if}} + +{{* condition de filtrage *}} +{{if $selected_category != null}} + {{:assign cat_key=$selected_category|quote_sql}} + {{:assign cat_condition="category = %s"|args:$cat_key}} +{{else}} + {{:assign cat_condition=1}} +{{/if}} + +{{* déterminer les types de mouvements *}} +{{#foreach from=$config.output_nature key="key"}} + {{if $type == 'temporaire' && $fee == 'payant'}} + {{:assign var="out_keys." value=$key|quote_sql}} + {{/if}} +{{/foreach}} +{{:assign out_keys=$out_keys|implode:","}} +{{:assign out_keys="("|cat:$out_keys|cat:")"}} + +{{* sélecteur de catégorie *}} +{{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1"}} +{{#load type="category" order="$$.name"}} + {{:assign + var="cat_options." + value=$key + label=$name + href="?cat_key=%s"|args:$key + }} +{{/load}} + + + +Historique des locations
+| Date | +Mouvement | +Opération | +Matériel | +Quantité | +Dépositaire | +Stockage | +Documents | +Écritures | +Remarques | ++ |
| {{$date|date_short}} | +{{if $direction == "input"}}Entrée{{else}}Sortie{{/if}} | +{{$op_label}} | +{{$materiel}} | +{{$amount}} | +{{:link href="/admin/users/details.php?id=%s"|args:$user_id label="%s"|args:$user}} | +{{$stockage}} | +{{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}} | +{{if $transactions != null}}{{:icon shape="money"}}{{/if}} | +{{$comment}} | ++ {{:linkbutton + label="Détails" + href="movements/movement_details.html?key=%s"|args:$key + shape="eye" + }} + | +