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/_inventory.html b/_inventory.html index 090a01d..53e9566 100644 --- a/_inventory.html +++ b/_inventory.html @@ -1,40 +1,56 @@ {{* -*- brindille -*- *}} {{* - inventaire des entrées/sorties des matériels permanents + Inventaire des matériels en stock dans l'association *}} {{* filtrer selon la catégorie *}} {{if $_GET.cat_key == null}} {{: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}} {{:assign selected_category=null}} {{:save key="config" stock_cat_key=null}} {{else}} {{:assign selected_category=$_GET.cat_key}} - {{:assign cat_key=$selected_category|quote_sql}} {{:save key="config" stock_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}} -{{* Sélecteur catégories *}} -{{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1&prop=1"}} +{{* filtrer selon appartenance *}} +{{if $_GET.prop == null}} + {{:assign selected_prop=$module.config.stock_prop}} +{{elseif $_GET.prop == -1}} + {{:assign selected_prop=null}} + {{:save key="config" stock_prop=null}} +{{else}} + {{:assign selected_prop=$_GET.prop}} + {{:save key="config" stock_prop=$_GET.prop}} +{{/if}} + +{{if $selected_prop == null}} + {{:assign prop_condition="1"}} +{{elseif $selected_prop == 1}} + {{:assign prop_condition="$$.stock NOT NULL"}} +{{else}} + {{:assign prop_condition="$$.notowned != 0"}} +{{/if}} + +{{* sélecteurs de catégorie et d'appartenance *}} +{{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1"}} {{#load type="category" order="$$.name"}} {{:assign var="categories.%s"|args:$key value=$name}} {{:assign var="cat_options." value=$key label=$name - href="?cat_key=%s&prop=1"|args:$key + href="?cat_key=%s"|args:$key }} {{/load}} @@ -47,8 +63,21 @@ }} +{{:assign var="prop_options." value="" label="Tous les matériels" href="?prop=-1"}} +{{:assign var="prop_options." value="1" label="Matériels propriété de l'association" href="?prop=1"}} +{{:assign var="prop_options." value="0" label="Matériels NON propriété de l'association" href="?prop=0"}} + +
+ Filtrer par appartenance + {{:dropdown + title="Filtrer par appartenance" + options=$prop_options + value="%s"|args:$selected_prop + }} +
+
-

Inventaire des matériels propriété de l'association

+

Inventaire des matériels présents dans l'association

{{#list @@ -58,22 +87,32 @@ FROM @TABLE as cat WHERE cat.key = @TABLE.$$.category) AS 'Catégorie' ; $$.stock AS 'Stock' ; + (SELECT COALESCE($$.notowned, 0)) AS 'Temp' ; + (SELECT $$.stock + COALESCE($$.notowned, 0)) AS 'Total' ; $$.out AS 'Sorti' ; (SELECT $$.stock - $$.out) AS 'Disponible' " type="equipment" - where="$$.status <> 'archived' AND $$.stock NOT NULL AND %s"|args:$cat_condition + where="$$.status <> 'archived' AND %s AND %s"|args:$cat_condition:$prop_condition order=1 }} {{:assign var=cat_name from=categories.%s|args:$category}} - {{:link href="equipment_history.html?key=%s&prop=1"|args:$key" label=$name}} + {{if $selected_prop == null}} + {{:assign prop=""}} + {{else}} + {{:assign prop="&prop=%s"|args:$selected_prop}} + {{/if}} + {{:link href="equipment_history.html?key=%s&prop=%s"|args:$key:$selected_prop" label=$name}} {{$cat_name}} {{$stock}} + {{$col4}} + {{$col5}} {{$out}} - {{$col5}} + {{$col7}} - {{if $col5 > 0}} +{{* + {{if $col7 > 0}} {{:linkbutton label="Sortie" shape="minus" @@ -85,6 +124,7 @@ shape="plus" href="movements/input_equipment.html?key=%s"|args:$key target="_dialog"}} +*}} {{:linkbutton label="Historique" href="equipment_history.html?key=%s&prop=1"|args:$key diff --git a/_nav.html b/_nav.html index 8ea688e..dfdf9ef 100644 --- a/_nav.html +++ b/_nav.html @@ -12,27 +12,29 @@ {{/if}} {{if $current == 'inventaire'}} - - - {{if $subsubcurrent == 'historique'}} + {{if $subcurrent == 'historique'}} {{/if}} - {{elseif $current == 'historique'}} + {{elseif $current == 'prêt'}} + {{elseif $current == 'location'}} + {{elseif $current == 'archives'}} {{if $subsubcurrent == 'historique'}} @@ -58,7 +60,9 @@ {{/if}} diff --git a/_temp_inventory.html b/_temp_inventory.html index d4b29d4..df4f8aa 100644 --- a/_temp_inventory.html +++ b/_temp_inventory.html @@ -4,34 +4,12 @@ inventaire des entrées/sorties des matériels temporaires *}} -{{* filtrer selon la catégorie *}} -{{if $_GET.cat_key == null}} - {{:assign selected_category=$module.config.temp_cat_key}} - {{if $module.config.temp_cat_key != null}} - {{:assign cat_key=$selected_category|quote_sql}} - {{/if}} -{{elseif $_GET.cat_key == -1}} - {{:assign selected_category=null}} - {{:save key="config" temp_cat_key=null}} -{{else}} - {{:assign selected_category=$_GET.cat_key}} - {{:assign cat_key=$selected_category|quote_sql}} - {{:save key="config" temp_cat_key=$selected_category}} -{{/if}} - -{{* condition de filtrage *}} -{{if $selected_category != null}} - {{:assign cat_condition="$$.category = %s"|args:$cat_key}} -{{else}} - {{:assign cat_condition="1"}} -{{/if}} - {{* Sélecteur catégories *}} -{{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1&prop=0"}} +{{:assign var="options." value="" label="Toutes les catégories" href="?prop=0"}} {{#load type="category" order="$$.name"}} {{:assign var="categories.%s"|args:$key value=$name}} {{:assign - var="cat_options." + var="options." value=$key label=$name href="?cat_key=%s&prop=0"|args:$key @@ -42,8 +20,8 @@ Filtrer par catégorie {{:dropdown title="Filtrer par catégorie" - options=$cat_options - value="%s"|args:$selected_category + options=$options + value="%s"|args:$_GET.cat_key }} @@ -51,6 +29,14 @@

Inventaire des matériels empruntés ou loués

+{{* filtrer selon la catégorie *}} +{{if $_GET.cat_key == null}} + {{:assign condition="1"}} +{{else}} + {{:assign cat_key=$_GET.cat_key|quote_sql}} + {{:assign condition="$$.category = %s"|args:$cat_key}} +{{/if}} + {{#list select=" $$.name AS 'Matériel' ; @@ -60,7 +46,7 @@ $$.notowned AS 'Quantité' " type="equipment" - where="$$.status <> 'archived' AND $$.notowned != 0 AND %s"|args:$cat_condition + where="$$.status <> 'archived' AND $$.notowned != 0 AND %s"|args:$condition order=1 }} {{:assign var=cat_name from=categories.%s|args:$category}} diff --git a/archives.html b/archives.html index 261673c..efb1a22 100644 --- a/archives.html +++ b/archives.html @@ -9,11 +9,30 @@

Matériel remis en service

{{/if}} +{{* filtrer selon la catégorie *}} +{{if $_GET.cat_key == null}} + {{:assign selected_category=$module.config.archive_cat_key}} +{{elseif $_GET.cat_key == -1}} + {{:assign selected_category=null}} + {{:save key="config" archive_cat_key=null}} +{{else}} + {{:assign selected_category=$_GET.cat_key}} + {{:save key="config" archive_cat_key=$selected_category}} +{{/if}} + +{{* condition de filtrage *}} +{{if $selected_category == null}} + {{:assign cat_condition="1"}} +{{else}} + {{:assign cat_key=$selected_category|quote_sql}} + {{:assign cat_condition="$$.category == %s"|args:$cat_key}} +{{/if}} + {{* Sélecteur catégories *}} -{{:assign var="options." value="" label="Toutes les catégories" href="?prop=1"}} +{{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1"}} {{#load type="category" order="$$.name"}} {{:assign - var="options." + var="cat_options." value=$key label=$name href="?cat_key=%s"|args:$key @@ -24,8 +43,8 @@ Filtrer par catégorie {{:dropdown title="Filtrer par catégorie" - options=$options - value="%s"|args:$_GET.cat_key + options=$cat_options + value="%s"|args:$selected_category }} @@ -33,14 +52,6 @@

Matériels qui ne sont plus dans l'association

-{{* filtrer selon la catégorie *}} -{{if $_GET.cat_key == null}} - {{:assign condition="1"}} -{{else}} - {{:assign cat_key=$_GET.cat_key|quote_sql}} - {{:assign condition="$$.category == %s"|args:$cat_key}} -{{/if}} - {{* Liste des matériels archivés *}} {{#list select=" @@ -50,7 +61,7 @@ WHERE cat.key = @TABLE.$$.category) AS "Catégorie" " type="equipment" - where="$$.status='archived' AND %s"|args:$condition + where="$$.status='archived' AND %s"|args:$cat_condition order=1 }} diff --git a/equipment_history.html b/equipment_history.html index 82b869e..26a3ead 100644 --- a/equipment_history.html +++ b/equipment_history.html @@ -12,14 +12,6 @@ - msg : message de retour *}} - -{{* barre de navigation *}} -{{if $_GET.prop == 1}} - {{:assign proprio="proprio"}} -{{else}} - {{:assign proprio="nonproprio"}} -{{/if}} - {{:assign equipment_key=$_GET.key|trim}} {{#load key=$equipment_key assign="equipment"}} {{else}} @@ -33,12 +25,13 @@ {{:admin_header title="Gestion des matériels" custom_css="./style.css" current="module_equipment"}} +{{* barre de navigation *}} {{if $_GET.current != null}} {{:assign current=$_GET.current}} {{else}} {{:assign current="inventaire"}} {{/if}} -{{:include file="./_nav.html" current=$current subcurrent=$proprio 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.msg == "modification"}} @@ -61,34 +54,69 @@ {{* récupérer la config des entrées/sorties *}} {{:include file="./_get_config.html" keep="config"}} -{{* déterminer les types de mouvements selon l'affection du matériel *}} -{{#foreach from=$config.input_nature}} - {{if $_GET.prop}} +{{* filtrer selon appartenance *}} +{{if $_GET.prop == null}} + {{:assign selected_prop=$module.config.eqpmt_hist_prop}} +{{elseif $_GET.prop == -1}} + {{:assign selected_prop=null}} + {{:save key="config" eqpmt_hist_prop=null}} +{{else}} + {{:assign selected_prop=$_GET.prop}} + {{:save key="config" eqpmt_hist_prop=$_GET.prop}} +{{/if}} + +{{* déterminer les types de mouvements selon l'appartenance du matériel *}} +{{#foreach from=$config.input_nature key="key"}} + {{if $selected_prop == null}} + {{* les deux sortes de matériel *}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{if $type == 'temporaire'}} + {{:assign var="temp_inputs." value=$key|quote_sql}} + {{/if}} + {{elseif $selected_prop == 1}} {{* matériel propriété de l'asso *}} {{if $type != 'temporaire'}} - {{:assign var="input_types." value=$label}} + {{:assign var="mvt_keys." value=$key|quote_sql}} {{/if}} {{else}} {{* matériel non propriété de l'asso *}} {{if $type == 'temporaire'}} - {{:assign var="input_types." value=$label}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{:assign var="temp_inputs." value=$key|quote_sql}} {{/if}} {{/if}} {{/foreach}} -{{#foreach from=$config.output_nature}} - {{if $_GET.prop}} +{{#foreach from=$config.output_nature key="key"}} + {{if $selected_prop == null}} + {{* les deux sortes de matériel *}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{if $type == "temporaire"}} + {{:assign var="temp_outputs." value=$key|quote_sql}} + {{/if}} + {{elseif $selected_prop == 1}} {{* matériel propriété de l'asso *}} {{if $type != 'retour'}} - {{:assign var="output_types." value=$label}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{if $type == "temporaire"}} + {{:assign var="temp_outputs." value=$key|quote_sql}} + {{/if}} {{/if}} {{else}} {{* matériel non propriété de l'asso *}} {{if $type == 'retour'}} - {{:assign var="output_types." value=$label}} + {{:assign var="mvt_keys." value=$key|quote_sql}} {{/if}} {{/if}} {{/foreach}} +{{:assign key_cond=$mvt_keys|implode:","}} +{{:assign key_cond="("|cat:$key_cond|cat:")"}} + +{{if $selected_prop == null}} + {{:assign prop_condition="1"}} +{{else}} + {{:assign prop_condition="$$.operation in %s"|args:$key_cond}} +{{/if}} {{* calculer et mémoriser les quantités pour que le tri de la liste affiche les valeurs correctes *}} {{:assign stock=0}} @@ -122,27 +150,10 @@ {{:assign var="quantites.%s.nonproprio"|args:$id value=$nonproprio}} {{/load}} -{{if $current != "archives"}} - -{{/if}} - -{{* lister tous les mouvements du matériel passé en paramètre *}} -{{if $_GET.prop}} - {{* calculer la quantité temporairement l'extérieur de chaque matériel *}} - {{#foreach from=$config.output_nature key=key}} - {{if $type == "temporaire"}} - {{:assign var="temp_outputs." value=$key|quote_sql}} - {{/if}} - {{/foreach}} - {{:assign operations=$temp_outputs|implode:","}} - {{:assign operations="("|cat:$operations|cat:")"}} +{{if $selected_prop == null || $selected_prop}} + {{* calculer la quantité sortie temporairement de chaque matériel *}} + {{:assign output_ops=$temp_outputs|implode:","}} + {{:assign output_ops="("|cat:$output_ops|cat:")"}} {{#select mvt.key AS mvt_key, @@ -156,97 +167,17 @@ GROUP by mvt.key ; !table=$module.table - !op = $operations + !op = $output_ops :eqpmt_key = $_GET.key }} {{:assign var="reste.%s"|args:$mvt_key value=$reste}} {{/select}} +{{/if}} - {{#list - type="movement" - select=" - ($$.date || '_' || substr('000000' || id, -6, 6)) AS 'Date'; - CASE $$.direction WHEN 'input' THEN 'Entrée' WHEN 'output' THEN 'Sortie' END AS 'Mouvement'; - $$.operation AS 'Opération'; - $$.amount AS 'Quantité'; - '' AS 'Stock'; - '' AS 'Sorti'; - '' AS 'Disponible'; - CASE WHEN $$.user NOT NULL - THEN (SELECT %s AS nom FROM users WHERE id = $$.user) - ELSE '' - END AS 'Dépositaire'; - CASE WHEN $$.storage NOT NULL - THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage) - ELSE '' - END AS 'Stockage'; - '' AS 'Documents'; - $$.transactions AS 'Écritures' - "|args:$config.user_fields.name_sql - equipment=$equipment_key - order=1 - }} - {{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$direction:$operation}} - {{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}} - - {{if $direction === "input" && $op_label|in:$input_types || - $direction === "output"&& $op_label|in:$output_types - }} - {{:assign var="stock" from="quantites.%s.stock"|args:$id}} - {{:assign var="exterieur" from="quantites.%s.exterieur"|args:$id}} - {{:assign var="dispo" from="quantites.%s.dispo"|args:$id}} - - {{:assign file_path="%s/%s/"|args:$module.storage_root:$key}} - {{:assign file_path=$file_path|cat:"%"}} - {{#select count(*) AS nb FROM files WHERE path LIKE :file_path ; :file_path=$file_path}} - {{:assign nb_files=$nb}} - {{/select}} - - {{$date|date_short}} - {{$col2}} - {{$op_label}} - {{$amount}} - {{$stock}} - {{$exterieur}} - {{$dispo}} - {{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$col8}} - {{$col9}} - {{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}} - {{if $transactions|count > 0}}{{:icon shape="money"}}{{/if}} - - {{if $current != "archives"}} - {{if $direction == "output" && $type_mvt == "temporaire"}} - {{:assign var="temp_ext" from="reste.%s"|args:$key}} - {{if $temp_ext != null && $temp_ext > 0}} - {{:linkbutton - label="Retour" - href="movements/output_return.html?key=%s&prop=%s"|args:$key:$_GET.prop - shape="reset" - target="_dialog"}} - {{/if}} - {{/if}} - {{:linkbutton - label="Détails" - href="movements/movement_details.html?key=%s&prop=%s&from=eh"|args:$key:$_GET.prop - shape="eye" - }} - {{/if}} - - - {{/if}} - {{/list}} - {{if $dispo_final === 0}} - Il n'y a aucun matériel disponible, il n'est donc pas possible d'effectuer une sortie - {{/if}} -{{else}} +{{if $selected_prop == null || ! $selected_prop}} {{* calculer la quantité présente temporairement de chaque matériel *}} - {{#foreach from=$config.input_nature key=key}} - {{if $type == "temporaire"}} - {{:assign var="temp_inputs." value=$key|quote_sql}} - {{/if}} - {{/foreach}} - {{:assign operations=$temp_inputs|implode:","}} - {{:assign operations="("|cat:$operations|cat:")"}} + {{:assign input_ops=$temp_inputs|implode:","}} + {{:assign input_ops="("|cat:$input_ops|cat:")"}} {{#select mvt.key AS mvt_key, @@ -260,71 +191,163 @@ GROUP by mvt.key ; !table=$module.table - !op = $operations + !op = $input_ops :eqpmt_key = $_GET.key }} {{:assign var="present.%s"|args:$mvt_key value=$present}} {{/select}} +{{/if}} - {{#list - type="movement" - select="($$.date || '_' || substr('000000' || id, -6, 6)) AS 'Date'; - CASE $$.direction WHEN 'input' THEN 'Entrée' WHEN 'output' THEN 'Sortie' END AS 'Mouvement'; - $$.operation AS 'Opération'; - $$.amount AS 'Quantité'; - "" as 'Présent'; - CASE WHEN $$.storage NOT NULL - THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage) - ELSE '' - END as 'Stockage'; - '' AS 'Documents'; - $$.transactions AS 'Écritures' - " - equipment=$equipment_key - order=1 +{{:assign + select_debut=" + ($$.date || '_' || substr('000000' || id, -6, 6)) AS 'Date'; + CASE $$.direction WHEN 'input' THEN 'Entrée' WHEN 'output' THEN 'Sortie' END AS 'Mouvement'; + $$.operation AS 'Opération'; + $$.amount AS 'Quantité';" +}} +{{:assign + select_prop="'' AS 'Stock'; + '' AS 'Sorti'; + '' AS 'Disponible';" +}} +{{:assign + select_depositaire="CASE WHEN $$.user NOT NULL + THEN (SELECT %s AS nom FROM users WHERE id = $$.user) + ELSE '' + END AS 'Dépositaire'; + "|args:$config.user_fields.name_sql +}} +{{:assign + select_non_prop="'' as 'Temporaire';" +}} +{{:assign select_final=" + CASE WHEN $$.storage NOT NULL + THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage) + ELSE '' + END AS 'Stockage'; + '' AS 'Documents'; + $$.transactions AS 'Écritures' + " +}} + +{{if $selected_prop == null}} + {{:assign select_clause=$select_debut|cat:$select_prop|cat:$select_non_prop|cat:$select_depositaire|cat:$select_final}} +{{elseif $selected_prop}} + {{:assign select_clause=$select_debut|cat:$select_prop|cat:$select_depositaire|cat:$select_final}} +{{else}} + {{:assign select_clause=$select_debut|cat:$select_non_prop|cat:$select_final}} +{{/if}} + +{{:assign var="prop_options." value="" label="Tous les matériels" href="?key=%s&prop=-1"|args:$_GET.key}} +{{:assign var="prop_options." value="1" label="Matériels propriété de l'association" href="?key=%s&prop=1"|args:$_GET.key}} +{{:assign var="prop_options." value="0" label="Matériels NON propriété de l'association" href="?key=%s&prop=0"|args:$_GET.key}} + +
+ Filtrer par appartenance + {{:dropdown + title="Filtrer par appartenance" + options=$prop_options + value="%s"|args:$selected_prop }} - {{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$direction:$col3}} - {{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}} +
- {{if $direction === "input" && $op_label|in:$input_types || - $direction === "output"&& $op_label|in:$output_types - }} - {{:assign var="stock" from="quantites.%s.nonproprio"|args:$id}} +{{if $current != "archives"}} + +{{/if}} - {{:assign file_path="%s/%s/"|args:$module.storage_root:$key}} - {{:assign file_path=$file_path|cat:"%"}} - {{#select count(*) AS nb FROM files WHERE path LIKE :file_path ; :file_path=$file_path}} - {{:assign nb_files=$nb}} - {{/select}} - - {{$date|date_short}} - {{$col2}} - {{$op_label}} - {{$amount}} - {{$stock}} - {{$col6}} - {{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}} - {{if $transactions|count > 0}}{{:icon shape="money"}}{{/if}} - - {{if $direction == "input" && $type_mvt == "temporaire"}} - {{:assign var="temp_in" from="present.%s"|args:$key}} - {{if $temp_in != null && $temp_in > 0}} - {{:linkbutton - label="Retour" - href="movements/input_return.html?key=%s&prop=%s"|args:$key:$_GET.prop - shape="reset" - target="_dialog"}} - {{/if}} - {{/if}} - {{:linkbutton - label="Détails" - href="movements/movement_details.html?key=%s&prop=%s&from=eh"|args:$key:$_GET.prop - shape="eye" - }} - - +{{* lister les mouvements du matériel passé en paramètre *}} +{{#list + type="movement" + select="%s"|args:$select_clause + where="%s"|args:$prop_condition + equipment=$equipment_key + order=1 +}} + {{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$direction:$operation}} + {{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}} + + {{:assign var="stock" from="quantites.%s.stock"|args:$id}} + {{:assign var="exterieur" from="quantites.%s.exterieur"|args:$id}} + {{:assign var="dispo" from="quantites.%s.dispo"|args:$id}} + {{:assign var="tempo" from="quantites.%s.nonproprio"|args:$id}} + + {{:assign file_path="%s/%s/"|args:$module.storage_root:$key}} + {{:assign file_path=$file_path|cat:"%"}} + {{#select count(*) AS nb FROM files WHERE path LIKE :file_path ; :file_path=$file_path}} + {{:assign nb_files=$nb}} + {{/select}} + + {{if $selected_prop == null}} + {{:assign user_details=$col9}} + {{:assign storage=$col10}} + {{elseif $selected_prop}} + {{:assign user_details=$col8}} + {{:assign storage=$col9}} + {{else}} + {{:assign user_details=$col6}} + {{:assign storage=$col6}} + {{/if}} + + + {{$date|date_short}} + {{$col2}} + {{$op_label}} + {{$amount}} + {{if $selected_prop == null || $selected_prop}} + {{$stock}} + {{$exterieur}} + {{$dispo}} {{/if}} - {{/list}} + {{if $selected_prop == null || ! $selected_prop}} + {{$tempo}} + {{/if}} + {{if $selected_prop == null || $selected_prop}} + {{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$user_details}} + {{/if}} + {{$storage}} + {{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}} + {{if $transactions|count > 0}}{{:icon shape="money"}}{{/if}} + + {{if $current != "archives"}} + {{if $direction == "output" && $type_mvt == "temporaire"}} + {{:assign var="temp_ext" from="reste.%s"|args:$key}} + {{if $temp_ext != null && $temp_ext > 0}} + {{:linkbutton + label="Retour" + href="movements/output_return.html?key=%s&prop=%s"|args:$key:$selected_prop + shape="reset" + target="_dialog"}} + {{/if}} + {{/if}} + {{if $direction == "input" && $type_mvt == "temporaire"}} + {{:assign var="temp_in" from="present.%s"|args:$key}} + {{if $temp_in != null && $temp_in > 0}} + {{:linkbutton + label="Retour" + href="movements/input_return.html?key=%s&prop=%s"|args:$key:$selected_prop + shape="reset" + target="_dialog"}} + {{/if}} + {{/if}} + {{:linkbutton + label="Détails" + href="movements/movement_details.html?key=%s&prop=%s&from=eh"|args:$key:$selected_prop + shape="eye" + }} + {{/if}} + + +{{/list}} + +{{if $dispo_final == 0 && $stock > 0 && $current != "archives"}} + Il n'y a aucun matériel disponible, il n'est donc pas possible d'effectuer une sortie {{/if}} {{:admin_footer}} diff --git a/global_history.html b/global_history.html index 75b1889..6038924 100644 --- a/global_history.html +++ b/global_history.html @@ -8,7 +8,7 @@ {{:admin_header title="Historique des mouvements" custom_css="./style.css" current="module_equipment"}} -{{:include file="./_nav.html" current="historique" subcurrent="tous"}} +{{:include file="./_nav.html" current="historique"}} {{* récupérer la config des entrées/sorties *}} {{:include file="./_get_config.html" keep="config"}} @@ -35,7 +35,61 @@ {{:assign cat_condition=1}} {{/if}} -{{* Sélecteur catégories *}} +{{* filtrer selon appartenance *}} +{{if $_GET.prop == null}} + {{:assign selected_prop=$module.config.hist_prop}} +{{elseif $_GET.prop == -1}} + {{:assign selected_prop=null}} + {{:save key="config" hist_prop=null}} +{{else}} + {{:assign selected_prop=$_GET.prop}} + {{:save key="config" hist_prop=$_GET.prop}} +{{/if}} + +{{* déterminer les types de mouvements selon l'appartenance du matériel *}} +{{#foreach from=$config.input_nature key="key"}} + {{if $selected_prop == null}} + {{* les deux sortes de matériel *}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{elseif $selected_prop == 1}} + {{* matériel propriété de l'asso *}} + {{if $type != 'temporaire'}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{/if}} + {{else}} + {{* matériel non propriété de l'asso *}} + {{if $type == 'temporaire'}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{/if}} + {{/if}} +{{/foreach}} + +{{#foreach from=$config.output_nature key="key"}} + {{if $selected_prop == null}} + {{* les deux sortes de matériel *}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{elseif $selected_prop == 1}} + {{* matériel propriété de l'asso *}} + {{if $type != 'retour'}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{/if}} + {{else}} + {{* matériel non propriété de l'asso *}} + {{if $type == 'retour'}} + {{:assign var="mvt_keys." value=$key|quote_sql}} + {{/if}} + {{/if}} +{{/foreach}} +{{:assign key_cond=$mvt_keys|implode:","}} +{{:assign key_cond="("|cat:$key_cond|cat:")"}} + +{{if $selected_prop == null}} + {{:assign prop_condition="1"}} +{{else}} + {{:assign prop_condition="$$.operation in %s"|args:$key_cond}} +{{/if}} + +{{* sélecteurs de catégorie et d'appartenance *}} {{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1"}} {{#load type="category" order="$$.name"}} {{:assign var="categories.%s"|args:$key value=$name}} @@ -56,6 +110,19 @@ }} +{{:assign var="prop_options." value="" label="Tous les matériels" href="?prop=-1"}} +{{:assign var="prop_options." value="1" label="Matériels propriété de l'association" href="?prop=1"}} +{{:assign var="prop_options." value="0" label="Matériels NON propriété de l'association" href="?prop=0"}} + +
+ Filtrer par appartenance + {{:dropdown + title="Filtrer par appartenance" + options=$prop_options + value="%s"|args:$selected_prop + }} +
+

Historique de tous les mouvements de matériel

@@ -78,9 +145,9 @@ THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage) ELSE '' END as 'Stockage'; - $$.comment AS 'Commentaire' + $$.comment AS 'Remarque' "|args:$config.user_fields.name_sql - where="%s"|args:$cat_condition + where="%s AND %s"|args:$cat_condition:$prop_condition order=1 max=50 desc=true diff --git a/index.html b/index.html index dce00cb..740bf3b 100644 --- a/index.html +++ b/index.html @@ -14,15 +14,6 @@ {{else}} {{#restrict block=true section="accounting" level="write"}}{{/restrict}} - {{if $_GET.prop == null || $_GET.prop}} - {{:assign proprio="proprio"}} - {{else}} - {{:assign proprio="nonproprio"}} - {{/if}} - - {{#load type="category" count=true assign="result"}}{{/load}} - {{:include file="_nav.html" current="inventaire" cat="%d"|args:$result.count subcurrent="%s"|args:$proprio}} - {{if $_GET.ok}} {{if $_GET.msg == "ajout" }}

Ajout effectué

@@ -37,14 +28,13 @@

Modification refusée

{{/if}} + {{#load type="category" count=true limit=1 assign="result"}}{{/load}} + {{:include file="_nav.html" current="inventaire" cat="%d"|args:$result.count subcurrent="stock"}} + {{if $result.count == 0}}

Il n'y a aucune catégorie : vous devez en ajouter.

{{else}} - {{if $_GET.prop == null || $_GET.prop == "1"}} - {{:include file="./_inventory.html"}} - {{else}} - {{:include file="./_temp_inventory.html"}} - {{/if}} + {{:include file="./_inventory.html"}} {{/if}} {{:admin_footer}} diff --git a/loan_history.html b/loan_history.html index 65fcddc..f825528 100644 --- a/loan_history.html +++ b/loan_history.html @@ -2,14 +2,21 @@ {{#restrict block=true section="accounting" level="write"}}{{/restrict}} -{{: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"}} +{{if $_GET.output_type == "loan"}} + {{:assign label="prêt"}} +{{elseif $_GET.output_type == "rent"}} + {{:assign label="location"}} +{{else}} + {{:error message="Cette page n'existe pas !"}} +{{/if}} + +{{:admin_header title="%ss en cours"|args:$label|ucfirst custom_css="../style.css" current="module_equipment"}} +{{:include file="./_nav.html" current="%s"|args:$label 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}} @@ -31,20 +38,72 @@ {{/if}} {{/if}} -
-

Historique des prêts de matériel

-
- {{* lecture config (défaut ou enregistrée) *}} {{:include file="./_get_config.html" keep="config"}} +{{* filtrer selon la catégorie *}} +{{if $_GET.cat_key == null}} + {{:assign var="selected_category" from="module.config.%s_hist_cat_key"|args:$_GET.output_type}} +{{elseif $_GET.cat_key == -1}} + {{:assign selected_category=null}} + {{if $_GET.output_type == "loan"}} + {{:save key="config" loan_hist_cat_key=null}} + {{elseif $_GET.output_type == "rent"}} + {{:save key="config" rent_hist_cat_key=null}} + {{/if}} +{{else}} + {{:assign selected_category=$_GET.cat_key}} + {{if $_GET.output_type == "loan"}} + {{:save key="config" loan_hist_cat_key=$selected_category}} + {{elseif $_GET.output_type == "rent"}} + {{:save key="config" rent_hist_cat_key=$selected_category}} + {{/if}} +{{/if}} + +{{* condition de filtrage *}} +{{if $selected_category != null}} + {{:assign cat_key=$selected_category|quote_sql}} + {{:assign cat_condition="json_extract(mat.document, '$.category') = %s"|args:$cat_key}} +{{else}} + {{:assign cat_condition=1}} +{{/if}} + {{#foreach from=$config.output_nature key="key"}} - {{if $type == 'temporaire'}} - {{:assign var="output_types." value=$key|quote_sql}} + {{if $type != 'temporaire'}} + {{:continue}} + {{/if}} + {{if $_GET.output_type == "loan" && $fee != 'payant'}} + {{:assign var="out_keys." value=$key|quote_sql}} + {{elseif $_GET.output_type == "rent" && $fee == 'payant'}} + {{:assign var="out_keys." value=$key|quote_sql}} {{/if}} {{/foreach}} -{{:assign output_ops=$output_types|implode:","}} -{{:assign output_ops="("|cat:$output_ops|cat:")"}} +{{: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="?output_type=%s&cat_key=-1"|args:$_GET.output_type}} +{{#load type="category" order="$$.name"}} + {{:assign + var="cat_options." + value=$key + label=$name + href="?output_type=%s&cat_key=%s"|args:$_GET.output_type:$key + }} +{{/load}} + +
+ Filtrer par catégorie + {{:dropdown + title="Filtrer par catégorie" + options=$cat_options + value="%s"|args:$selected_category + }} +
+ +
+

{{$label|ucfirst}} de matériel en cours

+
{{:assign premier=true}} {{#select @@ -61,29 +120,29 @@ LEFT JOIN !table AS links ON mvt.key = json_extract(links.document, '$.temp_key') LEFT JOIN !table AS retour ON retour.key = json_extract(links.document, '$.return') INNER JOIN !table AS mat ON mat.key = json_extract(mvt.document, '$.equipment') - WHERE - json_extract(mvt.document, '$.type') = 'movement' - AND - json_extract(mvt.document, '$.operation') IN !op + WHERE json_extract(mvt.document, '$.type') = 'movement' + AND json_extract(mvt.document, '$.operation') IN !op + AND !cat_condition GROUP BY mvt.key HAVING remain != 0 - ORDER BY out_date, nom + ORDER BY out_date DESC, nom ; !table=$module.table - !op = $output_ops + !op = $out_keys + !cat_condition=$cat_condition }} {{if $premier}} - - - - - - - - + + + + + + + + @@ -122,9 +181,14 @@ href="movements/output_return.html?key=%s&prop=1"|args:$mvt_key shape="reset" target="_dialog"}} + {{if $_GET.output_type == "loan"}} + {{:assign from="lh"}} + {{elseif $_GET.output_type == "rent"}} + {{:assign from="rh"}} + {{/if}} {{:linkbutton label="Détails" - href="movements/movement_details.html?key=%s&prop=1&from=lh"|args:$mvt_key + href="movements/movement_details.html?key=%s&prop=1&from=%s"|args:$mvt_key:$from shape="eye" }} diff --git a/loan_movements.html b/loan_movements.html new file mode 100644 index 0000000..55d74f7 --- /dev/null +++ b/loan_movements.html @@ -0,0 +1,235 @@ +{{* -*- brindille -*- *}} + +{{#restrict block=true section="accounting" level="write"}}{{/restrict}} + +{{* + Afficher l'historique des prêts ou locations +*}} + +{{if $_GET.output_type == "loan"}} + {{:assign label="prêt"}} +{{elseif $_GET.output_type == "rent"}} + {{:assign label="location"}} +{{else}} + {{:error message="Cette page n'existe pas !"}} +{{/if}} + +{{:admin_header title="Historique des %ss"|args:$label custom_css="./style.css" current="module_equipment"}} + +{{:include file="./_nav.html" current="%s"|args:$label subcurrent="historique"}} + +{{* + 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}} + +{{* 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 var="selected_category" from="module.config.%s_cat_key"|args:$_GET.output_type}} +{{elseif $_GET.cat_key == -1}} + {{:assign selected_category=null}} + {{if $_GET.output_type == "loan"}} + {{:save key="config" loan_cat_key=null}} + {{elseif $_GET.output_type == "rent"}} + {{:save key="config" rent_cat_key=null}} + {{/if}} +{{else}} + {{:assign selected_category=$_GET.cat_key}} + {{if $_GET.output_type == "loan"}} + {{:save key="config" loan_cat_key=$selected_category}} + {{elseif $_GET.output_type == "rent"}} + {{:save key="config" rent_cat_key=$selected_category}} + {{/if}} +{{/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'}} + {{:continue}} + {{/if}} + {{if $_GET.output_type == "loan" && $fee != 'payant'}} + {{:assign var="out_keys." value=$key|quote_sql}} + {{elseif $_GET.output_type == "rent" && $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="?output_type=%s&cat_key=-1"|args:$_GET.output_type}} +{{#load type="category" order="$$.name"}} + {{:assign + var="cat_options." + value=$key + label=$name + href="?output_type=%s&cat_key=%s"|args:$_GET.output_type:$key + }} +{{/load}} + +
+ Filtrer par catégorie + {{:dropdown + title="Filtrer par catégorie" + options=$cat_options + value="%s"|args:$selected_category + }} +
+ +
+

Historique des {{$label}}s

+
+ +{{* lister les mouvements *}} +{{:assign premier=true}} +{{#select * FROM + (WITH + sorties AS + (SELECT + mvt.key, + json_extract(mvt.document, '$.date') AS date, + json_extract(mvt.document, '$.direction') AS direction, + json_extract(mvt.document, '$.operation') AS operation, + json_extract(mat.document, '$.name') AS materiel, + json_extract(mat.document, '$.category') AS category, + json_extract(mvt.document, '$.amount') AS amount, + users.id AS user_id, + users.nom AS user, + json_extract(storage.document, '$.name') AS stockage, + json_extract(mvt.document, '$.transactions') AS transactions, + json_extract(mvt.document, '$.comment') AS comment, + json_extract(mvt.document, '$.return_date') AS return_date + FROM !table AS mvt + INNER JOIN !table AS mat ON mat.key = json_extract(mvt.document, '$.equipment') + LEFT JOIN users ON users.id = json_extract(mvt.document, '$.user') + LEFT JOIN !table AS storage ON storage.key = json_extract(mvt.document, '$.storage') + WHERE json_extract(mvt.document, '$.type') = 'movement' + AND json_extract(mvt.document, '$.operation') IN !op + AND !cat_condition + ), + entrees AS + (SELECT + mvt.key, + json_extract(mvt.document, '$.date') AS date, + json_extract(mvt.document, '$.direction') AS direction, + json_extract(mvt.document, '$.operation') AS operation, + json_extract(mat.document, '$.name') AS materiel, + json_extract(mat.document, '$.category') AS category, + json_extract(mvt.document, '$.amount') AS amount, + users.id AS user_id, + users.nom AS user, + json_extract(storage.document, '$.name') AS stockage, + json_extract(mvt.document, '$.transactions') AS transactions, + json_extract(mvt.document, '$.comment') AS comment, + json_extract(mvt.document, '$.return_date') AS return_date + FROM !table AS mvt + INNER JOIN !table AS mat ON mat.key = json_extract(mvt.document, '$.equipment') + LEFT JOIN users ON users.id = json_extract(mvt.document, '$.user') + LEFT JOIN !table AS storage ON storage.key = json_extract(mvt.document, '$.storage') + INNER JOIN ( + SELECT json_extract(links.document, '$.return') AS return_key + FROM !table AS links + INNER JOIN sorties ON json_extract(links.document, '$.temp_key') = sorties.key + ) AS filtered_links ON filtered_links.return_key = mvt.key + WHERE !cat_condition + ) + SELECT * FROM sorties UNION SELECT * FROM entrees + ) + ORDER BY date DESC, user + ; + !table=$module.table + !op = $out_keys + !cat_condition=$cat_condition +}} + {{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}} + {{:assign file_path="%s/%s/"|args:$module.storage_root:$key}} + {{:assign file_path=$file_path|cat:"%"}} + {{#select count(*) AS nb FROM files WHERE path LIKE :file_path ; :file_path=$file_path}} + {{:assign nb_files=$nb}} + {{/select}} + + {{if $premier}} +
MatérielDate prêtQuantitéMembreDate retourReste à rendreRemarqueMatérielDate prêtQuantitéMembreDate retourReste à rendreRemarque
+ + + + + + + + + + + + + + + + + {{:assign premier=false}} + {{/if}} + + + + + + + + + + + + + + +{{else}} +

Aucun mouvement.

+{{/select}} + +
DateMouvementOpérationMatérielQuantitéDépositaireStockageDocumentsÉcrituresRemarque
{{$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}} + {{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 + shape="eye" + }} +
+{{else}} +

Aucun mouvement.

+{{/if}} +{{:admin_footer}} diff --git a/movements/copy_movement.html b/movements/copy_movement.html index 84c0e2e..97f0302 100644 --- a/movements/copy_movement.html +++ b/movements/copy_movement.html @@ -207,12 +207,25 @@ transactions=$transactions return_date=$return_date|parse_date }} - {{if $_GET.from == "lh"}} - {{:assign from="../loan_history.html"}} - {{else}} - {{:assign from="../equipment_history.html"}} + + {{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"}} + {{else}} + {{:redirect force="../loan_%s.html?output_type=%s&ok=1&key=%s&prop=%s&msg=copie"|args:$suffix:$output_type:$eqpmt_key:$prop}} {{/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 506ebe4..0ecafb2 100644 --- a/movements/delete_movement.html +++ b/movements/delete_movement.html @@ -23,11 +23,25 @@ {{:include file="../_get_config.html" keep="config"}} {{#form on="delete"}} - {{if $_GET.from == "lh"}} - {{:assign from="../loan_history.html"}} - {{else}} - {{:assign from="../equipment_history.html"}} + {{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"}} + {{else}} + {{:assign from="../loan_%s.html"|args:$suffix}} + {{:assign param="&output_type=%s"|args:$output_type}} + {{/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}} @@ -36,7 +50,7 @@ {{:assign link_key=$key}} {{/load}} {{if $link_key != null}} - {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression"|args:$from:$mvt_suppr.equipment:$_GET.prop}} + {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression%s"|args:$from:$mvt_suppr.equipment:$_GET.prop:$param}} {{/if}} {{else}} {{:assign dispo=0}} @@ -69,7 +83,7 @@ {{* problème ? *}} {{if $dispo < 0 || $nonprop < 0}} - {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression"|args:$from:$mvt_suppr.equipment:$_GET.prop}} + {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression%s"|args:$from:$mvt_suppr.equipment:$_GET.prop:$param}} {{/if}} {{/if}} {{/load}} @@ -90,7 +104,7 @@ {{:assign link_key=$key}} {{/load}} {{if $link_key != null}} - {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression"|args:$from:$mvt_suppr.equipment:$_GET.prop}} + {{:redirect force="%s?key=%s&prop=%s&err=1&msg=suppression%s"|args:$from:$mvt_suppr.equipment:$_GET.prop:$param}} {{/if}} {{elseif $type_operation == 'retour'}} {{#load type="link" where="$$.return = :key" :key=$_GET.key}} @@ -155,11 +169,11 @@ out=$curr_eqpmt.out notowned=$curr_eqpmt.notowned }} - {{:redirect force="%s?ok=1&key=%s&prop=%s&msg=suppression"|args:$from:$mvt_suppr.equipment:$_GET.prop}} + {{:redirect force="%s?ok=1&key=%s&prop=%s&msg=suppression%s"|args:$from:$mvt_suppr.equipment:$_GET.prop:$param}} {{else}} {{* supprimer le matériel *}} {{:delete key=$curr_eqpmt.key}} - {{:redirect force="../index.html?ok=1&msg=supprmvtmat"}} + {{:redirect force="%s?ok=1&msg=supprmvtmat%s"|args:$from:$param}} {{/if}} {{/form}} diff --git a/movements/modify_movement.html b/movements/modify_movement.html index 542267f..d78c337 100644 --- a/movements/modify_movement.html +++ b/movements/modify_movement.html @@ -224,12 +224,25 @@ transactions=$transactions return_date=$return_date|parse_date }} - {{if $_GET.from == "lh"}} - {{:assign from="../loan_history.html"}} - {{else}} - {{:assign from="../equipment_history.html"}} + + {{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"}} + {{else}} + {{:redirect force="../loan_%s.html?output_type=%s&ok=1&key=%s&prop=%s&msg=modification"|args:$suffix:$output_type:$eqpmt_key:$prop}} {{/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 ac2bb5a..ad367b3 100644 --- a/movements/movement_details.html +++ b/movements/movement_details.html @@ -9,6 +9,7 @@ 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"}}