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

(-)a/circ/reserveratios.pl (-4 / +7 lines)
Lines 33-41 use C4::Biblio qw/GetMarcBiblio GetRecordValue GetFrameworkCode/; Link Here
33
use C4::Acquisition qw/GetOrdersByBiblionumber/;
33
use C4::Acquisition qw/GetOrdersByBiblionumber/;
34
34
35
my $input = new CGI;
35
my $input = new CGI;
36
my $startdate = $input->param('from');
36
my $startdate       = $input->param('from');
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
40
40
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
41
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
41
    {
42
    {
Lines 90-95 if ($enddate) { Link Here
90
    push @query_params, format_date_in_iso($enddate);
91
    push @query_params, format_date_in_iso($enddate);
91
}
92
}
92
93
94
my $nfl_comparison = $include_ordered ? '<=' : '=';
93
my $strsth =
95
my $strsth =
94
"SELECT reservedate,
96
"SELECT reservedate,
95
        reserves.borrowernumber as borrowernumber,
97
        reserves.borrowernumber as borrowernumber,
Lines 116-122 my $strsth = Link Here
116
 LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
118
 LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
117
 LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
119
 LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
118
 WHERE
120
 WHERE
119
 notforloan = 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
121
 notforloan $nfl_comparison 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
120
 $sqldatewhere
122
 $sqldatewhere
121
";
123
";
122
124
Lines 177-182 $template->param( Link Here
177
    from            => $startdate,
179
    from            => $startdate,
178
    to              => $enddate,
180
    to              => $enddate,
179
    ratio           => $ratio,
181
    ratio           => $ratio,
182
    include_ordered => $include_ordered,
180
    reserveloop     => \@reservedata,
183
    reserveloop     => \@reservedata,
181
);
184
);
182
185
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-15 / +25 lines)
Lines 89-108 Link Here
89
<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
89
<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
90
<fieldset class="brief">
90
<fieldset class="brief">
91
<h4>Refine results:</h4>
91
<h4>Refine results:</h4>
92
<ol><li><label for="ratio">
92
<ol>
93
    Hold ratio:
93
    <li>
94
</label>
94
        <label for="ratio">Hold ratio:</label>
95
<input type="text" size="5" id="ratio" name="ratio" value="[% ratio %]" /></li>
95
        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio %]" />
96
<li><label for="from">
96
    <li>
97
    Start date:
97
98
</label>
98
    <li>
99
<input type="text" size="10" id="from" name="from" value="[% from %]" class="datepickerfrom" />
99
        <label for="include_ordered">Included ordered:</label>
100
</li>
100
        [% IF include_ordered %]
101
<li><label for="to">
101
            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
102
    End date:
102
        [% ELSE %]
103
</label>
103
            <input id="include_ordered" name="include_ordered" type="checkbox"/>
104
<input size="10" id="to" name="to" value="[% to %]" type="text" class="datepickerto" />
104
        [% END %]
105
</li></ol>
105
    <li>
106
107
    <li>
108
        <label for="from">Start date:</label>
109
        <input type="text" size="10" id="from" name="from" value="[% from %]" class="datepickerfrom" />
110
    </li>
111
112
    <li>
113
        <label for="to">End date:</label>
114
        <input size="10" id="to" name="to" value="[% to %]" type="text" class="datepickerto" />
115
    </li>
116
</ol>
106
(inclusive)
117
(inclusive)
107
118
108
<fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset>
119
<fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset>
109
- 

Return to bug 13298