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

(-)a/circ/pendingreserves.pl (-3 / +6 lines)
Lines 168-173 if ($enddate_iso) { Link Here
168
    push @query_params, $enddate_iso;
168
    push @query_params, $enddate_iso;
169
}
169
}
170
170
171
my $item_type = C4::Context->preference('item-level_itypes') ? "items.itype" : "biblioitems.itemtype";
172
171
my $strsth =
173
my $strsth =
172
    "SELECT min(reservedate) as l_reservedate,
174
    "SELECT min(reservedate) as l_reservedate,
173
            reserves.reserve_id,
175
            reserves.reserve_id,
Lines 180-187 my $strsth = Link Here
180
            reserves.itemnumber,
182
            reserves.itemnumber,
181
            items.holdingbranch,
183
            items.holdingbranch,
182
            items.homebranch,
184
            items.homebranch,
183
            GROUP_CONCAT(DISTINCT items.itype 
185
            GROUP_CONCAT(DISTINCT $item_type
184
                    ORDER BY items.itemnumber SEPARATOR '|') l_itype,
186
                    ORDER BY items.itemnumber SEPARATOR '|') l_item_type,
185
            GROUP_CONCAT(DISTINCT items.location 
187
            GROUP_CONCAT(DISTINCT items.location 
186
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
188
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
187
            GROUP_CONCAT(DISTINCT items.itemcallnumber 
189
            GROUP_CONCAT(DISTINCT items.itemcallnumber 
Lines 199-204 my $strsth = Link Here
199
    FROM  reserves
201
    FROM  reserves
200
        LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
202
        LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
201
        LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
203
        LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
204
        LEFT JOIN biblioitems ON biblio.biblionumber=biblioitems.biblionumber
202
        LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber
205
        LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber
203
        LEFT JOIN issues ON items.itemnumber=issues.itemnumber
206
        LEFT JOIN issues ON items.itemnumber=issues.itemnumber
204
        LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber
207
        LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber
Lines 249-255 while ( my $data = $sth->fetchrow_hashref ) { Link Here
249
            count           => $data->{icount},
252
            count           => $data->{icount},
250
            rcount          => $data->{rcount},
253
            rcount          => $data->{rcount},
251
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
254
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
252
            itypes          => [split('\|', $data->{l_itype})],
255
            itemTypes       => [split('\|', $data->{l_item_type})],
253
            locations       => [split('\|', $data->{l_location})],
256
            locations       => [split('\|', $data->{l_location})],
254
            reserve_id      => $data->{reserve_id},
257
            reserve_id      => $data->{reserve_id},
255
            holdingbranch   => $data->{holdingbranch},
258
            holdingbranch   => $data->{holdingbranch},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-6 / +5 lines)
Lines 60-66 Link Here
60
        <th>Available call numbers</th>
60
        <th>Available call numbers</th>
61
        <th>Available copy numbers</th>
61
        <th>Available copy numbers</th>
62
        <th>Available enumeration</th>
62
        <th>Available enumeration</th>
63
        <th class="string-sort">Available itypes</th>
63
        <th class="string-sort">Available item types</th>
64
        <th class="string-sort">Available locations</th>
64
        <th class="string-sort">Available locations</th>
65
        <th class="title-string">Earliest hold date</th>
65
        <th class="title-string">Earliest hold date</th>
66
        <th>Action</th>
66
        <th>Action</th>
Lines 96-103 Link Here
96
        <td><p>[% reserveloo.copyno %]</p></td>
96
        <td><p>[% reserveloo.copyno %]</p></td>
97
        <td><p>[% reserveloo.enumchron %]</p></td>
97
        <td><p>[% reserveloo.enumchron %]</p></td>
98
        <td>
98
        <td>
99
        [% FOREACH itype IN reserveloo.itypes %]
99
        [% FOREACH itemType IN reserveloo.itemTypes %]
100
            [% ItemTypes.GetDescription( itype ) %]
100
            [% ItemTypes.GetDescription( itemType ) %]
101
        [% END %]
101
        [% END %]
102
        </td>
102
        </td>
103
        <td>
103
        <td>
Lines 149-155 Link Here
149
        <td><input type="text" class="filter" data-column_num="6" placeholder="Call number" style="width:95%"/></td>
149
        <td><input type="text" class="filter" data-column_num="6" placeholder="Call number" style="width:95%"/></td>
150
        <td><input type="text" class="filter" data-column_num="7" placeholder="Available copy" style="width:95%"/></td>
150
        <td><input type="text" class="filter" data-column_num="7" placeholder="Available copy" style="width:95%"/></td>
151
        <td><input type="text" class="filter" data-column_num="8" placeholder="Available enumeration" style="width:95%"/></td>
151
        <td><input type="text" class="filter" data-column_num="8" placeholder="Available enumeration" style="width:95%"/></td>
152
        <td id="itypefilter"></td>
152
        <td id="type-filter"></td>
153
        <td id="locationfilter"></td>
153
        <td id="locationfilter"></td>
154
        <td></td>
154
        <td></td>
155
        <td></td>
155
        <td></td>
Lines 245-251 Link Here
245
                  holdst.fnFilter( filter_value, 5, true );
245
                  holdst.fnFilter( filter_value, 5, true );
246
              });
246
              });
247
          });
247
          });
248
          $("#itypefilter").each( function () {
248
          $("#type-filter").each( function () {
249
              $(this).html( createSelect( holdst.fnGetColumnData(9) ) );
249
              $(this).html( createSelect( holdst.fnGetColumnData(9) ) );
250
              $('select', this).change( function () {
250
              $('select', this).change( function () {
251
                  holdst.fnFilter( $(this).val(), 9 );
251
                  holdst.fnFilter( $(this).val(), 9 );
252
- 

Return to bug 19972