From 59f7c0a0dacba918cab631b75008e56f11782859 Mon Sep 17 00:00:00 2001 From: Andrew Fuerste Henry Date: Mon, 10 Mar 2025 13:57:07 +0000 Subject: [PATCH] Bug 38331: Add dateaccessioned, itemlost_on, damaged_on, withdrawn_on, datelasteen to itemsearch results to test: 1 - have items with values in dateaccessioned, itemlost_on, damaged_on, withdrawn_on, datelastseen 2 - perform an item search that returns those items 3 - observe these values are not available 4 - apply patch, restart_all 5 - repeat item search, those values still don't show 6 - go to table settings, see dateaccessioned, itemlost_on, damaged_on, withdrawn_on, datelastseen are now available to be displayed, but are hidden by default 7 - adjust table settings to show all new fields 8 - repeat search, now you see values! 9 - export results in available formats, confirm new values are in export --- admin/columns_settings.yml | 15 +++++++++++++++ .../en/includes/catalogue/itemsearch_item.csv.inc | 4 +++- .../includes/catalogue/itemsearch_item.json.inc | 3 ++- .../includes/csv_headers/catalogue/itemsearch.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 10 ++++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 8377ba2f77..3ccc0c1a81 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -715,6 +715,21 @@ modules: columnname: last_checkout_date - columnname: due_date + - + columnname: dateaccessioned + is_hidden: 1 + - + columnname: itemlost_on + is_hidden: 1 + - + columnname: damaged_on + is_hideen: 1 + - + columnname: withdrawn_on + is_hidden: 1 + - + columnname: datelastseen + is_hidden: 1 - columnname: actions cannot_be_toggled: 1 diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc index f87affb256..16d708d5d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc @@ -18,4 +18,6 @@ "[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) || "" | replace('"', '""') | $raw %]" [%- delimiter | $raw -%] "[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn ) || "" | replace('"', '""') | $raw %]" [%- delimiter | $raw -%] "[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => item.damaged ) || "" | replace('"', '""') | $raw %]" [%- delimiter | $raw -%] "[% (item.issues || 0) | $raw %]" [%- delimiter | $raw -%] -"[% item.datelastborrowed | $KohaDates | $raw %]" [%- delimiter | $raw -%] "[% IF item.checkout %][% item.checkout.date_due | $KohaDates | $raw %][% END %]" +"[% item.datelastborrowed | $KohaDates | $raw %]" [%- delimiter | $raw -%] "[% IF item.checkout %][% item.checkout.date_due | $KohaDates | $raw %][% END %]" [%- delimiter | $raw -%] "[% item.dateaccessioned | $KohaDates | $raw %]" +[%- delimiter | $raw -%] "[% item.itemlost_on | $KohaDates | $raw %]" [%- delimiter | $raw -%] "[% item.damaged_on | $KohaDates | $raw %]" [%- delimiter | $raw -%] "[% item.withdrawn_on | $KohaDates | $raw %]" [%- delimiter | $raw -%] +"[% item.datelastseen | $KohaDates | $raw %]" diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc index bb5feb5492..033acf4347 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc @@ -25,7 +25,8 @@ "[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) || "" | html %]", "[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn ) || "" | html %]", "[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => item.damaged ) || "" | html %]", "[% (item.issues || 0) | html %]", "[% item.datelastborrowed | $KohaDates %]", -"[% IF item.checkout %][% item.checkout.date_due | $KohaDates %][% END %]", +"[% IF item.checkout %][% item.checkout.date_due | $KohaDates %][% END %]", "[% item.dateaccessioned |$KohaDates %]", "[% item.itemlost_on |$KohaDates %]", "[% item.damaged_on |$KohaDates %]", "[% item.withdrawn_on |$KohaDates %]", +"[% item.datelastseen |$KohaDates %]", "[% FILTER escape_quotes ~%]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt index 502470d854..0a8d79f1ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt @@ -3,5 +3,5 @@ [%- PROCESS 'i18n.inc' -%] [%- SET delimiter = Koha.CSVDelimiter() -%] [%- BLOCK -%] - "[% t("Title") | html %]"[%- delimiter | $raw -%]"[% t("Publication date") | html %]"[%- delimiter | $raw -%]"[% t("Publisher") | html %]"[%- delimiter | $raw -%]"[% t("Collection") | html %]"[%- delimiter | $raw -%]"[% t("Barcode") | html %]"[%- delimiter | $raw -%]"[% t("Item number") | html %]"[%- delimiter | $raw -%]"[% t("Serial enumeration") | html %]"[%- delimiter | $raw -%]"[% t("Call number") | html %]"[%- delimiter | $raw -%]"[% t("Home library") | html %]"[%- delimiter | $raw -%]"[% t("Current library") | html %]"[%- delimiter | $raw -%]"[% t("Shelving location") | html %]"[%- delimiter | $raw -%]"[% t("Item type") | html %]"[%- delimiter | $raw -%]"[% t("Inventory number") | html %]"[%- delimiter | $raw -%]"[% t("Not for loan status") | html %]"[%- delimiter | $raw -%]"[% t("Lost status") | html %]"[%- delimiter | $raw -%]"[% t("Withdrawn status") | html %]"[%- delimiter | $raw -%]"[% t("Damaged status") | html %]"[%- delimiter | $raw -%]"[% t("Checkouts") | html %]"[%- delimiter | $raw -%]"[% t("Last checkout date") | html %]"[%- delimiter | $raw -%]"[% t("Due date") | html %]" + "[% t("Title") | html %]"[%- delimiter | $raw -%]"[% t("Publication date") | html %]"[%- delimiter | $raw -%]"[% t("Publisher") | html %]"[%- delimiter | $raw -%]"[% t("Collection") | html %]"[%- delimiter | $raw -%]"[% t("Barcode") | html %]"[%- delimiter | $raw -%]"[% t("Item number") | html %]"[%- delimiter | $raw -%]"[% t("Serial enumeration") | html %]"[%- delimiter | $raw -%]"[% t("Call number") | html %]"[%- delimiter | $raw -%]"[% t("Home library") | html %]"[%- delimiter | $raw -%]"[% t("Current library") | html %]"[%- delimiter | $raw -%]"[% t("Shelving location") | html %]"[%- delimiter | $raw -%]"[% t("Item type") | html %]"[%- delimiter | $raw -%]"[% t("Inventory number") | html %]"[%- delimiter | $raw -%]"[% t("Not for loan status") | html %]"[%- delimiter | $raw -%]"[% t("Lost status") | html %]"[%- delimiter | $raw -%]"[% t("Withdrawn status") | html %]"[%- delimiter | $raw -%]"[% t("Damaged status") | html %]"[%- delimiter | $raw -%]"[% t("Checkouts") | html %]"[%- delimiter | $raw -%]"[% t("Last checkout date") | html %]"[%- delimiter | $raw -%]"[% t("Due date") | html %]"[%- delimiter | $raw -%]"[% t("Date accessioned") | html %]"[%- delimiter | $raw -%]"[% t("Item lost on date") | html %]"[%- delimiter | $raw -%]"[% t("Damaged on date") | html %]"[%- delimiter | $raw -%]"[% t("Wthdrawn on date") | html %]"[%- delimiter | $raw -%]"[% t("Date last seen") | html %]" [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt index cbfdfa733c..aa2cc60f38 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -493,6 +493,11 @@ + ' ' + _("Checkouts") + '' + ' ' + _("Last checkout date") + '' + ' ' + _("Due date") + '' + + ' ' + _("Date accessioned") + '' + + ' ' + _("Item lost on date") + '' + + ' ' + _("Item damaged on date") + '' + + ' ' + _("Withdrawn on date") + '' + + ' ' + _("Date last seen") + '' + ' ' + _("Actions") + '' + ' '; @@ -688,6 +693,11 @@ { 'name': 'issues' }, { 'name': 'datelastborrowed' }, { 'name': 'date_due' }, + { 'name': 'dateaccessioned' }, + { 'name': 'itemlost_on' }, + { 'name': 'damaged_on' }, + { 'name': 'withdrawn_on' }, + { 'name': 'datelastseen' }, { 'name': 'actions', 'orderable': false, searchable: false, } ], "pagingType": "full_numbers", -- 2.39.5