-
-
-
+
+
-
+ updateShoppingList: function () {
+ this.loading = true
+ let recipe_promises = []
+
+ for (let i in this.shopping_list.recipes) {
+ if (this.shopping_list.recipes[i].created) {
+ console.log('updating recipe', this.shopping_list.recipes[i])
+ recipe_promises.push(this.$http.post("{% url 'api:shoppinglistrecipe-list' %}", this.shopping_list.recipes[i], {}).then((response) => {
+ let old_id = this.shopping_list.recipes[i].id
+ console.log("list recipe create respose ", response.body)
+ this.$set(this.shopping_list.recipes, i, response.body)
+ for (let e of this.shopping_list.entries.filter(item => item.list_recipe === old_id)) {
+ console.log("found recipe updating ID")
+ e.list_recipe = this.shopping_list.recipes[i].id
+ }
+ }).catch((err) => {
+ console.log(err)
+ this.makeToast(gettext('Error'), gettext("There was an error updating a resource!") + err.bodyText, 'danger')
+ }))
+ }
+ }
+
+ Promise.allSettled(recipe_promises).then(() => {
+ console.log("proceeding to update shopping list", this.shopping_list)
+
+ if (this.shopping_list.id === undefined) {
+ return this.$http.post("{% url 'api:shoppinglist-list' %}", this.shopping_list, {}).then((response) => {
+ console.log(response)
+ this.makeToast(gettext('Updated'), gettext("Object created successfully!"), 'success')
+ this.loading = false
+
+ this.shopping_list = response.body
+ this.shopping_list_id = this.shopping_list.id
+
+ window.history.pushState('shopping_list', '{% trans 'Shopping List' %}', "{% url 'view_shopping' 123456 %}".replace('123456', this.shopping_list_id));
+ }).catch((err) => {
+ console.log(err)
+ this.makeToast(gettext('Error'), gettext("There was an error creating a resource!") + err.bodyText, 'danger')
+ this.loading = false
+ })
+ } else {
+ return this.$http.put("{% url 'api:shoppinglist-detail' 123456 %}".replace('123456', this.shopping_list.id), this.shopping_list, {}).then((response) => {
+ console.log(response)
+ this.shopping_list = response.body
+ this.makeToast(gettext('Updated'), gettext("Changes saved successfully!"), 'success')
+ this.loading = false
+ }).catch((err) => {
+ console.log(err)
+ this.makeToast(gettext('Error'), gettext("There was an error updating a resource!") + err.bodyText, 'danger')
+ this.loading = false
+ })
+ }
+
+
+ })
+ },
+ sortEntries: function (a, b) {
+
+ },
+ dragChanged: function (category, evt) {
+ if (evt.added !== undefined) {
+ if (evt.added.element.id === undefined) {
+ this.makeToast(gettext('Warning'), gettext('This feature is only available after saving the shopping list'), 'warning')
+ } else {
+ this.shopping_list.entries.forEach(entry => {
+ if (entry.id === evt.added.element.id) {
+ if (category.id === -1) {
+ entry.food.supermarket_category = null
+ } else {
+ entry.food.supermarket_category = {
+ name: category.name,
+ id: category.id
+ }
+ }
+ this.$http.put(("{% url 'api:food-detail' 123456 %}").replace('123456', entry.food.id), entry.food).then((response) => {
+
+ }).catch((err) => {
+ this.makeToast(gettext('Error'), gettext('There was an error updating a resource!') + err.bodyText, 'danger')
+ })
+ }
+ })
+ }
+
+
+ }
+ },
+ entryChecked: function (entry) {
+ this.auto_sync_blocked = true
+ let updates = []
+ this.shopping_list.entries.forEach((item) => {
+ if (entry.entries.includes(item.id)) {
+ item.checked = entry.checked
+ updates.push(this.$http.put("{% url 'api:shoppinglistentry-detail' 123456 %}".replace('123456', item.id), item, {}).then((response) => {
+
+ }).catch((err) => {
+ console.log(err)
+ this.makeToast(gettext('Error'), gettext('There was an error updating a resource!') + err.bodyText, 'danger')
+ this.loading = false
+ }))
+ }
+ })
+
+ Promise.allSettled(updates).then(() => {
+ this.auto_sync_blocked = false
+ if (this.unchecked_entries < 1) {
+ this.shopping_list.finished = true
+
+ this.$http.put("{% url 'api:shoppinglist-detail' 123456 %}".replace('123456', this.shopping_list.id), this.shopping_list, {}).then((response) => {
+ this.makeToast(gettext('Finished'), gettext('Shopping list finished!'), 'success')
+ }).catch((err) => {
+ console.log(err)
+ this.makeToast(gettext('Error'), gettext("There was an error updating a resource!") + err.bodyText, 'danger')
+ })
+ } else {
+ if (this.unchecked_entries > 0 && this.shopping_list.finished) {
+ this.shopping_list.finished = false
+
+ this.$http.put("{% url 'api:shoppinglist-detail' 123456 %}".replace('123456', this.shopping_list.id), this.shopping_list, {}).then((response) => {
+ this.makeToast(gettext('Open'), gettext('Shopping list reopened!'), 'success')
+ }).catch((err) => {
+ console.log(err)
+ this.makeToast(gettext('Error'), gettext("There was an error updating a resource!") + err.bodyText, 'danger')
+ })
+ }
+ }
+ })
+ },
+ addEntry: function () {
+ if (this.new_entry.food !== undefined) {
+ this.shopping_list.entries.push({
+ 'list_recipe': null,
+ 'food': this.new_entry.food,
+ 'unit': this.new_entry.unit,
+ 'amount': parseFloat(this.new_entry.amount),
+ 'order': 0,
+ 'checked': false,
+ })
+
+ this.new_entry = {
+ unit: undefined,
+ amount: undefined,
+ food: undefined,
+ }
+
+ this.$refs.new_entry_amount.focus();
+ } else {
+ this.makeToast(gettext('Error'), gettext('Please enter a valid food'), 'danger')
+ }
+ },
+ addSimpleEntry: function () {
+ if (this.simple_entry !== '') {
+
+ this.$http.post('{% url 'api_ingredient_from_string' %}', {text: this.simple_entry}, {emulateJSON: true}).then((response) => {
+
+ console.log(response)
+
+ let unit = null
+ if (response.body.unit !== '') {
+ unit = {'name': response.body.unit}
+ }
+
+ this.shopping_list.entries.push({
+ 'list_recipe': null,
+ 'food': {'name': response.body.food, supermarket_category: null},
+ 'unit': unit,
+ 'amount': response.body.amount,
+ 'order': 0,
+ 'checked': false,
+ })
+
+ this.simple_entry = ''
+ }).catch((err) => {
+ console.log(err)
+ this.makeToast(gettext('Error'), gettext('Something went wrong while trying to add the simple entry.'), 'danger')
+ })
+ }
+ },
+ getRecipes: function () {
+ let url = "{% url 'api:recipe-list' %}?page_size=5&internal=true"
+ if (this.recipe_query !== '') {
+ url += '&query=' + this.recipe_query;
+ } else {
+ this.recipes = []
+ return
+ }
+
+ this.$http.get(url).then((response) => {
+ this.recipes = response.data.results;
+ }).catch((err) => {
+ console.log("getRecipes error: ", err);
+ this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')
+ })
+ },
+ getRecipeUrl: function (id) {
+ return '{% url 'view_recipe' 123456 %}'.replace('123456', id)
+ },
+ addRecipeToList: function (recipe, servings = 1) {
+ let slr = {
+ "created": true,
+ "id": Math.random() * 1000,
+ "recipe": recipe.id,
+ "recipe_name": recipe.name,
+ "servings": servings,
+ }
+ this.shopping_list.recipes.push(slr)
+
+ this.$http.get('{% url 'api:recipe-detail' 123456 %}'.replace('123456', recipe.id)).then((response) => {
+ for (let s of response.data.steps) {
+ for (let i of s.ingredients) {
+ if (!i.is_header && i.food !== null && i.food.ignore_shopping === false) {
+ this.shopping_list.entries.push({
+ 'list_recipe': slr.id,
+ 'food': i.food,
+ 'unit': i.unit,
+ 'amount': i.amount,
+ 'order': 0
+ })
+ }
+ }
+ }
+ }).catch((err) => {
+ this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')
+ })
+ },
+ removeRecipeFromList: function (slr) {
+ this.shopping_list.entries = this.shopping_list.entries.filter(item => item.list_recipe !== slr.id)
+ this.shopping_list.recipes = this.shopping_list.recipes.filter(item => item !== slr)
+ },
+ searchKeywords: function (query) {
+ this.keywords_loading = true
+ this.$http.get("{% url 'api:keyword-list' %}" + '?query=' + query + '&limit=10').then((response) => {
+ this.keywords = response.data.results;
+ this.keywords_loading = false
+ }).catch((err) => {
+ console.log(err)
+ this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')
+ })
+ },
+
+ searchUnits: function (query) {
+ this.units_loading = true
+ this.$http.get("{% url 'api:unit-list' %}" + '?query=' + query + '&limit=10').then((response) => {
+ this.units = response.data.results;
+ this.units_loading = false
+ }).catch((err) => {
+ this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')
+ })
+ },
+ searchFoods: function (query) {
+ this.foods_loading = true
+ this.$http.get("{% url 'api:food-list' %}" + '?query=' + query + '&limit=10').then((response) => {
+ this.foods = response.data.results
+ this.foods_loading = false
+ }).catch((err) => {
+ this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')
+ })
+ },
+ addFoodType: function (tag, index) {
+ let new_food = {'name': tag, supermarket_category: null}
+ this.foods.push(new_food)
+ this.new_entry.food = new_food
+ },
+ addUnitType: function (tag, index) {
+ let new_unit = {'name': tag}
+ this.units.push(new_unit)
+ this.new_entry.unit = new_unit
+ },
+ searchUsers: function (query) {
+ this.users_loading = true
+ this.$http.get("{% url 'api:username-list' %}" + '?query=' + query + '&limit=10').then((response) => {
+ this.users = response.data
+ this.users_loading = false
+ }).catch((err) => {
+ this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')
+ })
+ },
+ searchSupermarket: function (query) { //TODO move to central component
+ this.supermarkets_loading = true
+ this.$http.get("{% url 'api:supermarket-list' %}" + '?query=' + query + '&limit=10').then((response) => {
+ this.supermarkets = response.data
+ this.supermarkets_loading = false
+ }).catch((err) => {
+ this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')
+ })
+ },
+ },
+ beforeDestroy() {
+ window.removeEventListener('online', this.updateOnlineStatus);
+ window.removeEventListener('offline', this.updateOnlineStatus);
+ }
+ });
+
{% endblock %}
diff --git a/cookbook/views/views.py b/cookbook/views/views.py
index 0eb2a4852..2252acc15 100644
--- a/cookbook/views/views.py
+++ b/cookbook/views/views.py
@@ -387,6 +387,7 @@ def user_settings(request):
up.shopping_auto_sync = shopping_form.cleaned_data['shopping_auto_sync']
up.filter_to_supermarket = shopping_form.cleaned_data['filter_to_supermarket']
up.default_delay = shopping_form.cleaned_data['default_delay']
+ up.shopping_recent_days = shopping_form.cleaned_data['shopping_recent_days']
if up.shopping_auto_sync < settings.SHOPPING_MIN_AUTOSYNC_INTERVAL:
up.shopping_auto_sync = settings.SHOPPING_MIN_AUTOSYNC_INTERVAL
up.save()
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 19a9b58ee..0ad2e824f 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -25,24 +25,10 @@
{{ $t("filter_to_supermarket") }}
@@ -459,6 +457,7 @@ import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem"
import ShoppingLineItem from "@/components/ShoppingLineItem"
import GenericMultiselect from "@/components/GenericMultiselect"
import GenericPill from "@/components/GenericPill"
+import LookupInput from "@/components/Modals/LookupInput"
import draggable from "vuedraggable"
import { ApiMixin, getUserPreference } from "@/utils/utils"
@@ -470,7 +469,7 @@ Vue.use(BootstrapVue)
export default {
name: "ShoppingListView",
mixins: [ApiMixin],
- components: { ContextMenu, ContextMenuItem, ShoppingLineItem, GenericMultiselect, GenericPill, draggable },
+ components: { ContextMenu, ContextMenuItem, ShoppingLineItem, GenericMultiselect, GenericPill, draggable, LookupInput },
data() {
return {
@@ -492,6 +491,7 @@ export default {
mealplan_autoinclude_related: false,
mealplan_autoexclude_onhand: true,
filter_to_supermarket: false,
+ shopping_recent_days: 7,
},
new_supermarket: { entrymode: false, value: undefined, editmode: undefined },
new_category: { entrymode: false, value: undefined },
@@ -577,6 +577,16 @@ export default {
defaultDelay() {
return getUserPreference("default_delay") || 2
},
+ formUnit() {
+ let unit = this.Models.SHOPPING_LIST.create.form.unit
+ unit.value = this.new_item.unit
+ return unit
+ },
+ formFood() {
+ let food = this.Models.SHOPPING_LIST.create.form.food
+ food.value = this.new_item.food
+ return food
+ },
itemsDelayed() {
return this.items.filter((x) => !x.delay_until || !Date.parse(x?.delay_until) > new Date(Date.now())).length < this.items.length
},
@@ -647,6 +657,10 @@ export default {
},
methods: {
// this.genericAPI inherited from ApiMixin
+ test(e) {
+ this.new_item.unit = e
+ console.log(e, this.new_item, this.formUnit)
+ },
addItem() {
let api = new ApiApiFactory()
api.createShoppingListEntry(this.new_item)
diff --git a/vue/src/apps/SupermarketView/SupermarketView.vue b/vue/src/apps/SupermarketView/SupermarketView.vue
index 2559a1429..821504c9f 100644
--- a/vue/src/apps/SupermarketView/SupermarketView.vue
+++ b/vue/src/apps/SupermarketView/SupermarketView.vue
@@ -1,201 +1,178 @@
+
+
+
+
+
{{ $t("Supermarket") }}
-
+
-
+
+ {{ $t("Edit") }}
+
+ {{ $t("New") }}
+
+
-
-
{{ $t('Supermarket') }}
+
-
-
+
+
+
+ {{ $t("Categories") }}
+
+
-
- {{ $t('Edit') }}
-
- {{ $t('New') }}
-
-
+
+
+
+
+
+
+
+
{{ $t("Selected") }} {{ $t("Categories") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
{{ $t('Categories') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ $t('Selected') }} {{ $t('Categories') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/vue/src/components/Modals/GenericModalForm.vue b/vue/src/components/Modals/GenericModalForm.vue
index 1e2d22379..4855f89bc 100644
--- a/vue/src/components/Modals/GenericModalForm.vue
+++ b/vue/src/components/Modals/GenericModalForm.vue
@@ -8,7 +8,6 @@
{{ f.label }}
-
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 36385620b..d2546dff5 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -238,7 +238,6 @@
"mealplan_autoinclude_related_desc": "When adding a meal plan to the shopping list (manually or automatically), include all related recipes.",
"default_delay_desc": "Default number of hours to delay a shopping list entry.",
"filter_to_supermarket": "Filter to Supermarket",
- "filter_to_supermarket_desc": "Filter shopping list to only include supermarket categories.",
"Week_Numbers": "Week numbers",
"Show_Week_Numbers": "Show week numbers ?",
"Export_As_ICal": "Export current period to iCal format",
@@ -260,6 +259,10 @@
"nothing": "Nothing to do",
"err_merge_self": "Cannot merge item with itself",
"show_sql": "Show SQL",
+ "filter_to_supermarket_desc": "By default, filter shopping list to only include categories for selected supermarket.",
"CategoryName": "Category Name",
- "SupermarketName": "Supermarket Name"
+ "SupermarketName": "Supermarket Name",
+ "CategoryInstruction": "Drag categories to change the order categories appear in shopping list.",
+ "shopping_recent_days_desc": "Days of recent shopping list entries to display.",
+ "shopping_recent_days": "Recent Days"
}
diff --git a/vue/src/utils/models.js b/vue/src/utils/models.js
index 312e6cc91..ab94efdc6 100644
--- a/vue/src/utils/models.js
+++ b/vue/src/utils/models.js
@@ -216,6 +216,24 @@ export class Models {
},
create: {
params: [["amount", "unit", "food", "checked"]],
+ form: {
+ unit: {
+ form_field: true,
+ type: "lookup",
+ field: "unit",
+ list: "UNIT",
+ label: i18n.t("Unit"),
+ allow_create: true,
+ },
+ food: {
+ form_field: true,
+ type: "lookup",
+ field: "food",
+ list: "FOOD",
+ label: i18n.t("Food"),
+ allow_create: true,
+ },
+ },
},
}