diff --git a/inventaire.html b/inventaire.html
index f268f00..ddf779a 100644
--- a/inventaire.html
+++ b/inventaire.html
@@ -40,6 +40,14 @@
{{/if}}
{{/foreach}}
+{{* filtrer selon la catégorie *}}
+{{if $_GET.cat_key == null}}
+ {{:assign condition="1"}}
+{{else}}
+ {{:assign cat_key=$_GET.cat_key|quote_sql}}
+ {{:assign condition="$$.category == %s"|args:$cat_key}}
+{{/if}}
+
{{if $mat_present}}
{{#list
select="
@@ -50,21 +58,12 @@
"" AS 'Dispo'
"
type="equipment"
+ where="$$.status<>'archived' AND %s"|args:$condition
order=1
}}
- {{if $status == "archived"}}
- {{:continue}}
- {{/if}}
-
{{:assign var=eqpmt_key value=$key}}
- {{:assign var=cat_key value=$category}}
- {{:assign var=cat_name from=categories.%s|args:$cat_key}}
-
- {{if $_GET.cat_key != null && $_GET.cat_key != $cat_key}}
- {{:continue}}
- {{/if}}
-
+ {{:assign var=cat_name from=categories.%s|args:$category}}
{{:assign var=stock from="equipments.%s.stock"|args:$eqpmt_key}}
{{:assign var=exterieur from="equipments.%s.exterieur"|args:$eqpmt_key}}
{{:assign dispo="%d-%d"|math:$stock:$exterieur}}
diff --git a/inventaire_nonprop.html b/inventaire_nonprop.html
index 8f9f7ea..f7b8f26 100644
--- a/inventaire_nonprop.html
+++ b/inventaire_nonprop.html
@@ -40,6 +40,14 @@
{{/if}}
{{/foreach}}
+{{* filtrer selon la catégorie *}}
+{{if $_GET.cat_key == null}}
+ {{:assign condition="1"}}
+{{else}}
+ {{:assign cat_key=$_GET.cat_key|quote_sql}}
+ {{:assign condition="$$.category == %s"|args:$cat_key}}
+{{/if}}
+
{{if $mat_present}}
{{#list
select="
@@ -48,16 +56,11 @@
"" AS 'Quantité'
"
type="equipment"
+ where="%s"|args:$condition
order=1
}}
{{:assign var=eqpmt_key value=$key}}
- {{:assign var=cat_key value=$category}}
- {{:assign var=cat_name from=categories.%s|args:$cat_key}}
-
- {{if $_GET.cat_key != null && $_GET.cat_key != $cat_key}}
- {{:continue}}
- {{/if}}
-
+ {{:assign var=cat_name from=categories.%s|args:$category}}
{{:assign var=qte from="equipments.%s.nonproprio"|args:$eqpmt_key}}
{{if $qte == null}}