Correcting code to display patronimage correctly

[koha_fer] / circ / branchoverdues.pl

diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl
index f51a79d..091f874 100755 (executable)
--- a/circ/branchoverdues.pl
+++ b/circ/branchoverdues.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 #
 # This file is part of Koha.
 #
@@ -20,19 +19,19 @@
 use strict;
 use C4::Context;
 use CGI;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Auth;
-use C4::Date;
-use C4::Circulation::Circ2;    # AddNotifyLine
-use C4::Koha;                  # GetDepartement...
-use Mail::Sendmail;
-use Getopt::Long;
+use C4::Dates qw/format_date/;
+use C4::Overdues;    # AddNotifyLine
+use C4::Biblio;
+use C4::Koha;
+use C4::Debug;
 use Date::Calc qw/Today Today_and_Now Now/;
 
 =head1 branchoverdues.pl
 
  this module is a new interface, allow to the librarian to check all items on overdues (based on the acountlines type 'FU' )
- this interface is filtered by branches (automaticly), and by department (optional) ....
+ this interface is filtered by branches (automatically), and by location (optional) ....
  all informations are stocked in the notifys BDD
 
  FIXME for this time, we have only four methods to notify :
@@ -55,6 +54,8 @@ use Date::Calc qw/Today Today_and_Now Now/;
 =cut
 
 my $input       = new CGI;
+my $dbh = C4::Context->dbh;
+
 my $theme = $input->param('theme');    # only used if allowthemeoverride is set
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -80,7 +81,7 @@ my $itemnumber     = $input->param('itemnumber');
 my $method         = $input->param('method');
 my $overduelevel   = $input->param('overduelevel');
 my $notifyId       = $input->param('notifyId');
-my $department = $input->param('department');
+my $location       = $input->param('location');
 
 # now create the line in bdd (notifys)
 if ( $input->param('action') eq 'add' ) {
@@ -88,9 +89,7 @@ if ( $input->param('action') eq 'add' ) {
       AddNotifyLine( $borrowernumber, $itemnumber, $overduelevel, $method,
         $notifyId );
 }
-
-#  possibility to remove notify line
-if ( $input->param('action') eq 'remove' ) {
+elsif ( $input->param('action') eq 'remove' ) {
     my $notify_date  = $input->param('notify_date');
     my $removenotify =
       RemoveNotifyLine( $borrowernumber, $itemnumber, $notify_date );
@@ -100,30 +99,16 @@ my @overduesloop;
 my @todayoverduesloop;
 my $counter = 0;
 
-my @getoverdues = GetOverduesForBranch( $default, $department );
-
-# filter by department
-if ($department) {
-    my ( $departmentlib, $departmentValue ) = GetDepartementLib($department);
-    $template->param(
-        department      => $departmentlib,
-        departmentValue => $departmentValue,
-    );
+my @getoverdues = GetOverduesForBranch( $default, $location );
+use Data::Dumper;
+$debug and warn "HERE : $default / $location" . Dumper(@getoverdues);
+# search for location authorised value
+my ($tag,$subfield) = GetMarcFromKohaField('items.location','');
+my $tagslib = &GetMarcStructure(1,'');
+if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
+    my $values= GetAuthorisedValues($tagslib->{$tag}->{$subfield}->{authorised_value});
+    $template->param(locationsloop => $values);
 }
-else {
-
-    # initiate the selector of departments .....
-    my @getdepartments = GetDepartements();
-    my @departmentsloop;
-    foreach my $dpt (@getdepartments) {
-        my %department;
-        $department{'authorised_value'} = $dpt->{'authorised_value'};
-        $department{'lib'}              = $dpt->{'lib'};
-        push( @departmentsloop, \%department );
-    }
-    $template->param( departmentsloop => \@departmentsloop, );
-}
-
 # now display infos
 foreach my $num (@getoverdues) {
 
@@ -165,6 +150,7 @@ foreach my $num (@getoverdues) {
 $template->param(
     overduesloop => \@overduesloop,
     show_date    => format_date($todaysdate),
+    location     => $location,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;