From 285cb4dece0e0e0a0fadd83ae14226209bdd8f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Fri, 9 Oct 2015 21:33:03 +0200 Subject: [PATCH] Bug 14995: Remove C4::Dates: Delete files reservereport.pl / reservereport.tt The following files use C4::Dates, but they seem no longer to be in use: - koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt - reports/reservereport.pl To verify: git grep 'reservereport' Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/reports/reservereport.tt | 44 ----- reports/reservereport.pl | 151 ------------------ 2 files changed, 195 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt delete mode 100755 reports/reservereport.pl diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt deleted file mode 100644 index c2cbc4fcf8..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt +++ /dev/null @@ -1,44 +0,0 @@ -[% INCLUDE 'doc-head-open.inc' %] -Koha › Hold Report › All holds -[% INCLUDE 'doc-head-close.inc' %] - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] - - - -
- -
-
-
- - - - [% FOREACH dataloo IN dataloop %] - - - - - - - [% END %] -
NameHold dateTitleClass
- [% dataloo.name %] - - [% dataloo.reservedate %] - - [% dataloo.title |html %] - - [% dataloo.classification %] -
-

[% count %]

- -
-
-
-[% INCLUDE 'reports-menu.inc' %] -
-
-[% INCLUDE 'intranet-bottom.inc' %] \ No newline at end of file diff --git a/reports/reservereport.pl b/reports/reservereport.pl deleted file mode 100755 index 17bcf33e27..0000000000 --- a/reports/reservereport.pl +++ /dev/null @@ -1,151 +0,0 @@ -#!/usr/bin/perl - -#written 26/4/2000 -#script to display reports - -# Copyright 2000-2002 Katipo Communications -# -# 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 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. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - -# script now takes a branchcode arg -# eg: http://koha.rangitikei.katipo.co.nz/cgi-bin/koha/reports/reservereport.pl?branch=BL - -use strict; -#use warnings; FIXME - Bug 2505 -use C4::Stats; -use C4::Dates qw/format_date/; -use CGI qw ( -utf8 ); -use C4::Output; -use C4::Branch; # GetBranches -use C4::Auth; -use C4::Koha; -use C4::Items; - - -my $input = new CGI; -my $time = $input->param('time'); -my $branch = $input->param('branch'); -my $sort = $input->param('sort'); - -if (!$branch) { - $branch = "ALL"; -} - -my $branches=GetBranches(); - -my ( $template, $borrowernumber, $cookie ) = get_template_and_user( - { - template_name => "reports/reservereport.tt", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => { reports => '*' }, - debug => 1, - } -); - -# building up branches dropdown box - -my %branchall; -my $branchcount=0; -my @branchloop; - -foreach my $br (keys %$branches) { - $branchcount++; - my %branch1; - $branch1{name}=$branches->{$br}->{'branchname'}; - $branch1{value}=$br; - push(@branchloop,\%branch1); - } - -my ( $count, $data ) = unfilledreserves($branch); - -my @dataloop; -my $toggle; -for ( my $i = 0 ; $i < $count ; $i++ ) { - my %line; - $toggle = $i%2 ? 0 : 1; - $line{'borrowernumber'} = $data->[$i]->{'borrowernumber'}; - $line{'surname'} = $data->[$i]->{'surname'}; - $line{'firstname'} = $data->[$i]->{'firstname'}; - $line{'sortdate'} = $data->[$i]->{'reservedate'}; - $line{'reservedate'} = format_date($data->[$i]->{'reservedate'}); - $line{'biblionumber'} = $data->[$i]->{'biblionumber'}; - $line{'title'} = $data->[$i]->{'title'}; - $line{'classification'} = $data->[$i]->{'classification'}; - $line{'dewey'} = $data->[$i]->{'dewey'}; - $line{'status'} = $data->[$i]->{'found'}; - $line{'branchcode'} = $data->[$i]->{'branchcode'}; - $line{'toggle'} = $toggle; - if ( $line{'status'} ne 'W' ) { - - # its not waiting, we need to find if its on issue, or on the shelf - # FIXME still need to shift the text to the template so its translateable - if ( $data->[$i]) { - # find if its on issue - my @items = GetItemsInfo( $line{biblionumber} ); - my $onissue = 0; - foreach my $item (@items) { - if ( $item->{'datedue'} eq 'Reserved' ) { - $onissue = 0; - if ($item->{'branchname'} eq ''){ - $line{'status'}='In Transit'; - } - else { - $line{'status'} = "On shelf at $item->{'branchname'}"; - } - - } - - else { - $onissue = 1; - } - } - if ($onissue) { - $line{'status'} = 'On Issue'; - } - } - else { - $line{'status'}="Waiting for pickup"; - - } - } - push( @dataloop, \%line ); -} - -if ($sort eq 'name'){ - @dataloop = sort {$a->{'surname'} cmp $b->{'surname'}} @dataloop; -} -elsif ($sort eq 'date'){ - @dataloop = sort {$a->{'sortdate'} cmp $b->{'sortdate'}} @dataloop; -} -elsif ($sort eq 'title'){ - @dataloop = sort {$a->{'title'} cmp $b->{'title'}} @dataloop; -} -else { - @dataloop = sort {$a->{'status'} cmp $b->{'status'}} @dataloop; -} - - -$template->param( - count => $count, - dataloop => \@dataloop, - branchcode => $branch, - branchloop => \@branchloop - -); - -output_html_with_http_headers $input, $cookie, $template->output;