diff --git a/src/components/aircrafts/AircraftDetailCard.vue b/src/components/aircrafts/AircraftDetailCard.vue index 74e752b..dd0b9bd 100644 --- a/src/components/aircrafts/AircraftDetailCard.vue +++ b/src/components/aircrafts/AircraftDetailCard.vue @@ -2,6 +2,8 @@ import {aircraft} from "src/composables/objects/aircraft"; import {confirmObject} from "src/composables/dialog"; import {useQuasar} from "quasar"; +import {storeToRefs} from "pinia"; +import {useUserStore} from "stores/User"; const props = defineProps({ aircraft: { @@ -11,9 +13,11 @@ const props = defineProps({ }); const emits = defineEmits(["delete"]); - const $q = useQuasar(); +const loggedUser = storeToRefs(useUserStore()).user; + + const confirmDelete = (aircraftId) => { $q.dialog(confirmObject('Opravdu chceš smazat toto letadlo?')) .onOk(() => { @@ -26,7 +30,7 @@ const confirmDelete = (aircraftId) => { - +
{ + + + Provozovatel: {{ aircraft.organization.name }} + + Výrobce: {{ aircraft.manufacturer }} diff --git a/src/components/aircrafts/AircraftForm.vue b/src/components/aircrafts/AircraftForm.vue index acd65e8..6451bb7 100644 --- a/src/components/aircrafts/AircraftForm.vue +++ b/src/components/aircrafts/AircraftForm.vue @@ -5,6 +5,7 @@ import {setDefaultData} from "src/composables/form/formHandling"; import {defaultValues, isRequestPending} from "src/composables/form/props"; import {isNumber, isRequired, maxLength, minLength} from "src/composables/form/rules"; import {commonProps} from "src/composables/inputs"; +import ComboboxInput from "components/inputs/ComboboxInput.vue"; const formData = reactive({ id: null, @@ -14,12 +15,16 @@ const formData = reactive({ manufacturer: "", description: "", photo: null, - organizationId: null + organization: null }); const props = defineProps({ defaultValues, - isRequestPending + isRequestPending, + organizations: { + type: Array, + required: true, + } }); const rules = { @@ -28,8 +33,12 @@ const rules = { }; onMounted(() => { - if (Object.keys(props.defaultValues).length > 0) + if (Object.keys(props.defaultValues).length > 0) { setDefaultData(formData, props.defaultValues); + if (props.defaultValues.organization) { + formData.organization = {id: props.defaultValues.organization.id, name: props.defaultValues.organization.name}; + } + } }) @@ -45,6 +54,23 @@ onMounted(() => { v-bind="commonProps" /> + + + + { v-bind="commonProps" /> - + + + Provozovatel: {{ aircraft.organization.name }} + + diff --git a/src/components/AvatarFromPhoto.vue b/src/components/avatars/AvatarFromPhoto.vue similarity index 100% rename from src/components/AvatarFromPhoto.vue rename to src/components/avatars/AvatarFromPhoto.vue diff --git a/src/components/AvatarsGroup.vue b/src/components/avatars/AvatarsGroup.vue similarity index 82% rename from src/components/AvatarsGroup.vue rename to src/components/avatars/AvatarsGroup.vue index 42d8624..13c7600 100644 --- a/src/components/AvatarsGroup.vue +++ b/src/components/avatars/AvatarsGroup.vue @@ -8,7 +8,7 @@ const props = defineProps({ diff --git a/src/components/copilots/CopilotsList.vue b/src/components/copilots/CopilotsList.vue index 88c7e1c..56dba99 100644 --- a/src/components/copilots/CopilotsList.vue +++ b/src/components/copilots/CopilotsList.vue @@ -11,14 +11,16 @@ const props = defineProps({