Bug 19899: Restore Item floats feature - do not crash

[koha.git] / circ / bookcount.pl

diff --git a/circ/bookcount.pl b/circ/bookcount.pl
index 75bf319..2976a05 100755 (executable)
--- a/circ/bookcount.pl
+++ b/circ/bookcount.pl
@@ -7,44 +7,40 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 #use warnings; FIXME - Bug 2505
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Debug;
 use C4::Context;
 use C4::Circulation;
 use C4::Output;
 use C4::Koha;
 use C4::Auth;
-use C4::Branch; # GetBranches
 use C4::Biblio; # GetBiblioItemData
-use C4::Dates qw/format_date/;
+use Koha::DateUtils;
+use Koha::Libraries;
 
 my $input        = new CGI;
 my $itm          = $input->param('itm');
 my $bi           = $input->param('bi');
 my $biblionumber = $input->param('biblionumber');
-my $branches     = GetBranches;
 
 my $idata = itemdatanum($itm);
 my $data  = GetBiblioItemData($bi);
 
-my $homebranch    = $branches->{ $idata->{'homebranch'}    }->{'branchname'};
-my $holdingbranch = $branches->{ $idata->{'holdingbranch'} }->{'branchname'};
-
 my $lastmove = lastmove($itm);
 
 my $lastdate;
@@ -60,7 +56,7 @@ if ( not $lastmove ) {
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/bookcount.tmpl",
+        template_name   => "circ/bookcount.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -69,13 +65,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $branchloop = GetBranchesLoop(C4::Context->userenv->{branch});
-foreach (@$branchloop) {
-    my $date = lastseenat( $itm, $_->{value} );
-    my ($datechunk, $timechunk) =  slashdate($date);
-    $_->{issues}     = issuesat($itm, $_->{value});
-    $_->{seen}       = $datechunk;
-    $_->{seentime}   = $timechunk;
+my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;
+for my $library ( @$libraries ) {
+    $library->{selected} = 1 if $library->{branchcode} eq C4::Context->userenv->{branch};
+    $library->{issues}     = issuesat($itm, $library->{branchcode});
+    $library->{seen}       = lastseenat( $itm, $library->{branchcode} ) || undef;
 }
 
 $template->param(
@@ -84,11 +78,11 @@ $template->param(
     author                  => $data->{'author'},
     barcode                 => $idata->{'barcode'},
     biblioitemnumber        => $bi,
-    homebranch              => $homebranch,
-    holdingbranch           => $holdingbranch,
-    lastdate                => $lastdate ?  format_date($lastdate) : 0,
+    homebranch              => $idata->{homebranch},
+    holdingbranch           => $idata->{holdingbranch},
+    lastdate                => $lastdate ? $lastdate : 0,
     count                   => $count,
-    branchloop              => $branchloop,
+    libraries               => $libraries,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
@@ -170,14 +164,3 @@ sub lastseenat {
     my $date = ( $date1 lt $date2 ) ? $date2 : $date1 ;
     return ($date);
 }
-
-#####################################################
-# return date and time from timestamp
-sub slashdate {
-    my ($date) = @_;
-    $date or return;
-    return (
-        format_date($date),
-        substr($date,11,5)
-    );
-}