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

(-)a/circ/reserveratios.pl (-21 / +24 lines)
Lines 102-109 my $strsth = Link Here
102
        items.itemnumber,
102
        items.itemnumber,
103
        GROUP_CONCAT(DISTINCT items.itemcallnumber 
103
        GROUP_CONCAT(DISTINCT items.itemcallnumber 
104
        		ORDER BY items.itemnumber SEPARATOR '<br/>') as listcall,
104
        		ORDER BY items.itemnumber SEPARATOR '<br/>') as listcall,
105
        GROUP_CONCAT(DISTINCT homebranch 
106
        		ORDER BY items.itemnumber SEPARATOR '<br/>') as homebranch_list,
105
        GROUP_CONCAT(DISTINCT holdingbranch 
107
        GROUP_CONCAT(DISTINCT holdingbranch 
106
        		ORDER BY items.itemnumber SEPARATOR '<br/>') as listbranch,
108
        		ORDER BY items.itemnumber SEPARATOR '<br/>') as holdingbranch_list,
107
        GROUP_CONCAT(DISTINCT items.location 
109
        GROUP_CONCAT(DISTINCT items.location 
108
        		ORDER BY items.itemnumber SEPARATOR '<br/>') as l_location,
110
        		ORDER BY items.itemnumber SEPARATOR '<br/>') as l_location,
109
        GROUP_CONCAT(DISTINCT items.itype 
111
        GROUP_CONCAT(DISTINCT items.itype 
Lines 144-169 while ( my $data = $sth->fetchrow_hashref ) { Link Here
144
    push(
146
    push(
145
        @reservedata,
147
        @reservedata,
146
        {
148
        {
147
            reservedate      => format_date( $data->{reservedate} ),
149
            reservedate        => format_date( $data->{reservedate} ),
148
            priority         => $data->{priority},
150
            priority           => $data->{priority},
149
            name             => $data->{borrower},
151
            name               => $data->{borrower},
150
            title            => $data->{title},
152
            title              => $data->{title},
151
            subtitle            => $data->{subtitle},
153
            subtitle           => $data->{subtitle},
152
            author           => $data->{author},
154
            author             => $data->{author},
153
            itemnum          => $data->{itemnumber},
155
            itemnum            => $data->{itemnumber},
154
            biblionumber     => $data->{biblionumber},
156
            biblionumber       => $data->{biblionumber},
155
            holdingbranch    => $data->{holdingbranch},
157
            holdingbranch      => $data->{holdingbranch},
156
            listbranch       => $data->{listbranch},
158
            homebranch_list    => $data->{homebranch_list},
157
            branch           => $data->{branch},
159
            holdingbranch_list => $data->{holdingbranch_list},
158
            itemcallnumber   => $data->{itemcallnumber},
160
            branch             => $data->{branch},
159
            location         => $data->{l_location},
161
            itemcallnumber     => $data->{itemcallnumber},
160
            itype            => $data->{l_itype},
162
            location           => $data->{l_location},
161
            reservecount     => $data->{reservecount},
163
            itype              => $data->{l_itype},
162
            itemcount        => $data->{itemcount},
164
            reservecount       => $data->{reservecount},
163
            ratiocalc        => sprintf("%.0d", $ratio_atleast1 ? ($thisratio / $ratio) : $thisratio),
165
            itemcount          => $data->{itemcount},
164
            thisratio        => sprintf("%.2f", $thisratio),
166
            ratiocalc          => sprintf( "%.0d", $ratio_atleast1 ? ( $thisratio / $ratio ) : $thisratio ),
165
            thisratio_atleast1 => ($thisratio >= 1) ? 1 : 0,
167
            thisratio => sprintf( "%.2f", $thisratio ),
166
            listcall         => $data->{listcall}    
168
            thisratio_atleast1 => ( $thisratio >= 1 ) ? 1 : 0,
169
            listcall => $data->{listcall}
167
        }
170
        }
168
    );
171
    );
169
}
172
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-2 / +3 lines)
Lines 55-60 Link Here
55
          <th>Items</th>
55
          <th>Items</th>
56
          <th>Hold ratio</th>
56
          <th>Hold ratio</th>
57
          <th>Title</th>
57
          <th>Title</th>
58
          <th>Home libraries</th>
58
          <th>Holding libraries</th>
59
          <th>Holding libraries</th>
59
          <th>Location</th>
60
          <th>Location</th>
60
          <th>Itype</th>
61
          <th>Itype</th>
Lines 70-76 Link Here
70
            <td><p class="ratiolimit">[% reserveloo.thisratio %]</p></td>
71
            <td><p class="ratiolimit">[% reserveloo.thisratio %]</p></td>
71
            <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title |html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author %][% END %]
72
            <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title |html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author %][% END %]
72
            </td>
73
            </td>
73
            <td><p>[% reserveloo.listbranch %]</p></td>
74
            <td><p>[% reserveloo.homebranch_list %]</p></td>
75
            <td><p>[% reserveloo.holdingbranch_list %]</p></td>
74
            <td><p>[% reserveloo.location %]</p></td>
76
            <td><p>[% reserveloo.location %]</p></td>
75
            <td><p>[% reserveloo.itype %]</p></td>
77
            <td><p>[% reserveloo.itype %]</p></td>
76
            <td><p>[% reserveloo.listcall %]</p></td>
78
            <td><p>[% reserveloo.listcall %]</p></td>
77
- 

Return to bug 13299