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

fix after rebase

Browse Source
This commit is contained in:
smilerz
2021-11-30 14:33:13 -06:00
parent fdd86b0c2d
commit 7ad088d953
3 changed files with 49 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cookbook/templates/shopping_list.html
View File

@ -19,23 +19,10 @@
<script src="{% static 'js/js.cookie.min.js' %}"></script>
<link rel="stylesheet" href="{% static 'css/pretty-checkbox.min.css' %}" />
{% endblock %} {% block content %}
<script src="{% static 'js/js.cookie.min.js' %}"></script>
<link rel="stylesheet" href="{% static 'css/pretty-checkbox.min.css' %}">
{% endblock %}
{% block content %}
<div class="row">
<span class="col col-md-9">
<h2>{% trans 'Shopping List' %}</h2>
</span>
<div class="col col-mdd-3 text-right">
<b-form-checkbox switch size="lg" v-model="edit_mode"
@change="$forceUpdate()">{% trans 'Edit' %}</b-form-checkbox>
</div>
<div class="row">
<span class="col col-md-9">
<h2>{% trans 'Shopping List' %}</h2>

44
cookbook/tests/factories/__init__.py
View File

@ -71,16 +71,16 @@ class FoodFactory(factory.django.DjangoModelFactory):
"""Food factory."""
name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=3))
description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
# supermarket_category = factory.Maybe(
# factory.LazyAttribute(lambda x: x.has_category),
# yes_declaration=factory.SubFactory(SupermarketCategoryFactory, space=factory.SelfAttribute('..space')),
# no_declaration=None
# )
# recipe = factory.Maybe(
# factory.LazyAttribute(lambda x: x.has_recipe),
# yes_declaration=factory.SubFactory('cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')),
# no_declaration=None
# )
supermarket_category = factory.Maybe(
factory.LazyAttribute(lambda x: x.has_category),
yes_declaration=factory.SubFactory(SupermarketCategoryFactory, space=factory.SelfAttribute('..space')),
no_declaration=None
)
recipe = factory.Maybe(
factory.LazyAttribute(lambda x: x.has_recipe),
yes_declaration=factory.SubFactory('cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')),
no_declaration=None
)
space = factory.SubFactory(SpaceFactory)
class Params:
@ -178,21 +178,21 @@ class ShoppingListRecipeFactory(factory.django.DjangoModelFactory):
class ShoppingListEntryFactory(factory.django.DjangoModelFactory):
"""ShoppingListEntry factory."""
# list_recipe = factory.Maybe(
# factory.LazyAttribute(lambda x: x.has_mealplan),
# yes_declaration=factory.SubFactory(ShoppingListRecipeFactory, space=factory.SelfAttribute('..space')),
# no_declaration=None
# )
list_recipe = factory.Maybe(
factory.LazyAttribute(lambda x: x.has_mealplan),
yes_declaration=factory.SubFactory(ShoppingListRecipeFactory, space=factory.SelfAttribute('..space')),
no_declaration=None
)
food = factory.SubFactory(FoodFactory, space=factory.SelfAttribute('..space'))
# unit = factory.SubFactory(UnitFactory, space=factory.SelfAttribute('..space'))
# # ingredient = factory.SubFactory(IngredientFactory)
# amount = factory.LazyAttribute(lambda x: Decimal(faker.random_int(min=1, max=10))/100)
# order = 0
# checked = False
# created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
# created_at = factory.LazyAttribute(lambda x: faker.past_date())
# completed_at = None
# delay_until = None
amount = factory.LazyAttribute(lambda x: Decimal(faker.random_int(min=1, max=10))/100)
order = 0
checked = False
created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
created_at = factory.LazyAttribute(lambda x: faker.past_date())
completed_at = None
delay_until = None
space = factory.SubFactory('cookbook.tests.factories.SpaceFactory')
class Params:

54
vue/src/utils/openapi/api.ts
View File

@ -1081,10 +1081,10 @@ export interface MealPlan {
created_by?: string;
/**
*
* @type {Array<number>}
* @type {Array<MealPlanShared>}
* @memberof MealPlan
*/
shared?: Array<number>;
shared?: Array<MealPlanShared> | null;
/**
*
* @type {string}
@ -1269,6 +1269,25 @@ export interface MealPlanRecipeKeywords {
*/
label?: string;
}
/**
*
* @export
* @interface MealPlanShared
*/
export interface MealPlanShared {
/**
*
* @type {number}
* @memberof MealPlanShared
*/
id?: number;
/**
*
* @type {string}
* @memberof MealPlanShared
*/
username?: string;
}
/**
*
* @export
@ -1465,10 +1484,10 @@ export interface RecipeBook {
icon?: string | null;
/**
*
* @type {Array<RecipeBookShared>}
* @type {Array<MealPlanShared>}
* @memberof RecipeBook
*/
shared: Array<RecipeBookShared>;
shared: Array<MealPlanShared>;
/**
*
* @type {string}
@ -1513,25 +1532,6 @@ export interface RecipeBookEntry {
*/
recipe_content?: string;
}
/**
*
* @export
* @interface RecipeBookShared
*/
export interface RecipeBookShared {
/**
*
* @type {number}
* @memberof RecipeBookShared
*/
id?: number;
/**
*
* @type {string}
* @memberof RecipeBookShared
*/
username?: string;
}
/**
*
* @export
@ -2029,10 +2029,10 @@ export interface ShoppingList {
entries: Array<ShoppingListEntries> | null;
/**
*
* @type {Array<RecipeBookShared>}
* @type {Array<MealPlanShared>}
* @memberof ShoppingList
*/
shared: Array<RecipeBookShared>;
shared: Array<MealPlanShared>;
/**
*
* @type {boolean}
@ -2960,10 +2960,10 @@ export interface UserPreference {
show_recent?: boolean;
/**
*
* @type {Array<number>}
* @type {Array<MealPlanShared>}
* @memberof UserPreference
*/
plan_share?: Array<number>;
plan_share?: Array<MealPlanShared> | null;
/**
*
* @type {number}