Compare commits
6 commits
90276cb026
...
17b8812f43
| Author | SHA1 | Date | |
|---|---|---|---|
|
17b8812f43 | ||
|
|
e692cf0b2c | ||
|
|
e4e717dfb1 | ||
|
|
8bbd0b8101 | ||
|
|
1961431942 | ||
|
|
e28d1b8195 |
21 changed files with 253 additions and 227 deletions
|
|
@ -26,9 +26,3 @@
|
|||
{{/foreach}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
|
||||
{{if $module.config.loan_duration != null}}
|
||||
{{:assign loan_duration=$module.config.loan_duration}}
|
||||
{{else}}
|
||||
{{:assign loan_duration=$config_defaut.loan_duration}}
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@
|
|||
{{else}}
|
||||
{{:assign prop="&prop=%s"|args:$selected_prop}}
|
||||
{{/if}}
|
||||
<td>{{:link href="equipment_history.html?key=%s&prop=%s"|args:$key:$selected_prop" label=$name}}</td>
|
||||
<td>{{:link href="equipment_history.html?key=%s&prop=%s"|args:$key:$selected_prop label=$name}}</td>
|
||||
<td>{{$cat_name}}</td>
|
||||
<td class="num">{{$stock}}</td>
|
||||
<td class="num">{{$col4}}</td>
|
||||
|
|
@ -120,22 +120,8 @@
|
|||
<td class="num">{{$out}}</td>
|
||||
<td class="num">{{$col7}}</td>
|
||||
<td class="actions">
|
||||
{{*
|
||||
{{if $col7 > 0}}
|
||||
{{:linkbutton
|
||||
label="Sortie"
|
||||
shape="minus"
|
||||
href="movements/output_equipment.html?key=%s"|args:$key
|
||||
target="_dialog"}}
|
||||
{{/if}}
|
||||
{{:linkbutton
|
||||
label="Entrée"
|
||||
shape="plus"
|
||||
href="movements/input_equipment.html?key=%s"|args:$key
|
||||
target="_dialog"}}
|
||||
*}}
|
||||
{{:linkbutton
|
||||
label="Historique"
|
||||
label="Mouvements"
|
||||
href="equipment_history.html?key=%s&prop=1"|args:$key
|
||||
shape="table"}}
|
||||
{{:linkbutton
|
||||
|
|
|
|||
46
_nav.html
46
_nav.html
|
|
@ -3,14 +3,30 @@
|
|||
<nav class="tabs">
|
||||
{{if $current == 'inventaire'}}
|
||||
<aside>
|
||||
{{if $subcurrent == 'stock' && $cat == 0}}
|
||||
{{if $subcurrent == 'stock'}}
|
||||
{{if $cat == 0}}
|
||||
{{:linkbutton label="Ajouter une catégorie" shape="plus" href="categories/add_category.html" target="_dialog"}}
|
||||
{{else}}
|
||||
{{if $subcurrent == 'stock'}}
|
||||
{{:exportmenu right=true}}
|
||||
{{/if}}
|
||||
{{:linkbutton label="Ajouter un nouveau matériel" shape="plus" href="movements/add_new_equipment.html" target="_dialog"}}
|
||||
{{/if}}
|
||||
{{elseif $subcurrent == "mouvements"}}
|
||||
{{if $sortie != null}}
|
||||
{{:linkbutton label="Sortie" shape="minus" href="movements/output_equipment.html?key=%s"|args:$key target="_dialog"}}
|
||||
{{/if}}
|
||||
{{:linkbutton label="Entrée" shape="plus" href="movements/input_equipment.html?key=%s"|args:$key target="_dialog"}}
|
||||
{{/if}}
|
||||
</aside>
|
||||
{{elseif $current == 'config'}}
|
||||
<aside>
|
||||
{{if $subcurrent == 'categories'}}
|
||||
{{:linkbutton label="Ajouter une catégorie" shape="plus" href="add_category.html" target="_dialog"}}
|
||||
{{elseif $subcurrent == 'storage'}}
|
||||
{{:linkbutton label="Ajouter un lieu de stockage" shape="plus" href="add_storage.html" target="_dialog"}}
|
||||
{{elseif $subcurrent == 'typesES'}}
|
||||
{{:linkbutton label="Ajouter un type d'entrée" shape="plus" href="config/add_movement_type.html?dir=input" target="_dialog"}}
|
||||
{{:linkbutton label="Ajouter un type de sortie" shape="plus" href="config/add_movement_type.html?dir=output" target="_dialog"}}
|
||||
{{/if}}
|
||||
</aside>
|
||||
{{/if}}
|
||||
|
||||
|
|
@ -24,44 +40,30 @@
|
|||
</ul>
|
||||
|
||||
{{if $current == 'inventaire'}}
|
||||
{{if $subcurrent == 'historique'}}
|
||||
{{if $subcurrent == 'mouvements'}}
|
||||
<ul class="sub">
|
||||
<li class="title"><strong>Historique — {{$eqpmt}} ({{$category}})</strong></li>
|
||||
<li class="title"><strong>Mouvements — {{$eqpmt}} ({{$category}})</strong></li>
|
||||
</ul>
|
||||
{{/if}}
|
||||
{{elseif $current == 'prêt'}}
|
||||
<ul class="sub">
|
||||
<li {{if $subcurrent == 'encours'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html?output_type=loan">En cours</a></li>
|
||||
<li {{if $subcurrent == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}loan_movements.html?output_type=loan">Historique</a></li>
|
||||
<li {{if $subcurrent == 'membres'}} class="current"{{/if}}><a href="{{$module.url}}member_loan.html?output_type=loan">Membres</a></li>
|
||||
<li {{if $subcurrent == 'membres'}} class="current"{{/if}}><a href="{{$module.url}}member_loan.html?output_type=loan">Prêts en cours aux membres</a></li>
|
||||
</ul>
|
||||
{{elseif $current == 'location'}}
|
||||
<ul class="sub">
|
||||
<li {{if $subcurrent == 'encours'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html?output_type=rent">En cours</a></li>
|
||||
<li {{if $subcurrent == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}loan_movements.html?output_type=rent">Historique</a></li>
|
||||
<li {{if $subcurrent == 'membres'}} class="current"{{/if}}><a href="{{$module.url}}member_loan.html?output_type=rent">Membres</a></li>
|
||||
<li {{if $subcurrent == 'membres'}} class="current"{{/if}}><a href="{{$module.url}}member_loan.html?output_type=rent">Locations en cours aux membres</a></li>
|
||||
</ul>
|
||||
{{elseif $current == 'archives'}}
|
||||
{{if $subsubcurrent == 'historique'}}
|
||||
{{if $subcurrent == 'mouvements'}}
|
||||
<ul class="sub">
|
||||
<li class="title"><strong>Historique — {{$eqpmt}} ({{$category}})</strong></li>
|
||||
</ul>
|
||||
{{/if}}
|
||||
{{elseif $current == 'config'}}
|
||||
{{if $subcurrent == 'categories'}}
|
||||
<aside>
|
||||
{{:linkbutton label="Ajouter une catégorie" shape="plus" href="add_category.html" target="_dialog"}}
|
||||
</aside>
|
||||
{{elseif $subcurrent == 'storage'}}
|
||||
<aside>
|
||||
{{:linkbutton label="Ajouter un lieu de stockage" shape="plus" href="add_storage.html" target="_dialog"}}
|
||||
</aside>
|
||||
{{elseif $subcurrent == 'typesES'}}
|
||||
<aside>
|
||||
{{:linkbutton label="Ajouter un type d'entrée" shape="plus" href="config/add_movement_type.html?dir=input" target="_dialog"}}
|
||||
{{:linkbutton label="Ajouter un type de sortie" shape="plus" href="config/add_movement_type.html?dir=output" target="_dialog"}}
|
||||
</aside>
|
||||
{{/if}}
|
||||
<ul class="sub">
|
||||
<li {{if $subcurrent == 'categories'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Catégories</a></li>
|
||||
<li {{if $subcurrent == 'storage'}} class="current"{{/if}}><a href="{{$module.url}}storage/index.html">Lieux de stockage</a></li>
|
||||
|
|
|
|||
|
|
@ -66,11 +66,11 @@
|
|||
}}
|
||||
|
||||
<tr>
|
||||
<td>{{$name}}</td>
|
||||
<td>{{:link href="equipment_history.html?key=%s&prop=1¤t=archives"|args:$key label=$name}}</td>
|
||||
<td>{{$col2}}</td>
|
||||
<td class="actions">
|
||||
{{:linkbutton
|
||||
label="Historique"
|
||||
label="Mouvements"
|
||||
href="equipment_history.html?key=%s&prop=1¤t=archives"|args:$key
|
||||
shape="table"}}
|
||||
{{:linkbutton
|
||||
|
|
|
|||
|
|
@ -36,6 +36,11 @@
|
|||
"type" : {
|
||||
"type" : "string",
|
||||
"enum" : ["définitif", "temporaire", "retour"]
|
||||
},
|
||||
"fee" : {
|
||||
"description" : "tarif sortie temporaire",
|
||||
"type" : ["string", "null"],
|
||||
"enum" : ["gratuit", "payant"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
{{#restrict block=true section="accounting" level="write"}}{{/restrict}}
|
||||
|
||||
{{#form on="save"}}
|
||||
{{* vérifier la valisité de la durée saisie *}}
|
||||
{{if $_POST.loan_duration <= 0}}
|
||||
{{:error message="Durée (%s) erronée ; doit être > 0"|args:$_POST.loan_duration}}
|
||||
{{* vérifier la validité de la durée saisie *}}
|
||||
{{if $_POST.loan_duration < 0}}
|
||||
{{:error message="Durée (%s) erronée ; doit être >= 0"|args:$_POST.loan_duration}}
|
||||
{{/if}}
|
||||
|
||||
{{:save
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
<fieldset>
|
||||
<legend>Autres paramètres</legend>
|
||||
<dl>
|
||||
{{:input type="number" name="loan_duration" label="Durée de prêt par défaut" min=1 required=true default=$loan_duration help="Durée en nombre de jours"}}
|
||||
{{:input type="number" name="loan_duration" label="Durée de prêt par défaut" min=0 default=$module.config.loan_duration help="Durée en nombre de jours ; mettre 0 pour supprimer la durée par défaut"}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
<p class="submit">
|
||||
|
|
|
|||
12
default.json
12
default.json
|
|
@ -26,13 +26,19 @@
|
|||
{
|
||||
"key" : "c9ba00d9-26ee-448b-9f02-73e479ec2980",
|
||||
"label" : "Prêt",
|
||||
"type" : "temporaire"
|
||||
"type" : "temporaire",
|
||||
"fee" : "gratuit"
|
||||
},
|
||||
{
|
||||
"key" : "5c6c20bf-53e9-49dc-bcd6-e3cac23a6786",
|
||||
"label" : "Location",
|
||||
"type" : "temporaire",
|
||||
"fee" : "payant"
|
||||
},
|
||||
{
|
||||
"key" : "fefefa51-1a85-46ca-ab78-b594b10390ff",
|
||||
"label" : "Retour de Location/Emprunt",
|
||||
"type" : "retour"
|
||||
}
|
||||
],
|
||||
"loan_duration" : "30"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,25 +31,6 @@
|
|||
{{else}}
|
||||
{{:assign current="inventaire"}}
|
||||
{{/if}}
|
||||
{{:include file="./_nav.html" current=$current subcurrent="historique" eqpmt=$equipment.name category=$category.name}}
|
||||
|
||||
{{if $_GET.ok}}
|
||||
{{if $_GET.msg == "modification"}}
|
||||
<p class="block confirm">Modification enregistrée</p>
|
||||
{{elseif $_GET.msg == "copie"}}
|
||||
<p class="block confirm">Mouvement copié</p>
|
||||
{{elseif $_GET.msg == "retour"}}
|
||||
<p class="block confirm">Retour enregistré</p>
|
||||
{{elseif $_GET.msg == "suppression"}}
|
||||
<p class="block confirm">Mouvement supprimé</p>
|
||||
{{else}}
|
||||
<p class="block confirm">Mouvement enregistré</p>
|
||||
{{/if}}
|
||||
{{elseif $_GET.err}}
|
||||
{{if $_GET.msg == "suppression"}}
|
||||
<p class="block error">Ce mouvement ne peut être supprimé</p>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{* récupérer la config des entrées/sorties *}}
|
||||
{{:include file="./_get_config.html" keep="config"}}
|
||||
|
|
@ -248,6 +229,29 @@
|
|||
{{: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}}
|
||||
|
||||
{{if $dispo_final > 0 && $selected_prop == null || $selected_prop}}
|
||||
{{:assign sortie="sortie"}}
|
||||
{{/if}}
|
||||
{{:include file="./_nav.html" current=$current subcurrent="mouvements" eqpmt=$equipment.name category=$category.name sortie=$sortie key=$_GET.key}}
|
||||
|
||||
{{if $_GET.ok}}
|
||||
{{if $_GET.msg == "modification"}}
|
||||
<p class="block confirm">Modification enregistrée</p>
|
||||
{{elseif $_GET.msg == "copie"}}
|
||||
<p class="block confirm">Mouvement copié</p>
|
||||
{{elseif $_GET.msg == "retour"}}
|
||||
<p class="block confirm">Retour enregistré</p>
|
||||
{{elseif $_GET.msg == "suppression"}}
|
||||
<p class="block confirm">Mouvement supprimé</p>
|
||||
{{else}}
|
||||
<p class="block confirm">Mouvement enregistré</p>
|
||||
{{/if}}
|
||||
{{elseif $_GET.err}}
|
||||
{{if $_GET.msg == "suppression"}}
|
||||
<p class="block error">Ce mouvement ne peut être supprimé</p>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
<fieldset class="shortFormRight">
|
||||
<legend>Filtrer par appartenance</legend>
|
||||
{{:dropdown
|
||||
|
|
@ -257,17 +261,6 @@
|
|||
}}
|
||||
</fieldset>
|
||||
|
||||
{{if $current != "archives"}}
|
||||
<nav class="tabs">
|
||||
<aside>
|
||||
{{if $dispo_final > 0 && $selected_prop == null || $selected_prop}}
|
||||
{{:linkbutton label="Sortie" shape="minus" href="movements/output_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
|
||||
{{/if}}
|
||||
{{:linkbutton label="Entrée" shape="plus" href="movements/input_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
|
||||
</aside>
|
||||
</nav>
|
||||
{{/if}}
|
||||
|
||||
{{* lister les mouvements du matériel passé en paramètre *}}
|
||||
{{#list
|
||||
type="movement"
|
||||
|
|
@ -275,6 +268,7 @@
|
|||
where="%s"|args:$prop_condition
|
||||
equipment=$equipment_key
|
||||
order=1
|
||||
desc=true
|
||||
}}
|
||||
{{: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}}
|
||||
|
|
@ -322,12 +316,19 @@
|
|||
<td class="num">{{if $transactions|count > 0}}{{"Oui"}}{{/if}}</td>
|
||||
<td class="actions">
|
||||
{{if $current != "archives"}}
|
||||
{{if $direction == "output" && $type_mvt == "retour"}}
|
||||
{{:assign prop = 0}}
|
||||
{{elseif $direction == "input" && $type_mvt == "temporaire"}}
|
||||
{{:assign prop = 0}}
|
||||
{{else}}
|
||||
{{:assign prop = 1}}
|
||||
{{/if}}
|
||||
{{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
|
||||
href="movements/output_return.html?key=%s&prop=%s"|args:$key:$prop
|
||||
shape="reset"
|
||||
target="_dialog"}}
|
||||
{{/if}}
|
||||
|
|
@ -337,14 +338,14 @@
|
|||
{{if $temp_in != null && $temp_in > 0}}
|
||||
{{:linkbutton
|
||||
label="Retour"
|
||||
href="movements/input_return.html?key=%s&prop=%s"|args:$key:$selected_prop
|
||||
href="movements/input_return.html?key=%s&prop=%s"|args:$key:$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
|
||||
href="movements/movement_details.html?key=%s&prop=%s&from=eh"|args:$key:$prop
|
||||
shape="eye"
|
||||
}}
|
||||
{{/if}}
|
||||
|
|
@ -352,10 +353,6 @@
|
|||
</tr>
|
||||
{{/list}}
|
||||
|
||||
{{if $dispo_final == 0 && $stock > 0 && $current != "archives"}}
|
||||
<span class="help">Il n'y a aucun matériel disponible, il n'est donc pas possible d'effectuer une sortie</span>
|
||||
{{/if}}
|
||||
|
||||
{{:admin_footer}}
|
||||
|
||||
<script type="text/javascript" src="scripts.js"></script>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
{{else}}
|
||||
{{#restrict block=true section="accounting" level="write"}}{{/restrict}}
|
||||
|
||||
{{#load type="category" count=true limit=1 assign="result"}}{{/load}}
|
||||
{{:include file="_nav.html" current="inventaire" cat="%d"|args:$result.count subcurrent="stock"}}
|
||||
|
||||
{{if $_GET.ok}}
|
||||
{{if $_GET.msg == "ajout" }}
|
||||
<p class="block confirm">Ajout effectué</p>
|
||||
|
|
@ -28,9 +31,6 @@
|
|||
<p class="block error">Modification refusée</p>
|
||||
{{/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}}
|
||||
<p class="block alert">Il n'y a aucune catégorie : vous devez en ajouter.</p>
|
||||
{{else}}
|
||||
|
|
|
|||
|
|
@ -99,10 +99,6 @@
|
|||
}}
|
||||
</fieldset>
|
||||
|
||||
<div class="shortFormLeft">
|
||||
<p class="help">{{$label|ucfirst}} de matériel en cours</p>
|
||||
</div>
|
||||
|
||||
{{:assign premier=true}}
|
||||
{{#select
|
||||
users.nom AS nom,
|
||||
|
|
|
|||
|
|
@ -104,10 +104,6 @@
|
|||
}}
|
||||
</fieldset>
|
||||
|
||||
<div class="shortFormLeft">
|
||||
<p class="help">Historique des {{$label}}s</p>
|
||||
</div>
|
||||
|
||||
{{* lister les mouvements *}}
|
||||
{{:assign premier=true}}
|
||||
{{#select * FROM
|
||||
|
|
|
|||
|
|
@ -42,10 +42,6 @@
|
|||
{{:assign out_keys=$out_keys|implode:","}}
|
||||
{{:assign out_keys="("|cat:$out_keys|cat:")"}}
|
||||
|
||||
<div class="shortFormLeft">
|
||||
<p class="help">{{$label|ucfirst}}s aux membres</p>
|
||||
</div>
|
||||
|
||||
{{:assign premier=true}}
|
||||
{{#select
|
||||
nom, user, GROUP_CONCAT(mat_name, ", ") AS materiel, SUM(remain) AS quantite
|
||||
|
|
@ -90,12 +86,20 @@
|
|||
<td>{{$materiel}}</td>
|
||||
</tr>
|
||||
{{else}}
|
||||
<p class="block alert">Aucun mouvement.</p>
|
||||
{{if $label == "prêt"}}
|
||||
<p class="block alert">Aucun {{$label}} en cours.</p>
|
||||
{{elseif $label == "location"}}
|
||||
<p class="block alert">Aucune {{$label}} en cours.</p>
|
||||
{{/if}}
|
||||
{{/select}}
|
||||
</tbody>
|
||||
</table>
|
||||
{{else}}
|
||||
<p class="block alert">Aucun mouvement.</p>
|
||||
{{if $label == "prêt"}}
|
||||
<p class="block alert">Aucun {{$label}} en cours.</p>
|
||||
{{elseif $label == "location"}}
|
||||
<p class="block alert">Aucune {{$label}} en cours.</p>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{:admin_footer}}
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>Informations facultatives</legend>
|
||||
<legend>Autres informations</legend>
|
||||
<dl>
|
||||
{{if $storage != null}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
{{/load}}
|
||||
|
||||
{{* récupérer la config des entrées/sorties *}}
|
||||
{{:include file="../_get_config.html" keep="config, directions, loan_duration"}}
|
||||
{{: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}}
|
||||
|
||||
{{* interdire de dupliquer un retour => utiliser le bouton « Retour » *}}
|
||||
|
|
@ -95,8 +95,12 @@
|
|||
{{: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}}
|
||||
{{if $_POST.set_return_date != null}}
|
||||
{{:assign return_date=$_POST.return_date}}
|
||||
|
||||
{{if $_POST.return_date != null}}
|
||||
{{:assign return_date=$_POST.return_date|parse_date}}
|
||||
{{if $return_date < $_POST.date|parse_date}}
|
||||
{{:error message="La date de retour doit être postérieure à la date de sortie !"}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{:assign return_date=null}}
|
||||
{{/if}}
|
||||
|
|
@ -205,7 +209,7 @@
|
|||
user=$user.id
|
||||
storage=$_POST.storage
|
||||
transactions=$transactions
|
||||
return_date=$return_date|parse_date
|
||||
return_date=$return_date
|
||||
}}
|
||||
|
||||
{{if $_GET.from|substr:0:1 == "l"}}
|
||||
|
|
@ -240,7 +244,6 @@
|
|||
-------------------- Préparer la saisie --------------------
|
||||
*}}
|
||||
|
||||
{{* récupérer les infos de la catégorie *}}
|
||||
{{#load key=$equipment.category assign="category"}}{{/load}}
|
||||
{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$mvt_new.direction:$mvt_new.operation}}
|
||||
|
||||
|
|
@ -268,17 +271,18 @@
|
|||
<fieldset>
|
||||
<legend>Informations obligatoires</legend>
|
||||
<dl>
|
||||
{{: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 $mvt_new.direction == "input"}}
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
|
||||
{{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}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="entree">
|
||||
<legend>Informations facultatives</legend>
|
||||
<legend>Autres informations</legend>
|
||||
<dl>
|
||||
{{if $prop == 1 && $mvt_new.direction == "output"}}
|
||||
{{:input
|
||||
|
|
@ -292,27 +296,25 @@
|
|||
}}
|
||||
{{/if}}
|
||||
{{if $mvt_new.direction == "input" && $storage != null}}
|
||||
{{:input type="select" name="storage" default=$mvt_new.storage label="Lieu de stockage" 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 $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}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
|
||||
{{if $mvt_new.direction == "output" && $type_mvt == "temporaire"}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40" rows="3" required=false default=$mvt_new.comment}}
|
||||
{{if $mvt_new.direction == "output"}}
|
||||
{{if $mvt_new.return_date != null}}
|
||||
{{:assign checked="checked"}}
|
||||
{{:assign visibility="visible"}}
|
||||
{{:assign return_date=$mvt_new.return_date}}
|
||||
{{else}}
|
||||
{{:assign visibility="hidden"}}
|
||||
{{if $module.config.loan_duration != null && $module.config.loan_duration > 0}}
|
||||
{{:assign ts_sortie=$mvt_new.date|strtotime}}
|
||||
{{:assign ts_retour="%d+%d*(60*60*24)"|math:$ts_sortie:$loan_duration}}
|
||||
{{:assign ts_retour="%d+%d*(60*60*24)"|math:$ts_sortie:$module.config.loan_duration}}
|
||||
{{:assign return_date=$ts_retour|date_short}}
|
||||
{{/if}}
|
||||
{{:input id="set_return_date" type="checkbox" value=1 name="set_return_date" label="Fixer une date de retour" help="Cocher pour fixer une date de retour" checked="%s"|args:$checked}}
|
||||
<div id="div_return_date" style="visibility:{{$visibility}}">
|
||||
{{/if}}
|
||||
<div id="div_return_date">
|
||||
{{:input type="date" name="return_date" label="Date de retour" default=$return_date}}
|
||||
<input type="hidden" id="loan_duration" name="loan_duration" value="{{$loan_duration}}">
|
||||
<input type="hidden" id="loan_duration" name="loan_duration" value="{{$module.config.loan_duration}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
</dl>
|
||||
|
|
@ -327,9 +329,17 @@
|
|||
{{:admin_footer}}
|
||||
|
||||
<script type="text/javascript" src="../scripts.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
function changeVisibility(evt, idcheck = 'f_set_return_date_1', fields = ['div_return_date']) {
|
||||
toggleVisibility(idcheck, fields);
|
||||
let output_nature = {{$config.output_nature|json_encode|raw}};
|
||||
|
||||
function changeVisibility(evt,
|
||||
id_date = 'f_date',
|
||||
id_type = 'f_operation',
|
||||
div = 'div_return_date',
|
||||
id_return_date = 'f_return_date')
|
||||
{
|
||||
toggleVisibility(id_date, id_type, div, id_return_date);
|
||||
}
|
||||
|
||||
function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_date', id_loan_duration='loan_duration')
|
||||
|
|
@ -338,7 +348,8 @@ function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_da
|
|||
}
|
||||
|
||||
(function () {
|
||||
document.getElementById('f_set_return_date_1').onclick = changeVisibility;
|
||||
document.getElementById('f_operation').onchange = changeVisibility;
|
||||
document.getElementById('f_date').onchange = changeReturnDate;
|
||||
document.getElementById('f_operation').onchange();
|
||||
})();
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@
|
|||
{{else}}
|
||||
{{* supprimer le matériel *}}
|
||||
{{:delete key=$curr_eqpmt.key}}
|
||||
{{:redirect force="%s?ok=1&msg=supprmvtmat%s"|args:$from:$param}}
|
||||
{{:redirect force="../index.html?ok=1&msg=supprmvtmat"|args}}
|
||||
{{/if}}
|
||||
{{/form}}
|
||||
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="entree">
|
||||
<legend>Informations facultatives</legend>
|
||||
<legend>Autres informations</legend>
|
||||
<dl>
|
||||
{{if $storage != null}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
|
|
|
|||
|
|
@ -15,22 +15,7 @@
|
|||
{{/load}}
|
||||
|
||||
{{* récupérer la config des entrées/sorties *}}
|
||||
{{:include file="../_get_config.html" keep="config, directions, loan_duration"}}
|
||||
{{: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}}
|
||||
{{:include file="../_get_config.html" keep="config, directions"}}
|
||||
|
||||
{{* infos pour affichage *}}
|
||||
{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$mvt_new.direction:$mvt_new.operation}}
|
||||
|
|
@ -45,25 +30,15 @@
|
|||
{{:error message="Aucun matériel avec la clé « %s »"|args:$eqpmt_key}}
|
||||
{{/load}}
|
||||
|
||||
{{#foreach from=$directions key="direction"}}
|
||||
{{:assign var="nature" from="config.%s_nature"|args:$direction}}
|
||||
{{#foreach from=$nature key="key"}}
|
||||
{{if $type_mvt != "retour" && $type != "retour" ||
|
||||
$type_mvt == "retour" && $type == "retour"}}
|
||||
{{:assign var="%s_labels.%s"|args:$direction:$key value=$label}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
{{/foreach}}
|
||||
|
||||
{{*
|
||||
-------------------- Traiter la saisie --------------------
|
||||
*}}
|
||||
{{#form on="save"}}
|
||||
{{* vérifier la validité de la saisie *}}
|
||||
{{if $_POST.amount <= 0}}
|
||||
{{:error message="La quantité (%s) doit être strictement positive !!"|args:$_POST.amount}}
|
||||
{{/if}}
|
||||
|
||||
{{* 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}}
|
||||
|
|
@ -86,8 +61,13 @@
|
|||
{{: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}}
|
||||
{{if $_POST.set_return_date != null}}
|
||||
{{:assign return_date=$_POST.return_date}}
|
||||
{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt_new.direction:$mvt_new.operation}}
|
||||
|
||||
{{if $_POST.return_date != null}}
|
||||
{{:assign return_date=$_POST.return_date|parse_date}}
|
||||
{{if $return_date < $_POST.date|parse_date}}
|
||||
{{:error message="La date de retour doit être postérieure à la date de sortie !"}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{:assign return_date=null}}
|
||||
{{/if}}
|
||||
|
|
@ -99,10 +79,7 @@
|
|||
*}}
|
||||
{{:assign insere=false}}
|
||||
{{#load
|
||||
where="
|
||||
$$.type = 'movement'
|
||||
AND
|
||||
$$.equipment = :eqpmt_key"
|
||||
where="$$.type = 'movement' AND $$.equipment = :eqpmt_key"
|
||||
:eqpmt_key=$eqpmt_key
|
||||
order="$$.date"
|
||||
assign="movement"
|
||||
|
|
@ -222,7 +199,7 @@
|
|||
user=$user_id
|
||||
storage=$_POST.storage
|
||||
transactions=$transactions
|
||||
return_date=$return_date|parse_date
|
||||
return_date=$return_date
|
||||
}}
|
||||
|
||||
{{if $_GET.from|substr:0:1 == "l"}}
|
||||
|
|
@ -236,6 +213,20 @@
|
|||
{{:assign suffix="movements"}}
|
||||
{{/if}}
|
||||
|
||||
{{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}}
|
||||
|
||||
{{if $_GET.from == "eh"}}
|
||||
{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
|
||||
{{elseif $suffix == null}}
|
||||
|
|
@ -251,14 +242,26 @@
|
|||
{{:assign mvt_label="sortie"}}
|
||||
{{/if}}
|
||||
{{:admin_header title="Modifier une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
|
||||
|
||||
{{:form_errors}}
|
||||
|
||||
{{*
|
||||
-------------------- Préparer la saisie --------------------
|
||||
*}}
|
||||
|
||||
{{#load key=$equipment.category assign="category"}}{{/load}}
|
||||
|
||||
{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt_new.direction:$mvt_new.operation}}
|
||||
{{#foreach from=$directions key="direction"}}
|
||||
{{:assign var="nature" from="config.%s_nature"|args:$direction}}
|
||||
{{#foreach from=$nature key="key"}}
|
||||
{{if $type_mvt != "retour" && $type != "retour" ||
|
||||
$type_mvt == "retour" && $type == "retour"}}
|
||||
{{:assign var="%s_labels.%s"|args:$direction:$key value=$label}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
{{/foreach}}
|
||||
|
||||
|
||||
{{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}}
|
||||
|
|
@ -302,9 +305,9 @@
|
|||
</fieldset>
|
||||
|
||||
<fieldset class="entree">
|
||||
<legend>Informations facultatives</legend>
|
||||
<legend>Autres informations</legend>
|
||||
<dl>
|
||||
{{if $prop == 1 && $mvt_new.direction == "output"}}
|
||||
{{if $mvt_new.direction == "output" && $type_mvt != "retour"}}
|
||||
{{:input
|
||||
type="list"
|
||||
name="user"
|
||||
|
|
@ -315,30 +318,26 @@
|
|||
max=1
|
||||
}}
|
||||
{{/if}}
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{if $storage != null}}
|
||||
{{if $mvt_new.direction == "input" && $storage != null}}
|
||||
{{: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"}}
|
||||
{{:input type="list" name="transactions" label="Écritures liées" default=$mvt_new.transactions target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
|
||||
{{/if}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
|
||||
{{if $mvt_new.direction == "output" && $type_mvt == "temporaire"}}
|
||||
{{if $mvt_new.direction == "output"}}
|
||||
{{if $mvt_new.return_date != null}}
|
||||
{{:assign checked="checked"}}
|
||||
{{:assign visibility="visible"}}
|
||||
{{:assign return_date=$mvt_new.return_date}}
|
||||
{{else}}
|
||||
{{:assign visibility="hidden"}}
|
||||
{{if $module.config.loan_duration != null && $module.config.loan_duration > 0}}
|
||||
{{:assign ts_sortie=$mvt_new.date|strtotime}}
|
||||
{{:assign ts_retour="%d+%d*(60*60*24)"|math:$ts_sortie:$loan_duration}}
|
||||
{{:assign ts_retour="%d+%d*(60*60*24)"|math:$ts_sortie:$module.config.loan_duration}}
|
||||
{{:assign return_date=$ts_retour|date_short}}
|
||||
{{/if}}
|
||||
{{:input id="set_return_date" type="checkbox" value=1 name="set_return_date" label="Fixer une date de retour" help="Cocher pour fixer une date de retour" checked="%s"|args:$checked}}
|
||||
<div id="div_return_date" style="visibility:{{$visibility}}">
|
||||
{{/if}}
|
||||
<div id="div_return_date">
|
||||
{{:input type="date" name="return_date" label="Date de retour" default=$return_date}}
|
||||
<input type="hidden" id="loan_duration" name="loan_duration" value="{{$loan_duration}}">
|
||||
<input type="hidden" id="loan_duration" name="loan_duration" value="{{$module.config.loan_duration}}">
|
||||
</div>
|
||||
{{/if}}
|
||||
</dl>
|
||||
|
|
@ -353,9 +352,17 @@
|
|||
{{:admin_footer}}
|
||||
|
||||
<script type="text/javascript" src="../scripts.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
function changeVisibility(evt, idcheck = 'f_set_return_date_1', fields = ['div_return_date']) {
|
||||
toggleVisibility(idcheck, fields);
|
||||
let output_nature = {{$config.output_nature|json_encode|raw}};
|
||||
|
||||
function changeVisibility(evt,
|
||||
id_date = 'f_date',
|
||||
id_type = 'f_operation',
|
||||
div = 'div_return_date',
|
||||
id_return_date = 'f_return_date')
|
||||
{
|
||||
toggleVisibility(id_date, id_type, div, id_return_date);
|
||||
}
|
||||
|
||||
function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_date', id_loan_duration='loan_duration')
|
||||
|
|
@ -364,7 +371,8 @@ function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_da
|
|||
}
|
||||
|
||||
(function () {
|
||||
document.getElementById('f_set_return_date_1').onclick = changeVisibility;
|
||||
document.getElementById('f_operation').onchange = changeVisibility;
|
||||
document.getElementById('f_date').onchange = changeReturnDate;
|
||||
document.getElementById('f_operation').onchange();
|
||||
})();
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
*}}
|
||||
|
||||
{{* récupérer la config des entrées/sorties *}}
|
||||
{{:include file="../_get_config.html" keep="config, loan_duration"}}
|
||||
{{:include file="../_get_config.html" keep="config"}}
|
||||
|
||||
{{* types de sorties *}}
|
||||
{{#foreach from=$config.output_nature key=key}}
|
||||
|
|
@ -33,22 +33,27 @@
|
|||
|
||||
{{* Traiter l'envoi du formulaire *}}
|
||||
{{#form on="save"}}
|
||||
{{* vérifier la validité de la saisie *}}
|
||||
|
||||
{{* interdire date dans le futur *}}
|
||||
{{if $_POST.date|parse_date|strtotime > $now}}
|
||||
{{: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 $type_mvt != "temporaire" && $_POST.set_return_date != null}}
|
||||
{{if $type_mvt != "temporaire" && $_POST.return_date != null}}
|
||||
{{:error message="On ne peut associer une date de retour qu'à une sortie temporaire"}}
|
||||
{{/if}}
|
||||
{{if $_POST.set_return_date != null}}
|
||||
{{:assign return_date=$_POST.return_date}}
|
||||
|
||||
{{if $_POST.return_date != null}}
|
||||
{{:assign return_date=$_POST.return_date|parse_date}}
|
||||
{{if $return_date < $_POST.date|parse_date}}
|
||||
{{:error message="La date de retour doit être postérieure à la date de sortie !"}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{:assign return_date=null}}
|
||||
{{/if}}
|
||||
|
|
@ -169,7 +174,7 @@
|
|||
date=$_POST.date|parse_date
|
||||
comment=$_POST.remarques|trim
|
||||
user=$user.id
|
||||
return_date=$return_date|parse_date
|
||||
return_date=$return_date
|
||||
transactions=$transactions
|
||||
}}
|
||||
{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}}
|
||||
|
|
@ -180,13 +185,16 @@
|
|||
{{* barre de navigation *}}
|
||||
{{:include file="../_nav.html" current="sorties"}}
|
||||
{{/if}}
|
||||
{{:form_errors}}
|
||||
|
||||
{{#load key=$equipment.category assign="category"}}{{/load}}
|
||||
{{:assign dispo="%d-%d"|math:$equipment.stock:$equipment.out}}
|
||||
|
||||
{{if $dispo > 0}}
|
||||
{{:assign ts_retour="%d+%d*(60*60*24)"|math:$now:$loan_duration}}
|
||||
{{if $module.config.loan_duration != null && $module.config.loan_duration > 0}}
|
||||
{{:assign ts_retour="%d+%d*(60*60*24)"|math:$now:$module.config.loan_duration}}
|
||||
{{:assign date_retour=$ts_retour|date_short}}
|
||||
{{/if}}
|
||||
|
||||
{{* formulaire de sortie de matériel *}}
|
||||
<form method="post" action="">
|
||||
|
|
@ -226,10 +234,9 @@
|
|||
}}
|
||||
{{: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 id="set_return_date" type="checkbox" value=1 name="set_return_date" label="Fixer une date de retour" help="Cocher pour fixer une date de retour"}}
|
||||
<div id="div_return_date" style="visibility:hidden">
|
||||
<div id="div_return_date">
|
||||
{{:input type="date" id="return_date" name="return_date" label="Date de retour" default=$date_retour}}
|
||||
<input type="hidden" id="loan_duration" name="loan_duration" value="{{$loan_duration}}">
|
||||
<input type="hidden" id="loan_duration" name="loan_duration" value="{{$module.config.loan_duration}}">
|
||||
</div>
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
|
@ -241,16 +248,20 @@
|
|||
<p class="block error">Il n'y a aucune unité de ce matériel disponible à la date du {{$now|date_short}}</p>
|
||||
{{/if}}
|
||||
|
||||
{{:form_errors}}
|
||||
{{:admin_footer}}
|
||||
|
||||
<script type="text/javascript" src="../scripts.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var paid_keys = {{$paid_keys|json_encode|raw}};
|
||||
let output_nature = {{$config.output_nature|json_encode|raw}};
|
||||
|
||||
function changeVisibility(evt, idcheck = 'f_set_return_date_1', fields = ['div_return_date']) {
|
||||
toggleVisibility(idcheck, fields);
|
||||
function changeVisibility(evt,
|
||||
id_date = 'f_date',
|
||||
id_type = 'f_operation',
|
||||
div = 'div_return_date',
|
||||
id_return_date = 'f_return_date')
|
||||
{
|
||||
toggleVisibility(id_date, id_type, div, id_return_date);
|
||||
}
|
||||
|
||||
function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_date', id_loan_duration='loan_duration')
|
||||
|
|
@ -259,8 +270,8 @@ function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_da
|
|||
}
|
||||
|
||||
(function () {
|
||||
document.getElementById('f_set_return_date_1').checked = false;
|
||||
document.getElementById('f_set_return_date_1').onclick = changeVisibility;
|
||||
document.getElementById('f_operation').onchange = changeVisibility;
|
||||
document.getElementById('f_date').onchange = changeReturnDate;
|
||||
document.getElementById('f_operation').onchange();
|
||||
})();
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="entree">
|
||||
<legend>Informations facultatives</legend>
|
||||
<legend>Autres informations</legend>
|
||||
<dl>
|
||||
{{if $storage != null}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
|
|
|
|||
34
scripts.js
34
scripts.js
|
|
@ -26,18 +26,6 @@ function disableColumSort(liste) {
|
|||
}
|
||||
}
|
||||
|
||||
function toggleVisibility(idcheck, fields) {
|
||||
const elem = document.getElementById(idcheck);
|
||||
for (let id of fields) {
|
||||
const field = document.getElementById(id);
|
||||
if (elem.checked) {
|
||||
field.style.visibility = "visible";
|
||||
} else {
|
||||
field.style.visibility = "hidden";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* renvoyer la valeur en secondes d'une date au format j/m/a
|
||||
* @param {string} date
|
||||
|
|
@ -59,7 +47,29 @@ function getDate(idelem) {
|
|||
function setReturnDate(id_date, id_return_date, id_loan_duration)
|
||||
{
|
||||
const loan_duration = document.getElementById(id_loan_duration).value;
|
||||
if (loan_duration !== undefined && loan_duration > 0) {
|
||||
let nbsec = getDate(id_date) + loan_duration*24*60*60;
|
||||
const date_retour = new Date(nbsec * 1000);
|
||||
document.getElementById(id_return_date).value = date_retour.toLocaleDateString();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* changer la visibilité de la date de retour
|
||||
*/
|
||||
function toggleVisibility(id_date, id_type, div, id_return_date)
|
||||
{
|
||||
const key = document.getElementById(id_type).value;
|
||||
let type_sortie;
|
||||
if (key !== undefined && key != '') {
|
||||
type_sortie = output_nature[key].type;
|
||||
}
|
||||
const div_date = document.getElementById(div);
|
||||
if (type_sortie == 'temporaire') {
|
||||
div_date.style.visibility = "visible";
|
||||
document.getElementById(id_date).onchange();
|
||||
} else {
|
||||
div_date.style.visibility = "hidden";
|
||||
document.getElementById(id_return_date).value = null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@
|
|||
{{"Reste %s jours"|args:$delai}}
|
||||
{{elseif $retard > 0 }}
|
||||
{{:tag color="darkred" label="Retard %s jours"|args:$retard}}
|
||||
{{else}}
|
||||
{{elseif $return_date != null}}
|
||||
{{:tag color="darkgreen" label="À rendre aujourdh'ui"}}
|
||||
{{/if}}
|
||||
</td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue