Attachment #101016 for bug #24907

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




my $enddate         = $input->param('to');
my $ratio           = $input->param('ratio');
my $include_ordered = $input->param('include_ordered');
my $include_suspended = $input->param('include_suspended');

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {

  : q{};

my $nfl_comparison = $include_ordered ? '<=' : '=';
my $sus_comparison = $include_suspended ? '<=' : '<';
my $strsth =
"SELECT reservedate,
        reserves.borrowernumber as borrowernumber,

 $include_aqorders_qty_join
 WHERE
 notforloan $nfl_comparison 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
 AND suspend $sus_comparison 1
 $sqldatewhere
";


    to              => $enddate,
    ratio           => $ratio,
    include_ordered => $include_ordered,
    include_suspended => $include_suspended,
    reserveloop     => \@reservedata,
);





    <li>

    <li>
        <label for="include_suspended">Included suspended:</label>
        [% IF include_suspended %]
            <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
        [% ELSE %]
            <input id="include_suspended" name="include_suspended" type="checkbox"/>
        [% END %]
    <li>

    <li>
        <label for="from">Start date:</label>
        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="datepickerfrom" />
    </li>
- 

Return to bug 24907

Lines 37-42 my $startdate = $input->param('from'); Link Here

(-)a/circ/reserveratios.pl (+4 lines)
37	my $enddate = $input->param('to');	37	my $enddate = $input->param('to');
38	my $ratio = $input->param('ratio');	38	my $ratio = $input->param('ratio');
39	my $include_ordered = $input->param('include_ordered');	39	my $include_ordered = $input->param('include_ordered');
		40	my $include_suspended = $input->param('include_suspended');
40		41
41	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	42	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
42	{	43	{
Lines 104-109 my $include_aqorders_qty_join = Link Here
104	: q{};	105	: q{};
105		106
106	my $nfl_comparison = $include_ordered ? '<=' : '=';	107	my $nfl_comparison = $include_ordered ? '<=' : '=';
		108	my $sus_comparison = $include_suspended ? '<=' : '<';
107	my $strsth =	109	my $strsth =
108	"SELECT reservedate,	110	"SELECT reservedate,
109	reserves.borrowernumber as borrowernumber,	111	reserves.borrowernumber as borrowernumber,
Lines 138-143 my $strsth = Link Here
138	$include_aqorders_qty_join	140	$include_aqorders_qty_join
139	WHERE	141	WHERE
140	notforloan $nfl_comparison 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0	142	notforloan $nfl_comparison 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
		143	AND suspend $sus_comparison 1
141	$sqldatewhere	144	$sqldatewhere
142	";	145	";
143		146
Lines 199-204 $template->param( Link Here
199	to => $enddate,	202	to => $enddate,
200	ratio => $ratio,	203	ratio => $ratio,
201	include_ordered => $include_ordered,	204	include_ordered => $include_ordered,
		205	include_suspended => $include_suspended,
202	reserveloop => \@reservedata,	206	reserveloop => \@reservedata,
203	);	207	);
204		208

Lines 141-146 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-1 / +9 lines)
141	<li>	141	<li>
142		142
143	<li>	143	<li>
		144	<label for="include_suspended">Included suspended:</label>
		145	[% IF include_suspended %]
		146	<input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
		147	[% ELSE %]
		148	<input id="include_suspended" name="include_suspended" type="checkbox"/>
		149	[% END %]
		150	<li>
		151
		152	<li>
144	<label for="from">Start date:</label>	153	<label for="from">Start date:</label>
145	<input type="text" size="10" id="from" name="from" value="[% from \| $KohaDates %]" class="datepickerfrom" />	154	<input type="text" size="10" id="from" name="from" value="[% from \| $KohaDates %]" class="datepickerfrom" />
146	</li>	155	</li>
147	-