somewhat working list

This commit is contained in:
vabene1111 2023-12-22 14:35:17 +01:00
parent ddf9ef11a0
commit a70ebd5130
3 changed files with 87 additions and 398 deletions

View File

@ -113,66 +113,22 @@
</div> </div>
<!-- shopping list table --> <!-- shopping list table -->
<div v-if="items && items.length > 0">
<div v-for="(categories, checked_key) in Sections" :key="checked_key">
<div v-if="checked_key == 'true'"
class="bg-header w-100 text-center d-flex justify-content-center align-items-center">
<span class="h4 d-flex mt-1 mb-1">{{ $t("Completed") }}</span>
</div>
<div v-for="(foods_group, category_key) in categories" :key="category_key"> <b-row v-for="c in shopping_list_store.category_food_entries" v-bind:key="c.id" class="pr-4 pl-4">
<div class="dropdown b-dropdown position-static inline-block" <b-col cols="12">
data-html2canvas-ignore="true" <b-button-group class="w-100 mt-1">
v-if="Object.entries(foods_group).length > 0"> <b-button variant="light" block class="btn btn-block text-left">
<button <span v-if="c.id === -1">{{$t('Undefined')}}</span>
aria-haspopup="true" <span v-else>{{ c.name}}</span>
aria-expanded="false"
type="button"
class="btn dropdown-toggle btn-link text-decoration-none text-dark pr-2 dropdown-toggle-no-caret"
@click.stop="openContextMenu($event, foods_group, true)"
>
<i class="fas fa-ellipsis-v"></i>
</button>
<b-button
class="btn btn-lg text-decoration-none text-dark px-1 py-0 border-0"
variant="link"
data-toggle="collapse"
:href="'#section-' + sectionID(checked_key, category_key)"
:aria-expanded="'true' ? checked_key == 'false' : 'true'"
>
<i class="fa fa-chevron-right rotate"/>
<span class="h6 ml-2 text-secondary">{{ category_key }}</span>
</b-button> </b-button>
</div> <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- todo implement -->
</b-button-group>
<div class="collapse" <span v-for="f in c.foods" v-bind:key="f.id">
:id="'section-' + sectionID(checked_key, category_key)" visible <shopping-line-item :entries="f['entries']" class="mt-1"/>
role="tabpanel" :class="{ show: checked_key == 'false' }"> </span>
<!-- passing an array of values to the table grouped by Food --> </b-col>
<transition-group name="slide-fade"> </b-row>
<div class="pl-4 pr-0"
v-for="(entries, index) in Object.entries(foods_group)"
:key="index">
<transition name="slide-fade" mode="out-in">
<shopping-line-item
:entries="entries[1]"
:groupby="group_by"
:settings="settings"
@open-context-menu="openContextMenu"
@update-checkbox="updateChecked"
@update-delaythis="delayThis"
/>
</transition>
</div>
</transition-group>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -704,7 +660,9 @@ export default {
id: undefined, id: undefined,
}, },
add_recipe_servings: 1, add_recipe_servings: 1,
shopping_list_height: '60vh' shopping_list_height: '60vh',
shopping_list_store: useShoppingListStore()
} }
}, },
computed: { computed: {
@ -926,6 +884,7 @@ export default {
store.refreshFromAPI() store.refreshFromAPI()
}, },
methods: { methods: {
useShoppingListStore,
/** /**
* failed requests to sync entry check events are automatically re-queued by the service worker for sync * failed requests to sync entry check events are automatically re-queued by the service worker for sync
* this command allows to manually force replaying those events before re-enabling automatic sync * this command allows to manually force replaying those events before re-enabling automatic sync

View File

@ -1,96 +1,31 @@
<template> <template>
<div id="shopping_line_item" class="pt-1"> <div id="shopping_line_item">
<b-row>
<b-col cold="12"> <b-button-group class="w-100">
<b-button-group class="mt-1 w-100 pr-5">
<b-button variant="dark" block class="btn btn-block text-left" @click="detail_modal_visible = true"> <b-button variant="dark" block class="btn btn-block text-left" @click="detail_modal_visible = true">
<span>{{ food_row }}</span> <div class="d-flex ">
<span v-if="info_row"><br/><small class="text-muted">{{ info_row }}</small></span> <div class="d-flex flex-column pr-2" v-if="Object.keys(amounts).length> 0">
<span v-for="a in amounts" v-bind:key="a.id">{{ a.amount }} {{ a.unit }}<br/></span>
</div>
<div class="d-flex flex-column flex-grow-1 align-self-center">
{{ food.name }}
</div>
</div>
<div class="flex-row">
<span v-if="info_row"><br/><small class="text-muted">{{ info_row }} INFO</small></span>
</div>
</b-button> </b-button>
<b-button variant="success" @click="updateChecked"><i class="fas fa-check"></i></b-button> <b-button variant="success"><i class="fas fa-check"></i></b-button>
</b-button-group> </b-button-group>
</b-col>
</b-row>
<!-- detail rows -->
<div class="card no-body mb-1 pt-2 align-content-center shadow-sm" v-if="showDetails">
<div v-for="(e, x) in entries" :key="e.id">
<b-row class="small justify-content-around">
<b-col cols="auto" md="4" class="overflow-hidden text-nowrap">
<button
aria-haspopup="true"
aria-expanded="false"
type="button"
class="btn btn-link btn-sm m-0 p-0 pl-2"
style="text-overflow: ellipsis"
@click.stop="openRecipeCard($event, e)"
@mouseover="openRecipeCard($event, e)"
>
{{ formatOneRecipe(e) }}
</button>
</b-col>
<b-col cols="auto" md="4" class="text-muted">{{ formatOneMealPlan(e) }}</b-col>
<b-col cols="auto" md="4" class="text-muted text-right overflow-hidden text-nowrap pr-4">
{{ formatOneCreatedBy(e) }}
<div v-if="formatOneCompletedAt(e)">{{ formatOneCompletedAt(e) }}</div>
</b-col>
</b-row>
<b-row align-h="start">
<b-col cols="3" md="2" class="justify-content-start align-items-center d-flex d-md-none pr-0"
v-if="settings.left_handed">
<input type="checkbox" class="form-control form-control-sm checkbox-control-mobile"
:checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
</b-col>
<b-col cols="2" md="1" class="align-items-center d-flex">
<div class="dropdown b-dropdown position-static inline-block" data-html2canvas-ignore="true"
@click.stop="$emit('open-context-menu', $event, e)">
<button
aria-haspopup="true"
aria-expanded="false"
type="button"
:class="settings.left_handed ? 'dropdown-spacing' : ''"
class="btn dropdown-toggle btn-link text-decoration-none text-body pr-1 pr-md-3 pl-md-3 dropdown-toggle-no-caret"
>
<i class="fas fa-ellipsis-v fa-lg"></i>
</button>
</div>
</b-col>
<b-col cols="1" class="justify-content-center align-items-center d-none d-md-flex">
<input type="checkbox" class="form-control form-control-sm checkbox-control"
:checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
</b-col>
<b-col cols="7" md="9">
<b-row class="d-flex align-items-center h-100">
<b-col cols="5" md="3" class="d-flex align-items-center">
<strong class="mr-1">{{ formatOneAmount(e) }}</strong> {{ formatOneUnit(e) }}
</b-col>
<b-col cols="7" md="6" class="align-items-center d-flex pl-0 pr-0 pl-md-2 pr-md-2">
{{ formatOneFood(e) }}
</b-col>
<b-col cols="12" class="d-flex d-md-none">
<div class="small text-muted text-truncate" v-for="(n, i) in formatOneNote(e)"
:key="i">{{ n }}
</div>
</b-col>
</b-row>
</b-col>
<b-col cols="3" md="2" class="justify-content-start align-items-center d-flex d-md-none"
v-if="!settings.left_handed">
<input type="checkbox" class="form-control form-control-sm checkbox-control-mobile"
:checked="formatChecked" @change="updateChecked" :key="entries[0].id"/>
</b-col>
</b-row>
<hr class="w-75 mt-1 mb-1 mt-md-3 mb-md-3" v-if="x !== entries.length - 1"/>
<div class="pb-1 pb-md-4" v-if="x === entries.length - 1"></div>
</div>
</div>
<b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false"> <b-modal v-model="detail_modal_visible" @hidden="detail_modal_visible = false">
<template #modal-title> <template #modal-title>
<h5> {{ food_row }}</h5> <h5> {{ food_row }}</h5>
<small class="text-muted">{{ entries[0].food.description }}</small> <small class="text-muted">{{ food.description }}</small>
</template> </template>
@ -102,25 +37,30 @@
<b-button variant="info" block>Later</b-button> <!-- TODO localize --> <b-button variant="info" block>Later</b-button> <!-- TODO localize -->
<b-button variant="danger" block>{{$t('Delete')}}</b-button> <b-button variant="danger" block>{{ $t('Delete') }}</b-button>
<h6 class="mt-2">Details</h6> <!-- TODO localize --> <h6 class="mt-2">Details</h6> <!-- TODO localize -->
<b-row v-for="e in entries" v-bind:key="e.id"> <b-row v-for="e in entries" v-bind:key="e.id">
<b-col cold="12"> <b-col cold="12">
<b-button-group class="mt-1 w-100"> <b-button-group class="mt-1 w-100">
<b-button variant="dark" block class="btn btn-block text-left"> <b-button variant="dark" block class="btn btn-block text-left">
<span>{{formatOneAmount(e)}} {{formatOneUnit(e)}} {{formatOneFood(e)}}</span> <span>{{ food.name }}</span>
<span ><br/><small class="text-muted"> <span><br/><small class="text-muted">
<span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''"> <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
<a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{e.recipe_mealplan.recipe_name}} </a>({{e.recipe_mealplan.servings}} {{$t('Servings')}})<br/> <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{ e.recipe_mealplan.recipe_name }} </a>({{
e.recipe_mealplan.servings
}} {{ $t('Servings') }})<br/>
</span> </span>
<span v-if="e.recipe_mealplan && e.recipe_mealplan.mealplan_type !== undefined"> {{ e.recipe_mealplan.mealplan_type}} {{formatDate(e.recipe_mealplan.mealplan_from_date)}} <br/></span> <span
v-if="e.recipe_mealplan && e.recipe_mealplan.mealplan_type !== undefined"> {{
e.recipe_mealplan.mealplan_type
}} {{ formatDate(e.recipe_mealplan.mealplan_from_date) }} <br/></span>
{{ e.created_by.display_name}} {{ formatDate(e.created_at)}}<br/> {{ e.created_by.display_name }} {{ formatDate(e.created_at) }}<br/>
</small></span> </small></span>
</b-button> </b-button>
<b-button variant="success" @click="updateChecked"><i class="fas fa-check"></i></b-button> <!-- TODO implement --> <b-button variant="success"><i class="fas fa-check"></i></b-button> <!-- TODO implement -->
</b-button-group> </b-button-group>
</b-col> </b-col>
@ -139,99 +79,55 @@
import Vue from "vue" import Vue from "vue"
import {BootstrapVue} from "bootstrap-vue" import {BootstrapVue} from "bootstrap-vue"
import "bootstrap-vue/dist/bootstrap-vue.css" import "bootstrap-vue/dist/bootstrap-vue.css"
import ContextMenu from "@/components/ContextMenu/ContextMenu"
import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem"
import {ApiMixin, resolveDjangoUrl} from "@/utils/utils" import {ApiMixin, resolveDjangoUrl} from "@/utils/utils"
import RecipeCard from "./RecipeCard.vue"
import Vue2TouchEvents from "vue2-touch-events"
Vue.use(BootstrapVue) Vue.use(BootstrapVue)
Vue.use(Vue2TouchEvents)
export default { export default {
// TODO ApiGenerator doesn't capture and share error information - would be nice to share error details when available
// or i'm capturing it incorrectly
name: "ShoppingLineItem", name: "ShoppingLineItem",
mixins: [ApiMixin], mixins: [ApiMixin],
components: {}, components: {},
props: { props: {
entries: { entries: {type: Object,},
type: Array,
},
settings: Object,
groupby: {type: String},
}, },
data() { data() {
return { return {
showDetails: false,
recipe: undefined,
servings: 1,
dragStartX: 0,
distance_left: 0,
detail_modal_visible: false, detail_modal_visible: false,
} }
}, },
computed: { computed: {
formatAmount: function () { food: function () {
let amount = {} return this.entries[Object.keys(this.entries)[0]]['food']
this.entries.forEach((entry) => {
let unit = entry?.unit?.name ?? "---"
if (entry.amount) {
if (amount[unit]) {
amount[unit] += entry.amount
} else {
amount[unit] = entry.amount
}
}
})
for (const [k, v] of Object.entries(amount)) {
amount[k] = Math.round(v * 100 + Number.EPSILON) / 100 // javascript hack to force rounding at 2 places
}
return amount
}, },
formatCategory: function () { amounts: function () {
return this.formatOneCategory(this.entries[0]) || this.$t("Undefined") let unit_amounts = {}
},
formatChecked: function () {
return this.entries.map((x) => x.checked).every((x) => x === true)
},
formatHint: function () {
if (this.groupby == "recipe") {
return this.formatCategory
} else {
return this.formatRecipe
}
},
formatFood: function () {
return this.formatOneFood(this.entries[0])
},
formatUnit: function () {
return this.formatOneUnit(this.entries[0])
},
formatRecipe: function () {
if (this.entries?.length == 1) {
return this.formatOneMealPlan(this.entries[0]) || ""
} else {
let mealplan_name = this.entries.filter((x) => x?.recipe_mealplan?.name)
// return [this.formatOneMealPlan(mealplan_name?.[0]), this.$t("CountMore", { count: this.entries?.length - 1 })].join(" ")
return mealplan_name for (let i in this.entries) {
.map((x) => { let e = this.entries[i]
return this.formatOneMealPlan(x)
})
.join(" - ")
}
},
formatNotes: function () {
if (this.entries?.length == 1) {
return this.formatOneNote(this.entries[0]) || ""
}
return ""
},
let unit = -1
if (e.unit !== undefined && e.unit !== null) {
unit = e.unit.id
}
if (e.amount > 0) {
if (unit in unit_amounts) {
unit_amounts[unit]['amount'] += e.amount
} else {
if (unit === -1) {
unit_amounts[unit] = {id: -1, unit: "", amount: e.amount}
} else {
unit_amounts[unit] = {id: e.unit.id, unit: e.unit.name, amount: e.amount}
}
}
}
}
return unit_amounts
},
food_row: function () { food_row: function () {
let item = this.entries[0] return this.food.name
return this.formatOneAmount(item) + " " + this.formatOneUnit(item) + " " + this.formatOneFood(item)
}, },
info_row: function () { info_row: function () {
// TODO add setting // TODO add setting
@ -275,11 +171,10 @@ export default {
}, },
watch: {}, watch: {},
mounted() { mounted() {
this.servings = this.entries?.[0]?.recipe_mealplan?.servings ?? 0
}, },
methods: { methods: {
resolveDjangoUrl, resolveDjangoUrl,
// this.genericAPI inherited from ApiMixin
formatDate: function (datetime) { formatDate: function (datetime) {
if (!datetime) { if (!datetime) {
@ -290,187 +185,12 @@ export default {
timeStyle: "short", timeStyle: "short",
}).format(Date.parse(datetime)) }).format(Date.parse(datetime))
}, },
startHandler: function (event) {
if (event.changedTouches.length > 0) {
this.dragStartX = event.changedTouches[0].clientX
}
},
getOffset(el) {
let rect = el.getBoundingClientRect();
return {
left: rect.left + window.scrollX,
top: rect.top + window.scrollY,
right: rect.right - window.scrollX,
};
},
moveHandler: function (event) {
let item = this.$refs['shopping_line_item'];
this.distance_left = event.changedTouches[0].clientX - this.dragStartX;
item.style.marginLeft = this.distance_left
item.style.marginRight = -this.distance_left
item.style.backgroundColor = '#ddbf86'
item.style.border = "1px solid #000"
let delay_icon = this.$refs['delay_icon']
let check_icon = this.$refs['check_icon']
let color_factor = Math.abs(this.distance_left) / 100
if (this.distance_left > 0) {
item.parentElement.parentElement.style.backgroundColor = 'rgba(130,170,139,0)'.replace(/[^,]+(?=\))/, color_factor)
check_icon.style.display = "block"
check_icon.style.left = this.getOffset(item.parentElement.parentElement).left + 40
check_icon.style.top = this.getOffset(item.parentElement.parentElement).top - 92
check_icon.style.opacity = color_factor - 0.3
} else {
item.parentElement.parentElement.style.backgroundColor = 'rgba(185,135,102,0)'.replace(/[^,]+(?=\))/, color_factor)
delay_icon.style.display = "block"
delay_icon.style.left = this.getOffset(item.parentElement.parentElement).right - 40
delay_icon.style.top = this.getOffset(item.parentElement.parentElement).top - 92
delay_icon.style.opacity = color_factor - 0.3
}
},
endHandler: function (event) {
let item = this.$refs['shopping_line_item'];
item.removeAttribute('style');
item.parentElement.parentElement.removeAttribute('style');
let delay_icon = this.$refs['delay_icon']
let check_icon = this.$refs['check_icon']
delay_icon.style.display = "none"
check_icon.style.display = "none"
if (Math.abs(this.distance_left) > window.screen.width / 6) {
if (this.distance_left > 0) {
let checked = false;
this.entries.forEach((cur) => {
checked = cur.checked
})
let update = {entries: this.entries.map((x) => x.id), checked: !checked}
this.$emit("update-checkbox", update)
} else {
this.$emit("update-delaythis", this.entries)
}
}
},
formatOneAmount: function (item) {
return item?.amount ?? 1
},
formatOneUnit: function (item) {
return item?.unit?.name ?? ""
},
formatOneCategory: function (item) {
return item?.food?.supermarket_category?.name
},
formatOneCompletedAt: function (item) {
if (!item.completed_at) {
return false
}
return [this.$t("Completed"), "@", this.formatDate(item.completed_at)].join(" ")
},
formatOneFood: function (item) {
return item.food.name
},
formatOneDelayUntil: function (item) {
if (!item.delay_until || (item.delay_until && item.checked)) {
return false
}
return [this.$t("DelayUntil"), "-", this.formatDate(item.delay_until)].join(" ")
},
formatOneMealPlan: function (item) {
return item?.recipe_mealplan?.name ?? ""
},
formatOneRecipe: function (item) {
return item?.recipe_mealplan?.recipe_name ?? ""
},
formatOneNote: function (item) {
if (!item) {
item = this.entries[0]
}
return [item?.recipe_mealplan?.mealplan_note, item?.ingredient_note].filter(String)
},
formatOneCreatedBy: function (item) {
return [this.$t("Added_by"), item?.created_by.display_name, "@", this.formatDate(item.created_at)].join(" ")
},
openRecipeCard: function (e, item) {
this.genericAPI(this.Models.RECIPE, this.Actions.FETCH, {id: item.recipe_mealplan.recipe}).then((result) => {
let recipe = result.data
recipe.steps = undefined
this.recipe = true
this.$refs.recipe_card.open(e, recipe)
})
},
updateChecked: function (e, item) {
let update = undefined
if (!item) {
update = {entries: this.entries.map((x) => x.id), checked: !this.formatChecked}
} else {
update = {entries: [item], checked: !item.checked}
}
console.log(update)
this.$emit("update-checkbox", update)
},
}, },
} }
</script> </script>
<!--style src="vue-multiselect/dist/vue-multiselect.min.css"></style-->
<style> <style>
/* table { border-collapse:collapse } /* Ensure no space between cells */
/* tr.strikeout td { position:relative } /* Setup a new coordinate system */
/* tr.strikeout td:before { /* Create a new element that */
/* content: " "; /* …has no text content */
/* position: absolute; /* …is absolutely positioned */
/* left: 0; top: 50%; width: 100%; /* …with the top across the middle */
/* border-bottom: 1px solid #000; /* …and with a border on the top */
/* } */
.checkbox-control {
font-size: 0.6rem;
}
.checkbox-control-mobile {
font-size: 1rem;
}
.rotate {
-moz-transition: all 0.25s linear;
-webkit-transition: all 0.25s linear;
transition: all 0.25s linear;
}
.rotated {
-moz-transform: rotate(90deg);
-webkit-transform: rotate(90deg);
transform: rotate(90deg);
}
.unit-badge-lg {
font-size: 1rem !important;
font-weight: 500 !important;
}
@media (max-width: 768px) {
.dropdown-spacing {
padding-left: 0 !important;
padding-right: 0 !important;
}
}
.invis-border {
border: 1px solid transparent;
}
@media (min-width: 992px) {
.fa-ellipsis-v {
font-size: 20px;
}
}
@media (min-width: 576px) {
.fa-ellipsis-v {
font-size: 16px;
}
}
</style> </style>

View File

@ -106,6 +106,16 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
} }
return -1 return -1
}, },
toggleFoodCheckedState(food) {
/**
* function to handle user checking or unchecking a food
*/
this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries'].forEach(e => {
e.checked = !e.checked
this.updateObject(e)
})
},
delayFood(food) { delayFood(food) {
/** /**
* function to handle user "delaying" shopping entry * function to handle user "delaying" shopping entry