Prêts de matériel en cours
+{{$label|ucfirst}} de matériel en cours
-| Matériel | -Date prêt | -Quantité | -Membre | -Date retour | -Reste à rendre | -Remarque | -+ | Matériel | +Date prêt | +Quantité | +Membre | +Date retour | +Reste à rendre | +Remarque | +Stockage | Documents | Écritures | -Remarque | +Remarques | @@ -212,14 +170,9 @@ | {{if $transactions != null}}{{:icon shape="money"}}{{/if}} | {{$comment}} | - {{if $_GET.output_type == "loan"}} - {{:assign from="lm"}} - {{elseif $_GET.output_type == "rent"}} - {{:assign from="rm"}} - {{/if}} {{:linkbutton label="Détails" - href="movements/movement_details.html?key=%s&prop=1&from=%s"|args:$key:$from + href="movements/movement_details.html?key=%s"|args:$key shape="eye" }} | @@ -228,8 +181,5 @@
|---|
Aucun mouvement.
-{{/if}} + {{:admin_footer}} diff --git a/movements/copy_movement.html b/movements/copy_movement.html index 97f0302..84c0e2e 100644 --- a/movements/copy_movement.html +++ b/movements/copy_movement.html @@ -207,25 +207,12 @@ transactions=$transactions return_date=$return_date|parse_date }} - - {{if $_GET.from|substr:0:1 == "l"}} - {{:assign output_type="loan"}} - {{elseif $_GET.from|substr:0:1 == "r"}} - {{:assign output_type="rent"}} - {{/if}} - {{if $_GET.from|substr:1:1 == "h"}} - {{:assign suffix="history"}} - {{elseif $_GET.from|substr:1:1 == "m"}} - {{:assign suffix="movements"}} - {{/if}} - - {{if $_GET.from == "eh"}} - {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}} - {{elseif $suffix == null}} - {{:redirect force="../index.html"}} + {{if $_GET.from == "lh"}} + {{:assign from="../loan_history.html"}} {{else}} - {{:redirect force="../loan_%s.html?output_type=%s&ok=1&key=%s&prop=%s&msg=copie"|args:$suffix:$output_type:$eqpmt_key:$prop}} + {{:assign from="../equipment_history.html"}} {{/if}} + {{:redirect force="%s?ok=1&key=%s&prop=%s&msg=copie"|args:$from:$eqpmt_key:$prop}} {{/form}} {{if $mvt_new.direction == "input"}} diff --git a/movements/delete_movement.html b/movements/delete_movement.html index 0ecafb2..506ebe4 100644 --- a/movements/delete_movement.html +++ b/movements/delete_movement.html @@ -23,25 +23,11 @@ {{:include file="../_get_config.html" keep="config"}} {{#form on="delete"}} - {{if $_GET.from|substr:0:1 == "l"}} - {{:assign output_type="loan"}} - {{elseif $_GET.from|substr:0:1 == "r"}} - {{:assign output_type="rent"}} - {{/if}} - {{if $_GET.from|substr:1:1 == "h"}} - {{:assign suffix="history"}} - {{elseif $_GET.from|substr:1:1 == "m"}} - {{:assign suffix="movements"}} - {{/if}} - {{if $_GET.from == "eh"}} - {{:assign from="../equipment_history.html"}} - {{elseif $suffix == null}} - {{:assign from="../index.html"}} + {{if $_GET.from == "lh"}} + {{:assign from="../loan_history.html"}} {{else}} - {{:assign from="../loan_%s.html"|args:$suffix}} - {{:assign param="&output_type=%s"|args:$output_type}} + {{:assign from="../equipment_history.html"}} {{/if}} - {{* vérifier s'il est possible de supprimer le mouvement *}} {{if $mvt_suppr.direction == 'input'}} {{:assign var="type_operation" from="config.input_nature.%s.type"|args:$mvt_suppr.operation}} @@ -50,7 +36,7 @@ {{:assign link_key=$key}} {{/load}} {{if $link_key != null}} - {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression%s"|args:$from:$mvt_suppr.equipment:$_GET.prop:$param}} + {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression"|args:$from:$mvt_suppr.equipment:$_GET.prop}} {{/if}} {{else}} {{:assign dispo=0}} @@ -83,7 +69,7 @@ {{* problème ? *}} {{if $dispo < 0 || $nonprop < 0}} - {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression%s"|args:$from:$mvt_suppr.equipment:$_GET.prop:$param}} + {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression"|args:$from:$mvt_suppr.equipment:$_GET.prop}} {{/if}} {{/if}} {{/load}} @@ -104,7 +90,7 @@ {{:assign link_key=$key}} {{/load}} {{if $link_key != null}} - {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression%s"|args:$from:$mvt_suppr.equipment:$_GET.prop:$param}} + {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression"|args:$from:$mvt_suppr.equipment:$_GET.prop}} {{/if}} {{elseif $type_operation == 'retour'}} {{#load type="link" where="$$.return = :key" :key=$_GET.key}} @@ -169,11 +155,11 @@ out=$curr_eqpmt.out notowned=$curr_eqpmt.notowned }} - {{:redirect force="%s?ok=1&key=%s&prop=%s&msg=suppression%s"|args:$from:$mvt_suppr.equipment:$_GET.prop:$param}} + {{:redirect force="%s?ok=1&key=%s&prop=%s&msg=suppression"|args:$from:$mvt_suppr.equipment:$_GET.prop}} {{else}} {{* supprimer le matériel *}} {{:delete key=$curr_eqpmt.key}} - {{:redirect force="%s?ok=1&msg=supprmvtmat%s"|args:$from:$param}} + {{:redirect force="../index.html?ok=1&msg=supprmvtmat"}} {{/if}} {{/form}} diff --git a/movements/modify_movement.html b/movements/modify_movement.html index d78c337..542267f 100644 --- a/movements/modify_movement.html +++ b/movements/modify_movement.html @@ -224,25 +224,12 @@ transactions=$transactions return_date=$return_date|parse_date }} - - {{if $_GET.from|substr:0:1 == "l"}} - {{:assign output_type="loan"}} - {{elseif $_GET.from|substr:0:1 == "r"}} - {{:assign output_type="rent"}} - {{/if}} - {{if $_GET.from|substr:1:1 == "h"}} - {{:assign suffix="history"}} - {{elseif $_GET.from|substr:1:1 == "m"}} - {{:assign suffix="movements"}} - {{/if}} - - {{if $_GET.from == "eh"}} - {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}} - {{elseif $suffix == null}} - {{:redirect force="../index.html"}} + {{if $_GET.from == "lh"}} + {{:assign from="../loan_history.html"}} {{else}} - {{:redirect force="../loan_%s.html?output_type=%s&ok=1&key=%s&prop=%s&msg=modification"|args:$suffix:$output_type:$eqpmt_key:$prop}} + {{:assign from="../equipment_history.html"}} {{/if}} + {{:redirect force="%s?ok=1&key=%s&prop=%s&msg=modification"|args:$from:$eqpmt_key:$prop}} {{/form}} {{if $mvt_new.direction == "input"}} diff --git a/movements/movement_details.html b/movements/movement_details.html index ad367b3..ac2bb5a 100644 --- a/movements/movement_details.html +++ b/movements/movement_details.html @@ -9,7 +9,6 @@ paramètres : - key : clé du mouvement - prop = 1 si matériel appartient à l'asso - - from = page d'appel *}} {{:admin_header title="Détails du mouvement" custom_css="../style.css" current="module_equipment"}} diff --git a/rent_history.html b/rent_history.html new file mode 100644 index 0000000..ac4e5a1 --- /dev/null +++ b/rent_history.html @@ -0,0 +1,140 @@ +{{* -*- brindille -*- *}} + +{{#restrict block=true section="accounting" level="write"}}{{/restrict}} + +{{:admin_header title="Locations en cours" custom_css="../style.css" current="module_equipment"}} +{{:include file="./_nav.html" current="location" subcurrent="encours"}} + +{{* + vérifier l'existence de la table du module + eh oui, il se peut qu'elle ne soit pas encore créée si aucune donnée n'a été ajoutée dedans +*}} + +{{#load limit="1"}} + {{:assign table_presente=true}} +{{else}} + {{:assign table_presente=false}} +{{/load}} + +{{if $table_presente}} +{{if $_GET.ok}} + {{if $_GET.msg == "modification"}} +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" + }} + | +