Il n'y a aucune catégorie : vous devez en ajouter.
{{else}} {{if $_GET.prop == null || $_GET.prop == "1"}} - {{:include file="./inventaire.html"}} + {{:include file="./_inventory.html"}} {{else}} - {{:include file="./inventaire_nonprop.html"}} + {{:include file="./_temp_inventory.html"}} {{/if}} {{/if}} diff --git a/modifier_materiel.html b/modify_equipment.html similarity index 100% rename from modifier_materiel.html rename to modify_equipment.html diff --git a/mouvements/valider_modification.html b/movements/_validate_modification.html similarity index 100% rename from mouvements/valider_modification.html rename to movements/_validate_modification.html diff --git a/mouvements/ajouter_entree.html b/movements/add_new_equipment.html similarity index 100% rename from mouvements/ajouter_entree.html rename to movements/add_new_equipment.html diff --git a/mouvements/dupliquer_mouvement.html b/movements/copy_movement.html similarity index 98% rename from mouvements/dupliquer_mouvement.html rename to movements/copy_movement.html index 3a0ec44..6c76a55 100644 --- a/mouvements/dupliquer_mouvement.html +++ b/movements/copy_movement.html @@ -135,7 +135,7 @@ {{* Vérifier la cohérence des mouvements du matériel *}} {{:include - file="./valider_modification.html" + file="./_validate_modification.html" keep="erreur" movements=$movements_new }} @@ -192,7 +192,7 @@ user=$user.id storage=$_POST.storage }} - {{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}} + {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}} {{/form}} {{:admin_header title="Dupliquer un mouvement" current="module_equipment"}} diff --git a/mouvements/supprimer_mouvement.html b/movements/delete_movement.html similarity index 91% rename from mouvements/supprimer_mouvement.html rename to movements/delete_movement.html index 6a91b3b..aea6243 100644 --- a/mouvements/supprimer_mouvement.html +++ b/movements/delete_movement.html @@ -29,7 +29,7 @@ {{:assign link_key=$key}} {{/load}} {{if $link_key != null}} - {{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}} + {{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}} {{/if}} {{else}} {{:assign dispo=0}} @@ -62,7 +62,7 @@ {{* problème ? *}} {{if $dispo < 0 || $nonprop < 0}} - {{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}} + {{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}} {{/if}} {{/if}} {{/load}} @@ -83,7 +83,7 @@ {{:assign link_key=$key}} {{/load}} {{if $link_key != null}} - {{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}} + {{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}} {{/if}} {{elseif $type_operation == 'retour'}} {{#load type="link" where="$$.return = :key" :key=$_GET.key}} @@ -148,7 +148,7 @@ out=$curr_eqpmt.out notowned=$curr_eqpmt.notowned }} - {{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}} + {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}} {{else}} {{* supprimer le matériel *}} {{:delete key=$curr_eqpmt.key}} diff --git a/mouvements/entrees/repertorie.html b/movements/input_equipment.html similarity index 89% rename from mouvements/entrees/repertorie.html rename to movements/input_equipment.html index f366d36..7811779 100644 --- a/mouvements/entrees/repertorie.html +++ b/movements/input_equipment.html @@ -8,11 +8,11 @@ {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="../../_nav.html" current="entrees"}} + {{:include file="../_nav.html" current="entrees"}} {{/if}} {{* récupérer la config des entrées/sorties *}} -{{:include file="../../_get_config.html" keep="config"}} +{{:include file="../_get_config.html" keep="config"}} {{* types d'entrées *}} {{#foreach from=$config.input_nature key=key}} @@ -50,7 +50,7 @@ {{:save key=$equipment.key - validate_schema="../../equipment.schema.json" + validate_schema="../equipment.schema.json" type="equipment" category=$equipment.category name=$equipment.name @@ -64,7 +64,7 @@ {{:assign mvt_key=""|uuid}} {{:save key=$mvt_key - validate_schema="../movement.schema.json" + validate_schema="./movement.schema.json" type="movement" direction="input" operation=$_POST.operation @@ -80,10 +80,10 @@ {{else}} {{:assign prop=1}} {{/if}} - {{:redirect force="../../historique.html?key=%s&ok=1&msg=entrée&prop=%s"|args:$equipment.key:$prop}} + {{:redirect force="../equipment_history.html?key=%s&ok=1&msg=entrée&prop=%s"|args:$equipment.key:$prop}} {{/form}} -{{:admin_header title="Entrée de matériel" custom_css="./../../style.css" current="module_equipment"}} +{{:admin_header title="Entrée de matériel" custom_css="../style.css" current="module_equipment"}} {{:form_errors}} {{* formulaire de saisie d'une entrée de matériel *}} diff --git a/mouvements/input_return.html b/movements/input_return.html similarity index 96% rename from mouvements/input_return.html rename to movements/input_return.html index a47615c..a311473 100644 --- a/mouvements/input_return.html +++ b/movements/input_return.html @@ -107,7 +107,7 @@ {{* Vérifier la cohérence des mouvements du matériel *}} {{:include - file="./valider_modification.html" + file="./_validate_modification.html" keep="erreur, pb" movements=$movements_new }} @@ -161,10 +161,10 @@ temp_key=$_GET.key return=$mvt_key }} - {{:redirect force="../historique.html?ok=1&key=%s&prop=0&msg=retour"|args:$mvt_new.equipment}} + {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=0&msg=retour"|args:$mvt_new.equipment}} {{/form}} -{{:admin_header title="Retour de matériel" custom_css="./../../style.css" current="module_equipment"}} +{{:admin_header title="Retour de matériel" custom_css="../style.css" current="module_equipment"}} {{:form_errors}} {{* barre de navigation *}} diff --git a/mouvements/link.schema.json b/movements/link.schema.json similarity index 100% rename from mouvements/link.schema.json rename to movements/link.schema.json diff --git a/mouvements/modifier_mouvement.html b/movements/modify_movement.html similarity index 98% rename from mouvements/modifier_mouvement.html rename to movements/modify_movement.html index 3d8d30f..93b3ca3 100644 --- a/mouvements/modifier_mouvement.html +++ b/movements/modify_movement.html @@ -126,7 +126,7 @@ {{* Vérifier la cohérence des mouvements du matériel *}} {{:include - file="./valider_modification.html" + file="./_validate_modification.html" keep="erreur" movements=$movements_new }} @@ -207,7 +207,7 @@ user=$user_id storage=$_POST.storage }} - {{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}} + {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}} {{/form}} {{:admin_header title="Modifier un mouvement" current="module_equipment"}} diff --git a/mouvements/movement.schema.json b/movements/movement.schema.json similarity index 100% rename from mouvements/movement.schema.json rename to movements/movement.schema.json diff --git a/mouvements/sorties/stock_disponible.html b/movements/output_equipment.html similarity index 94% rename from mouvements/sorties/stock_disponible.html rename to movements/output_equipment.html index eec388e..da10405 100644 --- a/mouvements/sorties/stock_disponible.html +++ b/movements/output_equipment.html @@ -6,7 +6,7 @@ *}} {{* récupérer la config des entrées/sorties *}} -{{:include file="../../_get_config.html" keep="config"}} +{{:include file="../_get_config.html" keep="config"}} {{* types de sorties *}} {{#foreach from=$config.output_nature key=key}} @@ -119,7 +119,7 @@ {{:save key=$equipment.key - validate_schema="../../equipment.schema.json" + validate_schema="../equipment.schema.json" type="equipment" category=$equipment.category name=$equipment.name @@ -133,7 +133,7 @@ {{:assign mvt_key=""|uuid}} {{:save key=$mvt_key - validate_schema="../movement.schema.json" + validate_schema="./movement.schema.json" type="movement" direction="output" operation=$_POST.operation @@ -143,13 +143,13 @@ comment=$_POST.remarques|trim user=$user.id }} - {{:redirect force="../../historique.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}} + {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}} {{/form}} -{{:admin_header title="Sortie de matériel" custom_css="./../../style.css" current="module_equipment"}} +{{:admin_header title="Sortie de matériel" custom_css="../style.css" current="module_equipment"}} {{if ! $dialog}} {{* barre de navigation *}} - {{:include file="../../_nav.html" current="sorties"}} + {{:include file="../_nav.html" current="sorties"}} {{/if}} {{#load key=$equipment.category assign="category"}}{{/load}} diff --git a/mouvements/output_return.html b/movements/output_return.html similarity index 96% rename from mouvements/output_return.html rename to movements/output_return.html index aa011b0..49d09e9 100644 --- a/mouvements/output_return.html +++ b/movements/output_return.html @@ -107,7 +107,7 @@ {{* Vérifier la cohérence des mouvements du matériel *}} {{:include - file="./valider_modification.html" + file="./_validate_modification.html" keep="erreur, pb" movements=$movements_new }} @@ -162,13 +162,13 @@ return=$mvt_key }} {{if $_GET.user == null}} - {{:redirect force="../historique.html?ok=1&key=%s&prop=1&msg=retour"|args:$mvt_new.equipment}} + {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=retour"|args:$mvt_new.equipment}} {{else}} {{:redirect force="/admin/users/details.php?id=%s"|args:$_GET.user}} {{/if}} {{/form}} -{{:admin_header title="Retour de matériel" custom_css="./../../style.css" current="module_equipment"}} +{{:admin_header title="Retour de matériel" custom_css="../style.css" current="module_equipment"}} {{:form_errors}} {{* barre de navigation *}} diff --git a/snippets/user_details.html b/snippets/user_details.html index 07cf0ee..6d364be 100644 --- a/snippets/user_details.html +++ b/snippets/user_details.html @@ -80,7 +80,7 @@ {{if $direction == "output" && $type_mvt == "temporaire"}} {{:linkbutton label="Retour" - href="%smouvements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id + href="%smovements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id shape="history" target="_dialog"}} {{/if}} diff --git a/storage/delete_storage.html b/storage/delete_storage.html index b50e1a6..03facb6 100644 --- a/storage/delete_storage.html +++ b/storage/delete_storage.html @@ -17,7 +17,7 @@ {{/form}} -{{:admin_header title="Lieux de stockage" custom_css="./style.css" current="module_equipment"}} +{{:admin_header title="Lieux de stockage" custom_css="../style.css" current="module_equipment"}} {{:form_errors}} {{#load key=$_GET.key limit="1" assign="store"}}{{/load}}