Attachment 172645 Details for Bug 10190 – Bug 10190: Add letter names to tables

[patch] Bug 10190: Add letter names to tables

Bug-10190-Add-letter-names-to-tables.patch (text/plain), 4.72 KB, created by Martin Renvoize (ashimema) on 2024-10-10 16:20:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-10-10 16:20:24 UTC

Size: 4.72 KB

patch

obsolete

>From 95ad5a66bf78cac4332ecb62bad15052cdb8a122 Mon Sep 17 00:00:00 2001
>From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>Date: Wed, 14 Aug 2024 14:56:09 +0000
>Subject: [PATCH] Bug 10190: Add letter names to tables
>
>Sponsored-by: Glasgow Colleges Library Group <https://library.cityofglasgowcollege.ac.uk>
>Signed-off-by: George Harkins <George.Harkins@cityofglasgowcollege.ac.uk>
>---
> .../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 ac331a26c00..fac7b534fc3 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"
>                     />
>                 </div>
>                 <fieldset class="rows">
>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 f464cbb8833..27c0511c8a5 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"
>                     />
>                 </div>
>             </template>
>@@ -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 69f0df003a6..da01a45e943 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") }}
>                 </th>
>                 <th v-if="modal">
>-                    {{ $__("Notice") }}
>+                    {{ $__("Rule") }}
>                 </th>
>                 <th>
>                     {{ $__("Delay") }}
>@@ -114,11 +114,13 @@
>                         "
>                     >
>                         {{
>-                            rule[
>-                                "overdue_" +
>-                                    (modal ? i + 1 : triggerNumber) +
>-                                    "_notice"
>-                            ]
>+                            handleNotice(
>+                                rule[
>+                                    "overdue_" +
>+                                        (modal ? i + 1 : triggerNumber) +
>+                                        "_notice"
>+                                ]
>+                            )
>                         }}
>                     </td>
>                     <td
>@@ -224,6 +226,7 @@ export default {
>         "ruleBeingEdited",
>         "categories",
>         "itemTypes",
>+        "letters",
>     ],
>     methods: {
>         handleContext(value, data, type, displayProperty = "name") {
>@@ -251,6 +254,10 @@ export default {
>                         rule[`overdue_${number}_restrict`])
>             )
>         },
>+        handleNotice(notice) {
>+            const letter = this.letters.find(letter => letter.code === notice)
>+            return letter ? letter.name : notice
>+        },
>     },
> }
> </script>
>-- 
>2.47.0

Actions: View | Diff | Splinter Review

Attachments on bug 10190: 170357 | 170358 | 170359 | 170360 | 170361 | 170362 | 170363 | 170364 | 170365 | 170366 | 170367 | 170368 | 170369 | 170370 | 170371 | 170372 | 170373 | 170374 | 170375 | 170376 | 170380 | 170449 | 171727 | 171728 | 171729 | 171730 | 171731 | 171732 | 171733 | 171734 | 171735 | 171736 | 171737 | 171738 | 171739 | 171740 | 171741 | 171742 | 171743 | 171744 | 171745 | 171746 | 171747 | 171748 | 171749 | 171750 | 171751 | 171752 | 171753 | 171754 | 171755 | 172588 | 172589 | 172590 | 172591 | 172592 | 172593 | 172594 | 172595 | 172596 | 172597 | 172598 | 172599 | 172600 | 172601 | 172602 | 172603 | 172604 | 172605 | 172606 | 172607 | 172608 | 172609 | 172612 | 172614 | 172617 | 172619 | 172621 | 172622 | 172623 | 172624 | 172625 | 172626 | 172630 | 172631 | 172632 | 172633 | 172634 | 172635 | 172636 | 172637 | 172638 | 172639 | 172640 | 172641 | 172642 | 172643 | 172644 | 172645 | 172646 | 172647 | 172648 | 172649 | 172650 | 172651 | 172652 | 172653 | 172654 | 172655 | 172656 | 172657 | 172658 | 172659 | 172660 | 172661 | 172662 | 172663