diff --git a/_inventory.html b/_inventory.html
index 53e9566..213bcc9 100644
--- a/_inventory.html
+++ b/_inventory.html
@@ -5,14 +5,20 @@
*}}
{{* filtrer selon la catégorie *}}
+{{:assign saved_filters=$module.config.filters}}
+{{:assign var="user_filters" from="saved_filters.%s"|args:$logged_user.id}}
+
{{if $_GET.cat_key == null}}
- {{:assign selected_category=$module.config.stock_cat_key}}
-{{elseif $_GET.cat_key == -1}}
- {{:assign selected_category=null}}
- {{:save key="config" stock_cat_key=null}}
+ {{:assign selected_category=$user_filters.stock_cat_key}}
{{else}}
- {{:assign selected_category=$_GET.cat_key}}
- {{:save key="config" stock_cat_key=$selected_category}}
+ {{if $_GET.cat_key == -1}}
+ {{:assign selected_category=null}}
+ {{else}}
+ {{:assign selected_category=$_GET.cat_key}}
+ {{/if}}
+ {{:assign var="user_filters.stock_cat_key" value=$selected_category}}
+ {{:assign var="saved_filters.%s"|args:$logged_user.id value=$user_filters}}
+ {{:save key="config" filters=$saved_filters}}
{{/if}}
{{* condition de filtrage *}}
@@ -25,13 +31,16 @@
{{* filtrer selon appartenance *}}
{{if $_GET.prop == null}}
- {{:assign selected_prop=$module.config.stock_prop}}
-{{elseif $_GET.prop == -1}}
- {{:assign selected_prop=null}}
- {{:save key="config" stock_prop=null}}
+ {{:assign selected_prop=$user_filters.stock_prop}}
{{else}}
- {{:assign selected_prop=$_GET.prop}}
- {{:save key="config" stock_prop=$_GET.prop}}
+ {{if $_GET.prop == -1}}
+ {{:assign selected_prop=null}}
+ {{else}}
+ {{:assign selected_prop=$_GET.prop}}
+ {{/if}}
+ {{:assign var="user_filters.stock_prop" value=$selected_prop}}
+ {{:assign var="saved_filters.%s"|args:$logged_user.id value=$user_filters}}
+ {{:save key="config" filters=$saved_filters}}
{{/if}}
{{if $selected_prop == null}}
diff --git a/global_history.html b/global_history.html
index 6038924..47a01ba 100644
--- a/global_history.html
+++ b/global_history.html
@@ -14,14 +14,20 @@
{{:include file="./_get_config.html" keep="config"}}
{{* filtrer selon la catégorie *}}
+{{:assign saved_filters=$module.config.filters}}
+{{:assign var="user_filters" from="saved_filters.%s"|args:$logged_user.id}}
+
{{if $_GET.cat_key == null}}
- {{:assign selected_category=$module.config.hist_cat_key}}
-{{elseif $_GET.cat_key == -1}}
- {{:assign selected_category=null}}
- {{:save key="config" hist_cat_key=null}}
+ {{:assign selected_category=$user_filters.hist_cat_key}}
{{else}}
- {{:assign selected_category=$_GET.cat_key}}
- {{:save key="config" hist_cat_key=$selected_category}}
+ {{if $_GET.cat_key == -1}}
+ {{:assign selected_category=null}}
+ {{else}}
+ {{:assign selected_category=$_GET.cat_key}}
+ {{/if}}
+ {{:assign var="user_filters.hist_cat_key" value=$selected_category}}
+ {{:assign var="saved_filters.%s"|args:$logged_user.id value=$user_filters}}
+ {{:save key="config" filters=$saved_filters}}
{{/if}}
{{* condition de filtrage *}}
@@ -37,13 +43,16 @@
{{* filtrer selon appartenance *}}
{{if $_GET.prop == null}}
- {{:assign selected_prop=$module.config.hist_prop}}
-{{elseif $_GET.prop == -1}}
- {{:assign selected_prop=null}}
- {{:save key="config" hist_prop=null}}
+ {{:assign selected_prop=$user_filters.hist_prop}}
{{else}}
- {{:assign selected_prop=$_GET.prop}}
- {{:save key="config" hist_prop=$_GET.prop}}
+ {{if $_GET.prop == -1}}
+ {{:assign selected_prop=null}}
+ {{else}}
+ {{:assign selected_prop=$_GET.prop}}
+ {{/if}}
+ {{:assign var="user_filters.hist_prop" value=$selected_prop}}
+ {{:assign var="saved_filters.%s"|args:$logged_user.id value=$user_filters}}
+ {{:save key="config" filters=$saved_filters}}
{{/if}}
{{* déterminer les types de mouvements selon l'appartenance du matériel *}}
diff --git a/loan_history.html b/loan_history.html
index f825528..a7ff7de 100644
--- a/loan_history.html
+++ b/loan_history.html
@@ -38,26 +38,24 @@
{{/if}}
{{/if}}
-{{* lecture config (défaut ou enregistrée) *}}
+{{* lecture config *}}
{{:include file="./_get_config.html" keep="config"}}
{{* filtrer selon la catégorie *}}
+{{:assign saved_filters=$module.config.filters}}
+{{:assign var="user_filters" from="saved_filters.%s"|args:$logged_user.id}}
+
{{if $_GET.cat_key == null}}
- {{:assign var="selected_category" from="module.config.%s_hist_cat_key"|args:$_GET.output_type}}
-{{elseif $_GET.cat_key == -1}}
- {{:assign selected_category=null}}
- {{if $_GET.output_type == "loan"}}
- {{:save key="config" loan_hist_cat_key=null}}
- {{elseif $_GET.output_type == "rent"}}
- {{:save key="config" rent_hist_cat_key=null}}
- {{/if}}
+ {{:assign var="selected_category" from="user_filters.%s_hist_cat_key"|args:$_GET.output_type}}
{{else}}
- {{:assign selected_category=$_GET.cat_key}}
- {{if $_GET.output_type == "loan"}}
- {{:save key="config" loan_hist_cat_key=$selected_category}}
- {{elseif $_GET.output_type == "rent"}}
- {{:save key="config" rent_hist_cat_key=$selected_category}}
+ {{if $_GET.cat_key == -1}}
+ {{:assign selected_category=null}}
+ {{else}}
+ {{:assign selected_category=$_GET.cat_key}}
{{/if}}
+ {{:assign var="user_filters.%s_hist_cat_key"|args:$_GET.output_type value=$selected_category}}
+ {{:assign var="saved_filters.%s"|args:$logged_user.id value=$user_filters}}
+ {{:save key="config" filters=$saved_filters}}
{{/if}}
{{* condition de filtrage *}}
diff --git a/loan_movements.html b/loan_movements.html
index 55d74f7..4b56e9e 100644
--- a/loan_movements.html
+++ b/loan_movements.html
@@ -15,7 +15,6 @@
{{/if}}
{{:admin_header title="Historique des %ss"|args:$label custom_css="./style.css" current="module_equipment"}}
-
{{:include file="./_nav.html" current="%s"|args:$label subcurrent="historique"}}
{{*
@@ -47,22 +46,20 @@
{{:include file="./_get_config.html" keep="config"}}
{{* filtrer selon la catégorie *}}
+{{:assign saved_filters=$module.config.filters}}
+{{:assign var="user_filters" from="saved_filters.%s"|args:$logged_user.id}}
+
{{if $_GET.cat_key == null}}
- {{:assign var="selected_category" from="module.config.%s_cat_key"|args:$_GET.output_type}}
-{{elseif $_GET.cat_key == -1}}
- {{:assign selected_category=null}}
- {{if $_GET.output_type == "loan"}}
- {{:save key="config" loan_cat_key=null}}
- {{elseif $_GET.output_type == "rent"}}
- {{:save key="config" rent_cat_key=null}}
- {{/if}}
+ {{:assign var="selected_category" from="user_filters.%s_cat_key"|args:$_GET.output_type}}
{{else}}
- {{:assign selected_category=$_GET.cat_key}}
- {{if $_GET.output_type == "loan"}}
- {{:save key="config" loan_cat_key=$selected_category}}
- {{elseif $_GET.output_type == "rent"}}
- {{:save key="config" rent_cat_key=$selected_category}}
+ {{if $_GET.cat_key == -1}}
+ {{:assign selected_category=null}}
+ {{else}}
+ {{:assign selected_category=$_GET.cat_key}}
{{/if}}
+ {{:assign var="user_filters.%s_cat_key"|args:$_GET.output_type value=$selected_category}}
+ {{:assign var="saved_filters.%s"|args:$logged_user.id value=$user_filters}}
+ {{:save key="config" filters=$saved_filters}}
{{/if}}
{{* condition de filtrage *}}