mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-02 12:49:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

fully generic merge dialog

Browse Source
This commit is contained in:
vabene1111
2025-01-02 10:44:31 +01:00
parent 9e99edf6f6
commit cab1641b33
6 changed files with 145 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
vue3/src/components/dialogs/ModelMergeDialog.vue
View File

@@ -1,16 +1,36 @@
<template>
<v-dialog max-width="600px" :activator="props.activator" v-model="dialog">
<v-card :loading="loading">
<v-card-title>{{ $t('merge_title', {type: getGenericModelFromString(props.model).model.name}) }}</v-card-title>
<!-- TODO localize model name -->
<v-closable-card-title
:title="$t('merge_title', {type: $t(genericModel.model.localizationKey)})"
:sub-title="genericModel.getLabel(props.source)"
:icon="genericModel.model.icon"
v-model="dialog"
></v-closable-card-title>
<v-divider></v-divider>
<v-card-text>
{{ $t('merge_selection', {source: '', type: getGenericModelFromString(props.model).model.name}) }}
<model-select :model="props.model" v-model="target"></model-select>
<model-select append-to-body :model="props.model" v-model="target"></model-select>
{{ $t('merge_selection', {source: genericModel.getLabel(props.source), type: $t(genericModel.model.localizationKey)}) }}
<model-select :model="props.model" v-model="target" allow-create></model-select>
<v-row>
<v-col class="text-center">
<v-card color="warning" variant="tonal">
<v-card-title>{{ genericModel.getLabel(props.source) }}</v-card-title>
</v-card>
<v-icon icon="fa-solid fa-arrow-down" class="mt-4 mb-4"></v-icon>
<v-card color="success" variant="tonal">
<v-card-title v-if="!target">?</v-card-title>
<v-card-title v-else>{{ genericModel.getLabel(target) }}</v-card-title>
</v-card>
</v-col>
</v-row>
</v-card-text>
<v-card-actions>
<v-btn>{{ $t('Cancel') }}</v-btn>
<v-btn color="warning" @click="mergeModel()">{{ $t('Merge') }}</v-btn>
<v-btn :disabled="loading">{{ $t('Cancel') }}</v-btn>
<v-btn color="warning" @click="mergeModel()" :loading="loading">{{ $t('Merge') }}</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
@@ -20,31 +40,40 @@
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import {PropType, ref} from "vue";
import {EditorSupportedModels, getGenericModelFromString} from "@/types/Models";
import {EditorSupportedModels, EditorSupportedTypes, getGenericModelFromString} from "@/types/Models";
import {ApiApi, Food} from "@/openapi";
import {ErrorMessageType, PreparedMessage, useMessageStore} from "@/stores/MessageStore";
import {useI18n} from "vue-i18n";
import VClosableCardTitle from "@/components/dialogs/VClosableCardTitle.vue";
const props = defineProps({
model: {type: String as PropType<EditorSupportedModels>, required: true},
sourceId: {type: Number},
source: {type: {} as PropType<EditorSupportedTypes>, required: true},
activator: {type: String, default: 'parent'},
})
const {t} = useI18n()
const dialog = defineModel<boolean>({default: false})
const loading = ref(false)
const target = ref({} as Food)
const genericModel = getGenericModelFromString(props.model, t)
const target = ref<null | EditorSupportedTypes>(null)
/**
* merge source into selected target
*/
function mergeModel() {
let api = new ApiApi()
if (target.value != null) {
loading.value = true
api.apiFoodMergeUpdate({id: props.sourceId!, food: {} as Food, target: target.value.id!}).then(r => {
genericModel.merge(props.source, target.value).then(r => {
useMessageStore().addPreparedMessage(PreparedMessage.UPDATE_SUCCESS)
}).catch(err => {
useMessageStore().addError(ErrorMessageType.UPDATE_ERROR, err)
}).finally(() => {
loading.value = false
dialog.value = false
})
}

8
vue3/src/components/inputs/StepEditor.vue
View File

@@ -59,10 +59,10 @@
:min="0"></v-number-input>
</v-col>
<v-col cols="3">
<model-select model="Unit" v-model="ingredient.unit" hide-details></model-select>
<model-select model="Unit" v-model="ingredient.unit" allow-create hide-details></model-select>
</v-col>
<v-col cols="3">
<model-select model="Food" v-model="ingredient.food" hide-details></model-select>
<model-select model="Food" v-model="ingredient.food" allow-create hide-details></model-select>
</v-col>
<v-col cols="3" @keydown.tab="event => handleIngredientNoteTab(event, index)">
<v-text-field :label="$t('Note')" v-model="ingredient.note" hide-details></v-text-field>
@@ -153,8 +153,8 @@
<v-form>
<v-number-input v-model="step.ingredients[editingIngredientIndex].amount" inset control-variant="stacked" autofocus :label="$t('Amount')"
:min="0"></v-number-input>
<model-select model="Unit" v-model="step.ingredients[editingIngredientIndex].unit" :label="$t('Unit')"></model-select>
<model-select model="Food" v-model="step.ingredients[editingIngredientIndex].food" :label="$t('Food')"></model-select>
<model-select model="Unit" v-model="step.ingredients[editingIngredientIndex].unit" :label="$t('Unit')" allow-create></model-select>
<model-select model="Food" v-model="step.ingredients[editingIngredientIndex].food" :label="$t('Food')" allow-create></model-select>
<v-text-field :label="$t('Note')" v-model="step.ingredients[editingIngredientIndex].note"></v-text-field>
</v-form>
</v-card-text>