Bug 18643: Remove dead code in reports/statistics 'Till reconciliation'
authorMarc Véron <veron@veron.ch>
Sat, 20 May 2017 09:46:00 +0000 (11:46 +0200)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 5 Jun 2017 14:43:53 +0000 (11:43 -0300)
File koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt contains a link to /cgi-bin/koha/reports/stats.screen.pl with label 'Till reconciliation' that is commented out since years.
Remove this link and the related files:
cgi-bin/koha/reports/stats.screen.pl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt

To test:
- Apply patch
- Verify that Koha > Reports still display the same
- Verify that two files stats.screen.pl and stats_screen.tt are gone and thet they are not used
  anywhere in the Koha codebase

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt [deleted file]
reports/stats.screen.pl [deleted file]

index 9ce5d66..6b47b70 100644 (file)
@@ -68,7 +68,6 @@
         <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
                 <li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li>
                 <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha reports library</a></li>
-                <!--<li><a href="/cgi-bin/koha/reports/stats.screen.pl">Till reconciliation</a></li> -->
 </ul></div>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt
deleted file mode 100644 (file)
index df53367..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-[% INCLUDE 'doc-head-open.inc' %] 
-<title>Koha &rsaquo; Reports &rsaquo; Till reconciliation</title>
-[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-</head>
-<body id="rep_stats_screen" class="rep">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'circ-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Till reconciliation
-</div>
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
-
-<h1>Till reconciliation</h1>
-
-<fieldset><legend>Search between two dates</legend>
-<form action="stats.screen.pl" method="post">
-  <label for="from">Start Date: </label>
-  <input type="text" name="time" size="10" value="[% IF ( date ) %][% date %][% ELSE %]today[% END %]" id="from" class="datepickerfrom" />
-  <label for="to">End Date: </label>
-  <input type="text" name="time2" size="10" value="[% IF ( date2 ) %][% date2 %][% ELSE %]tomorrow[% END %]" class="datepickerto" id="to" />
-  <input type="submit" value="To screen" name="submit" class="submit" />
-<!--  <input type="submit" value="To Excel" name="submit" class="button"> --></fieldset>
-</form>
-
-<h2>Payments</h2>
-
-        <table>
-                <tr>
-                        <th>Library</th>
-                        <th>Date/time</th>
-                        <th>Surname</th>
-                        <th>First name</th>
-                        <th>Description</th>
-                        <th>Charge type</th>
-                        <th>Invoice amount</th>
-                        <th>Payment type</th>
-                        <th>Payment amount</th>
-                </tr>
-
-                [% FOREACH loop IN loop1 %]
-                <tr>
-                     <td>[% loop.branch %]</td>
-                        <td>[% loop.datetime %]</td>
-                        <td>[% loop.surname %]</td>
-                        <td>[% loop.firstname %]</td>
-                        <td>[% loop.description %]</td>
-                        <td>[% loop.accounttype %]</td>
-                        <td>[% loop.amount %]</td>
-                        <td>[% loop.type %]</td>
-                        <td>[% loop.value %]</td>
-                </tr>
-                [% END %]
-        </table>
-
-<p>
-        <b>Total amount paid: [% totalpaid %]</b>
-</p>
-
-
-<h2>Credits</h2>
-
-        <table>
-                <tr>
-                        <th>Library</th>
-                        <th>Date/time</th>
-                        <th>Surname</th>
-                        <th>First name</th>
-                        <th>Description</th>
-                        <th>Charge type</th>
-                        <th>Invoice amount</th>
-                </tr>
-
-                [% FOREACH loop IN loop2 %]
-                <tr>
-                     <td>[% loop.creditbranch %]</td>
-                        <td>[% loop.creditdate %]</td>
-                        <td>[% loop.creditsurname %]</td>
-                        <td>[% loop.creditfirstname %]</td>
-                        <td>[% loop.creditdescription %]</td>
-                        <td>[% loop.creditaccounttype %]</td>
-                        <td>[% loop.creditamount %]</td>
-                </tr>
-                [% END %]
-        </table>
-<p>
-       <ul><li> <b>Total amount credits: [% totalcredits %]</b></li>
-        <li><b>Total number written off: [% totalwritten %] charges</b></li></ul>
-</p>
-
-
-<h2>Refunds</h2>
-
-        <table>
-                <tr>
-                        <th>Library</th>
-                        <th>Date/time</th>
-                        <th>Surname</th>
-                        <th>First name</th>
-                        <th>Description</th>
-                        <th>Charge type</th>
-                        <th>Invoice amount</th>
-                </tr>
-
-                [% FOREACH loop IN loop3 %]
-                <tr>
-                     <td>[% loop.refundbranch %]</td>
-                        <td>[% loop.refunddate %]</td>
-                        <td>[% loop.refundsurname %]</td>
-                        <td>[% loop.refundfirstname %]</td>
-                        <td>[% loop.refunddescription %]</td>
-                        <td>[% loop.refundaccounttype %]</td>
-                        <td>[% loop.refundamount %]</td>
-                </tr>
-                [% END %]
-        </table>
-<p>
-        <ul><li><b>Total amount refunds: [% totalrefund %]</b></li>
-        <li><b>Total amount of cash collected: [% totalcash %] </b></li></ul>
-</p>
-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'reports-menu.inc' %]
-</div>
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/reports/stats.screen.pl b/reports/stats.screen.pl
deleted file mode 100755 (executable)
index 9ce4fe8..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright Katipo Communications 2006
-#
-# 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>.
-
-
-use strict;
-#use warnings; FIXME - Bug 2505
-use CGI qw ( -utf8 );
-use C4::Output;
-use C4::Auth;
-use C4::Context;
-use C4::Stats;
-use C4::Accounts;
-use C4::Debug;
-use Date::Manip;
-
-my $input = new CGI;
-my $time  = $input->param('time');
-my $time2 = $input->param('time2');
-my $op    = $input->param('submit');
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "reports/stats_screen.tt",
-        query           => $input,
-        type            => "intranet",
-        flagsrequired   => { reports => '*' },
-    }
-);
-
-( $time  = "today" )    if !$time;
-( $time2 = "tomorrow" ) if !$time2;
-
-my $date  = ParseDate($time);
-my $date2 = ParseDate($time2);
-$date  = UnixDate( $date,  '%Y-%m-%d' );
-$date2 = UnixDate( $date2, '%Y-%m-%d' );
-$debug and warn "MASON: TIME: $time, $time2";
-$debug and warn "MASON: DATE: $date, $date2";
-
-# get a list of every payment
-my @payments = TotalPaid( $date, $date2 );
-
-my $count = @payments;
-
-$debug and warn "MASON: number of payments=$count\n";
-
-my $i            = 0;
-my $totalcharges = 0;
-my $totalcredits = 0;
-my $totalpaid    = 0;
-my $totalwritten = 0;
-my @loop1;
-my @loop2;
-
-# lets get a a list of all individual item charges paid for by that payment
-
-foreach my $payment (@payments) {
-
-    my @charges;
-    if ( $payment->{'type'} ne 'writeoff' ) {
-
-        @charges = getcharges(
-            $payment->{'borrowernumber'},
-            $payment->{'timestamp'},
-            $payment->{'proccode'}
-        );
-        $totalcharges++;
-        my $count = @charges;
-
-   # getting each of the charges and putting them into a array to be printed out
-   #this loops per charge per person
-        for ( my $i2 = 0 ; $i2 < $count ; $i2++ ) {
-            my $hour = substr( $payment->{'timestamp'}, 8,  2 );
-            my $min  = substr( $payment->{'timestamp'}, 10, 2 );
-            my $sec  = substr( $payment->{'timestamp'}, 12, 2 );
-            my $time = "$hour:$min:$sec";
-            my $time2 = "$payment->{'date'}";
-
-  #               my $branch=Getpaidbranch($time2,$payment->{'borrowernumber'});
-            my $branch = $payment->{'branch'};
-
-            # lets build up a row
-            my %rows1 = (
-                branch      => $branch,
-                datetime    => $payment->{'datetime'},
-                surname     => $payment->{'surname'},
-                firstname   => $payment->{'firstname'},
-                description => $charges[$i2]->{'description'},
-                accounttype => $charges[$i2]->{'accounttype'},
-                amount      => sprintf( "%.2f", $charges[$i2]->{'amount'} )
-                ,    # rounding amounts to 2dp
-                type  => $payment->{'type'},
-                value => sprintf( "%.2f", $payment->{'value'} )
-            );       # rounding amounts to 2dp
-
-            push( @loop1, \%rows1 );
-
-        }
-            $totalpaid = $totalpaid + $payment->{'value'};
-                       $debug and warn "totalpaid = $totalpaid";               
-    }
-    else {
-        ++$totalwritten;
-    }
-
-}
-
-#get credits and append to the bottom of payments
-my @credits = getcredits( $date, $date2 );
-
-my $count = @credits;
-my $i     = 0;
-
-while ( $i < $count ) {
-
-    my %rows2 = (
-        creditbranch      => $credits[$i]->{'branchcode'},
-        creditdate        => $credits[$i]->{'date'},
-        creditsurname     => $credits[$i]->{'surname'},
-        creditfirstname   => $credits[$i]->{'firstname'},
-        creditdescription => $credits[$i]->{'description'},
-        creditaccounttype => $credits[$i]->{'accounttype'},
-        creditamount      => sprintf( "%.2f", $credits[$i]->{'amount'} )
-    );
-
-    push( @loop2, \%rows2 );
-    $totalcredits = $totalcredits + $credits[$i]->{'amount'};
-    $i++;    #increment the while loop
-}
-
-#takes off first char minus sign "-100.00"
-$totalcredits = substr( $totalcredits, 1 );
-
-my $totalrefunds = 0;
-my @loop3;
-my @refunds = getrefunds( $date, $date2 );
-$count = @refunds;
-$i     = 0;
-
-while ( $i < $count ) {
-
-    my %rows3 = (
-        refundbranch      => $refunds[$i]->{'branchcode'},
-        refunddate        => $refunds[$i]->{'datetime'},
-        refundsurname     => $refunds[$i]->{'surname'},
-        refundfirstname   => $refunds[$i]->{'firstname'},
-        refunddescription => $refunds[$i]->{'description'},
-        refundaccounttype => $refunds[$i]->{'accounttype'},
-        refundamount      => sprintf( "%.2f", $refunds[$i]->{'amount'} )
-    );
-
-    push( @loop3, \%rows3 );
-    $totalrefunds = $totalrefunds + $refunds[$i]->{'amount'};
-    $i++;    #increment the while loop
-}
-
-my $totalcash = $totalpaid - $totalrefunds;
-
-if ( $op eq 'To Excel' ) {
-
-    my $csv = Text::CSV_XS->new(
-        {
-            'quote_char'  => '"',
-            'escape_char' => '"',
-            'sep_char'    => ',',
-            'binary'      => 1
-        }
-    );
-
-    print $input->header(
-        -type       => 'application/vnd.ms-excel',
-        -attachment => "stats.csv",
-    );
-    print
-"Branch, Datetime, Surname, Firstnames, Description, Type, Invoice amount, Payment type, Payment Amount\n";
-
-    $DB::single = 1;
-
-    for my $row (@loop1) {
-        my @array = (
-            $row->{'branch'},      $row->{'datetime'},
-            $row->{'surname'},     $row->{'firstname'},
-            $row->{'description'}, $row->{'accounttype'},
-            $row->{'amount'},      $row->{'type'},
-            $row->{'value'}
-        );
-
-        $csv->combine(@array);
-        my $string = $csv->string(@array);
-        print $string, "\n";
-    }
-    print ",,,,,,,\n";
-    print
-"Branch, Date/time, Surname, Firstname, Description, Charge Type, Invoice Amount\n";
-
-    for my $row (@loop2) {
-
-        my @array = (
-            $row->{'creditbranch'},      $row->{'creditdate'},
-            $row->{'creditsurname'},     $row->{'creditfirstname'},
-            $row->{'creditdescription'}, $row->{'creditaccounttype'},
-            $row->{'creditamount'}
-        );
-
-        $csv->combine(@array);
-        my $string = $csv->string(@array);
-        print $string, "\n";
-    }
-    print ",,,,,,,\n";
-    print
-"Branch, Date/time, Surname, Firstname, Description, Charge Type, Invoice Amount\n";
-
-    for my $row (@loop3) {
-        my @array = (
-            $row->{'refundbranch'},      $row->{'refunddate'},
-            $row->{'refundsurname'},     $row->{'refundfirstname'},
-            $row->{'refunddescription'}, $row->{'refundaccounttype'},
-            $row->{'refundamount'}
-        );
-
-        $csv->combine(@array);
-        my $string = $csv->string(@array);
-        print $string, "\n";
-
-    }
-
-    print ",,,,,,,\n";
-    print ",,,,,,,\n";
-    print ",,Total Amount Paid, $totalpaid\n";
-    print ",,Total Number Written, $totalwritten\n";
-    print ",,Total Amount Credits, $totalcredits\n";
-    print ",,Total Amount Refunds, $totalrefunds\n";
-}
-else {
-    $template->param(
-        date         => $time,
-        date2        => $time2,
-        loop1        => \@loop1,
-        loop2        => \@loop2,
-        loop3        => \@loop3,
-        totalpaid    => $totalpaid,
-        totalcredits => $totalcredits,
-        totalwritten => $totalwritten,
-        totalrefund  => $totalrefunds,
-        totalcash    => $totalcash,
-    );
-    output_html_with_http_headers $input, $cookie, $template->output;
-}
-