lesanges/equipment
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lesanges:b2d6254a0c6862cc887a6e4c73f10ce3a953e65a
Branches Tags
lesanges:main
lesanges:linked_transactions
lesanges:v0.57
lesanges:v0.56
lesanges:v0.55
lesanges:v0.54
lesanges:v0.53
lesanges:v0.52
lesanges:v0.51
lesanges:v0.50
lesanges:v0.49
lesanges:v0.48
lesanges:v0.47
lesanges:v0.46
lesanges:v0.45
lesanges:v0.44
lesanges:v0.43
lesanges:v0.42
lesanges:v0.41
lesanges:v0.4
lesanges:v0.3
lesanges:v0.2
lesanges:0.1
..
compare: lesanges:7b7c3c652d55eac9b958f06476f66a7dd59395d9
Branches Tags
lesanges:main
lesanges:linked_transactions
lesanges:v0.57
lesanges:v0.56
lesanges:v0.55
lesanges:v0.54
lesanges:v0.53
lesanges:v0.52
lesanges:v0.51
lesanges:v0.50
lesanges:v0.49
lesanges:v0.48
lesanges:v0.47
lesanges:v0.46
lesanges:v0.45
lesanges:v0.44
lesanges:v0.43
lesanges:v0.42
lesanges:v0.41
lesanges:v0.4
lesanges:v0.3
lesanges:v0.2
lesanges:0.1

No commits in common. "b2d6254a0c6862cc887a6e4c73f10ce3a953e65a" and "7b7c3c652d55eac9b958f06476f66a7dd59395d9" have entirely different histories.
b2d6254a0c ... 7b7c3c652d

8 changed files with 33 additions and 100 deletions
Show stats Expand all files Collapse all files

21
movements/add_new_equipment.html
View file

@ -88,12 +88,6 @@
notowned=$notowned notowned=$notowned
}} }}
{{/if}} {{/if}}
{{* documents liés *}}
{{#foreach from=$_POST.transactions item="value"}}
{{:assign var="transactions." value=$value|intval}}
{{/foreach}}
{{* Enregistrer le mouvement *}} {{* Enregistrer le mouvement *}}
{{:assign mvt_key=""|uuid}} {{:assign mvt_key=""|uuid}}
{{:assign var="operation" from="input_labels.%d"|args:$_POST.type_operation}} {{:assign var="operation" from="input_labels.%d"|args:$_POST.type_operation}}
@ -108,7 +102,6 @@
date=$_POST.date|parse_date date=$_POST.date|parse_date
comment=$_POST.remarques|trim comment=$_POST.remarques|trim
storage=$_POST.storage storage=$_POST.storage
transactions=$transactions
}} }}
{{if $type_mvt == "temporaire"}} {{if $type_mvt == "temporaire"}}
@ -131,7 +124,7 @@
<form method="post" action=""> <form method="post" action="">
<fieldset class="entree"> <fieldset class="entree">
<legend>Informations obligatoires</legend> <legend>Enregistrer une entrée de matériel</legend>
<dl> <dl>
{{if $input_labels|count == 1}} {{if $input_labels|count == 1}}
{{:input type="select" name="operation" label="Type" required=true options=$input_labels}} {{:input type="select" name="operation" label="Type" required=true options=$input_labels}}
@ -140,21 +133,21 @@
{{/if}} {{/if}}
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}} {{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
{{:input type="number" name="amount" label="Quantité" min=1 required=true default=1}} {{:input type="number" name="amount" label="Quantité" min=1 required=true default=1}}
</dl>
</fieldset>
<fieldset>
<legend>Sélectionner une catégorie et indiquer le nom du nouveau matériel</legend>
<dl>
{{if $categories|count == 1}} {{if $categories|count == 1}}
{{:input type="select" name="category" label="Catégorie" options=$categories required=true}} {{:input type="select" name="category" label="Catégorie" options=$categories required=true}}
{{else}} {{else}}
{{:input type="select" name="category" label="Catégorie" default_empty="— Aucune —" options=$categories required=true}} {{:input type="select" name="category" label="Catégorie" default_empty="— Aucune —" options=$categories required=true}}
{{/if}} {{/if}}
{{:input type="text" name="name" label="Désignation" required=true}} {{:input type="text" name="name" label="Désignation" required=true}}
</dl>
</fieldset>
<fieldset>
<legend>Informations facultatives</legend>
<dl>
{{if $storage != null}} {{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}} {{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
{{/if}} {{/if}}
{{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
{{:input type="textarea" name="remarques" label="Remarques" cols="40", rows="3" required=false}} {{:input type="textarea" name="remarques" label="Remarques" cols="40", rows="3" required=false}}
</dl> </dl>
</fieldset> </fieldset>

23
movements/copy_movement.html
View file

@ -177,13 +177,7 @@
out=$equipment.out out=$equipment.out
notowned=$equipment.notowned notowned=$equipment.notowned
}} }}
{{* vérification réussie : enregistrer le nouveau mouvement *}}
{{* documents liés *}}
{{#foreach from=$_POST.transactions item="value"}}
{{:assign var="transactions." value=$value|intval}}
{{/foreach}}
{{* enregistrer le nouveau mouvement *}}
{{:assign mvt_key=""|uuid}} {{:assign mvt_key=""|uuid}}
{{:save {{:save
key=$mvt_key key=$mvt_key
@ -197,7 +191,6 @@
comment=$mvt_new.comment comment=$mvt_new.comment
user=$user.id user=$user.id
storage=$_POST.storage storage=$_POST.storage
transactions=$transactions
}} }}
{{:redirect force="../equipment_history.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}} {{/form}}
@ -226,16 +219,16 @@
{{* formulaire de copie du mouvement *}} {{* formulaire de copie du mouvement *}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations"> <fieldset class="informations">
<legend>Matériel</legend> <legend>Informations matériel</legend>
<dl class="describe"> <dl class="describe">
<dt>Désignation</dt> <dt>Matériel</dt>
<dd>{{$equipment.name}}</dd> <dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt> <dt>Catégorie</dt>
<dd>{{$category.name}}</dd> <dd>{{$category.name}}</dd>
</dl> </dl>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>Informations obligatoires</legend> <legend>Créer une copie du mouvement</legend>
<dl> <dl>
{{if $mvt_new.direction == "input"}} {{if $mvt_new.direction == "input"}}
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}} {{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
@ -244,11 +237,6 @@
{{/if}} {{/if}}
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}} {{: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="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
</dl>
</fieldset>
<fieldset class="entree">
<legend>Informations facultatives</legend>
<dl>
{{if $prop == 1 && $mvt_new.direction == "output"}} {{if $prop == 1 && $mvt_new.direction == "output"}}
{{:input {{:input
type="list" type="list"
@ -264,9 +252,6 @@
{{if $storage != null}} {{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}} {{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
{{/if}} {{/if}}
{{if $type_mvt != "retour"}}
{{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
{{/if}}
{{/if}} {{/if}}
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}} {{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
</dl> </dl>

31
movements/input_equipment.html
View file

@ -6,6 +6,11 @@
- key : clé du matériel à ajouter - key : clé du matériel à ajouter
*}} *}}
{{* barre de navigation *}}
{{if ! $dialog}}
{{:include file="../_nav.html" current="entrees"}}
{{/if}}
{{* récupérer la config des entrées/sorties *}} {{* récupérer la config des entrées/sorties *}}
{{:include file="../_get_config.html" keep="config"}} {{:include file="../_get_config.html" keep="config"}}
@ -24,6 +29,7 @@
{{* Traiter l'envoi du formulaire *}} {{* Traiter l'envoi du formulaire *}}
{{#form on="save"}} {{#form on="save"}}
{{* vérifier la quantité saisie *}} {{* vérifier la quantité saisie *}}
{{if $_POST.amount <= 0}} {{if $_POST.amount <= 0}}
{{:error message="La quantité (%s) doit être strictement positive !!"|args:$_POST.amount}} {{:error message="La quantité (%s) doit être strictement positive !!"|args:$_POST.amount}}
@ -42,11 +48,6 @@
{{:assign var="equipment.notowned" value="%d+%d"|math:$equipment.notowned:$_POST.amount|intval}} {{:assign var="equipment.notowned" value="%d+%d"|math:$equipment.notowned:$_POST.amount|intval}}
{{/if}} {{/if}}
{{* documents liés *}}
{{#foreach from=$_POST.transactions item="value"}}
{{:assign var="transactions." value=$value|intval}}
{{/foreach}}
{{:save {{:save
key=$equipment.key key=$equipment.key
validate_schema="../equipment.schema.json" validate_schema="../equipment.schema.json"
@ -72,7 +73,6 @@
date=$_POST.date|parse_date date=$_POST.date|parse_date
comment=$_POST.remarques|trim comment=$_POST.remarques|trim
storage=$_POST.storage storage=$_POST.storage
transactions=$transactions
}} }}
{{:assign var=type_entree from="config.input_nature.%s.type"|args:$_POST.operation}} {{:assign var=type_entree from="config.input_nature.%s.type"|args:$_POST.operation}}
{{if $type_entree == "temporaire"}} {{if $type_entree == "temporaire"}}
@ -90,19 +90,18 @@
{{#load type="storage" order="$$.name"}} {{#load type="storage" order="$$.name"}}
{{:assign var="storage.%s"|args:$key value=$name}} {{:assign var="storage.%s"|args:$key value=$name}}
{{/load}} {{/load}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations"> <fieldset class="informations">
<legend>Matériel</legend> <legend>Informations matériel</legend>
<dl class="describe"> <dl class="describe">
<dt>Désignation</dt> <dt>Matériel</dt>
<dd>{{$equipment.name}}</dd> <dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt> <dt>Catégorie</dt>
<dd>{{$category.name}}</dd> <dd>{{$category.name}}</dd>
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="entree"> <fieldset class="entree">
<legend>Informations obligatoires</legend> <legend>Enregistrer une entrée de matériel</legend>
<dl> <dl>
{{if $input_labels|count == 1}} {{if $input_labels|count == 1}}
{{:input type="select" name="operation" label="Type" required=true options=$input_labels}} {{:input type="select" name="operation" label="Type" required=true options=$input_labels}}
@ -111,15 +110,9 @@
{{/if}} {{/if}}
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}} {{: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="number" name="amount" label="Quantité" required=true min=1 default=1}}
</dl> {{if $storage != null}}
</fieldset> {{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
<fieldset class="entree"> {{/if}}
<legend>Informations facultatives</legend>
<dl>
{{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
{{/if}}
{{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
{{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}} {{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}}
</dl> </dl>
</fieldset> </fieldset>

4
movements/input_return.html
View file

@ -188,9 +188,9 @@
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations"> <fieldset class="informations">
<legend>Matériel</legend> <legend>Informations matériel</legend>
<dl class="describe"> <dl class="describe">
<dt>Désignation</dt> <dt>Matériel</dt>
<dd>{{$equipment.name}}</dd> <dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt> <dt>Catégorie</dt>
<dd>{{$category.name}}</dd> <dd>{{$category.name}}</dd>

28
movements/modify_movement.html
View file

@ -178,11 +178,6 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
{{* documents liés *}}
{{#foreach from=$_POST.transactions item="value"}}
{{:assign var="transactions." value=$value|intval}}
{{/foreach}}
{{:save {{:save
key=$equipment.key key=$equipment.key
validate_schema="../equipment.schema.json" validate_schema="../equipment.schema.json"
@ -214,7 +209,6 @@
comment=$mvt_new.comment comment=$mvt_new.comment
user=$user_id user=$user_id
storage=$_POST.storage storage=$_POST.storage
transactions=$transactions
}} }}
{{:redirect force="../equipment_history.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}} {{/form}}
@ -246,24 +240,16 @@
{{* formulaire de modification du mouvement *}} {{* formulaire de modification du mouvement *}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations"> <fieldset class="informations">
<legend>Matériel</legend> <legend>Informations matériel</legend>
<dl class="describe"> <dl class="describe">
<dt>Désignation</dt> <dt>Matériel</dt>
<dd>{{$equipment.name}}</dd> <dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt> <dt>Catégorie</dt>
<dd>{{$category.name}}</dd> <dd>{{$category.name}}</dd>
{{if $mvt_new.transactions != null}}
<dt>Écritures liées</dt>
<dd>
{{#foreach from=$mvt_new.transactions item="trans"}}
{{:link class="num" href="!acc/transactions/details.php?id=%d"|args:$trans label=$trans}}
{{/foreach}}
</dd>
{{/if}}
</dl> </dl>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>Informations obligatoires</legend> <legend>Modifier un mouvement</legend>
<dl> <dl>
{{if $mvt_new.direction == "input"}} {{if $mvt_new.direction == "input"}}
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}} {{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
@ -272,11 +258,6 @@
{{/if}} {{/if}}
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}} {{: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="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
</dl>
</fieldset>
<fieldset class="entree">
<legend>Informations facultatives</legend>
<dl>
{{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}} {{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}}
{{:input {{:input
type="list" type="list"
@ -292,9 +273,6 @@
{{if $storage != null}} {{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}} {{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}}
{{/if}} {{/if}}
{{if $type_mvt != "retour"}}
{{:input type="list" name="transactions" default=$mvt_new.transactions label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
{{/if}}
{{/if}} {{/if}}
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}} {{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
</dl> </dl>

6
movements/movement.schema.json
View file

@ -40,12 +40,6 @@
"storage": { "storage": {
"description": "clé du lieu de stockage", "description": "clé du lieu de stockage",
"type": ["string", "null"] "type": ["string", "null"]
},
"transactions": {
"type": ["array", "null"],
"items": {
"type": "integer"
}
} }
}, },
"required": ["type", "direction", "operation", "amount", "equipment", "date", "comment"] "required": ["type", "direction", "operation", "amount", "equipment", "date", "comment"]

9
movements/output_equipment.html
View file

@ -160,7 +160,7 @@
{{* formulaire de sortie de matériel *}} {{* formulaire de sortie de matériel *}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations"> <fieldset class="informations">
<legend>Matériel</legend> <legend>Informations matériel</legend>
<dl class="describe"> <dl class="describe">
<dt>Matériel</dt> <dt>Matériel</dt>
<dd>{{$equipment.name}}</dd> <dd>{{$equipment.name}}</dd>
@ -171,7 +171,7 @@
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="sortie"> <fieldset class="sortie">
<legend>Informations obligatoires</legend> <legend>Enregistrer une sortie</legend>
<dl> <dl>
{{if $output_labels|count == 1}} {{if $output_labels|count == 1}}
{{:input type="select" name="operation" label="Type" required=true options=$output_labels}} {{:input type="select" name="operation" label="Type" required=true options=$output_labels}}
@ -180,11 +180,6 @@
{{/if}} {{/if}}
{{:input type="date" name="date" label="Date de sortie" required=true default=$now|date_short}} {{: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=1 min=1 max=$dispo}} {{:input type="number" name="amount" label="Quantité" required=true default=1 min=1 max=$dispo}}
</dl>
</fieldset>
<fieldset class="entree">
<legend>Informations facultatives</legend>
<dl>
{{:input {{:input
type="list" type="list"
name="user" name="user"

11
movements/output_return.html
View file

@ -198,9 +198,9 @@
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations"> <fieldset class="informations">
<legend>Matériel</legend> <legend>Informations matériel</legend>
<dl class="describe"> <dl class="describe">
<dt>Désignation</dt> <dt>Matériel</dt>
<dd>{{$equipment.name}}</dd> <dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt> <dt>Catégorie</dt>
<dd>{{$category.name}}</dd> <dd>{{$category.name}}</dd>
@ -209,16 +209,11 @@
</dl> </dl>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>Informations obligatoires</legend> <legend>Retour de « {{$equipment.name}} (Catégorie : {{$category.name}}) »</legend>
<dl> <dl>
{{:input type="select" name="operation" label="Type" required=true options=$return_label}} {{:input type="select" name="operation" label="Type" required=true options=$return_label}}
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}} {{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
{{:input type="number" name="amount" label="Quantité" min=1 max=$exterieur required=true default=1}} {{:input type="number" name="amount" label="Quantité" min=1 max=$exterieur required=true default=1}}
</dl>
</fieldset>
<fieldset class="entree">
<legend>Informations facultatives</legend>
<dl>
{{if $storage != null}} {{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}} {{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
{{/if}} {{/if}}