Bugzilla – Attachment 43306 Details for
Bug 14995
Remove C4::Dates: Delete files reservereport.pl / reservereport.tt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14995 - Remove C4::Dates: Delete files reservereport.pl / reservereport.tt
Bug-14995---Remove-C4Dates-Delete-files-reserverep.patch (text/plain), 7.76 KB, created by
Marc Véron
on 2015-10-09 19:43:03 UTC
(
hide
)
Description:
Bug 14995 - Remove C4::Dates: Delete files reservereport.pl / reservereport.tt
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2015-10-09 19:43:03 UTC
Size:
7.76 KB
patch
obsolete
>From 6898888277ffa195c136431332418f3ffa663cb3 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >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' >--- > .../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 c2cbc4f..0000000 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tt >+++ /dev/null >@@ -1,44 +0,0 @@ >-[% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Hold Report › All holds</title> >-[% INCLUDE 'doc-head-close.inc' %] >-</head> >-<body id="rep_reservereport" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >- >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › All holds</div> >- >-<div id="doc3" class="yui-t2"> >- >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >- >-<table> >- <tr><th>Name</th><th>Hold date</th><th>Title</th><th>Class</th></tr> >- [% FOREACH dataloo IN dataloop %] >- <tr> >- <td> >- [% dataloo.name %] >- </td> >- <td> >- [% dataloo.reservedate %] >- </td> >- <td> >- [% dataloo.title |html %] >- </td> >- <td> >- [% dataloo.classification %] >- </td> >- </tr> >- [% END %] >-</table> >-<p>[% count %]</p> >- >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'reports-menu.inc' %] >-</div> >-</div> >-[% 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 17bcf33..0000000 >--- 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 <http://www.gnu.org/licenses>. >- >-# 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; >-- >1.7.10.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=43306">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14995
:
43306
|
43881
|
43933