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

(-)a/circ/pendingreserves.pl (+6 lines)
Lines 96-103 my $strsth = Link Here
96
                    ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
96
                    ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
97
            reserves.biblionumber,
97
            reserves.biblionumber,
98
            reserves.branchcode as l_branch,
98
            reserves.branchcode as l_branch,
99
            biblioitems.itemtype,
99
            GROUP_CONCAT(DISTINCT items.itype 
100
            GROUP_CONCAT(DISTINCT items.itype 
100
                    ORDER BY items.itemnumber SEPARATOR '|') l_itype,
101
                    ORDER BY items.itemnumber SEPARATOR '|') l_itype,
102
            GROUP_CONCAT(DISTINCT items.ccode
103
                    ORDER BY items.itemnumber SEPARATOR '|') l_ccode,
101
            GROUP_CONCAT(DISTINCT items.location 
104
            GROUP_CONCAT(DISTINCT items.location 
102
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
105
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
103
            GROUP_CONCAT(DISTINCT items.itemcallnumber 
106
            GROUP_CONCAT(DISTINCT items.itemcallnumber 
Lines 115-120 my $strsth = Link Here
115
    FROM  reserves
118
    FROM  reserves
116
        LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
119
        LEFT JOIN items ON items.biblionumber=reserves.biblionumber 
117
        LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
120
        LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
121
        LEFT JOIN biblioitems ON reserves.biblionumber = biblioitems.biblionumber
118
        LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber
122
        LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber
119
        LEFT JOIN issues ON items.itemnumber=issues.itemnumber
123
        LEFT JOIN issues ON items.itemnumber=issues.itemnumber
120
        LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber
124
        LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber
Lines 165-171 while ( my $data = $sth->fetchrow_hashref ) { Link Here
165
            count           => $data->{icount},
169
            count           => $data->{icount},
166
            rcount          => $data->{rcount},
170
            rcount          => $data->{rcount},
167
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
171
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
172
            itemtype        => $data->{itemtype},
168
            itypes          => [split('\|', $data->{l_itype})],
173
            itypes          => [split('\|', $data->{l_itype})],
174
            ccodes          => [split('\|', $data->{l_ccode})],
169
            locations       => [split('\|', $data->{l_location})],
175
            locations       => [split('\|', $data->{l_location})],
170
        }
176
        }
171
    );
177
    );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-2 / +15 lines)
Lines 41-46 Link Here
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 itypes</th>
44
        <th class="string-sort">Available ccodes</th>
44
        <th class="string-sort">Available locations</th>
45
        <th class="string-sort">Available locations</th>
45
        <th class="title-string">Earliest hold date</th>
46
        <th class="title-string">Earliest hold date</th>
46
        </tr>
47
        </tr>
Lines 75-84 Link Here
75
        <td><p>[% reserveloo.copyno %]</p></td>
76
        <td><p>[% reserveloo.copyno %]</p></td>
76
        <td><p>[% reserveloo.enumchron %]</p></td>
77
        <td><p>[% reserveloo.enumchron %]</p></td>
77
        <td>
78
        <td>
79
        [% ItemTypes.GetDescription(reserveloo.itemtype) %]
78
        [% FOREACH itype IN reserveloo.itypes %]
80
        [% FOREACH itype IN reserveloo.itypes %]
79
            [% ItemTypes.GetDescription( itype ) %]
81
            [% ItemTypes.GetDescription( itype ) %]
80
        [% END %]
82
        [% END %]
81
        </td>
83
        </td>
84
        <td>
85
            [% FOREACH ccode IN reserveloo.ccodes %]
86
                [% AuthorisedValues.GetByCode('CCODE', ccode) %]<br>
87
            [% END %]
88
        </td>
82
        <td>
89
        <td>
83
        [% FOREACH loc IN reserveloo.locations %]
90
        [% FOREACH loc IN reserveloo.locations %]
84
            [% AuthorisedValues.GetByCode('LOC', loc) %]<br>
91
            [% AuthorisedValues.GetByCode('LOC', loc) %]<br>
Lines 102-107 Link Here
102
        <td><input type="text" class="filter" data-column_num="7" placeholder="Available copy" style="width:95%"/></td>
109
        <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>
110
        <td><input type="text" class="filter" data-column_num="8" placeholder="Available enumeration" style="width:95%"/></td>
104
        <td id="itypefilter"></td>
111
        <td id="itypefilter"></td>
112
        <td id="ccodefilter"></td>
105
        <td id="locationfilter"></td>
113
        <td id="locationfilter"></td>
106
        <td></td>
114
        <td></td>
107
        </tr>
115
        </tr>
Lines 202-213 Link Here
202
                  holdst.fnFilter( $(this).val(), 9 );
210
                  holdst.fnFilter( $(this).val(), 9 );
203
              });
211
              });
204
          });
212
          });
205
          $("#locationfilter").each( function () {
213
          $("#ccodefilter").each( function () {
206
              $(this).html( createSelect( holdst.fnGetColumnData(10) ) );
214
              $(this).html( createSelect( holdst.fnGetColumnData(10) ) );
207
              $('select', this).change( function () {
215
              $('select', this).change( function () {
208
                  holdst.fnFilter( $(this).val(), 10 );
216
                  holdst.fnFilter( $(this).val(), 10 );
209
              });
217
              });
210
          });
218
          });
219
          $("#locationfilter").each( function () {
220
              $(this).html( createSelect( holdst.fnGetColumnData(11) ) );
221
              $('select', this).change( function () {
222
                  holdst.fnFilter( $(this).val(), 11 );
223
              });
224
          });
211
        });
225
        });
212
    </script>
226
    </script>
213
[% END %]
227
[% END %]
214
- 

Return to bug 20194