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

(-)a/circ/pendingreserves.pl (-6 / +6 lines)
Lines 192-202 my $strsth = Link Here
192 
            GROUP_CONCAT(DISTINCT items.location
192 
            GROUP_CONCAT(DISTINCT items.location
193 
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
 193 
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
194 
            GROUP_CONCAT(DISTINCT items.itemcallnumber
194 
            GROUP_CONCAT(DISTINCT items.itemcallnumber
195 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
 195 
                    ORDER BY items.itemnumber SEPARATOR '|') l_itemcallnumber,
196 
            GROUP_CONCAT(DISTINCT items.enumchron
 196 
            GROUP_CONCAT(DISTINCT items.enumchron
197 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
 197 
                    ORDER BY items.itemnumber SEPARATOR '|') l_enumchron,
198 
            GROUP_CONCAT(DISTINCT items.copynumber
 198 
            GROUP_CONCAT(DISTINCT items.copynumber
199 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
 199 
                    ORDER BY items.itemnumber SEPARATOR '|') l_copynumber,
200 
            biblio.title,
 200 
            biblio.title,
201 
            biblio.author,
 201 
            biblio.author,
202 
            count(DISTINCT items.itemnumber) as icount,
 202 
            count(DISTINCT items.itemnumber) as icount,
Lines 251-259 while ( my $data = $sth->fetchrow_hashref ) { Link Here
251 
            biblionumber    => $data->{biblionumber},
 251 
            biblionumber    => $data->{biblionumber},
252 
            holdingbranches => [split('\|', $data->{l_holdingbranch})],
 252 
            holdingbranches => [split('\|', $data->{l_holdingbranch})],
253 
            branch          => $data->{l_branch},
 253 
            branch          => $data->{l_branch},
254 
            itemcallnumber  => $data->{l_itemcallnumber},
 254 
            itemcallnumber  => [split('\|', $data->{l_itemcallnumber})],
255 
            enumchron       => $data->{l_enumchron},
 255 
            enumchron       => [split('\|', $data->{l_enumchron})],
256 
            copyno          => $data->{l_copynumber},
 256 
            copyno          => [split('\|', $data->{l_copynumber})],
257 
            count           => $data->{icount},
 257 
            count           => $data->{icount},
258 
            rcount          => $data->{rcount},
 258 
            rcount          => $data->{rcount},
259 
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
 259 
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-8 / +44 lines)
Lines 46-52 Link Here
46 
<h2>Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]</h2>
 46 
<h2>Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]</h2>
47 
<h3>Reported on [% todaysdate | $KohaDates %]</h3>
 47 
<h3>Reported on [% todaysdate | $KohaDates %]</h3>
48 
<p>The following holds have not been filled. Please retrieve them and check them in.</p>
 48 
<p>The following holds have not been filled. Please retrieve them and check them in.</p>
49 
<div class="searchresults">
 49 
<div id="searchresults">
50 
    [% IF ( reserveloop ) %]
 50 
    [% IF ( reserveloop ) %]
51 
    <table id="holdst">
 51 
    <table id="holdst">
52 
    <thead>
 52 
    <thead>
Lines 54-60 Link Here
54 
        <th>Pull this many items</th>
 54 
        <th>Pull this many items</th>
55 
        <th>Items available</th>
 55 
        <th>Items available</th>
56 
        <th>Patrons with holds</th>
 56 
        <th>Patrons with holds</th>
57 
        <th>First patron</td>
 57 
        <th>First patron</th>
58 
        <th class="anti-the">Title</th>
 58 
        <th class="anti-the">Title</th>
59 
        <th class="string-sort">Libraries</th>
 59 
        <th class="string-sort">Libraries</th>
60 
        <th>Available call numbers</th>
 60 
        <th>Available call numbers</th>
Lines 88-100 Link Here
88 
            <td>"</td>
 88 
            <td>"</td>
89 
        [% END %]
 89 
        [% END %]
90 
        <td>
 90 
        <td>
91 
            [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
 91 
            [% IF ( reserveloo.holdingbranches ) %]
92 
                [% Branches.GetName ( holdingbranch ) | html %]
 92 
               <ul>
93 
                    [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
94 
                        <li>
95 
                            [% Branches.GetName ( holdingbranch ) | html %]
96 
                        </li>
97 
                    [% END %]
98 
               </ul>
99 
            [% END %]
100 
        </td>
101 
        <td>
102 
            [% IF ( reserveloo.itemcallnumber ) %]
103 
                <ul>
104 
                    [% FOREACH itemcallnumber IN reserveloo.itemcallnumber  %]
105 
                        <li>
106 
                            [% itemcallnumber | html %]
107 
                        </li>
108 
                    [% END %]
109 
                </ul>
110 
            [% END %]
111 
        </td>
112 
        <td>
113 
            [% IF ( reserveloo.copyno ) %]
114 
                <ul>
115 
                    [% FOREACH copyno IN reserveloo.copyno %]
116 
                        <li>
117 
                            [% copyno | html %]
118 
                        </li>
119 
                    [% END %]
120 
                </ul>
121 
            [% END %]
122 
        </td>
123 
        <td>
124 
            [% IF ( reserveloo.enumchron ) %]
125 
                <ul>
126 
                    [% FOREACH enumchron IN reserveloo.enumchron %]
127 
                        <li>
128 
                            [% enumchron | html %]
129 
                        </li>
130 
                    [% END %]
131 
                </ul>
93 
            [% END %]
 132 
            [% END %]
94 
        </td>
 133 
        </td>
95 
        <td><p>[% reserveloo.itemcallnumber | html %]</p></td>
96 
        <td><p>[% reserveloo.copyno | html %]</p></td>
97 
        <td><p>[% reserveloo.enumchron | html %]</p></td>
98 
        <td>
 134 
        <td>
99 
        [% FOREACH itemType IN reserveloo.itemTypes %]
 135 
        [% FOREACH itemType IN reserveloo.itemTypes %]
100 
            [% ItemTypes.GetDescription( itemType ) | html %]
 136 
            [% ItemTypes.GetDescription( itemType ) | html %]
Lines 135-140 Link Here
135 
                <span>Biblio level hold.</span>
 171 
                <span>Biblio level hold.</span>
136 
            [% END %]
 172 
            [% END %]
137 
        [% END %]
 173 
        [% END %]
174 
            </td>
138 
        </tr>
 175 
        </tr>
139 
        [% END %]
 176 
        [% END %]
140 
    </tbody>
 177 
    </tbody>
141 
-

Return to bug 22536