From d342e123631c9eaed9574f9e3ed63991291d10d4 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Thu, 17 Feb 2022 14:23:35 +0100 Subject: [PATCH] show warning for multiple identical filter --- .../RecipeSearchView/RecipeSearchView.vue | 522 ++++++++++++------ vue/src/locales/en.json | 1 + 2 files changed, 364 insertions(+), 159 deletions(-) diff --git a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue index 9b934b112..7f0a4c7ba 100644 --- a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue +++ b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue @@ -1,6 +1,6 @@ @@ -558,40 +739,48 @@ and don't contain - anyall of the following books: + anyall of the following books: {{ k.items.flatMap((x) => x.name).join(", ") }} -
+
- and you can make right now (based on the on hand flag)
+ and you can make right now (based on the on hand flag)
- and contain anyall of the following units: + and contain anyall of the following units: {{ search.search_units.flatMap((x) => x.name).join(", ") }}
+ >
- and have a rating or - equal to {{ search.search_rating }}
+ and have a rating or + equal to {{ search.search_rating }}
- and have been last cooked + and have been last cooked {{ search.lastcooked }}
+ >
- and have been cooked or - equal to{{ search.timescooked }} times
+ and have been cooked or + equal to{{ search.timescooked }} times
order by {{ search.sort_order.flatMap((x) => x.text).join(", ") }} -
+
@@ -604,7 +793,8 @@
- +
- {{ $t("Page") }} {{ search.pagination_page }}/{{ Math.ceil(pagination_count / ui.page_size) }} + {{ $t("Page") }} {{ search.pagination_page }}/{{ + Math.ceil(pagination_count / ui.page_size) + }} {{ $t("Reset") }}
@@ -627,18 +819,24 @@
-
+
- +
- +
@@ -649,17 +847,17 @@ diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json index 2ce13465e..21ba67c5e 100644 --- a/vue/src/locales/en.json +++ b/vue/src/locales/en.json @@ -333,6 +333,7 @@ "ingredient_list": "Ingredient List", "explain": "Explain", "filter": "Filter", + "warning_duplicate_filter": "Warning: Due to technical limitations having multiple filters of the same combination (and/or/not) might yield unexpected results.", "reset_children": "Reset Child Inheritance", "reset_children_help": "Overwrite all children with values from inherited fields. Inheritted fields of children will be set to Inherit Fields unless Children Inherit Fields is set.", "substitute_help": "Substitutes are considered when searching for recipes that can be made with onhand ingredients.",