diff --git a/inventaire.html b/inventaire.html index ab0d4e1..84bc683 100644 --- a/inventaire.html +++ b/inventaire.html @@ -42,19 +42,18 @@ {{#list select=" - $$.date AS 'Date' ; - (SELECT $$.designation - FROM @TABLE AS b - WHERE b.key = @TABLE.$$.equipment) AS 'Matériel' ; - "" as 'Catégorie' ; - "" AS 'Stock' ; - "" AS 'Sorti' ; - "" AS 'Dispo' + (SELECT $$.designation + FROM @TABLE AS b + WHERE b.key = @TABLE.$$.equipment) AS 'Matériel' ; + "" as 'Catégorie' ; + "" AS 'Stock' ; + "" AS 'Sorti' ; + "" AS 'Dispo' " type="movement" group="$$.equipment" direction="input" - order=2 + order=1 }} {{:assign var=cat_key from="equipments.%s.category"|args:$equipment}} @@ -72,8 +71,7 @@ {{/if}} - {{$date|date_short}} - {{$col2}} + {{$col1}} {{$cat_name}} {{$stock}} {{if $exterieur == null}}0{{else}}{{$exterieur}}{{/if}} diff --git a/inventaire_nonprop.html b/inventaire_nonprop.html index e468028..dc3eeeb 100644 --- a/inventaire_nonprop.html +++ b/inventaire_nonprop.html @@ -42,17 +42,16 @@ {{#list select=" - $$.date AS 'Date' ; - (SELECT $$.designation - FROM @TABLE AS b - WHERE b.key = @TABLE.$$.equipment) AS 'Matériel' ; - "" as 'Catégorie' ; - "" AS 'Quantité' + (SELECT $$.designation + FROM @TABLE AS b + WHERE b.key = @TABLE.$$.equipment) AS 'Matériel' ; + "" as 'Catégorie' ; + "" AS 'Quantité' " type="movement" group="$$.equipment" direction="input" - order=2 + order=1 }} {{:assign var=cat_key from="equipments.%s.category"|args:$equipment}} @@ -67,8 +66,7 @@ {{:continue}} {{/if}} - {{$date|date_short}} - {{$col2}} + {{$col1}} {{$cat_name}} {{$qte}}