Listage des mouvements avec #list
This commit is contained in:
parent
fe100333ff
commit
d72165132b
|
|
@ -6,8 +6,6 @@
|
|||
|
||||
{{if $_GET.ok}}
|
||||
<p class="block confirm">{{$_GET.msg}}</p>
|
||||
{{else}}
|
||||
<p class="block alert">{{$_GET.msg}}</p>
|
||||
{{/if}}
|
||||
|
||||
<form method="post" action="">
|
||||
|
|
@ -20,9 +18,8 @@
|
|||
|
||||
{{* lister les entrées *}}
|
||||
<section class="liste_entrees">
|
||||
<h2>Liste des entrées avec la section #list</h2>
|
||||
<h2>Liste des entrées</h2>
|
||||
|
||||
{{* MARCHE PAS (voir message de Bohwaz)
|
||||
{{#list
|
||||
select="
|
||||
$$.date AS 'Date' ;
|
||||
|
|
@ -30,73 +27,32 @@
|
|||
$$.amount AS 'Nombre' ;
|
||||
(SELECT $$.designation
|
||||
FROM @TABLE AS b
|
||||
WHERE b.$$.equipment = @TABLE.$$.equipment)
|
||||
WHERE b.key = @TABLE.$$.equipment)
|
||||
AS 'Matériel' ;
|
||||
$$.comment AS 'Remarques'"
|
||||
type="movement"
|
||||
direction="entrée"
|
||||
order=1}}
|
||||
*}}
|
||||
|
||||
{{#list select="$$.date AS 'Date' ; $$.inputNature AS 'Type' ; $$.amount AS 'Nombre' ; '' AS 'Matériel' ; $$.comment AS 'Remarques'" type="movement" direction="entrée" order=1}}
|
||||
{{:assign var='mvt_key' value=$key}}
|
||||
{{#load type="equipment" key=$equipment assign="equipment"}}
|
||||
<tr>
|
||||
<td>{{$date|date_short}}</td>
|
||||
<td>{{$inputNature}}</td>
|
||||
<td>{{$amount}}</td>
|
||||
<td>{{$designation}}</td>
|
||||
<td>{{$comment}}</td>
|
||||
<td class="actions">
|
||||
{{:assign var='mvt_key' value=$key}}
|
||||
<tr>
|
||||
<td>{{$date|date_short}}</td>
|
||||
<td>{{$inputNature}}</td>
|
||||
<td>{{$amount}}</td>
|
||||
<td>{{$col4}}</td>
|
||||
<td>{{$comment}}</td>
|
||||
<td class="actions">
|
||||
{{*
|
||||
{{:linkbutton label="Supprimer" href="delete_entree.html?key=%s"|args:$mvt_key shape="delete" target="_dialog"}}
|
||||
{{:linkbutton label="Supprimer" href="delete_entree.html?key=%s"|args:$mvt_key shape="delete" target="_dialog"}}
|
||||
*}}
|
||||
{{:linkbutton
|
||||
label="Supprimer"
|
||||
href="../delete_movement.html?key=%s&mvt=entrée&caller=%s"|args:$mvt_key:$request_url
|
||||
shape="delete"
|
||||
target="_dialog"}}
|
||||
</td>
|
||||
</tr>
|
||||
{{/load}}
|
||||
{{:linkbutton
|
||||
label="Supprimer"
|
||||
href="../delete_movement.html?key=%s&mvt=entrée&caller=%s"|args:$mvt_key:$request_url
|
||||
shape="delete"
|
||||
target="_dialog"}}
|
||||
</td>
|
||||
</tr>
|
||||
{{/list}}
|
||||
</section>
|
||||
|
||||
{{*
|
||||
Remarque :
|
||||
- le tri par matériel ne fonctionne pas, car j'ai dû tricher pour afficher cette colonne
|
||||
*}}
|
||||
|
||||
<section class="liste_entrees">
|
||||
<h2>Liste des entrées avec la section #load</h2>
|
||||
<table class="list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Date</th>
|
||||
<th>Type</th>
|
||||
<th>Nombre</th>
|
||||
<th>Matériel</th>
|
||||
<th>Remarques</th>
|
||||
<th>Action(s)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#load type="movement" direction="entrée" order="$$.date" assign="entrees"}}
|
||||
{{#load type="equipment" key=$entrees.equipment assign="equipment"}}
|
||||
<tr>
|
||||
<td>{{$entrees.date|date_short}}</td>
|
||||
<td>{{$entrees.inputNature}}</td>
|
||||
<td>{{$entrees.amount}}</td>
|
||||
<td>{{$designation}}</td>
|
||||
<td>{{$entrees.comment}}</td>
|
||||
<td class="actions">
|
||||
{{:linkbutton label="Supprimer" href="delete_entree.html?key=%s"|args:$key shape="delete" target="_dialog"}}
|
||||
</td>
|
||||
</tr>
|
||||
{{/load}}
|
||||
</tbody>
|
||||
{{/load}}
|
||||
</table>
|
||||
</section>
|
||||
|
||||
{{:admin_footer}}
|
||||
|
|
|
|||
|
|
@ -19,28 +19,39 @@
|
|||
{{* lister les sorties *}}
|
||||
<section class="liste_sorties">
|
||||
<h2>Liste des sorties</h2>
|
||||
{{#list select="$$.date AS 'Date' ; $$.outputNature AS 'Type' ; $$.amount AS 'Nombre' ; "" AS 'Matériel' ; $$.comment AS 'Remarques'" type="movement" direction="sortie" order=1}}
|
||||
|
||||
{{#list
|
||||
select="
|
||||
$$.date AS 'Date' ;
|
||||
$$.outputNature AS 'Type' ;
|
||||
$$.amount AS 'Nombre' ;
|
||||
(SELECT $$.designation
|
||||
FROM @TABLE AS b
|
||||
WHERE b.key = @TABLE.$$.equipment)
|
||||
AS 'Matériel' ;
|
||||
$$.comment AS 'Remarques'"
|
||||
type="movement"
|
||||
direction="sortie"
|
||||
order=1}}
|
||||
|
||||
{{:assign var='mvt_key' value=$key}}
|
||||
{{#load type="equipment" key=$equipment assign="equipment"}}
|
||||
<tr>
|
||||
<td>{{$date|date_short}}</td>
|
||||
<td>{{$outputNature}}</td>
|
||||
<td>{{$amount}}</td>
|
||||
<td>{{$designation}}</td>
|
||||
<td>{{$col4}}</td>
|
||||
<td>{{$comment}}</td>
|
||||
<td class="actions">
|
||||
{{*
|
||||
{{:linkbutton label="Supprimer" href="delete_sortie.html?key=%s"|args:$mvt_key shape="delete" target="_dialog"}}
|
||||
{{:linkbutton label="Supprimer" href="delete_sortie.html?key=%s"|args:$mvt_key shape="delete" target="_dialog"}}
|
||||
*}}
|
||||
{{:linkbutton
|
||||
label="Supprimer"
|
||||
href="../delete_movement.html?key=%s&mvt=sortie&caller=%s"|args:$mvt_key:$request_url
|
||||
shape="delete"
|
||||
target="_dialog"}}
|
||||
|
||||
{{:linkbutton
|
||||
label="Supprimer"
|
||||
href="../delete_movement.html?key=%s&mvt=sortie&caller=%s"|args:$mvt_key:$request_url
|
||||
shape="delete"
|
||||
target="_dialog"}}
|
||||
</td>
|
||||
</tr>
|
||||
{{/load}}
|
||||
{{/list}}
|
||||
</section>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue