meal plan sort order

This commit is contained in:
vabene1111
2025-06-11 21:48:22 +02:00
parent 68399acb8f
commit 6bc3e26eff
3 changed files with 23 additions and 7 deletions

View File

@@ -72,9 +72,20 @@ const newPlanDialogDefaultItem = ref({} as MealPlan)
const planItems = computed(() => {
let items = [] as IMealPlanCalendarItem[]
useMealPlanStore().planList.forEach(mp => {
let startDate = mp.fromDate
let endDate = mp.toDate ? mp.toDate : mp.fromDate
if (mp.mealType.time) {
let hour = parseInt(mp.mealType.time.split(':')[0])
let minutes = parseInt(mp.mealType.time.split(':')[1])
let seconds = parseInt(mp.mealType.time.split(':')[2])
startDate.setHours(hour, minutes, seconds)
endDate.setHours(hour, minutes, seconds)
}
console.log(startDate, endDate)
items.push({
startDate: mp.fromDate,
endDate: mp.toDate,
startDate: startDate,
endDate: endDate,
id: mp.id,
mealPlan: mp,
} as IMealPlanCalendarItem)

View File

@@ -52,7 +52,7 @@
<span class="multiselect-clear-icon"></span>
</span>
</template>
<template #afterlist>
<template v-if="hasMoreItems" #afterlist>
<span class="text-disabled font-italic text-caption ms-3">{{$t('ModelSelectResultsHelp')}}</span>
</template>
</Multiselect>
@@ -127,6 +127,7 @@ const itemLabel = computed(() => {
const model = defineModel()
const modelClass = ref({} as GenericModel)
const loading = ref(false)
const hasMoreItems = ref(false)
const multiselect = useTemplateRef(`ref_${props.id}`)
@@ -145,8 +146,12 @@ function search(query: string) {
loading.value = true
return modelClass.value.list({query: query, page: 1, pageSize: props.limit}).then((r: any) => {
if (modelClass.value.model.isPaginated) {
if(r.next){
hasMoreItems.value = true
}
return r.results
} else {
hasMoreItems.value = false
return r
}
}).catch((err: any) => {