diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 8f834b42680..03c4f346da7 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -29,10 +29,6 @@ const $props = defineProps({ type: String, default: null, }, - module: { - type: String, - default: null, - }, summary: { type: Object, default: null, @@ -148,7 +144,9 @@ const toModule = computed(() => {{ t('components.smartCard.openSummary') }} </QTooltip> </QBtn> - <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }"> + <RouterLink + :to="{ name: `${dataKey}Summary`, params: { id: entity.id } }" + > <QBtn class="link" color="white" diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue index a5793407e65..671ef7fbcd0 100644 --- a/src/pages/Account/Alias/Card/AliasDescriptor.vue +++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue @@ -51,7 +51,6 @@ const removeAlias = () => { <CardDescriptor ref="descriptor" :url="`MailAliases/${entityId}`" - module="Alias" data-key="Alias" title="alias" > diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue index 728d2ced3ab..49328fe87eb 100644 --- a/src/pages/Account/Card/AccountDescriptor.vue +++ b/src/pages/Account/Card/AccountDescriptor.vue @@ -24,7 +24,6 @@ onMounted(async () => { ref="descriptor" :url="`VnUsers/preview`" :filter="{ ...filter, where: { id: entityId } }" - module="Account" data-key="Account" title="nickname" > diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue index dfcc8efc896..517517af0dd 100644 --- a/src/pages/Account/Role/Card/RoleDescriptor.vue +++ b/src/pages/Account/Role/Card/RoleDescriptor.vue @@ -35,7 +35,6 @@ const removeRole = async () => { <CardDescriptor url="VnRoles" :filter="{ where: { id: entityId } }" - module="Role" data-key="Role" :summary="$props.summary" > diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index 3749b0c7c41..4551c58fe33 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -46,7 +46,6 @@ onMounted(async () => { <CardDescriptor :url="`Claims/${entityId}`" :filter="filter" - module="Claim" title="client.name" data-key="Claim" > diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue index a4da925fa6d..89f9d94494f 100644 --- a/src/pages/Customer/Card/CustomerDescriptor.vue +++ b/src/pages/Customer/Card/CustomerDescriptor.vue @@ -55,7 +55,6 @@ const debtWarning = computed(() => { <template> <CardDescriptor - module="Customer" :url="`Clients/${entityId}/getCard`" :summary="$props.summary" data-key="Customer" diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index 19d13e51a50..8783da6d728 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -88,7 +88,6 @@ const getEntryRedirectionFilter = (entry) => { <template> <CardDescriptor ref="entryDescriptorRef" - module="Entry" :url="`Entries/${entityId}`" :userFilter="entryFilter" title="supplier.nickname" diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue index acd55c0fa47..3843f5bf713 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue @@ -90,7 +90,6 @@ async function setInvoiceCorrection(id) { <template> <CardDescriptor ref="cardDescriptorRef" - module="InvoiceIn" data-key="InvoiceIn" :url="`InvoiceIns/${entityId}`" :filter="filter" diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue index de614e9fc47..dfaf6c10988 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue @@ -36,7 +36,6 @@ function ticketFilter(invoice) { <template> <CardDescriptor ref="descriptor" - module="InvoiceOut" :url="`InvoiceOuts/${entityId}`" :filter="filter" title="ref" diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue index 7e7057a90c5..08bc0f57e18 100644 --- a/src/pages/Item/Card/ItemDescriptor.vue +++ b/src/pages/Item/Card/ItemDescriptor.vue @@ -88,7 +88,6 @@ const updateStock = async () => { <template> <CardDescriptor data-key="Item" - module="Item" :summary="$props.summary" :url="`Items/${entityId}/getCard`" @on-fetch="setData" diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue index 0f71ad1f1a6..725fb30aa60 100644 --- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue +++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue @@ -26,7 +26,6 @@ const entityId = computed(() => { </script> <template> <CardDescriptor - module="ItemType" :url="`ItemTypes/${entityId}`" :filter="filter" title="code" diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue index 1752efe7bdc..0d18864dc86 100644 --- a/src/pages/Order/Card/OrderDescriptor.vue +++ b/src/pages/Order/Card/OrderDescriptor.vue @@ -57,7 +57,6 @@ const total = ref(0); ref="descriptor" :url="`Orders/${entityId}`" :filter="filter" - module="Order" title="client.name" @on-fetch="setData" data-key="Order" diff --git a/src/pages/Route/Agency/Card/AgencyDescriptor.vue b/src/pages/Route/Agency/Card/AgencyDescriptor.vue index b9772037c76..a0472c6c3c8 100644 --- a/src/pages/Route/Agency/Card/AgencyDescriptor.vue +++ b/src/pages/Route/Agency/Card/AgencyDescriptor.vue @@ -22,7 +22,6 @@ const card = computed(() => store.data); </script> <template> <CardDescriptor - module="Agency" data-key="Agency" :url="`Agencies/${entityId}`" :title="card?.name" diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue index a8c6cc18bf6..829cce4444f 100644 --- a/src/pages/Route/Card/RouteDescriptor.vue +++ b/src/pages/Route/Card/RouteDescriptor.vue @@ -23,7 +23,6 @@ const entityId = computed(() => { </script> <template> <CardDescriptor - module="Route" :url="`Routes/${entityId}`" :filter="filter" :title="null" diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue index 1f1e6d6ff01..baa864a150f 100644 --- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue +++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue @@ -26,12 +26,7 @@ const entityId = computed(() => { </script> <template> - <CardDescriptor - module="Roadmap" - :url="`Roadmaps/${entityId}`" - :filter="filter" - data-key="Roadmap" - > + <CardDescriptor :url="`Roadmaps/${entityId}`" :filter="filter" data-key="Roadmap"> <template #body="{ entity }"> <VnLv :label="t('Roadmap')" :value="entity?.name" /> <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" /> diff --git a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue index f31ffe847c8..d9a2434ab3c 100644 --- a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue +++ b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue @@ -9,7 +9,6 @@ const { notify } = useNotify(); <template> <CardDescriptor :url="`Vehicles/${$route.params.id}`" - module="Vehicle" data-key="Vehicle" title="numberPlate" :to-module="{ name: 'VehicleList' }" diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue index 9d491e36e34..5e618aa7f46 100644 --- a/src/pages/Shelving/Card/ShelvingDescriptor.vue +++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue @@ -25,7 +25,6 @@ const entityId = computed(() => { </script> <template> <CardDescriptor - module="Shelving" :url="`Shelvings/${entityId}`" :filter="filter" title="code" diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue index 0b7642c1ce4..46c9f8ea0a8 100644 --- a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue +++ b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue @@ -17,7 +17,6 @@ const entityId = computed(() => props.id || route.params.id); </script> <template> <CardDescriptor - module="Parking" data-key="Parking" :url="`Parkings/${entityId}`" title="code" diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue index 6a6feb9ef82..462bdf853ae 100644 --- a/src/pages/Supplier/Card/SupplierDescriptor.vue +++ b/src/pages/Supplier/Card/SupplierDescriptor.vue @@ -62,7 +62,6 @@ const getEntryQueryParams = (supplier) => { <template> <CardDescriptor - module="Supplier" :url="`Suppliers/${entityId}`" :filter="filter" data-key="Supplier" diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue index 762db19bff4..c5f3233b1de 100644 --- a/src/pages/Ticket/Card/TicketDescriptor.vue +++ b/src/pages/Ticket/Card/TicketDescriptor.vue @@ -44,7 +44,6 @@ function ticketFilter(ticket) { @on-fetch="(data) => ([problems] = data)" /> <CardDescriptor - module="Ticket" :url="`Tickets/${entityId}`" :filter="filter" data-key="Ticket" diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue index 72acf91b843..922f89f333f 100644 --- a/src/pages/Travel/Card/TravelDescriptor.vue +++ b/src/pages/Travel/Card/TravelDescriptor.vue @@ -32,7 +32,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity. <template> <CardDescriptor - module="Travel" :url="`Travels/${entityId}`" :title="data.title" :subtitle="data.subtitle" diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue index 0828c2ba6ec..de3f634e2c0 100644 --- a/src/pages/Worker/Card/WorkerDescriptor.vue +++ b/src/pages/Worker/Card/WorkerDescriptor.vue @@ -50,7 +50,6 @@ const handlePhotoUpdated = (evt = false) => { <template> <CardDescriptor ref="cardDescriptorRef" - module="Worker" :data-key="dataKey" url="Workers/summary" :filter="{ where: { id: entityId } }" diff --git a/src/pages/Worker/Card/WorkerDescriptorProxy.vue b/src/pages/Worker/Card/WorkerDescriptorProxy.vue index 43deb7821a0..a142570f9ca 100644 --- a/src/pages/Worker/Card/WorkerDescriptorProxy.vue +++ b/src/pages/Worker/Card/WorkerDescriptorProxy.vue @@ -12,11 +12,6 @@ const $props = defineProps({ <template> <QPopupProxy> - <WorkerDescriptor - v-if="$props.id" - :id="$props.id" - :summary="WorkerSummary" - data-key="workerDescriptorProxy" - /> + <WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" /> </QPopupProxy> </template> diff --git a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue index ecd7fa36c6c..4b7dfd9b80d 100644 --- a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue +++ b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue @@ -42,7 +42,6 @@ const { openConfirmationModal } = useVnConfirm(); <template> <CardDescriptor ref="DepartmentDescriptorRef" - module="Department" :url="`Departments/${entityId}`" :summary="$props.summary" :to-module="{ name: 'WorkerDepartment' }" diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue index 49237a02b35..27676212e65 100644 --- a/src/pages/Zone/Card/ZoneDescriptor.vue +++ b/src/pages/Zone/Card/ZoneDescriptor.vue @@ -25,12 +25,7 @@ const entityId = computed(() => { </script> <template> - <CardDescriptor - module="Zone" - :url="`Zones/${entityId}`" - :filter="filter" - data-key="Zone" - > + <CardDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone"> <template #menu="{ entity }"> <ZoneDescriptorMenuItems :zone="entity" /> </template>