diff --git a/src/components/displays/department/tables/SelfServeTryModal.vue b/src/components/displays/department/tables/SelfServeTryModal.vue index 2441e24c..d6278730 100644 --- a/src/components/displays/department/tables/SelfServeTryModal.vue +++ b/src/components/displays/department/tables/SelfServeTryModal.vue @@ -238,6 +238,41 @@ const getConditionById = (id) => { + +
{{ getConditionById(t.condition_id).description }}
+Regler:
+Ingen opgaver fundet
diff --git a/src/composables/useSelfServeLogic.js b/src/composables/useSelfServeLogic.js index f7a60b55..cc497a88 100644 --- a/src/composables/useSelfServeLogic.js +++ b/src/composables/useSelfServeLogic.js @@ -141,7 +141,7 @@ export function useSelfServeLogic() { (item) => parseInt(item.department) === deptId && parseInt(item.product) === vTypeId && - (lId === null || parseInt(item.lane) === lId) + (lId === null || !item.lane || parseInt(item.lane) === 0 || parseInt(item.lane) === lId) ) .sort((a, b) => (a.order_priority || 0) - (b.order_priority || 0)); @@ -149,7 +149,7 @@ export function useSelfServeLogic() { (item) => parseInt(item.department) === deptId && parseInt(item.product) === vTypeId && - (lId === null || parseInt(item.lane) === lId) + (lId === null || !item.lane || parseInt(item.lane) === 0 || parseInt(item.lane) === lId) ); const conditionIds = conditions.value.map((item) => item.id); @@ -167,7 +167,7 @@ export function useSelfServeLogic() { (item) => parseInt(item.department) === deptId && parseInt(item.product) === vTypeId && - (lId === null || parseInt(item.lane) === lId) + (lId === null || !item.lane || parseInt(item.lane) === 0 || parseInt(item.lane) === lId) ); tasks.value = await Promise.all( diff --git a/src/views/dashboards/userDashboard/wash/MyWashStart.vue b/src/views/dashboards/userDashboard/wash/MyWashStart.vue index c4c14407..03573adf 100644 --- a/src/views/dashboards/userDashboard/wash/MyWashStart.vue +++ b/src/views/dashboards/userDashboard/wash/MyWashStart.vue @@ -1108,6 +1108,41 @@ watch(() => currentStep.value, () => { + +{{ getConditionById(t.condition_id).description }}
+Regler:
+Ingen opgaver fundet