From 7331ec4ca82c671a69de9736c9c4fe5e610ab4b3 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Wed, 14 Aug 2024 14:56:09 +0000 Subject: [PATCH] Bug 10190: Add letter names to tables Sponsored-by: Glasgow Colleges Library Group Signed-off-by: George Harkins --- .../CirculationTriggersFormAdd.vue | 1 + .../CirculationTriggersList.vue | 7 ++++++- .../CirculationTriggers/TriggersTable.vue | 19 +++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue index 87568766c55..2d4b1d666b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue @@ -19,6 +19,7 @@ :triggerNumber="newTriggerNumber - 1" :modal="true" :ruleBeingEdited="ruleBeingEdited" + :letters="letters" />
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue index 06810ce0879..8e3e8be9f05 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue @@ -92,6 +92,7 @@ :triggerNumber="number" :categories="categories" :itemTypes="itemTypes" + :letters="letters" /> @@ -113,13 +114,17 @@ import ToolbarButton from "../../ToolbarButton.vue"; import { APIClient } from "../../../fetch/api-client.js"; import TriggersTable from "./TriggersTable.vue"; import { inject } from "vue"; +import { storeToRefs } from "pinia"; export default { setup() { - const { splitCircRulesByTriggerNumber } = inject("circRulesStore"); + const circRulesStore = inject("circRulesStore"); + const { splitCircRulesByTriggerNumber } = circRulesStore; + const { letters } = storeToRefs(circRulesStore); return { splitCircRulesByTriggerNumber, + letters, }; }, data() { diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/TriggersTable.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/TriggersTable.vue index 798aab18452..a86331ae192 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/TriggersTable.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/TriggersTable.vue @@ -9,7 +9,7 @@ {{ $__("Item type") }} - {{ $__("Notice") }} + {{ $__("Rule") }} {{ $__("Delay") }} @@ -114,11 +114,13 @@ " > {{ - rule[ - "overdue_" + - (modal ? i + 1 : triggerNumber) + - "_notice" - ] + handleNotice( + rule[ + "overdue_" + + (modal ? i + 1 : triggerNumber) + + "_notice" + ] + ) }} letter.code === notice); + return letter ? letter.name : notice; + }, }, }; -- 2.48.1