Attachment #60008 for bug #18079

View | Details | Raw Unified | Return to bug 18079
Collapse All | Expand All




# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;
#		Someone let me know what indep. branches is supposed to do and I'll make that part work too
#
# 		The reserve pull lists *works* as long as not for indepencdant branches, I can fix!

use strict;
#use warnings; FIXME - Bug 2505

use constant PULL_INTERVAL => 2;


use DateTime::Duration;

my $input = new CGI;
my $startdate = $input->param('from');
my $enddate = $input->param('to');
my $run_report = ( not defined $input->param('run_report') ) ? 1 : $input->param('run_report');

my $theme = $input->param('theme');    # only used if allowthemeoverride is set


);

my $today = dt_from_string;
$startdate =~ s/^\s+//;
$startdate =~ s/\s+$//;
$enddate =~ s/^\s+//;
$enddate =~ s/\s+$//;

if ( $startdate ) {
    $startdate =~ s/^\s+//;
    $startdate =~ s/\s+$//;
    $startdate = eval{dt_from_string( $startdate )};
}
unless ( $startdate ){

}

if ( $enddate ) {
    $enddate =~ s/^\s+//;
    $enddate =~ s/\s+$//;
    $enddate = eval{dt_from_string( $enddate )};
}
unless ( $enddate ) {

}

my @reservedata;
my $dbh = C4::Context->dbh;
my $sqldatewhere = "";
my $startdate_iso = output_pref({ dt => $startdate, dateformat => 'iso', dateonly => 1 });
my $enddate_iso   = output_pref({ dt => $enddate, dateformat => 'iso', dateonly => 1 });
    my $enddate_iso   = output_pref({ dt => $enddate, dateformat => 'iso', dateonly => 1 });
    $debug and warn $startdate_iso. "\n" . $enddate_iso;
    my @query_params = ();
    if ($startdate_iso) {
        $sqldatewhere .= " AND reservedate >= ?";
        push @query_params, $startdate_iso;
    }
    if ($enddate_iso) {
        $sqldatewhere .= " AND reservedate <= ?";
        push @query_params, $enddate_iso;
    }

$debug and warn $startdate_iso. "\n" . $enddate_iso;

my @query_params = ();

if ($startdate_iso) {
    $sqldatewhere .= " AND reservedate >= ?";
    push @query_params, $startdate_iso;
}
if ($enddate_iso) {
    $sqldatewhere .= " AND reservedate <= ?";
    push @query_params, $enddate_iso;
}

my $strsth =
    "SELECT min(reservedate) as l_reservedate,
            reserves.borrowernumber as borrowernumber,
            GROUP_CONCAT(DISTINCT items.holdingbranch 
                    ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
            reserves.biblionumber,
            reserves.branchcode as l_branch,
            GROUP_CONCAT(DISTINCT reserves.branchcode 
                    ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
            items.holdingbranch as branch,
            GROUP_CONCAT(DISTINCT items.itype 
                    ORDER BY items.itemnumber SEPARATOR '|') l_itype,
            GROUP_CONCAT(DISTINCT items.location 

                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
            GROUP_CONCAT(DISTINCT items.copynumber
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
            items.itemnumber,
            notificationdate,
            reminderdate,
            max(priority) as priority,
            reserves.found,
            biblio.title,
            biblio.author,
            count(DISTINCT items.itemnumber) as icount,

    $sqldatewhere
    AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)
    AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
    AND items.itemnumber NOT IN (select itemnumber FROM reserves where found IS NOT NULL)
    AND issues.itemnumber IS NULL
    AND reserves.priority <> 0 
    AND reserves.suspend = 0

    #    multiple patrons have a hold on an item


if (C4::Context->preference('IndependentBranches')){
    $strsth .= " AND items.holdingbranch=? ";
    push @query_params, C4::Context->userenv->{'branch'};
}
$strsth .= " GROUP BY reserves.biblionumber ORDER BY biblio.title ";

my $sth = $dbh->prepare($strsth);
$sth->execute(@query_params);

while ( my $data = $sth->fetchrow_hashref ) {
    my $record = Koha::Biblios->find($data->{biblionumber});
    if ($record){
        $data->{subtitle} = [ $record->subtitles ];
        }
        push(
            @reservedata,
            {
                reservedate     => $data->{l_reservedate},
                priority        => $data->{priority},
                name            => $data->{l_patron},
                title           => $data->{title},
                subtitle        => $data->{subtitle},
                author          => $data->{author},
                borrowernumber  => $data->{borrowernumber},
                itemnum         => $data->{itemnumber},
                phone           => $data->{phone},
                email           => $data->{email},
                biblionumber    => $data->{biblionumber},
                statusw         => ( $data->{found} eq "W" ),
                statusf         => ( $data->{found} eq "F" ),
                holdingbranches => [split('\|', $data->{l_holdingbranch})],,
                branch          => $data->{l_branch},
                itemcallnumber  => $data->{l_itemcallnumber},
                enumchron       => $data->{l_enumchron},
                copyno          => $data->{l_copynumber},
                notificationdate=> $data->{notificationdate},
                reminderdate    => $data->{reminderdate},
                count           => $data->{icount},
                rcount          => $data->{rcount},
                pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
                itypes          => [split('\|', $data->{l_itype})],
                locations       => [split('\|', $data->{l_location})],
            }
        );
    }
    push(
        @reservedata, {
            reservedate     => $data->{l_reservedate},
            name            => $data->{l_patron},
            title           => $data->{title},
            subtitle        => $data->{subtitle},
            author          => $data->{author},
            borrowernumber  => $data->{borrowernumber},
            biblionumber    => $data->{biblionumber},
            holdingbranches => [split('\|', $data->{l_holdingbranch})],
            branch          => $data->{l_branch},
            itemcallnumber  => $data->{l_itemcallnumber},
            enumchron       => $data->{l_enumchron},
            copyno          => $data->{l_copynumber},
            count           => $data->{icount},
            rcount          => $data->{rcount},
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
            itypes          => [split('\|', $data->{l_itype})],
            locations       => [split('\|', $data->{l_location})],
        }
    );
}
$sth->finish;

$template->param(
    todaysdate          => $today,
    from                => $startdate,
    to                  => $enddate,
    run_report          => $run_report,
    reserveloop         => \@reservedata,
    "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
    HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL,




    <div id="yui-main">
    <div class="yui-b">

<h2>Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]</h2>
[% IF ( run_report ) %]
<h3>Reported on [% todaysdate | $KohaDates %]</h3>
<p>The following holds have not been filled. Please retrieve them and check them in.</p>
<div class="searchresults">

        </td>
        <td>
            <span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate | $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) %]</span>
            [% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fulfilled</p>[% END %]
        </td>
        </tr>
        [% END %]

        <b>No items found.</b>
    [% END %]
</div>
[% END %]

</div>
</div>
- 

Return to bug 18079

Lines 17-29 Link Here

(-)a/circ/pendingreserves.pl (-84 / +60 lines)
17	# You should have received a copy of the GNU General Public License	17	# You should have received a copy of the GNU General Public License
18	# along with Koha; if not, see <http://www.gnu.org/licenses>.	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
19		19
20	# Modification by D.Ulm, actually works (as long as indep. branches not turned on)	20	use Modern::Perl;
21	# Someone let me know what indep. branches is supposed to do and I'll make that part work too
22	#
23	# The reserve pull lists works as long as not for indepencdant branches, I can fix!
24
25	use strict;
26	#use warnings; FIXME - Bug 2505
27		21
28	use constant PULL_INTERVAL => 2;	22	use constant PULL_INTERVAL => 2;
29		23
Lines 37-45 use Koha::DateUtils; Link Here
37	use DateTime::Duration;	31	use DateTime::Duration;
38		32
39	my $input = new CGI;	33	my $input = new CGI;
40	my $startdate=$input->param('from');	34	my $startdate = $input->param('from');
41	my $enddate=$input->param('to');	35	my $enddate = $input->param('to');
42	my $run_report = ( not defined $input->param('run_report') ) ? 1 : $input->param('run_report');
43		36
44	my $theme = $input->param('theme'); # only used if allowthemeoverride is set	37	my $theme = $input->param('theme'); # only used if allowthemeoverride is set
45		38
Lines 55-66 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
55	);	48	);
56		49
57	my $today = dt_from_string;	50	my $today = dt_from_string;
58	$startdate =~ s/^\s+//;
59	$startdate =~ s/\s+$//;
60	$enddate =~ s/^\s+//;
61	$enddate =~ s/\s+$//;
62		51
63	if ( $startdate ) {	52	if ( $startdate ) {
		53	$startdate =~ s/^\s+//;
		54	$startdate =~ s/\s+$//;
64	$startdate = eval{dt_from_string( $startdate )};	55	$startdate = eval{dt_from_string( $startdate )};
65	}	56	}
66	unless ( $startdate ){	57	unless ( $startdate ){
Lines 70-75 unless ( $startdate ){ Link Here
70	}	61	}
71		62
72	if ( $enddate ) {	63	if ( $enddate ) {
		64	$enddate =~ s/^\s+//;
		65	$enddate =~ s/\s+$//;
73	$enddate = eval{dt_from_string( $enddate )};	66	$enddate = eval{dt_from_string( $enddate )};
74	}	67	}
75	unless ( $enddate ) {	68	unless ( $enddate ) {
Lines 78-109 unless ( $enddate ) { Link Here
78	}	71	}
79		72
80	my @reservedata;	73	my @reservedata;
81	if ( $run_report ) {	74	my $dbh = C4::Context->dbh;
82	my $dbh = C4::Context->dbh;	75	my $sqldatewhere = "";
83	my $sqldatewhere = "";	76	my $startdate_iso = output_pref({ dt => $startdate, dateformat => 'iso', dateonly => 1 });
84	my $startdate_iso = output_pref({ dt => $startdate, dateformat => 'iso', dateonly => 1 });	77	my $enddate_iso = output_pref({ dt => $enddate, dateformat => 'iso', dateonly => 1 });
85	my $enddate_iso = output_pref({ dt => $enddate, dateformat => 'iso', dateonly => 1 });
86	$debug and warn $startdate_iso. "\n" . $enddate_iso;
87	my @query_params = ();
88	if ($startdate_iso) {
89	$sqldatewhere .= " AND reservedate >= ?";
90	push @query_params, $startdate_iso;
91	}
92	if ($enddate_iso) {
93	$sqldatewhere .= " AND reservedate <= ?";
94	push @query_params, $enddate_iso;
95	}
96		78
97	my $strsth =	79	$debug and warn $startdate_iso. "\n" . $enddate_iso;
		80
		81	my @query_params = ();
		82
		83	if ($startdate_iso) {
		84	$sqldatewhere .= " AND reservedate >= ?";
		85	push @query_params, $startdate_iso;
		86	}
		87	if ($enddate_iso) {
		88	$sqldatewhere .= " AND reservedate <= ?";
		89	push @query_params, $enddate_iso;
		90	}
		91
		92	my $strsth =
98	"SELECT min(reservedate) as l_reservedate,	93	"SELECT min(reservedate) as l_reservedate,
99	reserves.borrowernumber as borrowernumber,	94	reserves.borrowernumber as borrowernumber,
100	GROUP_CONCAT(DISTINCT items.holdingbranch	95	GROUP_CONCAT(DISTINCT items.holdingbranch
101	ORDER BY items.itemnumber SEPARATOR '\|') l_holdingbranch,	96	ORDER BY items.itemnumber SEPARATOR '\|') l_holdingbranch,
102	reserves.biblionumber,	97	reserves.biblionumber,
103	reserves.branchcode,	98	reserves.branchcode as l_branch,
104	GROUP_CONCAT(DISTINCT reserves.branchcode
105	ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
106	items.holdingbranch as branch,
107	GROUP_CONCAT(DISTINCT items.itype	99	GROUP_CONCAT(DISTINCT items.itype
108	ORDER BY items.itemnumber SEPARATOR '\|') l_itype,	100	ORDER BY items.itemnumber SEPARATOR '\|') l_itype,
109	GROUP_CONCAT(DISTINCT items.location	101	GROUP_CONCAT(DISTINCT items.location
Lines 114-124 if ( $run_report ) { Link Here
114	ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,	106	ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
115	GROUP_CONCAT(DISTINCT items.copynumber	107	GROUP_CONCAT(DISTINCT items.copynumber
116	ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,	108	ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
117	items.itemnumber,
118	notificationdate,
119	reminderdate,
120	max(priority) as priority,
121	reserves.found,
122	biblio.title,	109	biblio.title,
123	biblio.author,	110	biblio.author,
124	count(DISTINCT items.itemnumber) as icount,	111	count(DISTINCT items.itemnumber) as icount,
Lines 135-141 if ( $run_report ) { Link Here
135	$sqldatewhere	122	$sqldatewhere
136	AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)	123	AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)
137	AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)	124	AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
138	AND items.itemnumber NOT IN (select itemnumber FROM reserves where found='W')	125	AND items.itemnumber NOT IN (select itemnumber FROM reserves where found IS NOT NULL)
139	AND issues.itemnumber IS NULL	126	AND issues.itemnumber IS NULL
140	AND reserves.priority <> 0	127	AND reserves.priority <> 0
141	AND reserves.suspend = 0	128	AND reserves.suspend = 0
Lines 145-203 if ( $run_report ) { Link Here
145	# multiple patrons have a hold on an item	132	# multiple patrons have a hold on an item
146		133
147		134
148	if (C4::Context->preference('IndependentBranches')){	135	if (C4::Context->preference('IndependentBranches')){
149	$strsth .= " AND items.holdingbranch=? ";	136	$strsth .= " AND items.holdingbranch=? ";
150	push @query_params, C4::Context->userenv->{'branch'};	137	push @query_params, C4::Context->userenv->{'branch'};
151	}	138	}
152	$strsth .= " GROUP BY reserves.biblionumber ORDER BY biblio.title ";	139	$strsth .= " GROUP BY reserves.biblionumber ORDER BY biblio.title ";
153		140
154	my $sth = $dbh->prepare($strsth);	141	my $sth = $dbh->prepare($strsth);
155	$sth->execute(@query_params);	142	$sth->execute(@query_params);
156		143
157	while ( my $data = $sth->fetchrow_hashref ) {	144	while ( my $data = $sth->fetchrow_hashref ) {
158	my $record = Koha::Biblios->find($data->{biblionumber});	145	my $record = Koha::Biblios->find($data->{biblionumber});
159	if ($record){	146	if ($record){
160	$data->{subtitle} = [ $record->subtitles ];	147	$data->{subtitle} = [ $record->subtitles ];
161	}
162	push(
163	@reservedata,
164	{
165	reservedate => $data->{l_reservedate},
166	priority => $data->{priority},
167	name => $data->{l_patron},
168	title => $data->{title},
169	subtitle => $data->{subtitle},
170	author => $data->{author},
171	borrowernumber => $data->{borrowernumber},
172	itemnum => $data->{itemnumber},
173	phone => $data->{phone},
174	email => $data->{email},
175	biblionumber => $data->{biblionumber},
176	statusw => ( $data->{found} eq "W" ),
177	statusf => ( $data->{found} eq "F" ),
178	holdingbranches => [split('\\|', $data->{l_holdingbranch})],,
179	branch => $data->{l_branch},
180	itemcallnumber => $data->{l_itemcallnumber},
181	enumchron => $data->{l_enumchron},
182	copyno => $data->{l_copynumber},
183	notificationdate=> $data->{notificationdate},
184	reminderdate => $data->{reminderdate},
185	count => $data->{icount},
186	rcount => $data->{rcount},
187	pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
188	itypes => [split('\\|', $data->{l_itype})],
189	locations => [split('\\|', $data->{l_location})],
190	}
191	);
192	}	148	}
193	$sth->finish;	149	push(
		150	@reservedata, {
		151	reservedate => $data->{l_reservedate},
		152	name => $data->{l_patron},
		153	title => $data->{title},
		154	subtitle => $data->{subtitle},
		155	author => $data->{author},
		156	borrowernumber => $data->{borrowernumber},
		157	biblionumber => $data->{biblionumber},
		158	holdingbranches => [split('\\|', $data->{l_holdingbranch})],
		159	branch => $data->{l_branch},
		160	itemcallnumber => $data->{l_itemcallnumber},
		161	enumchron => $data->{l_enumchron},
		162	copyno => $data->{l_copynumber},
		163	count => $data->{icount},
		164	rcount => $data->{rcount},
		165	pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
		166	itypes => [split('\\|', $data->{l_itype})],
		167	locations => [split('\\|', $data->{l_location})],
		168	}
		169	);
194	}	170	}
		171	$sth->finish;
195		172
196	$template->param(	173	$template->param(
197	todaysdate => $today,	174	todaysdate => $today,
198	from => $startdate,	175	from => $startdate,
199	to => $enddate,	176	to => $enddate,
200	run_report => $run_report,
201	reserveloop => \@reservedata,	177	reserveloop => \@reservedata,
202	"BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,	178	"BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
203	HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') \|\| PULL_INTERVAL,	179	HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') \|\| PULL_INTERVAL,

Lines 85-92 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-5 / +1 lines)
85	<div id="yui-main">	85	<div id="yui-main">
86	<div class="yui-b">	86	<div class="yui-b">
87		87
88	<h2>Holds to pull[% IF ( run_report ) %] placed between [% from \| $KohaDates %] and [% to \| $KohaDates %][% END %]</h2>	88	<h2>Holds to pull placed between [% from \| $KohaDates %] and [% to \| $KohaDates %]</h2>
89	[% IF ( run_report ) %]
90	<h3>Reported on [% todaysdate \| $KohaDates %]</h3>	89	<h3>Reported on [% todaysdate \| $KohaDates %]</h3>
91	<p>The following holds have not been filled. Please retrieve them and check them in.</p>	90	<p>The following holds have not been filled. Please retrieve them and check them in.</p>
92	<div class="searchresults">	91	<div class="searchresults">
Lines 149-155 $(document).ready(function() { Link Here
149	</td>	148	</td>
150	<td>	149	<td>
151	<span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate \| $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) %]</span>	150	<span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate \| $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) %]</span>
152	[% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fulfilled</p>[% END %]
153	</td>	151	</td>
154	</tr>	152	</tr>
155	[% END %]	153	[% END %]
Lines 175-181 $(document).ready(function() { Link Here
175	<b>No items found.</b>	173	<b>No items found.</b>
176	[% END %]	174	[% END %]
177	</div>	175	</div>
178	[% END %]
179		176
180	</div>	177	</div>
181	</div>	178	</div>
182	-