mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2026-01-08 07:38:26 -05:00
fix case insensitive get_or_create
This commit is contained in:
smilerz
@@ -63,7 +63,7 @@ class TreeManager(MP_NodeManager):
|
|||||||
def get_or_create(self, *args, **kwargs):
|
def get_or_create(self, *args, **kwargs):
|
||||||
kwargs['name'] = kwargs['name'].strip()
|
kwargs['name'] = kwargs['name'].strip()
|
||||||
try:
|
try:
|
||||||
return self.get(name__exact=kwargs['name'], space=kwargs['space']), False
|
return self.get(name__iexact=kwargs['name'], space=kwargs['space']), False
|
||||||
except self.model.DoesNotExist:
|
except self.model.DoesNotExist:
|
||||||
with scopes_disabled():
|
with scopes_disabled():
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -302,7 +302,7 @@ class KeywordSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
|
|||||||
# duplicate names might be routed to create
|
# duplicate names might be routed to create
|
||||||
name = validated_data.pop('name').strip()
|
name = validated_data.pop('name').strip()
|
||||||
space = validated_data.pop('space', self.context['request'].space)
|
space = validated_data.pop('space', self.context['request'].space)
|
||||||
obj, created = Keyword.objects.get_or_create(name__iexact=name, space=space, defaults=validated_data)
|
obj, created = Keyword.objects.get_or_create(name=name, space=space, defaults=validated_data)
|
||||||
return obj
|
return obj
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
@@ -438,7 +438,7 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
|
|||||||
else:
|
else:
|
||||||
validated_data['onhand_users'] = list(set(onhand_users) - set(shared_users))
|
validated_data['onhand_users'] = list(set(onhand_users) - set(shared_users))
|
||||||
|
|
||||||
obj, created = Food.objects.get_or_create(name__iexact=name, space=space, defaults=validated_data)
|
obj, created = Food.objects.get_or_create(name=name, space=space, defaults=validated_data)
|
||||||
return obj
|
return obj
|
||||||
|
|
||||||
def update(self, instance, validated_data):
|
def update(self, instance, validated_data):
|
||||||
|
|||||||
@@ -8,21 +8,15 @@
|
|||||||
<div class="row justify-content-center">
|
<div class="row justify-content-center">
|
||||||
<div class="col-12 col-lg-10 col-xl-8 mt-3 mb-3">
|
<div class="col-12 col-lg-10 col-xl-8 mt-3 mb-3">
|
||||||
<b-input-group>
|
<b-input-group>
|
||||||
<b-input
|
<b-input class="form-control form-control-lg form-control-borderless form-control-search" v-model="search.search_input" v-bind:placeholder="$t('Search')"></b-input>
|
||||||
class="form-control form-control-lg form-control-borderless form-control-search"
|
|
||||||
v-model="search.search_input" v-bind:placeholder="$t('Search')"></b-input>
|
|
||||||
<b-input-group-append>
|
<b-input-group-append>
|
||||||
<b-button v-b-tooltip.hover :title="$t('show_sql')" @click="showSQL()"
|
<b-button v-b-tooltip.hover :title="$t('show_sql')" @click="showSQL()" v-if="debug && ui.sql_debug">
|
||||||
v-if="debug && ui.sql_debug">
|
|
||||||
<i class="fas fa-bug" style="font-size: 1.5em"></i>
|
<i class="fas fa-bug" style="font-size: 1.5em"></i>
|
||||||
</b-button>
|
</b-button>
|
||||||
<b-button variant="light" v-b-tooltip.hover :title="$t('Random Recipes')"
|
<b-button variant="light" v-b-tooltip.hover :title="$t('Random Recipes')" @click="openRandom()">
|
||||||
@click="openRandom()">
|
|
||||||
<i class="fas fa-dice-five" style="font-size: 1.5em"></i>
|
<i class="fas fa-dice-five" style="font-size: 1.5em"></i>
|
||||||
</b-button>
|
</b-button>
|
||||||
<b-button v-b-toggle.collapse_advanced_search v-b-tooltip.hover
|
<b-button v-b-toggle.collapse_advanced_search v-b-tooltip.hover :title="$t('Advanced Settings')" v-bind:variant="searchFiltered(true) ? 'danger' : 'primary'">
|
||||||
:title="$t('Advanced Settings')"
|
|
||||||
v-bind:variant="searchFiltered(true) ? 'danger' : 'primary'">
|
|
||||||
<!-- TODO consider changing this icon to a filter -->
|
<!-- TODO consider changing this icon to a filter -->
|
||||||
<i class="fas fa-caret-down" v-if="!search.advanced_search_visible"></i>
|
<i class="fas fa-caret-down" v-if="!search.advanced_search_visible"></i>
|
||||||
<i class="fas fa-caret-up" v-if="search.advanced_search_visible"></i>
|
<i class="fas fa-caret-up" v-if="search.advanced_search_visible"></i>
|
||||||
@@ -32,18 +26,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<b-collapse id="collapse_advanced_search" class="mt-2 shadow-sm"
|
<b-collapse id="collapse_advanced_search" class="mt-2 shadow-sm" v-model="search.advanced_search_visible">
|
||||||
v-model="search.advanced_search_visible">
|
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body p-4">
|
<div class="card-body p-4">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<a class="btn btn-primary btn-block text-uppercase"
|
<a class="btn btn-primary btn-block text-uppercase" :href="resolveDjangoUrl('new_recipe')">{{ $t("New_Recipe") }}</a>
|
||||||
:href="resolveDjangoUrl('new_recipe')">{{ $t("New_Recipe") }}</a>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<a class="btn btn-primary btn-block text-uppercase"
|
<a class="btn btn-primary btn-block text-uppercase" :href="resolveDjangoUrl('data_import_url')">{{ $t("Import") }}</a>
|
||||||
:href="resolveDjangoUrl('data_import_url')">{{ $t("Import") }}</a>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<button
|
<button
|
||||||
@@ -62,186 +53,99 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<button id="id_settings_button"
|
<button id="id_settings_button" class="btn btn-primary btn-block text-uppercase"><i class="fas fa-cog fa-lg m-1"></i></button>
|
||||||
class="btn btn-primary btn-block text-uppercase"><i
|
|
||||||
class="fas fa-cog fa-lg m-1"></i></button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<b-popover target="id_settings_button" triggers="click" placement="bottom">
|
<b-popover target="id_settings_button" triggers="click" placement="bottom">
|
||||||
<b-tabs content-class="mt-1 text-nowrap" small>
|
<b-tabs content-class="mt-1 text-nowrap" small>
|
||||||
<b-tab :title="$t('Settings')" active :title-link-class="['mx-0']">
|
<b-tab :title="$t('Settings')" active :title-link-class="['mx-0']">
|
||||||
<b-form-group v-bind:label="$t('Recently_Viewed')"
|
<b-form-group v-bind:label="$t('Recently_Viewed')" label-for="popover-input-1" label-cols="6" class="mb-1">
|
||||||
label-for="popover-input-1" label-cols="6" class="mb-1">
|
<b-form-input type="number" v-model="ui.recently_viewed" id="popover-input-1" size="sm"></b-form-input>
|
||||||
<b-form-input type="number" v-model="ui.recently_viewed"
|
|
||||||
id="popover-input-1" size="sm"></b-form-input>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
|
|
||||||
<b-form-group v-bind:label="$t('Recipes_per_page')"
|
<b-form-group v-bind:label="$t('Recipes_per_page')" label-for="popover-input-page-count" label-cols="6" class="mb-1">
|
||||||
label-for="popover-input-page-count" label-cols="6"
|
<b-form-input type="number" v-model="ui.page_size" id="popover-input-page-count" size="sm"></b-form-input>
|
||||||
class="mb-1">
|
|
||||||
<b-form-input type="number" v-model="ui.page_size"
|
|
||||||
id="popover-input-page-count"
|
|
||||||
size="sm"></b-form-input>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
|
|
||||||
<b-form-group v-bind:label="$t('Meal_Plan')" label-for="popover-input-2"
|
<b-form-group v-bind:label="$t('Meal_Plan')" label-for="popover-input-2" label-cols="6" class="mb-1">
|
||||||
label-cols="6" class="mb-1">
|
<b-form-checkbox switch v-model="ui.show_meal_plan" id="popover-input-2" size="sm"></b-form-checkbox>
|
||||||
<b-form-checkbox switch v-model="ui.show_meal_plan"
|
|
||||||
id="popover-input-2" size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
|
|
||||||
<b-form-group v-if="ui.show_meal_plan"
|
<b-form-group v-if="ui.show_meal_plan" v-bind:label="$t('Meal_Plan_Days')" label-for="popover-input-5" label-cols="6" class="mb-1">
|
||||||
v-bind:label="$t('Meal_Plan_Days')"
|
<b-form-input type="number" v-model="ui.meal_plan_days" id="popover-input-5" size="sm"></b-form-input>
|
||||||
label-for="popover-input-5" label-cols="6" class="mb-1">
|
|
||||||
<b-form-input type="number" v-model="ui.meal_plan_days"
|
|
||||||
id="popover-input-5" size="sm"></b-form-input>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
|
|
||||||
<b-form-group v-bind:label="$t('Sort_by_new')"
|
<b-form-group v-bind:label="$t('Sort_by_new')" label-for="popover-input-3" label-cols="6" class="mb-1">
|
||||||
label-for="popover-input-3" label-cols="6" class="mb-1">
|
<b-form-checkbox switch v-model="ui.sort_by_new" id="popover-input-3" size="sm"></b-form-checkbox>
|
||||||
<b-form-checkbox switch v-model="ui.sort_by_new"
|
|
||||||
id="popover-input-3" size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<div class="row" style="margin-top: 1vh">
|
<div class="row" style="margin-top: 1vh">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<a :href="resolveDjangoUrl('view_settings') + '#search'">{{
|
<a :href="resolveDjangoUrl('view_settings') + '#search'">{{ $t("Search Settings") }}</a>
|
||||||
$t("Search Settings")
|
|
||||||
}}</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</b-tab>
|
</b-tab>
|
||||||
<b-tab :title="$t('fields')" :title-link-class="['mx-0']">
|
<b-tab :title="$t('fields')" :title-link-class="['mx-0']">
|
||||||
<b-form-group v-bind:label="$t('show_keywords')"
|
<b-form-group v-bind:label="$t('show_keywords')" label-for="popover-show_keywords" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_keywords" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_keywords" id="popover-show_keywords" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_keywords"
|
|
||||||
id="popover-show_keywords"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('show_foods')"
|
<b-form-group v-bind:label="$t('show_foods')" label-for="popover-show_foods" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_foods" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_foods" id="popover-show_foods" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_foods"
|
|
||||||
id="popover-show_foods"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('show_books')"
|
<b-form-group v-bind:label="$t('show_books')" label-for="popover-input-show_books" label-cols="8" class="mb-1">
|
||||||
label-for="popover-input-show_books" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_books" id="popover-input-show_books" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_books"
|
|
||||||
id="popover-input-show_books"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('show_rating')"
|
<b-form-group v-bind:label="$t('show_rating')" label-for="popover-show_rating" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_rating" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_rating" id="popover-show_rating" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_rating"
|
|
||||||
id="popover-show_rating"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('show_units')"
|
<b-form-group v-bind:label="$t('show_units')" label-for="popover-show_units" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_units" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_units" id="popover-show_units" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_units"
|
|
||||||
id="popover-show_units"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('show_filters')"
|
<b-form-group v-bind:label="$t('show_filters')" label-for="popover-show_filters" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_filters" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_filters" id="popover-show_filters" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_filters"
|
|
||||||
id="popover-show_filters"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('show_sortby')"
|
<b-form-group v-bind:label="$t('show_sortby')" label-for="popover-show_sortby" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_sortby" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_sortby" id="popover-show_sortby" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_sortby"
|
|
||||||
id="popover-show_sortby"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('times_cooked')"
|
<b-form-group v-bind:label="$t('times_cooked')" label-for="popover-show_timescooked" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_timescooked" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_timescooked" id="popover-show_cooked" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_timescooked"
|
|
||||||
id="popover-show_cooked"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('make_now')"
|
<b-form-group v-bind:label="$t('make_now')" label-for="popover-show_makenow" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_makenow" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_makenow" id="popover-show_makenow" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_makenow"
|
|
||||||
id="popover-show_makenow"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('last_cooked')"
|
<b-form-group v-bind:label="$t('last_cooked')" label-for="popover-show_cookedon" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_cookedon" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_cookedon" id="popover-show_cookedon" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_cookedon"
|
|
||||||
id="popover-show_cookedon"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('last_viewed')"
|
<b-form-group v-bind:label="$t('last_viewed')" label-for="popover-show_viewedon" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_viewedon" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_viewedon" id="popover-show_viewedon" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_viewedon"
|
|
||||||
id="popover-show_viewedon"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('created_on')"
|
<b-form-group v-bind:label="$t('created_on')" label-for="popover-show_createdon" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_createdon" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_createdon" id="popover-show_createdon" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_createdon"
|
|
||||||
id="popover-show_createdon"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('updatedon')"
|
<b-form-group v-bind:label="$t('updatedon')" label-for="popover-show_updatedon" label-cols="8" class="mb-1">
|
||||||
label-for="popover-show_updatedon" label-cols="8"
|
<b-form-checkbox switch v-model="ui.show_updatedon" id="popover-show_updatedon" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.show_updatedon"
|
|
||||||
id="popover-show_updatedon"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
</b-tab>
|
</b-tab>
|
||||||
|
|
||||||
<b-tab :title="$t('advanced')" :title-link-class="['mx-0']">
|
<b-tab :title="$t('advanced')" :title-link-class="['mx-0']">
|
||||||
<b-form-group v-bind:label="$t('remember_search')"
|
<b-form-group v-bind:label="$t('remember_search')" label-for="popover-rem-search" label-cols="8" class="mb-1">
|
||||||
label-for="popover-rem-search" label-cols="8"
|
<b-form-checkbox switch v-model="ui.remember_search" id="popover-rem-search" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.remember_search"
|
|
||||||
id="popover-rem-search"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-if="ui.remember_search"
|
<b-form-group v-if="ui.remember_search" v-bind:label="$t('remember_hours')" label-for="popover-input-rem-hours" label-cols="8" class="mb-1">
|
||||||
v-bind:label="$t('remember_hours')"
|
<b-form-input type="number" v-model="ui.remember_hours" id="popover-rem-hours" size="sm"></b-form-input>
|
||||||
label-for="popover-input-rem-hours" label-cols="8"
|
|
||||||
class="mb-1">
|
|
||||||
<b-form-input type="number" v-model="ui.remember_hours"
|
|
||||||
id="popover-rem-hours" size="sm"></b-form-input>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-bind:label="$t('tree_select')"
|
<b-form-group v-bind:label="$t('tree_select')" label-for="popover-input-treeselect" label-cols="8" class="mb-1">
|
||||||
label-for="popover-input-treeselect" label-cols="8"
|
<b-form-checkbox switch v-model="ui.tree_select" id="popover-input-treeselect" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.tree_select"
|
|
||||||
id="popover-input-treeselect"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<b-form-group v-if="debug" v-bind:label="$t('sql_debug')"
|
<b-form-group v-if="debug" v-bind:label="$t('sql_debug')" label-for="popover-input-sqldebug" label-cols="8" class="mb-1">
|
||||||
label-for="popover-input-sqldebug" label-cols="8"
|
<b-form-checkbox switch v-model="ui.sql_debug" id="popover-input-sqldebug" size="sm"></b-form-checkbox>
|
||||||
class="mb-1">
|
|
||||||
<b-form-checkbox switch v-model="ui.sql_debug"
|
|
||||||
id="popover-input-sqldebug"
|
|
||||||
size="sm"></b-form-checkbox>
|
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
</b-tab>
|
</b-tab>
|
||||||
</b-tabs>
|
</b-tabs>
|
||||||
|
|
||||||
<div class="row" style="margin-top: 1vh">
|
<div class="row" style="margin-top: 1vh">
|
||||||
<div class="col-12" style="text-align: right">
|
<div class="col-12" style="text-align: right">
|
||||||
<b-button size="sm" variant="secondary" style="margin-right: 8px"
|
<b-button size="sm" variant="secondary" style="margin-right: 8px" @click="$root.$emit('bv::hide::popover')">{{ $t("Close") }} </b-button>
|
||||||
@click="$root.$emit('bv::hide::popover')">{{ $t("Close") }}
|
|
||||||
</b-button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</b-popover>
|
</b-popover>
|
||||||
@@ -279,24 +183,21 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- keywords filter -->
|
<!-- keywords filter -->
|
||||||
<h6 class="mb-0" v-if="ui.expert_mode && search.keywords_fields > 1">
|
<h6 class="mb-0" v-if="ui.expert_mode && search.keywords_fields > 1">
|
||||||
{{ $t("Keywords") }}</h6>
|
{{ $t("Keywords") }}
|
||||||
<span class="text-sm-left text-warning"
|
</h6>
|
||||||
v-if="ui.expert_mode && search.keywords_fields > 1 && hasDuplicateFilter(search.search_keywords, search.keywords_fields)">{{
|
<span class="text-sm-left text-warning" v-if="ui.expert_mode && search.keywords_fields > 1 && hasDuplicateFilter(search.search_keywords, search.keywords_fields)">{{
|
||||||
$t('warning_duplicate_filter')
|
$t("warning_duplicate_filter")
|
||||||
}}</span>
|
}}</span>
|
||||||
<div class="row" v-if="ui.show_keywords">
|
<div class="row" v-if="ui.show_keywords">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<b-input-group class="mt-2" v-for="(k, a) in keywordFields" :key="a">
|
<b-input-group class="mt-2" v-for="(k, a) in keywordFields" :key="a">
|
||||||
<template #prepend v-if="ui.expert_mode">
|
<template #prepend v-if="ui.expert_mode">
|
||||||
<b-input-group-text style="width: 3em"
|
{{ k }} {{ search.keywords_fields }} {{ keywordFields }} {{ this.ui.enable_expert }}
|
||||||
@click="addField('keywords', k)">
|
<b-input-group-text style="width: 3em" @click="addField('keywords', k)">
|
||||||
<i class="fas fa-plus-circle text-primary"
|
<i class="fas fa-plus-circle text-primary" v-if="k == search.keywords_fields && k < 4" />
|
||||||
v-if="k == search.keywords_fields && k < 4"/>
|
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
<b-input-group-text style="width: 3em"
|
<b-input-group-text style="width: 3em" @click="removeField('keywords', k)">
|
||||||
@click="removeField('keywords', k)">
|
<i class="fas fa-minus-circle text-primary" v-if="k == search.keywords_fields && k > 1" />
|
||||||
<i class="fas fa-minus-circle text-primary"
|
|
||||||
v-if="k == search.keywords_fields && k > 1"/>
|
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
</template>
|
</template>
|
||||||
<treeselect
|
<treeselect
|
||||||
@@ -333,20 +234,14 @@
|
|||||||
switch
|
switch
|
||||||
style="width: 4em"
|
style="width: 4em"
|
||||||
>
|
>
|
||||||
<span class="text-uppercase"
|
<span class="text-uppercase" v-if="search.search_keywords[a].operator">{{ $t("or") }}</span>
|
||||||
v-if="search.search_keywords[a].operator">{{
|
|
||||||
$t("or")
|
|
||||||
}}</span>
|
|
||||||
<span class="text-uppercase" v-else>{{ $t("and") }}</span>
|
<span class="text-uppercase" v-else>{{ $t("and") }}</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
</b-input-group-append>
|
</b-input-group-append>
|
||||||
<b-input-group-append v-if="ui.expert_mode">
|
<b-input-group-append v-if="ui.expert_mode">
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.search_keywords[a].not"
|
<b-form-checkbox v-model="search.search_keywords[a].not" name="check-button" @change="refreshData(false)" class="shadow-none">
|
||||||
name="check-button"
|
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none">
|
|
||||||
<span class="text-uppercase">{{ $t("not") }}</span>
|
<span class="text-uppercase">{{ $t("not") }}</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
@@ -357,24 +252,20 @@
|
|||||||
|
|
||||||
<!-- foods filter -->
|
<!-- foods filter -->
|
||||||
<h6 class="mt-2 mb-0" v-if="ui.expert_mode && search.foods_fields > 1">
|
<h6 class="mt-2 mb-0" v-if="ui.expert_mode && search.foods_fields > 1">
|
||||||
{{ $t("Foods") }}</h6>
|
{{ $t("Foods") }}
|
||||||
<span class="text-sm-left text-warning"
|
</h6>
|
||||||
v-if="ui.expert_mode && search.foods_fields > 1 && hasDuplicateFilter(search.search_foods, search.foods_fields)">{{
|
<span class="text-sm-left text-warning" v-if="ui.expert_mode && search.foods_fields > 1 && hasDuplicateFilter(search.search_foods, search.foods_fields)">{{
|
||||||
$t('warning_duplicate_filter')
|
$t("warning_duplicate_filter")
|
||||||
}}</span>
|
}}</span>
|
||||||
<div class="row" v-if="ui.show_foods">
|
<div class="row" v-if="ui.show_foods">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<b-input-group class="mt-2" v-for="(f, i) in foodFields" :key="i">
|
<b-input-group class="mt-2" v-for="(f, i) in foodFields" :key="i">
|
||||||
<template #prepend v-if="ui.expert_mode">
|
<template #prepend v-if="ui.expert_mode">
|
||||||
<b-input-group-text style="width: 3em"
|
<b-input-group-text style="width: 3em" @click="addField('foods', f)">
|
||||||
@click="addField('foods', f)">
|
<i class="fas fa-plus-circle text-primary" v-if="f == search.foods_fields && f < 4" />
|
||||||
<i class="fas fa-plus-circle text-primary"
|
|
||||||
v-if="f == search.foods_fields && f < 4"/>
|
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
<b-input-group-text style="width: 3em"
|
<b-input-group-text style="width: 3em" @click="removeField('foods', f)">
|
||||||
@click="removeField('foods', f)">
|
<i class="fas fa-minus-circle text-primary" v-if="f == search.foods_fields && f > 1" />
|
||||||
<i class="fas fa-minus-circle text-primary"
|
|
||||||
v-if="f == search.foods_fields && f > 1"/>
|
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
</template>
|
</template>
|
||||||
<treeselect
|
<treeselect
|
||||||
@@ -403,24 +294,15 @@
|
|||||||
/>
|
/>
|
||||||
<b-input-group-append>
|
<b-input-group-append>
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.search_foods[i].operator"
|
<b-form-checkbox v-model="search.search_foods[i].operator" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em">
|
||||||
name="check-button"
|
<span class="text-uppercase" v-if="search.search_foods[i].operator">{{ $t("or") }}</span>
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" switch style="width: 4em">
|
|
||||||
<span class="text-uppercase"
|
|
||||||
v-if="search.search_foods[i].operator">{{
|
|
||||||
$t("or")
|
|
||||||
}}</span>
|
|
||||||
<span class="text-uppercase" v-else>{{ $t("and") }}</span>
|
<span class="text-uppercase" v-else>{{ $t("and") }}</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
</b-input-group-append>
|
</b-input-group-append>
|
||||||
<b-input-group-append v-if="ui.expert_mode">
|
<b-input-group-append v-if="ui.expert_mode">
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.search_foods[i].not"
|
<b-form-checkbox v-model="search.search_foods[i].not" name="check-button" @change="refreshData(false)" class="shadow-none">
|
||||||
name="check-button"
|
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none">
|
|
||||||
<span class="text-uppercase">{{ $t("not") }}</span>
|
<span class="text-uppercase">{{ $t("not") }}</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
@@ -431,24 +313,20 @@
|
|||||||
|
|
||||||
<!-- books filter -->
|
<!-- books filter -->
|
||||||
<h6 class="mt-2 mb-0" v-if="ui.expert_mode && search.books_fields > 1">
|
<h6 class="mt-2 mb-0" v-if="ui.expert_mode && search.books_fields > 1">
|
||||||
{{ $t("Books") }}</h6>
|
{{ $t("Books") }}
|
||||||
<span class="text-sm-left text-warning"
|
</h6>
|
||||||
v-if="ui.expert_mode && search.books_fields > 1 && hasDuplicateFilter(search.search_books, search.books_fields)">{{
|
<span class="text-sm-left text-warning" v-if="ui.expert_mode && search.books_fields > 1 && hasDuplicateFilter(search.search_books, search.books_fields)">{{
|
||||||
$t('warning_duplicate_filter')
|
$t("warning_duplicate_filter")
|
||||||
}}</span>
|
}}</span>
|
||||||
<div class="row" v-if="ui.show_books">
|
<div class="row" v-if="ui.show_books">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<b-input-group class="mt-2" v-for="(b, i) in bookFields" :key="i">
|
<b-input-group class="mt-2" v-for="(b, i) in bookFields" :key="i">
|
||||||
<template #prepend v-if="ui.expert_mode">
|
<template #prepend v-if="ui.expert_mode">
|
||||||
<b-input-group-text style="width: 3em"
|
<b-input-group-text style="width: 3em" @click="addField('books', b)">
|
||||||
@click="addField('books', b)">
|
<i class="fas fa-plus-circle text-primary" v-if="b == search.books_fields && b < 4" />
|
||||||
<i class="fas fa-plus-circle text-primary"
|
|
||||||
v-if="b == search.books_fields && b < 4"/>
|
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
<b-input-group-text style="width: 3em"
|
<b-input-group-text style="width: 3em" @click="removeField('books', b)">
|
||||||
@click="removeField('books', b)">
|
<i class="fas fa-minus-circle text-primary" v-if="b == search.books_fields && b > 1" />
|
||||||
<i class="fas fa-minus-circle text-primary"
|
|
||||||
v-if="b == search.books_fields && b > 1"/>
|
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
</template>
|
</template>
|
||||||
<generic-multiselect
|
<generic-multiselect
|
||||||
@@ -462,24 +340,15 @@
|
|||||||
></generic-multiselect>
|
></generic-multiselect>
|
||||||
<b-input-group-append>
|
<b-input-group-append>
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.search_books[i].operator"
|
<b-form-checkbox v-model="search.search_books[i].operator" name="check-button" @change="refreshData(false)" class="shadow-none" style="width: 4em" switch>
|
||||||
name="check-button"
|
<span class="text-uppercase" v-if="search.search_books[i].operator">{{ $t("or") }}</span>
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" style="width: 4em" switch>
|
|
||||||
<span class="text-uppercase"
|
|
||||||
v-if="search.search_books[i].operator">{{
|
|
||||||
$t("or")
|
|
||||||
}}</span>
|
|
||||||
<span class="text-uppercase" v-else>{{ $t("and") }}</span>
|
<span class="text-uppercase" v-else>{{ $t("and") }}</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
</b-input-group-append>
|
</b-input-group-append>
|
||||||
<b-input-group-append v-if="ui.expert_mode">
|
<b-input-group-append v-if="ui.expert_mode">
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.search_books[i].not"
|
<b-form-checkbox v-model="search.search_books[i].not" name="check-button" @change="refreshData(false)" class="shadow-none">
|
||||||
name="check-button"
|
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none">
|
|
||||||
<span class="text-uppercase">{{ $t("not") }}</span>
|
<span class="text-uppercase">{{ $t("not") }}</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
@@ -503,12 +372,8 @@
|
|||||||
/>
|
/>
|
||||||
<b-input-group-append>
|
<b-input-group-append>
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.search_rating_gte"
|
<b-form-checkbox v-model="search.search_rating_gte" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em">
|
||||||
name="check-button"
|
<span class="text-uppercase" v-if="search.search_rating_gte">>=</span>
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" switch style="width: 4em">
|
|
||||||
<span class="text-uppercase"
|
|
||||||
v-if="search.search_rating_gte">>=</span>
|
|
||||||
<span class="text-uppercase" v-else><=</span>
|
<span class="text-uppercase" v-else><=</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
@@ -531,13 +396,8 @@
|
|||||||
></generic-multiselect>
|
></generic-multiselect>
|
||||||
<b-input-group-append>
|
<b-input-group-append>
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.search_units_or"
|
<b-form-checkbox v-model="search.search_units_or" name="check-button" @change="refreshData(false)" class="shadow-none" style="width: 4em" switch>
|
||||||
name="check-button"
|
<span class="text-uppercase" v-if="search.search_units_or">{{ $t("or") }}</span>
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" style="width: 4em" switch>
|
|
||||||
<span class="text-uppercase" v-if="search.search_units_or">{{
|
|
||||||
$t("or")
|
|
||||||
}}</span>
|
|
||||||
<span class="text-uppercase" v-else>{{ $t("and") }}</span>
|
<span class="text-uppercase" v-else>{{ $t("and") }}</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
@@ -547,23 +407,17 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- special switches -->
|
<!-- special switches -->
|
||||||
<div class="row g-0"
|
<div class="row g-0" v-if="ui.show_timescooked || ui.show_makenow || ui.show_cookedon">
|
||||||
v-if="ui.show_timescooked || ui.show_makenow || ui.show_cookedon">
|
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<b-input-group class="mt-2">
|
<b-input-group class="mt-2">
|
||||||
<!-- times cooked -->
|
<!-- times cooked -->
|
||||||
<b-input-group-prepend is-text v-if="ui.show_timescooked">
|
<b-input-group-prepend is-text v-if="ui.show_timescooked">
|
||||||
{{ $t("times_cooked") }}
|
{{ $t("times_cooked") }}
|
||||||
</b-input-group-prepend>
|
</b-input-group-prepend>
|
||||||
<b-form-input id="timescooked" type="number" min="0"
|
<b-form-input id="timescooked" type="number" min="0" v-model="search.timescooked" v-if="ui.show_timescooked"></b-form-input>
|
||||||
v-model="search.timescooked"
|
|
||||||
v-if="ui.show_timescooked"></b-form-input>
|
|
||||||
<b-input-group-append v-if="ui.show_timescooked">
|
<b-input-group-append v-if="ui.show_timescooked">
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.timescooked_gte"
|
<b-form-checkbox v-model="search.timescooked_gte" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em">
|
||||||
name="check-button"
|
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" switch style="width: 4em">
|
|
||||||
<span class="text-uppercase" v-if="search.timescooked_gte">>=</span>
|
<span class="text-uppercase" v-if="search.timescooked_gte">>=</span>
|
||||||
<span class="text-uppercase" v-else><=</span>
|
<span class="text-uppercase" v-else><=</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
@@ -582,10 +436,7 @@
|
|||||||
@input="refreshData(false)"
|
@input="refreshData(false)"
|
||||||
/>
|
/>
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.cookedon_gte"
|
<b-form-checkbox v-model="search.cookedon_gte" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em">
|
||||||
name="check-button"
|
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" switch style="width: 4em">
|
|
||||||
<span class="text-uppercase" v-if="search.cookedon_gte">>=</span>
|
<span class="text-uppercase" v-if="search.cookedon_gte">>=</span>
|
||||||
<span class="text-uppercase" v-else><=</span>
|
<span class="text-uppercase" v-else><=</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
@@ -605,10 +456,7 @@
|
|||||||
@input="refreshData(false)"
|
@input="refreshData(false)"
|
||||||
/>
|
/>
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.createdon_gte"
|
<b-form-checkbox v-model="search.createdon_gte" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em">
|
||||||
name="check-button"
|
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" switch style="width: 4em">
|
|
||||||
<span class="text-uppercase" v-if="search.createdon_gte">>=</span>
|
<span class="text-uppercase" v-if="search.createdon_gte">>=</span>
|
||||||
<span class="text-uppercase" v-else><=</span>
|
<span class="text-uppercase" v-else><=</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
@@ -626,10 +474,7 @@
|
|||||||
@input="refreshData(false)"
|
@input="refreshData(false)"
|
||||||
/>
|
/>
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.viewedon_gte"
|
<b-form-checkbox v-model="search.viewedon_gte" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em">
|
||||||
name="check-button"
|
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" switch style="width: 4em">
|
|
||||||
<span class="text-uppercase" v-if="search.viewedon_gte">>=</span>
|
<span class="text-uppercase" v-if="search.viewedon_gte">>=</span>
|
||||||
<span class="text-uppercase" v-else><=</span>
|
<span class="text-uppercase" v-else><=</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
@@ -647,10 +492,7 @@
|
|||||||
@input="refreshData(false)"
|
@input="refreshData(false)"
|
||||||
/>
|
/>
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
<b-form-checkbox v-model="search.updatedon_gte"
|
<b-form-checkbox v-model="search.updatedon_gte" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em">
|
||||||
name="check-button"
|
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" switch style="width: 4em">
|
|
||||||
<span class="text-uppercase" v-if="search.updatedon_gte">>=</span>
|
<span class="text-uppercase" v-if="search.updatedon_gte">>=</span>
|
||||||
<span class="text-uppercase" v-else><=</span>
|
<span class="text-uppercase" v-else><=</span>
|
||||||
</b-form-checkbox>
|
</b-form-checkbox>
|
||||||
@@ -659,9 +501,7 @@
|
|||||||
<b-input-group-append v-if="ui.show_makenow">
|
<b-input-group-append v-if="ui.show_makenow">
|
||||||
<b-input-group-text>
|
<b-input-group-text>
|
||||||
{{ $t("make_now") }}
|
{{ $t("make_now") }}
|
||||||
<b-form-checkbox v-model="search.makenow" name="check-button"
|
<b-form-checkbox v-model="search.makenow" name="check-button" @change="refreshData(false)" class="shadow-none" switch style="width: 4em" />
|
||||||
@change="refreshData(false)"
|
|
||||||
class="shadow-none" switch style="width: 4em"/>
|
|
||||||
</b-input-group-text>
|
</b-input-group-text>
|
||||||
</b-input-group-append>
|
</b-input-group-append>
|
||||||
</b-input-group>
|
</b-input-group>
|
||||||
@@ -671,21 +511,19 @@
|
|||||||
<!-- Buttons -->
|
<!-- Buttons -->
|
||||||
<div class="row justify-content-end small">
|
<div class="row justify-content-end small">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<b-button class="my-0" variant="link" size="sm"
|
<b-button class="my-0" variant="link" size="sm" @click="search.explain_visible = !search.explain_visible">
|
||||||
@click="search.explain_visible = !search.explain_visible">
|
|
||||||
<div v-if="!search.explain_visible">
|
<div v-if="!search.explain_visible">
|
||||||
<i class="far fa-eye"></i>
|
<i class="far fa-eye"></i>
|
||||||
{{ $t("explain") }}
|
{{ $t("explain") }}
|
||||||
</div>
|
</div>
|
||||||
<div v-else><i class="far fa-eye-slash"></i> {{ $t("explain") }}</div>
|
<div v-else><i class="far fa-eye-slash"></i> {{ $t("explain") }}</div>
|
||||||
</b-button>
|
</b-button>
|
||||||
<b-button class="my-0" variant="link" size="sm"
|
<b-button class="my-0" variant="link" size="sm" @click="ui.expert_mode = !ui.expert_mode">
|
||||||
@click="ui.expert_mode = !ui.expert_mode">
|
<div v-if="!ui.enable_expert">
|
||||||
<div v-if="!expertMode">
|
|
||||||
<i class="fas fa-circle"></i>
|
<i class="fas fa-circle"></i>
|
||||||
{{ $t("expert_mode") }}
|
{{ $t("expert_mode") }}
|
||||||
</div>
|
</div>
|
||||||
<div v-if="expertMode">
|
<div v-if="ui.enable_expert">
|
||||||
<i class="far fa-circle"></i>
|
<i class="far fa-circle"></i>
|
||||||
{{ $t("simple_mode") }}
|
{{ $t("simple_mode") }}
|
||||||
</div>
|
</div>
|
||||||
@@ -714,8 +552,7 @@
|
|||||||
and
|
and
|
||||||
<b v-if="k.not">don't</b>
|
<b v-if="k.not">don't</b>
|
||||||
contain
|
contain
|
||||||
<b v-if="k.operator">any</b><b
|
<b v-if="k.operator">any</b><b v-else>all</b> of the following <span class="text-success">keywords</span>:
|
||||||
v-else>all</b> of the following <span class="text-success">keywords</span>:
|
|
||||||
<i>{{ k.items.flatMap((x) => x.name).join(", ") }}</i>
|
<i>{{ k.items.flatMap((x) => x.name).join(", ") }}</i>
|
||||||
<br />
|
<br />
|
||||||
</template>
|
</template>
|
||||||
@@ -726,9 +563,7 @@
|
|||||||
and
|
and
|
||||||
<b v-if="k.not">don't</b>
|
<b v-if="k.not">don't</b>
|
||||||
contain
|
contain
|
||||||
<b v-if="k.operator">any</b><b
|
<b v-if="k.operator">any</b><b v-else>all</b> of the following <span class="text-success">foods</span>:
|
||||||
v-else>all</b> of the following <span
|
|
||||||
class="text-success">foods</span>:
|
|
||||||
<i>{{ k.items.flatMap((x) => x.name).join(", ") }}</i>
|
<i>{{ k.items.flatMap((x) => x.name).join(", ") }}</i>
|
||||||
<br />
|
<br />
|
||||||
</template>
|
</template>
|
||||||
@@ -739,9 +574,7 @@
|
|||||||
and
|
and
|
||||||
<b v-if="k.not">don't</b>
|
<b v-if="k.not">don't</b>
|
||||||
contain
|
contain
|
||||||
<b v-if="k.operator">any</b><b
|
<b v-if="k.operator">any</b><b v-else>all</b> of the following <span class="text-success">books</span>:
|
||||||
v-else>all</b> of the following <span
|
|
||||||
class="text-success">books</span>:
|
|
||||||
<i>{{ k.items.flatMap((x) => x.name).join(", ") }}</i>
|
<i>{{ k.items.flatMap((x) => x.name).join(", ") }}</i>
|
||||||
<br />
|
<br />
|
||||||
</template>
|
</template>
|
||||||
@@ -750,30 +583,24 @@
|
|||||||
<span v-if="search.makenow"> and you can <span class="text-success">make right now</span> (based on the on hand flag) <br /></span>
|
<span v-if="search.makenow"> and you can <span class="text-success">make right now</span> (based on the on hand flag) <br /></span>
|
||||||
|
|
||||||
<span v-if="search.search_units.length > 0">
|
<span v-if="search.search_units.length > 0">
|
||||||
and contain <b v-if="search.search_units_or">any</b><b
|
and contain <b v-if="search.search_units_or">any</b><b v-else>all</b> of the following <span class="text-success">units</span>:
|
||||||
v-else>all</b> of the following <span
|
|
||||||
class="text-success">units</span>:
|
|
||||||
<i>{{ search.search_units.flatMap((x) => x.name).join(", ") }}</i
|
<i>{{ search.search_units.flatMap((x) => x.name).join(", ") }}</i
|
||||||
><br />
|
><br />
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span v-if="search.search_rating !== undefined">
|
<span v-if="search.search_rating !== undefined">
|
||||||
and have a <span class="text-success">rating</span> <template
|
and have a <span class="text-success">rating</span> <template v-if="search.search_rating_gte">greater than</template><template v-else> less than</template> or
|
||||||
v-if="search.search_rating_gte">greater than</template><template
|
|
||||||
v-else> less than</template> or
|
|
||||||
equal to {{ search.search_rating }}<br />
|
equal to {{ search.search_rating }}<br />
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span v-if="search.lastcooked !== undefined">
|
<span v-if="search.lastcooked !== undefined">
|
||||||
and have been <span class="text-success">last cooked</span> <template
|
and have been <span class="text-success">last cooked</span> <template v-if="search.lastcooked_gte"> after</template><template v-else> before</template>
|
||||||
v-if="search.lastcooked_gte"> after</template><template v-else> before</template>
|
|
||||||
<i>{{ search.lastcooked }}</i
|
<i>{{ search.lastcooked }}</i
|
||||||
><br />
|
><br />
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span v-if="search.timescooked !== undefined">
|
<span v-if="search.timescooked !== undefined">
|
||||||
and have <span class="text-success">been cooked</span> <template
|
and have <span class="text-success">been cooked</span> <template v-if="search.timescooked_gte"> at least</template><template v-else> less than</template> or
|
||||||
v-if="search.timescooked_gte"> at least</template><template v-else> less than</template> or
|
|
||||||
equal to<i>{{ search.timescooked }}</i> times <br />
|
equal to<i>{{ search.timescooked }}</i> times <br />
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
@@ -793,8 +620,7 @@
|
|||||||
|
|
||||||
<div class="row align-content-center">
|
<div class="row align-content-center">
|
||||||
<div class="col col-md-6" style="margin-top: 2vh">
|
<div class="col col-md-6" style="margin-top: 2vh">
|
||||||
<b-dropdown id="sortby" :text="sortByLabel" variant="link" toggle-class="text-decoration-none "
|
<b-dropdown id="sortby" :text="sortByLabel" variant="link" toggle-class="text-decoration-none " class="m-0 p-0">
|
||||||
class="m-0 p-0">
|
|
||||||
<div v-for="o in sortOptions" :key="o.id">
|
<div v-for="o in sortOptions" :key="o.id">
|
||||||
<b-dropdown-item
|
<b-dropdown-item
|
||||||
v-on:click="
|
v-on:click="
|
||||||
@@ -809,9 +635,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col col-md-6 text-right" style="margin-top: 2vh">
|
<div class="col col-md-6 text-right" style="margin-top: 2vh">
|
||||||
<span class="text-muted">
|
<span class="text-muted">
|
||||||
{{ $t("Page") }} {{ search.pagination_page }}/{{
|
{{ $t("Page") }} {{ search.pagination_page }}/{{ Math.ceil(pagination_count / ui.page_size) }}
|
||||||
Math.ceil(pagination_count / ui.page_size)
|
|
||||||
}}
|
|
||||||
<a href="#" @click="resetSearch()"><i class="fas fa-times-circle"></i> {{ $t("Reset") }}</a>
|
<a href="#" @click="resetSearch()"><i class="fas fa-times-circle"></i> {{ $t("Reset") }}</a>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -819,24 +643,18 @@
|
|||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col col-md-12">
|
<div class="col col-md-12">
|
||||||
<div
|
<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); grid-gap: 0.8rem">
|
||||||
style="display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); grid-gap: 0.8rem">
|
|
||||||
<template v-if="!searchFiltered()">
|
<template v-if="!searchFiltered()">
|
||||||
<recipe-card v-bind:key="`mp_${m.id}`" v-for="m in meal_plans" :recipe="m.recipe"
|
<recipe-card v-bind:key="`mp_${m.id}`" v-for="m in meal_plans" :recipe="m.recipe" :meal_plan="m" :footer_text="m.meal_type_name" footer_icon="far fa-calendar-alt"></recipe-card>
|
||||||
:meal_plan="m" :footer_text="m.meal_type_name"
|
|
||||||
footer_icon="far fa-calendar-alt"></recipe-card>
|
|
||||||
</template>
|
</template>
|
||||||
<recipe-card v-for="r in recipes" v-bind:key="r.id" :recipe="r"
|
<recipe-card v-for="r in recipes" v-bind:key="r.id" :recipe="r" :footer_text="isRecentOrNew(r)[0]" :footer_icon="isRecentOrNew(r)[1]"></recipe-card>
|
||||||
:footer_text="isRecentOrNew(r)[0]"
|
|
||||||
:footer_icon="isRecentOrNew(r)[1]"></recipe-card>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row" style="margin-top: 2vh" v-if="!random_search">
|
<div class="row" style="margin-top: 2vh" v-if="!random_search">
|
||||||
<div class="col col-md-12">
|
<div class="col col-md-12">
|
||||||
<b-pagination pills v-model="search.pagination_page" :total-rows="pagination_count"
|
<b-pagination pills v-model="search.pagination_page" :total-rows="pagination_count" :per-page="ui.page_size" @change="pageChange" align="center"></b-pagination>
|
||||||
:per-page="ui.page_size" @change="pageChange" align="center"></b-pagination>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -941,7 +759,6 @@ export default {
|
|||||||
remember_hours: 4,
|
remember_hours: 4,
|
||||||
sql_debug: false,
|
sql_debug: false,
|
||||||
tree_select: false,
|
tree_select: false,
|
||||||
enable_expert: false,
|
|
||||||
show_keywords: true,
|
show_keywords: true,
|
||||||
show_foods: true,
|
show_foods: true,
|
||||||
show_books: true,
|
show_books: true,
|
||||||
@@ -1021,23 +838,20 @@ export default {
|
|||||||
{ id: 0, label: this.$t("Unrated") + ratingCount(this.facets.Ratings?.["0.0"] ?? 0) },
|
{ id: 0, label: this.$t("Unrated") + ratingCount(this.facets.Ratings?.["0.0"] ?? 0) },
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
expertMode: function () {
|
|
||||||
return this.ui.enable_expert && this.ui.expert_mode
|
|
||||||
},
|
|
||||||
keywordFields: function () {
|
keywordFields: function () {
|
||||||
return !this.expertMode ? 1 : this.search.keywords_fields
|
return !this.ui.enable_expert ? 1 : this.search.keywords_fields
|
||||||
},
|
},
|
||||||
foodFields: function () {
|
foodFields: function () {
|
||||||
return !this.expertMode ? 1 : this.search.foods_fields
|
return !this.ui.enable_expert ? 1 : this.search.foods_fields
|
||||||
},
|
},
|
||||||
bookFields: function () {
|
bookFields: function () {
|
||||||
return !this.expertMode ? 1 : this.search.books_fields
|
return !this.ui.enable_expert ? 1 : this.search.books_fields
|
||||||
},
|
},
|
||||||
ratingFields: function () {
|
ratingFields: function () {
|
||||||
return !this.expertMode ? 1 : this.search.rating_fields
|
return !this.ui.enable_expert ? 1 : this.search.rating_fields
|
||||||
},
|
},
|
||||||
unitFields: function () {
|
unitFields: function () {
|
||||||
return !this.expertMode ? 1 : this.search.units_fields
|
return !this.ui.enable_expert ? 1 : this.search.units_fields
|
||||||
},
|
},
|
||||||
sortOptions: function () {
|
sortOptions: function () {
|
||||||
let sort_order = []
|
let sort_order = []
|
||||||
@@ -1146,7 +960,7 @@ export default {
|
|||||||
"ui.page_size": _debounce(function () {
|
"ui.page_size": _debounce(function () {
|
||||||
this.refreshData(false)
|
this.refreshData(false)
|
||||||
}, 300),
|
}, 300),
|
||||||
expertMode: function (newVal, oldVal) {
|
"ui.enable_expert": function (newVal, oldVal) {
|
||||||
if (!newVal) {
|
if (!newVal) {
|
||||||
this.search.search_keywords = this.search.search_keywords.map((x) => {
|
this.search.search_keywords = this.search.search_keywords.map((x) => {
|
||||||
return { ...x, not: false }
|
return { ...x, not: false }
|
||||||
@@ -1316,8 +1130,7 @@ export default {
|
|||||||
},
|
},
|
||||||
showSQL: function () {
|
showSQL: function () {
|
||||||
let params = this.buildParams()
|
let params = this.buildParams()
|
||||||
this.genericAPI(this.Models.RECIPE, this.Actions.LIST, params).then((result) => {
|
this.genericAPI(this.Models.RECIPE, this.Actions.LIST, params).then((result) => {})
|
||||||
})
|
|
||||||
},
|
},
|
||||||
// TODO refactor to combine with load KeywordChildren
|
// TODO refactor to combine with load KeywordChildren
|
||||||
loadFoodChildren({ action, parentNode, callback }) {
|
loadFoodChildren({ action, parentNode, callback }) {
|
||||||
@@ -1490,7 +1303,12 @@ export default {
|
|||||||
hasDuplicateFilter(type, count) {
|
hasDuplicateFilter(type, count) {
|
||||||
type = JSON.parse(JSON.stringify(type))
|
type = JSON.parse(JSON.stringify(type))
|
||||||
type.splice(count, type.length)
|
type.splice(count, type.length)
|
||||||
return (type.filter(x => x.operator === true && x.not === true).length > 1) || (type.filter(x => x.operator === true && x.not === false).length > 1) || (type.filter(x => x.operator === false && x.not === true).length > 1) || (type.filter(x => x.operator === false && x.not === false).length > 1)
|
return (
|
||||||
|
type.filter((x) => x.operator === true && x.not === true).length > 1 ||
|
||||||
|
type.filter((x) => x.operator === true && x.not === false).length > 1 ||
|
||||||
|
type.filter((x) => x.operator === false && x.not === true).length > 1 ||
|
||||||
|
type.filter((x) => x.operator === false && x.not === false).length > 1
|
||||||
|
)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user