cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new search and setting

Browse Source
This commit is contained in:
vabene1111 2021-04-18 11:03:15 +02:00
parent f78f7dfc14
commit 99004ad34b
9 changed files with 73 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cookbook/models.py
View File

@ -115,8 +115,9 @@ class UserPreference(models.Model, PermissionModelMixin):
# Search Style # Search Style
SMALL = 'SMALL' SMALL = 'SMALL'
LARGE = 'LARGE' LARGE = 'LARGE'
NEW = 'NEW'
SEARCH_STYLE = ((SMALL, _('Small')), (LARGE, _('Large')),) SEARCH_STYLE = ((SMALL, _('Small')), (LARGE, _('Large')), (NEW, _('New')))
user = AutoOneToOneField(User, on_delete=models.CASCADE, primary_key=True) user = AutoOneToOneField(User, on_delete=models.CASCADE, primary_key=True)
theme = models.CharField(choices=THEMES, max_length=128, default=FLATLY) theme = models.CharField(choices=THEMES, max_length=128, default=FLATLY)

2
cookbook/static/vue/js/import_response_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/offline_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/recipe_search_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/recipe_view.js
View File

File diff suppressed because one or more lines are too long

3
cookbook/views/views.py
View File

@ -55,6 +55,9 @@ def index(request):
def search(request): def search(request):
if has_group_permission(request.user, ('guest',)): if has_group_permission(request.user, ('guest',)):
if request.user.userpreference.search_style == UserPreference.NEW:
return search_v2(request)
f = RecipeFilter(request.GET, f = RecipeFilter(request.GET,
queryset=Recipe.objects.filter(space=request.user.userpreference.space).all().order_by('name'), queryset=Recipe.objects.filter(space=request.user.userpreference.space).all().order_by('name'),
space=request.space) space=request.space)

61
vue/src/apps/RecipeSearchView/RecipeSearchView.vue
View File

@ -28,18 +28,23 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-3">
<a class="btn btn-primary" :href="resolveDjangoUrl('new_recipe')">new Recipe</a> <a class="btn btn-primary btn-block text-uppercase"
:href="resolveDjangoUrl('new_recipe')">{{ $t('New_Recipe') }}</a>
</div> </div>
<div class="col-md-4"> <div class="col-md-3">
<a class="btn btn-primary" :href="resolveDjangoUrl('data_import_url')">URL Import</a> <a class="btn btn-primary btn-block text-uppercase"
:href="resolveDjangoUrl('data_import_url')">{{ $t('Url_Import') }}</a>
</div> </div>
<div class="col-md-4"> <div class="col-md-3">
<a class="btn btn-primary" href="#">Rest Search</a> <button class="btn btn-primary btn-block text-uppercase" @click="resetSearch">
{{ $t('Reset_Search') }}
</button>
</div> </div>
<div class="col-md-4"> <div class="col-md-3" style="position: relative;">
<b-form-checkbox v-model="search_internal" name="check-button" @change="refreshData" <b-form-checkbox v-model="search_internal" name="check-button" @change="refreshData"
class="shadow-none" switch> class="shadow-none"
style="position:relative;top: 50%; transform: translateY(-50%);" switch>
{{ $t('show_only_internal') }} {{ $t('show_only_internal') }}
</b-form-checkbox> </b-form-checkbox>
</div> </div>
@ -52,15 +57,19 @@
<b-input-group style="margin-top: 1vh"> <b-input-group style="margin-top: 1vh">
<generic-multiselect @change="genericSelectChanged" parent_variable="search_keywords" <generic-multiselect @change="genericSelectChanged" parent_variable="search_keywords"
:initial_selection="search_keywords"
search_function="listKeywords" label="label" style="width: 90%" search_function="listKeywords" label="label" style="width: 90%"
v-bind:placeholder="$t('Keywords')"></generic-multiselect> v-bind:placeholder="$t('Keywords')"></generic-multiselect>
<b-input-group-append is-text style="width: 10%"> <b-input-group-append style="width: 10%">
<b-input-group-text style="width: 100%">
<b-form-checkbox v-model="search_keywords_or" name="check-button" @change="refreshData" <b-form-checkbox v-model="search_keywords_or" name="check-button" @change="refreshData"
class="shadow-none" style="width: 100%" switch> class="shadow-none" switch>
<template v-if="search_keywords_or">{{ $t('OR') }}</template> <span class="text-uppercase" v-if="search_keywords_or">{{ $t('or') }}</span>
<template v-else>{{ $t('AND') }}</template> <span class="text-uppercase" v-else>{{ $t('and') }}</span>
</b-form-checkbox> </b-form-checkbox>
</b-input-group-text>
</b-input-group-append> </b-input-group-append>
</b-input-group> </b-input-group>
</div> </div>
@ -71,14 +80,17 @@
<b-input-group style="margin-top: 1vh"> <b-input-group style="margin-top: 1vh">
<generic-multiselect @change="genericSelectChanged" parent_variable="search_foods" <generic-multiselect @change="genericSelectChanged" parent_variable="search_foods"
:initial_selection="search_foods"
search_function="listFoods" label="name" style="width: 90%" search_function="listFoods" label="name" style="width: 90%"
v-bind:placeholder="$t('Ingredients')"></generic-multiselect> v-bind:placeholder="$t('Ingredients')"></generic-multiselect>
<b-input-group-append is-text style="width: 10%"> <b-input-group-append style="width: 10%">
<b-input-group-text style="width: 100%">
<b-form-checkbox v-model="search_foods_or" name="check-button" @change="refreshData" <b-form-checkbox v-model="search_foods_or" name="check-button" @change="refreshData"
class="shadow-none" tyle="width: 100%" switch> class="shadow-none" switch>
{{ $t('OR') }} <span class="text-uppercase" v-if="search_foods_or">{{ $t('or') }}</span>
<span class="text-uppercase" v-else>{{ $t('and') }}</span>
</b-form-checkbox> </b-form-checkbox>
</b-input-group-text>
</b-input-group-append> </b-input-group-append>
</b-input-group> </b-input-group>
@ -90,13 +102,18 @@
<b-input-group style="margin-top: 1vh"> <b-input-group style="margin-top: 1vh">
<generic-multiselect @change="genericSelectChanged" parent_variable="search_books" <generic-multiselect @change="genericSelectChanged" parent_variable="search_books"
:initial_selection="search_books"
search_function="listRecipeBooks" label="name" style="width: 90%" search_function="listRecipeBooks" label="name" style="width: 90%"
v-bind:placeholder="$t('Books')"></generic-multiselect> v-bind:placeholder="$t('Books')"></generic-multiselect>
<b-input-group-append is-text style="width: 10%"> <b-input-group-append style="width: 10%">
<b-input-group-text style="width: 100%">
<b-form-checkbox v-model="search_books_or" name="check-button" @change="refreshData" <b-form-checkbox v-model="search_books_or" name="check-button" @change="refreshData"
class="shadow-none" tyle="width: 100%" switch> class="shadow-none" tyle="width: 100%" switch>
{{ $t('OR') }} <span class="text-uppercase" v-if="search_books_or">{{ $t('or') }}</span>
<span class="text-uppercase" v-else>{{ $t('and') }}</span>
</b-form-checkbox> </b-form-checkbox>
</b-input-group-text>
</b-input-group-append> </b-input-group-append>
</b-input-group> </b-input-group>
@ -203,6 +220,14 @@ export default {
genericSelectChanged: function (obj) { genericSelectChanged: function (obj) {
this[obj.var] = obj.val this[obj.var] = obj.val
this.refreshData() this.refreshData()
},
resetSearch: function () {
this.search_input = ''
this.search_internal = false
this.search_keywords = []
this.search_foods = []
this.search_books = []
this.refreshData()
} }
} }
} }

9
vue/src/components/GenericMultiselect.vue
View File

@ -36,6 +36,15 @@ export default {
search_function: String, search_function: String,
label: String, label: String,
parent_variable: String, parent_variable: String,
initial_selection: Array,
},
watch: {
initial_selection: function (newVal, oldVal) { // watch it
this.selected_objects = newVal
}
},
mounted() {
this.search('')
}, },
methods: { methods: {
search: function (query) { search: function (query) {

7
vue/src/locales/en.json
View File

@ -16,6 +16,9 @@
"Import_finished": "Import finished", "Import_finished": "Import finished",
"View_Recipes": "View Recipes", "View_Recipes": "View Recipes",
"Log_Cooking": "Log Cooking", "Log_Cooking": "Log Cooking",
"New_Recipe": "New Recipe",
"Url_Import": "Url Import",
"Reset_Search": "Reset Search",
"Keywords": "Keywords", "Keywords": "Keywords",
"Books": "Books", "Books": "Books",
@ -42,7 +45,7 @@
"Search": "Search", "Search": "Search",
"Import": "Import", "Import": "Import",
"Print": "Print", "Print": "Print",
"OR": "OR", "or": "or",
"AND": "AND", "and": "and",
"Information": "Information" "Information": "Information"
} }