[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/reports... [rel_2_2]
|
From: |
Chris Cormack |
|
Subject: |
[Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/reports... [rel_2_2] |
|
Date: |
Sun, 01 Jul 2007 22:05:33 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Chris Cormack <rangi> 07/07/01 22:05:33
Modified files:
koha-tmpl/intranet-tmpl/default/en/reports: reports-home.tmpl
koha-tmpl/intranet-tmpl/npl/en/reports: reports-home.tmpl
Added files:
reports : processing_report.pl
koha-tmpl/intranet-tmpl/default/en/reports:
processing_report.tmpl
koha-tmpl/intranet-tmpl/npl/en/reports: processing_report.tmpl
Log message:
Adding Processing orders report
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/reports/processing_report.pl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.2&r2=1.9.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
Patches:
Index: koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/Attic/reports-home.tmpl,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -b -r1.9.2.2 -r1.9.2.3
--- koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl 7 Apr
2005 10:17:45 -0000 1.9.2.2
+++ koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl 1 Jul
2007 22:05:33 -0000 1.9.2.3
@@ -31,6 +31,7 @@
<ul>
<li><a
href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
<li><a
href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by
itemtype</a></li>
+ <li><a href="/cgi-bin/koha/reports/processing_report.pl">Orders
Processing report</a></li>
</ul>
<p>on issues</p>
<ul>
Index: koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/Attic/reports-home.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl 21 Apr 2005
19:38:11 -0000 1.4.2.2
+++ koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl 1 Jul 2007
22:05:33 -0000 1.4.2.3
@@ -19,6 +19,7 @@
<ul>
<li><a
href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
<li><a
href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by
itemtype</a></li>
+ <li><a href="/cgi-bin/koha/reports/processing_report.pl">Orders
Processing report</a></li>
</ul>
</div>
Index: reports/processing_report.pl
===================================================================
RCS file: reports/processing_report.pl
diff -N reports/processing_report.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ reports/processing_report.pl 1 Jul 2007 22:05:33 -0000 1.1.2.1
@@ -0,0 +1,230 @@
+#!/usr/bin/perl
+
+# $Id: processing_report.pl,v 1.1.2.1 2007/07/01 22:05:33 rangi Exp $
+
+# 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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+# test comment
+
+use strict;
+use C4::Auth;
+use CGI;
+use C4::Context;
+use HTML::Template;
+use C4::Koha;
+use C4::Interface::CGI::Output;
+use Date::Manip;
+use C4::Date;
+
+#use Data::Dumper;
+
+my $dbh = C4::Context->dbh;
+
+my $input = new CGI;
+my $do_it = $input->param('do_it');
+my $fullreportname = "reports/processing_report.tmpl";
+my $from = $input->param("from");
+my $to = $input->param("to");
+my $branch = $input->param("branch");
+my $notreceived = $input->param("notreceived");
+
+#warn "from=$from, to=$to, branch=$branch=";
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => $fullreportname,
+ query => $input,
+ type => "intranet",
+ authnotrequired => 1,
+ flagsrequired => { editcatalogue => 1 },
+ debug => 1,
+ }
+);
+$template->param( do_it => $do_it );
+
+my $dbh = C4::Context->dbh;
+my @values;
+my %labels;
+my %select;
+my @select;
+
+# id to and from are blank, populate with min and max amount, to return all
results.
+
+$branch = 'All' if ( !$branch );
+$from = '0000-00-00' if ( !$from );
+$to = '9999-99-99' if ( !$to );
+
+my $req;
+
+# get real branches (with a valid branchename), not mending, transit etc...
+$req = $dbh->prepare(
+ " SELECT branches.branchcode, branchname
+ FROM branches, branchrelations
+ WHERE categorycode = 'RE' AND
+ branches.branchcode = branchrelations.branchcode "
+);
+
+$req->execute;
+undef @select;
+undef %select;
+push @select, "All";
+$select{"All"} = "All";
+
+while ( my ( $value, $desc ) = $req->fetchrow ) {
+ push @select, $value;
+ $select{$value} = $desc;
+}
+my $CGIBranches = CGI::scrolling_list(
+ -name => 'branch',
+ -id => 'branch',
+ -values => address@hidden,
+ -labels => \%select,
+ -size => 1,
+ -multiple => 0
+);
+
+$template->param( CGIBranches => $CGIBranches, );
+
+#--------------------------------------------------------
+if ($do_it) {
+
+ my @orders;
+ my @resultloop;
+ my $toggle;
+ my $i = 0;
+ my @results;
+ my $results;
+ my $count = 0;
+
+ # get all the orders from startdate to enddate....
+ my $query = " select * from aqorders, aqorderbreakdown where ";
+ $query .= "entrydate > ? and " if ($from);
+
+ if ($to) {
+ $query .= "(datereceived < ? ";
+ $query .= "or datereceived is null" if ( $notreceived eq 'on' );
+ $query .= ") ";
+
+ }
+
+ $query .= " and aqorders.ordernumber = aqorderbreakdown.ordernumber";
+ $query .= " ORDER by title";
+
+
+ #warn "query = $query";
+
+ my $sth = $dbh->prepare($query);
+ $sth->execute( $from, $to );
+
+ while ( my $data = $sth->fetchrow_hashref ) {
+ my $datereceived = $data->{'datereceived'};
+ my $biblioitemnumber = $data->{'biblioitemnumber'};
+
+ # lets get some item info (if an item has been created
+ # and get some issue info too
+
+ $DB::single = 1;
+ my $query1 =
+"select * from items where biblioitemnumber = ? and dateaccessioned = ? limit
1";
+ my $sth1 = $dbh->prepare($query1);
+ $sth1->execute( $biblioitemnumber, $datereceived );
+ my $data1 = $sth1->fetchrow_hashref;
+
+ if ( $data1->{'homebranch'} eq $branch || $branch eq 'All' ) {
+ $data->{'homebranch'} = $data1->{'homebranch'};
+ $data->{'itemnumber'} = $data1->{'itemnumber'};
+ $data->{'dateaccessioned'} = $data1->{'dateaccessioned'};
+ $sth1->finish;
+ my $query2 = "select datetime from statistics where
+ itemnumber = ? and (type = 'return' or type = 'issue')
+ order by datetime limit 1";
+ my $sth2 = $dbh->prepare($query2);
+ $sth2->execute( $data->{'itemnumber'} );
+ my $data2 = $sth2->fetchrow_array;
+
+ $data->{'shelvedate'} = datetime_to_date($data2);
+ $sth2->finish;
+
+ # lets work out the number of total days in processing;
+
+ my $date1 = &ParseDate( $data->{'datereceived'} );
+ my $date2 = &ParseDate( $data->{'shelvedate'} );
+ if ( $data->{'shelvedate'} && $data->{'datereceived'} ) {
+ my $err;
+ my $delta = &DateCalc( $date1, $date2, \$err );
+ my $delta = &Delta_Format( $delta, 'exact', '%dt' );
+ my @delta = split /\./, $delta;
+
+ $data->{'delta'} = $delta[0];
+ }
+
+ $date1 = &ParseDate( $data->{'entrydate'} );
+ $date2 = &ParseDate( $data->{'datereceived'} );
+ if ( $data->{'entrydate'} && $data->{'datereceived'} ) {
+ my $err;
+ my $delta = &DateCalc( $date1, $date2, \$err );
+ my $delta = &Delta_Format( $delta, 'exact', '%dt' );
+ my @delta = split /\./, $delta;
+
+ $data->{'onorder'} = $delta[0];
+ }
+
+
+ $results[$count] = $data;
+ $count++;
+ }
+
+ }
+ $sth->finish;
+
+ #--------------------------------------------------------
+
+ for ( my $i = 0 ; $i < $count ; $i++ ) {
+ $toggle = $i % 2 ? 0 : 1;
+ my %line;
+ $line{'ordernumber'} = $results[$i]->{'ordernumber'};
+ $line{'title'} = $results[$i]->{'title'};
+ $line{'biblionumber'} = $results[$i]->{'biblionumber'};
+ $line{'homebranch'} = $results[$i]->{'homebranch'};
+ $line{'entrydate'} = $results[$i]->{'entrydate'};
+ $line{'datereceived'} = $results[$i]->{'datereceived'};
+ $line{'returndate'} = $results[$i]->{'returndate'};
+ $line{'dateaccessioned'} = $results[$i]->{'dateaccessioned'};
+ $line{'shelvedate'} = $results[$i]->{'shelvedate'};
+ $line{'delta'} = $results[$i]->{'delta'};
+ $line{'onorder'} = $results[$i]->{'onorder'};
+ $line{'toggle'} = $toggle;
+
+ #warn Dumper %line;
+ push( @resultloop, \%line );
+ }
+
+ #warn Dumper @resultloop;
+
+ $template->param(
+ from => $from,
+ to => $to,
+ branch => $branch,
+ count => $count,
+ notreceived => $notreceived,
+ resultloop => address@hidden,
+
+ );
+}
+
+output_html_with_http_headers $input, $cookie, $template->output;
Index: koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl
diff -N koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl 1 Jul
2007 22:05:33 -0000 1.1.2.1
@@ -0,0 +1,104 @@
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+<div id="main" >
+
+
+ <h1 class = "reports">Koha : Orders Processing Report </h1>
+ <form method="post">
+ <table>
+ <thead>
+ <tr>
+ <th class="reports">Start Date</th>
+ <th class="reports">End Date</th>
+ <th class="reports">Branch</th>
+ </tr>
+ </thead>
+ <tbody>
+<!---------------------------------------------------------------------------------------------------------------------------------------->
+ <tr class="hilighted">
+ <td > From <input type="text" size="10"
id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" >
+ <img src="<!-- TMPL_VAR
Name="themelang" -->/includes/calendar/cal.gif" id="buttonfrom1" style="cursor:
pointer;" />
+ <script type="text/javascript">
+ Calendar.setup({
+ inputField : "from",
+ ifFormat : "%Y-%m-%d",
+ button :
"buttonfrom1",
+ align : "Tl"
+ });
+ </script>
+ </td>
+
+
+ <td> To <input type="text" size="10" id="to"
name="to" value="<!-- TMPL_VAR NAME="to" -->" >
+ <img src="<!-- TMPL_VAR
Name="themelang" -->/includes/calendar/cal.gif" id="buttonto1" style="cursor:
pointer;" />
+ <script type="text/javascript">
+ Calendar.setup({
+ inputField : "to",
+ ifFormat : "%Y-%m-%d",
+ button :
"buttonto1",
+ align : "Tl"
+ });
+ </script>
+ </td>
+<td ><!-- TMPL_VAR NAME="CGIBranches" -->
+
+ <input TYPE="submit" value="OK" class="button reports">
+ <input type="hidden" name="report_name" value="<!--TMPL_VAR
NAME="report_name" -->">
+ <input type="hidden" name="do_it" value="1">
+ </form>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td>Include 'not yet received' items</td>
+ <td><input type="checkbox" name="notreceived"></td>
+ </tr>
+ </tbody>
+ </table>
+
+<br>
+<br>
+<!-- TMPL_IF NAME="do_it" -->
+<!-- Startdate= ><!-- TMPL_VAR NAME="from" -->, enddate=><!-- TMPL_VAR
NAME="to" -->, branch=><!-- TMPL_VAR NAME="branch" --> -->
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+<tr valign="top">
+ <td class="cell-header">Order</td>
+ <td class="cell-header">Title</td>
+ <td class="cell-header">Order Placed</td>
+ <td class="cell-header">Date Recieved</td>
+ <td class="cell-header">Date Shelved</td>
+ <td class="cell-header">Days on Order</td>
+ <td class="cell-header">Processing Days</td>
+ <td class="cell-header">Branch</td>
+</tr>
+
+<!--TMPL_LOOP NAME="resultloop"-->
+
+<!--TMPL_IF name="toggle"-->
+ <tr valign="top" class="hilighted">
+ <!--TMPL_ELSE-->
+ <tr valign="top" class="hilighted2">
+ <!--/TMPL_IF-->
+ <td class="cell"><a
href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!--TMPL_VAR
NAME="ordernumber"-->><!--TMPL_VAR NAME="ordernumber"--></a> </td>
+ <td class="cell"><a
href=/cgi-bin/koha/detail.pl?type=intra&bib=<!--TMPL_VAR
NAME="biblionumber"-->><!--TMPL_VAR NAME="title"--></a> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="entrydate"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="datereceived"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="shelvedate"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="onorder"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="delta"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="homebranch"--> </td>
+</tr>
+
+<!--/TMPL_LOOP"-->
+</table>
+
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl
diff -N koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl 1 Jul
2007 22:05:33 -0000 1.1.2.1
@@ -0,0 +1,106 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Orders Processing
Report<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+<div id="main" >
+
+
+ <h1 class = "reports">Koha : Orders Processing Report </h1>
+ <form method="post">
+ <table>
+ <thead>
+ <tr>
+ <th class="reports">Start Date</th>
+ <th class="reports">End Date</th>
+ <th class="reports">Branch</th>
+ </tr>
+ </thead>
+ <tbody>
+<!---------------------------------------------------------------------------------------------------------------------------------------->
+ <tr class="hilighted">
+ <td > From <input type="text" size="10"
id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" >
+ <img src="<!-- TMPL_VAR
Name="themelang" -->/includes/calendar/cal.gif" id="buttonfrom1" style="cursor:
pointer;" />
+ <script type="text/javascript">
+ Calendar.setup({
+ inputField : "from",
+ ifFormat : "%Y-%m-%d",
+ button :
"buttonfrom1",
+ align : "Tl"
+ });
+ </script>
+ </td>
+
+
+ <td> To <input type="text" size="10" id="to"
name="to" value="<!-- TMPL_VAR NAME="to" -->" >
+ <img src="<!-- TMPL_VAR
Name="themelang" -->/includes/calendar/cal.gif" id="buttonto1" style="cursor:
pointer;" />
+ <script type="text/javascript">
+ Calendar.setup({
+ inputField : "to",
+ ifFormat : "%Y-%m-%d",
+ button :
"buttonto1",
+ align : "Tl"
+ });
+ </script>
+ </td>
+<td ><!-- TMPL_VAR NAME="CGIBranches" -->
+
+ <input TYPE="submit" value="OK" class="button reports">
+ <input type="hidden" name="report_name" value="<!--TMPL_VAR
NAME="report_name" -->">
+ <input type="hidden" name="do_it" value="1">
+ </form>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td>Include 'not yet received' items</td>
+ <td><input type="checkbox" name="notreceived"></td>
+ </tr>
+ </tbody>
+ </table>
+
+<br>
+<br>
+<!-- TMPL_IF NAME="do_it" -->
+<!-- Startdate= ><!-- TMPL_VAR NAME="from" -->, enddate=><!-- TMPL_VAR
NAME="to" -->, branch=><!-- TMPL_VAR NAME="branch" --> -->
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+<tr valign="top">
+ <td class="cell-header">Order</td>
+ <td class="cell-header">Title</td>
+ <td class="cell-header">Order Placed</td>
+ <td class="cell-header">Date Recieved</td>
+ <td class="cell-header">Date Shelved</td>
+ <td class="cell-header">Days on Order</td>
+ <td class="cell-header">Processing Days</td>
+ <td class="cell-header">Branch</td>
+</tr>
+
+<!--TMPL_LOOP NAME="resultloop"-->
+
+<!--TMPL_IF name="toggle"-->
+ <tr valign="top" class="hilighted">
+ <!--TMPL_ELSE-->
+ <tr valign="top" class="hilighted2">
+ <!--/TMPL_IF-->
+ <td class="cell"><a
href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!--TMPL_VAR
NAME="ordernumber"-->><!--TMPL_VAR NAME="ordernumber"--></a> </td>
+ <td class="cell"><a
href=/cgi-bin/koha/detail.pl?type=intra&bib=<!--TMPL_VAR
NAME="biblionumber"-->><!--TMPL_VAR NAME="title"--></a> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="entrydate"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="datereceived"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="shelvedate"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="onorder"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="delta"--> </td>
+ <td class="cell"> <!--TMPL_VAR
NAME="homebranch"--> </td>
+</tr>
+
+<!--/TMPL_LOOP"-->
+</table>
+
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/reports... [rel_2_2],
Chris Cormack <=