From 51067f3f0d925bdd23b8981819474edd9481ed26 Mon Sep 17 00:00:00 2001
From: Laura Escamilla <laura.escamilla@bywatersolutions.com>
Date: Mon, 8 Apr 2024 21:03:13 +0000
Subject: [PATCH] Bug 36547: Added checked out column to Overdue table
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To test:
1. Make sure you have some overdue checkouts in your installation.
2. Go to Circulation > Overdues
3. Verify the ‘Checked out on’ column is visible by default, but can be hidden using the column settings
4. Verify that the export to CSV via the link on top of the table and includes the ‘Checked out on’ field.
5. Sign off and have an incredible day :D

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 admin/columns_settings.yml                              | 2 ++
 circ/overdue.pl                                         | 4 +++-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index af24061dcf..e50980bbd8 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1918,6 +1918,8 @@ modules:
               is_hidden: 1
             -
               columnname: shelving_location
+            -
+              columnname: datelastborrowed
             -
               columnname: barcode
             -
diff --git a/circ/overdue.pl b/circ/overdue.pl
index bc8a28d39f..8c4c6f1223 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -242,6 +242,7 @@ if ($noreport) {
         borrowers.branchcode,
         issues.itemnumber,
         issues.issuedate,
+        items.datelastborrowed,
         items.barcode,
         items.homebranch,
         items.holdingbranch,
@@ -337,6 +338,7 @@ if ($noreport) {
             email                  => $data->{email},
             branchcode             => $data->{branchcode},
             barcode                => $data->{barcode},
+            datelastborrowed       => $data->{datelastborrowed},
             itemnum                => $data->{itemnumber},
             issuedate              => $data->{issuedate},
             biblionumber           => $data->{biblionumber},
@@ -401,7 +403,7 @@ sub build_csv {
     # build header ...
     my @keys =
       qw ( duedate title author borrowertitle firstname surname phone barcode email address address2 zipcode city country
-      branchcode itemcallnumber biblionumber borrowernumber itemnum issuedate replacementprice itemnotes_nonpublic streetnumber streettype);
+      branchcode datelastissued itemcallnumber biblionumber borrowernumber itemnum issuedate replacementprice itemnotes_nonpublic streetnumber streettype);
     my $csv = Text::CSV_XS->new();
     $csv->combine(@keys);
     push @lines, $csv->string();
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index 57a56a5435..ba8169a062 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -92,6 +92,7 @@
           <th>Home library</th>
           <th>Holding library</th>
           <th>Shelving location</th>
+          <th>Checked out on</th>
           <th>Barcode</th>
           <th>Call number</th>
           <th>Item type</th>
@@ -120,6 +121,7 @@
             <td>[% Branches.GetName( overdueloo.homebranchcode ) | html %]</td>
             <td>[% Branches.GetName( overdueloo.holdingbranchcode ) | html %]</td>
             <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => overdueloo.location ) | html %]</td>
+            <td data-order="[% overdueloo.datelastborrowed | html %]"><span class='overdue'>[% overdueloo.datelastborrowed | $KohaDates %]</span></td>
           <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | uri %]&amp;itemnumber=[% overdueloo.itemnum | uri %]#item[% overdueloo.itemnum | uri %]">[% overdueloo.barcode | html %]</a></td>
           <td>[% overdueloo.itemcallnumber | html %]</td>
             <td>[% ItemTypes.GetDescription( overdueloo.itemtype ) | html %]</td>