Ajout lieu de stockage et membre destinataire sortie
This commit is contained in:
Jean-Christophe Engel
commit
7b3dcbce01
16 changed files with 439 additions and 72 deletions
|
|
@ -101,6 +101,7 @@
|
|||
equipment=$equipment_key
|
||||
date=$_POST.date|parse_date
|
||||
comment=$_POST.remarques|trim
|
||||
storage=$_POST.storage
|
||||
}}
|
||||
|
||||
{{if $type_mvt == "temporaire"}}
|
||||
|
|
@ -108,18 +109,22 @@
|
|||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{:redirect force="../index.html?prop=%s&ok=1&msg=ajout"|args:$prop:$msg}}
|
||||
{{:redirect force="../index.html?prop=%s&ok=1&msg=ajout"|args:$prop}}
|
||||
{{/form}}
|
||||
|
||||
{{:admin_header title="Entrée de matériel" current="module_equipment"}}
|
||||
{{:form_errors}}
|
||||
|
||||
{{if $categories != null}}
|
||||
{{#load type="storage" order="$$.name"}}
|
||||
{{:assign var="storage.%s"|args:$key value=$name}}
|
||||
{{/load}}
|
||||
|
||||
{{* formulaire ajout matériel *}}
|
||||
<form method="post" action="">
|
||||
|
||||
<fieldset class="entree">
|
||||
<legend>Ajouter une entrée de matériel</legend>
|
||||
<legend>Enregistrer une entrée de matériel</legend>
|
||||
<dl>
|
||||
{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
|
||||
|
|
@ -132,6 +137,7 @@
|
|||
<dl>
|
||||
{{:input type="select" name="category" label="Catégorie" default_empty="— Aucune —" options=$categories required=true}}
|
||||
{{:input type="text" name="name" label="Désignation" required=true}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
{{:input type="textarea" name="remarques" label="Remarques" cols="40", rows="3" required=false}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,24 @@
|
|||
{{: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_new.direction:$mvt_new.operation}}
|
||||
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{if $type_mvt == "temporaire"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{if $type_mvt == "retour"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{* infos pour affichage *}}
|
||||
{{:assign amount_init=$mvt_new.amount}}
|
||||
{{:assign date_init=$mvt_new.date|date_short}}
|
||||
|
|
@ -24,9 +42,6 @@
|
|||
{{:error message="Aucun matériel avec la clé « %s »"|args:$eqpmt_key}}
|
||||
{{/load}}
|
||||
|
||||
{{* récupérer la config des entrées/sorties *}}
|
||||
{{:include file="../_get_config.html" keep="config"}}
|
||||
|
||||
{{* limiter les opérations possibles *}}
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{* types d'entrées *}}
|
||||
|
|
@ -60,24 +75,19 @@
|
|||
{{:error message="Impossible de saisir une date dans le futur (%s)"|args:$_POST.date}}
|
||||
{{/if}}
|
||||
|
||||
{{if $mvt_new.direction != "output" && $_POST.user != null}}
|
||||
{{:error message="Un membre ne peut être associé qu'à une sortie"}}
|
||||
{{/if}}
|
||||
{{if $_POST.user|count > 1}}
|
||||
{{:error message="Un membre au plus peut être associé à une sortie"}}
|
||||
{{/if}}
|
||||
{{#foreach from=$_POST.user key="id" item="name"}}
|
||||
{{:assign var="user.id" value=$id}}
|
||||
{{:assign var="user.name" value=$name}}
|
||||
{{/foreach}}
|
||||
|
||||
{{* préparer le mouvement copié *}}
|
||||
{{:assign var="mvt_new.operation" value=$_POST.operation}}
|
||||
{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt_new.direction:$mvt_new.operation}}
|
||||
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{if $type_mvt == "temporaire"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{if $type_mvt == "retour"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{:assign var="mvt_new.amount" value=$_POST.amount}}
|
||||
{{:assign var="mvt_new.date" value=$_POST.date|parse_date}}
|
||||
{{:assign var="mvt_new.comment" value=$_POST.comment}}
|
||||
|
|
@ -175,6 +185,7 @@
|
|||
equipment=$eqpmt_key
|
||||
date=$mvt_new.date
|
||||
comment=$mvt_new.comment
|
||||
user=$user.id
|
||||
}}
|
||||
{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
|
||||
{{/if}}
|
||||
|
|
@ -191,6 +202,16 @@
|
|||
{{#load key=$equipment.category assign="category"}}{{/load}}
|
||||
{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$mvt_new.direction:$mvt_new.operation}}
|
||||
|
||||
{{if $mvt_new.user != null}}
|
||||
{{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}}
|
||||
{{:assign var="user.%s"|args:$id value=$nom}}
|
||||
{{/select}}
|
||||
{{/if}}
|
||||
|
||||
{{#load type="storage" order="$$.name"}}
|
||||
{{:assign var="storage.%s"|args:$key value=$name}}
|
||||
{{/load}}
|
||||
|
||||
{{* formulaire de copie du mouvement *}}
|
||||
<form method="post" action="">
|
||||
<fieldset>
|
||||
|
|
@ -198,14 +219,28 @@
|
|||
{{if $mvt_new.direction == "input"}}
|
||||
<dl>
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
|
||||
{{else}}
|
||||
<dl>
|
||||
{{else}}
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$output_labels|sort default=$mvt_new.operation}}
|
||||
{{/if}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
|
||||
{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
|
||||
</dl>
|
||||
{{/if}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
|
||||
{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
|
||||
{{if $prop == 1 && $mvt_new.direction == "output"}}
|
||||
{{:input
|
||||
type="list"
|
||||
name="user"
|
||||
label="Membre"
|
||||
default=$user
|
||||
target="!users/selector.php"
|
||||
multiple=true
|
||||
max=1
|
||||
help="dans le cas d'une sortie temporaire, il est possible d'associer un membre bénéficiaire"
|
||||
}}
|
||||
{{/if}}
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
{{/if}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
||||
<p class="submit">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{{* -*- brindille -*- *}}
|
||||
|
||||
{{*
|
||||
Ajouter une entrée de matériel
|
||||
Enregistrer une entrée de matériel
|
||||
paramètres :
|
||||
- key : clé du matériel à ajouter
|
||||
*}}
|
||||
|
|
@ -72,6 +72,7 @@
|
|||
equipment=$equipment.key
|
||||
date=$_POST.date|parse_date
|
||||
comment=$_POST.remarques|trim
|
||||
storage=$_POST.storage
|
||||
}}
|
||||
{{:assign var=type_entree from="config.input_nature.%s.type"|args:$_POST.operation}}
|
||||
{{if $type_entree == "temporaire"}}
|
||||
|
|
@ -86,6 +87,9 @@
|
|||
{{:form_errors}}
|
||||
|
||||
{{* formulaire de saisie d'une entrée de matériel *}}
|
||||
{{#load type="storage" order="$$.name"}}
|
||||
{{:assign var="storage.%s"|args:$key value=$name}}
|
||||
{{/load}}
|
||||
<form method="post" action="">
|
||||
<fieldset class="informations">
|
||||
<legend>Informations matériel</legend>
|
||||
|
|
@ -97,11 +101,13 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="entree">
|
||||
<legend>Ajouter une entrée de matériel</legend>
|
||||
<legend>Enregistrer une entrée de matériel</legend>
|
||||
<dl>
|
||||
{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
|
||||
{{:input type="number" name="amount" label="Quantité" required=true min=1 default=1}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
>>>>>>> depositaire
|
||||
{{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="entree">
|
||||
<legend>Ajouter un retour de matériel</legend>
|
||||
<legend>Enregistrer un retour de matériel</legend>
|
||||
<dl>
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,20 @@
|
|||
|
||||
{{* 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_new.direction:$mvt_new.operation}}
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{if $type_mvt == "temporaire"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{if $type_mvt == "retour"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{* infos pour affichage *}}
|
||||
{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$mvt_new.direction:$mvt_new.operation}}
|
||||
|
|
@ -43,29 +57,26 @@
|
|||
{{:error message="La quantité (%s) doit être strictement positive !!"|args:$_POST.amount}}
|
||||
{{/if}}
|
||||
|
||||
{{* interdire date dans le futur *}}
|
||||
{{* vérifier validité des données *}}
|
||||
{{if $_POST.date|parse_date|strtotime > $now}}
|
||||
{{:error message="Impossible de saisir une date dans le futur (%s)"|args:$_POST.date}}
|
||||
{{/if}}
|
||||
|
||||
{{* préparer le mouvement modifié *}}
|
||||
{{:assign var="mvt_new.operation" value=$_POST.operation}}
|
||||
{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt_new.direction:$mvt_new.operation}}
|
||||
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{if $type_mvt == "temporaire"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{if $type_mvt == "retour"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{if $mvt_new.direction == "input" && $_POST.user != null}}
|
||||
{{:error message="Un membre ne peut être associé qu'à une sortie"}}
|
||||
{{/if}}
|
||||
|
||||
{{if $_POST.user|count > 1}}
|
||||
{{:error message="Un membre au plus peut être associé à une sortie"}}
|
||||
{{/if}}
|
||||
|
||||
{{#foreach from=$_POST.user key="id" item="name"}}
|
||||
{{:assign var="user.id" value=$id}}
|
||||
{{:assign var="user.name" value=$name}}
|
||||
{{/foreach}}
|
||||
|
||||
{{* préparer le mouvement modifié *}}
|
||||
{{:assign var="mvt_new.operation" value=$_POST.operation}}
|
||||
{{:assign var="mvt_new.amount" value=$_POST.amount}}
|
||||
{{:assign var="mvt_new.date" value=$_POST.date|parse_date}}
|
||||
{{:assign var="mvt_new.comment" value=$_POST.comment}}
|
||||
|
|
@ -184,6 +195,8 @@
|
|||
equipment=$eqpmt_key
|
||||
date=$mvt_new.date
|
||||
comment=$mvt_new.comment
|
||||
user=$user.id
|
||||
storage=$_POST.storage
|
||||
}}
|
||||
{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
|
||||
{{/if}}
|
||||
|
|
@ -199,21 +212,45 @@
|
|||
{{* récupérer les infos de la catégorie *}}
|
||||
{{#load key=$equipment.category assign="category"}}{{/load}}
|
||||
|
||||
{{if $mvt_new.user != null}}
|
||||
{{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}}
|
||||
{{:assign var="user.%s"|args:$id value=$nom}}
|
||||
{{/select}}
|
||||
{{/if}}
|
||||
|
||||
{{#load type="storage" order="$$.name"}}
|
||||
{{:assign var="storage.%s"|args:$key value=$name}}
|
||||
{{/load}}
|
||||
|
||||
{{* formulaire de modification du mouvement *}}
|
||||
<form method="post" action="">
|
||||
<fieldset>
|
||||
<legend>Modifier « {{$op_label}} {{$equipment.name}} (Catégorie : {{$category.name}}) »</legend>
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
<dl>
|
||||
<dl>
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
|
||||
{{else}}
|
||||
<dl>
|
||||
{{else}}
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$output_labels|sort default=$mvt_new.operation}}
|
||||
{{/if}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
|
||||
{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
|
||||
</dl>
|
||||
{{/if}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
|
||||
{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
|
||||
{{if $prop == 1 && $mvt_new.direction == "output"}}
|
||||
{{:input
|
||||
type="list"
|
||||
name="user"
|
||||
label="Membre"
|
||||
default=$user
|
||||
target="!users/selector.php"
|
||||
multiple=true
|
||||
max=1
|
||||
help="dans le cas d'une sortie temporaire, il est possible d'associer un membre bénéficiaire"
|
||||
}}
|
||||
{{/if}}
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}}
|
||||
{{/if}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
||||
<p class="submit">
|
||||
|
|
|
|||
|
|
@ -32,6 +32,14 @@
|
|||
"comment": {
|
||||
"description": "Commentaire additionnel",
|
||||
"type": ["null", "string"]
|
||||
},
|
||||
"user": {
|
||||
"description": "identifiant membre dépositaire",
|
||||
"type": ["integer", "null"]
|
||||
},
|
||||
"storage": {
|
||||
"description": "clé du lieu de stockage",
|
||||
"type": ["string", "null"]
|
||||
}
|
||||
},
|
||||
"required": ["type", "direction", "operation", "amount", "equipment", "date", "comment"]
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="sortie">
|
||||
<legend>Ajouter une sortie d'un matériel présent temporairement</legend>
|
||||
<legend>Enregistrer la sortie d'un matériel présent temporairement</legend>
|
||||
<dl>
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$output_labels|sort}}
|
||||
{{:input type="date" name="date" label="Date de sortie" required=true default=$now|date_short}}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,6 @@
|
|||
- key : clé du matériel à sortir
|
||||
*}}
|
||||
|
||||
{{if ! $dialog}}
|
||||
{{* barre de navigation *}}
|
||||
{{:include file="../../_nav.html" current="sorties"}}
|
||||
{{/if}}
|
||||
|
||||
{{* récupérer la config des entrées/sorties *}}
|
||||
{{:include file="../../_get_config.html" keep="config"}}
|
||||
|
||||
|
|
@ -27,9 +22,22 @@
|
|||
{{:error message="Impossible de saisir une date dans le futur (%s)"|args:$_POST.date}}
|
||||
{{/if}}
|
||||
|
||||
{{* vérifier les infos saisies *}}
|
||||
{{if $_POST.operation == ""}}
|
||||
{{:error message="Vous devez choisir un type de sortie"}}
|
||||
{{/if}}
|
||||
|
||||
{{:assign var="type_mvt" from="config.output_nature.%s.type"|args:$_POST.operation}}
|
||||
{{if $_POST.user|count > 1}}
|
||||
{{:error message="Un membre au plus peut être associé à une sortie"}}
|
||||
{{/if}}
|
||||
{{#foreach from=$_POST.user key="id" item="name"}}
|
||||
{{:assign var="user.id" value=$id}}
|
||||
{{:assign var="user.name" value=$name}}
|
||||
{{/foreach}}
|
||||
|
||||
{{* récupérer les infos du matériel *}}
|
||||
{{#load type="equipment" key=$_GET.key assign="equipment"}}
|
||||
{{/load}}
|
||||
{{#load type="equipment" key=$_GET.key assign="equipment"}}{{/load}}
|
||||
|
||||
{{:assign stock=0}}
|
||||
{{:assign exterieur=0}}
|
||||
|
|
@ -42,7 +50,6 @@
|
|||
{{if ! $insere && $mvt.date > $_POST.date|parse_date}}
|
||||
{{:assign insere=true}}
|
||||
{{:assign dispo_old="%d-%d"|math:$stock:$exterieur}}
|
||||
{{:assign var="type_mvt" from="config.output_nature.%s.type"|args:$_POST.operation}}
|
||||
|
||||
{{if $type_mvt == 'définitif'}}
|
||||
{{:assign stock="%d-%d"|math:$stock:$_POST.amount}}
|
||||
|
|
@ -134,11 +141,16 @@
|
|||
equipment=$equipment.key
|
||||
date=$_POST.date|parse_date
|
||||
comment=$_POST.remarques|trim
|
||||
user=$user.id
|
||||
}}
|
||||
{{:redirect force="../../historique.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"}}
|
||||
{{if ! $dialog}}
|
||||
{{* barre de navigation *}}
|
||||
{{:include file="../../_nav.html" current="sorties"}}
|
||||
{{/if}}
|
||||
{{:form_errors}}
|
||||
|
||||
{{* Extraire et compiler les infos de la base *}}
|
||||
|
|
@ -167,11 +179,20 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="sortie">
|
||||
<legend>Ajouter une sortie</legend>
|
||||
<legend>Enregistrer une sortie</legend>
|
||||
<dl>
|
||||
{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$output_labels|sort}}
|
||||
{{:input type="date" name="date" label="Date de sortie" required=true default=$now|date_short}}
|
||||
{{:input type="number" name="amount" label="Quantité" required=true default=$dispo min=1 max=$dispo}}
|
||||
{{:input
|
||||
type="list"
|
||||
name="user"
|
||||
label="Membre"
|
||||
target="!users/selector.php"
|
||||
multiple=true
|
||||
max=1
|
||||
help="dans le cas d'une sortie temporaire, il est possible d'associer un membre bénéficiaire"
|
||||
}}
|
||||
{{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
|
@ -180,7 +201,15 @@
|
|||
</p>
|
||||
</form>
|
||||
{{else}}
|
||||
<p class="block error">Il y a 0 unité de ce matériel disponible à la date du {{$now|date_short}}</p>
|
||||
<p class="block error">Il n'y a aucune unité de ce matériel disponible à la date du {{$now|date_short}}</p>
|
||||
{{/if}}
|
||||
|
||||
{{:admin_footer}}
|
||||
|
||||
<script type="text/javascript" src="scripts.js"></script>
|
||||
<script type="text/javascript">
|
||||
let op = $('#f_operation');
|
||||
op.addEventListener("change", (evt) => {
|
||||
toggleUserChoice(document.querySelector("#user"));
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue