diff --git a/mouvements/entrees/index.html b/mouvements/entrees/index.html index 9b10b37..58f62d2 100644 --- a/mouvements/entrees/index.html +++ b/mouvements/entrees/index.html @@ -6,8 +6,6 @@ {{if $_GET.ok}}

{{$_GET.msg}}

-{{else}} -

{{$_GET.msg}}

{{/if}}
@@ -20,9 +18,8 @@ {{* lister les entrées *}}
-

Liste des entrées avec la section #list

+

Liste des entrées

-{{* 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"}} - - {{$date|date_short}} - {{$inputNature}} - {{$amount}} - {{$designation}} - {{$comment}} - + {{:assign var='mvt_key' value=$key}} + + {{$date|date_short}} + {{$inputNature}} + {{$amount}} + {{$col4}} + {{$comment}} + {{* - {{: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"}} - - - {{/load}} + {{:linkbutton + label="Supprimer" + href="../delete_movement.html?key=%s&mvt=entrée&caller=%s"|args:$mvt_key:$request_url + shape="delete" + target="_dialog"}} + + {{/list}}
-{{* -Remarque : -- le tri par matériel ne fonctionne pas, car j'ai dû tricher pour afficher cette colonne -*}} - -
-

Liste des entrées avec la section #load

- - - - - - - - - - - - - {{#load type="movement" direction="entrée" order="$$.date" assign="entrees"}} - {{#load type="equipment" key=$entrees.equipment assign="equipment"}} - - - - - - - - - {{/load}} - - {{/load}} -
DateTypeNombreMatérielRemarquesAction(s)
{{$entrees.date|date_short}}{{$entrees.inputNature}}{{$entrees.amount}}{{$designation}}{{$entrees.comment}} - {{:linkbutton label="Supprimer" href="delete_entree.html?key=%s"|args:$key shape="delete" target="_dialog"}} -
-
- {{:admin_footer}} diff --git a/mouvements/sorties/index.html b/mouvements/sorties/index.html index 423154a..4dcdb22 100644 --- a/mouvements/sorties/index.html +++ b/mouvements/sorties/index.html @@ -19,28 +19,39 @@ {{* lister les sorties *}}

Liste des sorties

- {{#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"}} {{$date|date_short}} {{$outputNature}} {{$amount}} - {{$designation}} + {{$col4}} {{$comment}} {{* - {{: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"}} - {{/load}} {{/list}}