réorganisation (cf remarques Bohwaz)

This commit is contained in:
Jean-Christophe Engel 2023-12-05 19:17:08 +01:00
parent 6006bdd169
commit 0e669a7c21
23 changed files with 279 additions and 236 deletions

View file

@ -5,17 +5,31 @@
{{:include file="../../_nav.html" current="entrees"}}
{{if $_GET.ok}}
<p class="block confirm">{{$_GET.msg}}</p>
{{if $_GET.msg|match:"suppression"}}
{{:assign msg="Entrée supprimée"}}
{{if $_GET.msg|match:"matériel"}}
{{:assign var="msg" value="%s - Matériel supprimé"|args:$msg}}
{{/if}}
{{elseif $_GET.msg == "entrée"}}
{{:assign msg="Entrée enregistrée"}}
{{elseif $_GET.msg == "modification"}}
{{:assign msg="Entrée modifiée"}}
{{/if}}
<p class="block confirm">{{$msg}}</p>
{{elseif $_GET.err}}
<p class="block error">{{$_GET.msg}}</p>
{{if $_GET.msg == "suppression"}}
<p class="block error">Impossible de supprimer l'entrée</p>
{{/if}}
{{/if}}
<form method="post" action="">
<fieldset class="entree">
<legend>Ajouter une entrée</legend>
{{:linkbutton label="Matériel répertorié" shape="plus" href="repertorie.html?dialog" target="_dialog"}}
{{:linkbutton label="Matériel non répertorié" shape="plus" href="non_repertorie.html?dialog" target="_dialog"}}
{{:linkbutton label="Retour de sortie temporaire" shape="plus" href="retour.html?dialog" target="_dialog"}}
<dl>
{{:linkbutton label="Matériel répertorié" shape="plus" href="repertorie.html" target="_dialog"}}
{{:linkbutton label="Matériel non répertorié" shape="plus" href="non_repertorie.html" target="_dialog"}}
{{:linkbutton label="Retour de sortie temporaire" shape="plus" href="retour.html" target="_dialog"}}
</dl>
</fieldset>
</form>
@ -26,7 +40,7 @@
{{#list
select="
$$.date AS 'Date' ;
$$.inputNature AS 'Type' ;
$$.input_nature AS 'Type' ;
$$.amount AS 'Nombre' ;
(SELECT $$.designation
FROM @TABLE AS b
@ -34,13 +48,13 @@
AS 'Matériel' ;
$$.comment AS 'Remarques'"
type="movement"
direction="entrée"
direction="input"
order=1}}
{{:assign var='mvt_key' value=$key}}
<tr>
<td>{{$date|date_short}}</td>
<td>{{$inputNature}}</td>
<td>{{$input_nature}}</td>
<td>{{$amount}}</td>
<td>{{$col4}}</td>
<td>{{$comment}}</td>
@ -52,7 +66,7 @@
target="_dialog"}}
{{:linkbutton
label="Modifier"
href="../modifier_mouvement.html?key=%s&direction=entrée&caller=%s"|args:$mvt_key:$request_url
href="../modifier_mouvement.html?key=%s&direction=input&caller=%s"|args:$mvt_key:$request_url
shape="edit"
target="_dialog"}}
</td>