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 118-124 my $strsth = Link Here
118
 LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
120
 LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
119
 LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
121
 LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
120
 WHERE
122
 WHERE
121
 notforloan = 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
123
 notforloan $nfl_comparison 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
122
 $sqldatewhere
124
 $sqldatewhere
123
";
125
";
124
126
Lines 180-185 $template->param( Link Here
180
    from            => $startdate,
182
    from            => $startdate,
181
    to              => $enddate,
183
    to              => $enddate,
182
    ratio           => $ratio,
184
    ratio           => $ratio,
185
    include_ordered => $include_ordered,
183
    reserveloop     => \@reservedata,
186
    reserveloop     => \@reservedata,
184
);
187
);
185
188
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-15 / +25 lines)
Lines 91-110 Link Here
91
<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
91
<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
92
<fieldset class="brief">
92
<fieldset class="brief">
93
<h4>Refine results:</h4>
93
<h4>Refine results:</h4>
94
<ol><li><label for="ratio">
94
<ol>
95
    Hold ratio:
95
    <li>
96
</label>
96
        <label for="ratio">Hold ratio:</label>
97
<input type="text" size="5" id="ratio" name="ratio" value="[% ratio %]" /></li>
97
        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio %]" />
98
<li><label for="from">
98
    <li>
99
    Start date:
99
100
</label>
100
    <li>
101
<input type="text" size="10" id="from" name="from" value="[% from %]" class="datepickerfrom" />
101
        <label for="include_ordered">Included ordered:</label>
102
</li>
102
        [% IF include_ordered %]
103
<li><label for="to">
103
            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
104
    End date:
104
        [% ELSE %]
105
</label>
105
            <input id="include_ordered" name="include_ordered" type="checkbox"/>
106
<input size="10" id="to" name="to" value="[% to %]" type="text" class="datepickerto" />
106
        [% END %]
107
</li></ol>
107
    <li>
108
109
    <li>
110
        <label for="from">Start date:</label>
111
        <input type="text" size="10" id="from" name="from" value="[% from %]" class="datepickerfrom" />
112
    </li>
113
114
    <li>
115
        <label for="to">End date:</label>
116
        <input size="10" id="to" name="to" value="[% to %]" type="text" class="datepickerto" />
117
    </li>
118
</ol>
108
(inclusive)
119
(inclusive)
109
120
110
<fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset>
121
<fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset>
111
- 

Return to bug 13298