diff --git a/equipment_history.html b/equipment_history.html index 3ce6424..48d5039 100644 --- a/equipment_history.html +++ b/equipment_history.html @@ -28,6 +28,7 @@ {{else}} {{:error message="Le matériel %s n'appartient à aucune catégorie"|args:$equipment.name}} {{/load}} + {{:admin_header title="Gestion des matériels" custom_css="./style.css" current="module_equipment"}} {{if $_GET.current != null}} @@ -176,11 +177,11 @@ THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage) ELSE '' END AS 'Stockage'; - $$.comment AS 'Commentaire' + '' AS 'Doc' "|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}} @@ -190,6 +191,12 @@ {{: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}} @@ -200,7 +207,7 @@ {{$dispo}} {{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$col8}} {{$col9}} - {{$comment}} + {{if $nb_files > 0}}{{:tag label="%s"|args:$nb_files}}{{:icon shape="attach"}}{{/if}} {{if $current != "archives"}} {{if $direction == "output" && $type_mvt == "temporaire"}} @@ -214,25 +221,11 @@ target="_dialog"}} {{/if}} {{/if}} - {{if $direction == "input" && $type_mvt == "retour"}} - {{* interdire dupliquer *}} - {{else}} - {{:linkbutton - label="Dupliquer" - href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop - shape="plus" - target="_dialog"}} - {{/if}} {{:linkbutton - label="Modifier" - href="movements/modify_movement.html?key=%s"|args:$key - shape="edit" - target="_dialog"}} - {{:linkbutton - label="Supprimer" - href="movements/delete_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop - shape="delete" - target="_dialog"}} + label="Détails" + href="movements/movement_details.html?key=%s&prop=%s"|args:$key:$_GET.prop + shape="eye" + }} {{/if}} @@ -276,8 +269,8 @@ CASE WHEN $$.storage NOT NULL THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage) ELSE '' - END as 'Stockage'; - $$.comment AS 'Commentaire'" + END as 'Stockage' + " equipment=$equipment_key order=1 }} @@ -295,7 +288,6 @@ {{$amount}} {{$stock}} {{$col6}} - {{$comment}} {{if $direction == "input" && $type_mvt == "temporaire"}} {{:assign var="temp_in" from="present.%s"|args:$key}} @@ -308,25 +300,11 @@ target="_dialog"}} {{/if}} {{/if}} - {{if $direction == "output" && $type_mvt == "retour"}} - {{* interdire dupliquer *}} - {{else}} - {{:linkbutton - label="Dupliquer" - href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop - shape="plus" - target="_dialog"}} - {{/if}} {{:linkbutton - label="Modifier" - href="movements/modify_movement.html?key=%s"|args:$key - shape="edit" - target="_dialog"}} - {{:linkbutton - label="Supprimer" - href="movements/delete_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop - shape="delete" - target="_dialog"}} + label="Détails" + href="movements/movement_details.html?key=%s&prop=%s"|args:$key:$_GET.prop + shape="eye" + }} {{/if}} diff --git a/movements/movement_details.html b/movements/movement_details.html new file mode 100644 index 0000000..c83528f --- /dev/null +++ b/movements/movement_details.html @@ -0,0 +1,105 @@ +{{* -*- brindille -*- *}} + +{{* + Afficher les détails d'un mouvement et donner la possibilité : + - d'associer des fichiers + - de modifier, supprimer ou dupliquer le mouvement + paramètres : + - key : clé du mouvement + - prop = 1 si matériel appartient à l'asso +*}} + +{{:admin_header title="Détails du mouvement" custom_css="../style.css" current="module_equipment"}} +{{:form_errors}} + +{{* récupérer les infos du mouvement *}} +{{#load key=$_GET.key assign="mvt"}} +{{else}} + {{:error message="Aucun mouvement avec la clé %s"|args:$_GET.key}} +{{/load}} + +{{* récupérer la config des entrées/sorties *}} +{{:include file="../_get_config.html" keep="config, directions"}} +{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt.direction:$mvt.operation}} + +{{* récupérer les infos du matériel associé *}} +{{#load key=$mvt.equipment assign="equipment"}} +{{else}} + {{:error message="Aucun matériel avec la clé « %s »"|args:$mvt.equipment}} +{{/load}} + +{{* + -------------------- Afficher les informations du mouvement -------------------- +*}} + +{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$mvt.direction:$mvt.operation}} +{{#load key=$equipment.category assign="category"}}{{/load}} +{{#load key=$mvt.storage assign="storage"}}{{/load}} +{{#select !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt.user}} + {{:assign user_name=$nom}} +{{/select}} + + + +
+
Opération
+
{{$op_label}}
+
Matériel
+
{{$equipment.name}}
+
Catégorie
+
{{$category.name}}
+
Date
+
{{$mvt.date|date_short}}
+
Quantité
+
{{$mvt.amount}}
+
Membre destinataire
+
+ {{if $mvt.user != null}} + {{$user_name}} + {{else}}— + {{/if}} +
+
Lieu de stockage
+
+ {{if $storage != null}} + {{$storage.name}} + {{else}}— + {{/if}} +
+
Écritures liées
+
+ {{#foreach from=$mvt.transactions item="trans"}} + {{:link class="num" href="!acc/transactions/details.php?id=%d"|args:$trans label=$trans}} + {{else}}— + {{/foreach}} +
+
Remarques
+
{{if $mvt.comment != null}} + {{$mvt.comment}} + {{else}}— + {{/if}} +
+
+ +
+ {{:admin_files path=$_GET.key upload=true edit=true use_trash=false}} +
+{{:admin_footer}}