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

(-)a/circ/pendingreserves.pl (-3 / +6 lines)
Lines 89-94 if ($enddate_iso) { Link Here
89
    push @query_params, $enddate_iso;
89
    push @query_params, $enddate_iso;
90
}
90
}
91
91
92
my $item_type = C4::Context->preference('item-level_itypes') ? "items.itype" : "biblioitems.itemtype";
93
92
my $strsth =
94
my $strsth =
93
    "SELECT min(reservedate) as l_reservedate,
95
    "SELECT min(reservedate) as l_reservedate,
94
            reserves.borrowernumber as borrowernumber,
96
            reserves.borrowernumber as borrowernumber,
Lines 96-103 my $strsth = Link Here
96
                    ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
98
                    ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
97
            reserves.biblionumber,
99
            reserves.biblionumber,
98
            reserves.branchcode as l_branch,
100
            reserves.branchcode as l_branch,
99
            GROUP_CONCAT(DISTINCT items.itype 
101
            GROUP_CONCAT(DISTINCT $item_type
100
                    ORDER BY items.itemnumber SEPARATOR '|') l_itype,
102
                    ORDER BY items.itemnumber SEPARATOR '|') l_item_type,
101
            GROUP_CONCAT(DISTINCT items.location 
103
            GROUP_CONCAT(DISTINCT items.location 
102
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
104
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
103
            GROUP_CONCAT(DISTINCT items.itemcallnumber 
105
            GROUP_CONCAT(DISTINCT items.itemcallnumber 
Lines 115-120 my $strsth = Link Here
115
    FROM  reserves
117
    FROM  reserves
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
120
        LEFT JOIN biblioitems ON biblio.biblionumber=biblioitems.biblionumber
118
        LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber
121
        LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber
119
        LEFT JOIN issues ON items.itemnumber=issues.itemnumber
122
        LEFT JOIN issues ON items.itemnumber=issues.itemnumber
120
        LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber
123
        LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber
Lines 165-171 while ( my $data = $sth->fetchrow_hashref ) { Link Here
165
            count           => $data->{icount},
168
            count           => $data->{icount},
166
            rcount          => $data->{rcount},
169
            rcount          => $data->{rcount},
167
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
170
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
168
            itypes          => [split('\|', $data->{l_itype})],
171
            itemTypes       => [split('\|', $data->{l_item_type})],
169
            locations       => [split('\|', $data->{l_location})],
172
            locations       => [split('\|', $data->{l_location})],
170
        }
173
        }
171
    );
174
    );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-6 / +5 lines)
Lines 40-46 Link Here
40
        <th>Available call numbers</th>
40
        <th>Available call numbers</th>
41
        <th>Available copy numbers</th>
41
        <th>Available copy numbers</th>
42
        <th>Available enumeration</th>
42
        <th>Available enumeration</th>
43
        <th class="string-sort">Available itypes</th>
43
        <th class="string-sort">Available item types</th>
44
        <th class="string-sort">Available locations</th>
44
        <th class="string-sort">Available locations</th>
45
        <th class="title-string">Earliest hold date</th>
45
        <th class="title-string">Earliest hold date</th>
46
        </tr>
46
        </tr>
Lines 75-82 Link Here
75
        <td><p>[% reserveloo.copyno %]</p></td>
75
        <td><p>[% reserveloo.copyno %]</p></td>
76
        <td><p>[% reserveloo.enumchron %]</p></td>
76
        <td><p>[% reserveloo.enumchron %]</p></td>
77
        <td>
77
        <td>
78
        [% FOREACH itype IN reserveloo.itypes %]
78
        [% FOREACH itemType IN reserveloo.itemTypes %]
79
            [% ItemTypes.GetDescription( itype ) %]
79
            [% ItemTypes.GetDescription( itemType ) %]
80
        [% END %]
80
        [% END %]
81
        </td>
81
        </td>
82
        <td>
82
        <td>
Lines 101-107 Link Here
101
        <td><input type="text" class="filter" data-column_num="6" placeholder="Call number" style="width:95%"/></td>
101
        <td><input type="text" class="filter" data-column_num="6" placeholder="Call number" style="width:95%"/></td>
102
        <td><input type="text" class="filter" data-column_num="7" placeholder="Available copy" style="width:95%"/></td>
102
        <td><input type="text" class="filter" data-column_num="7" placeholder="Available copy" style="width:95%"/></td>
103
        <td><input type="text" class="filter" data-column_num="8" placeholder="Available enumeration" style="width:95%"/></td>
103
        <td><input type="text" class="filter" data-column_num="8" placeholder="Available enumeration" style="width:95%"/></td>
104
        <td id="itypefilter"></td>
104
        <td id="type-filter"></td>
105
        <td id="locationfilter"></td>
105
        <td id="locationfilter"></td>
106
        <td></td>
106
        <td></td>
107
        </tr>
107
        </tr>
Lines 196-202 Link Here
196
                  holdst.fnFilter( filter_value, 5, true );
196
                  holdst.fnFilter( filter_value, 5, true );
197
              });
197
              });
198
          });
198
          });
199
          $("#itypefilter").each( function () {
199
          $("#type-filter").each( function () {
200
              $(this).html( createSelect( holdst.fnGetColumnData(9) ) );
200
              $(this).html( createSelect( holdst.fnGetColumnData(9) ) );
201
              $('select', this).change( function () {
201
              $('select', this).change( function () {
202
                  holdst.fnFilter( $(this).val(), 9 );
202
                  holdst.fnFilter( $(this).val(), 9 );
203
- 

Return to bug 19972