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

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (-23 / +21 lines)
Lines 297-315 Link Here
297
                        [% END %]
297
                        [% END %]
298
298
299
                    </td>
299
                    </td>
300
                    [% IF ( bibitemloo.holdable ) %][% UNLESS ( item_level_itypes ) %]
301
                                          <td>
302
                                            [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
303
                                [% bibitemloo.description %]
304
                                          </td>
305
                                        [% END %][% END %]
306
                    [% IF ( bibitemloo.holdable ) %]
300
                    [% IF ( bibitemloo.holdable ) %]
307
                    [% IF ( showpriority ) %]
301
		    <!-- HOLDABLE -->
308
                    <td>
302
                        [% UNLESS ( item_level_itypes ) %]
309
                    [% bibitemloo.rank %] out of [% bibitemloo.reservecount %]
303
                        <td>
310
                    </td>[% END %][% END %]
304
                            [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
311
		    [% IF ( reserve_in_future ) %]
305
                            [% bibitemloo.description %]
312
		    [% IF ( bibitemloo.holdable ) %]<td>
306
                        </td>
307
                        [% END %]
308
                        [% IF showholds %]
309
                        <td>
310
                        [% IF ( showpriority ) %] [% bibitemloo.rank %] out of [% END %][% bibitemloo.reservecount %]
311
                        </td>
312
                        [% END %]
313
		        [% IF ( reserve_in_future ) %]
314
                        <td>
313
              <input name="reserve_date_[% bibitemloo.biblionumber %]" id="reserve_date_[% bibitemloo.biblionumber %]" size="10">
315
              <input name="reserve_date_[% bibitemloo.biblionumber %]" id="reserve_date_[% bibitemloo.biblionumber %]" size="10">
314
              <script language="JavaScript" type="text/javascript">
316
              <script language="JavaScript" type="text/javascript">
315
              //<![CDATA[
317
              //<![CDATA[
Lines 348-357 Link Here
348
              </script>
350
              </script>
349
      <p style="margin:.3em 2em;">
351
      <p style="margin:.3em 2em;">
350
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('reserve_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
352
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('reserve_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
351
                </td>[% END %]
353
                        </td>
352
354
                        [% END %]
353
		    [% END %]
355
	                <td>
354
	[% IF ( bibitemloo.holdable ) %]<td>
355
        <input name="expiration_date_[% bibitemloo.biblionumber %]" id="expiration_date_[% bibitemloo.biblionumber %]" size="10" readonly="readonly" />
356
        <input name="expiration_date_[% bibitemloo.biblionumber %]" id="expiration_date_[% bibitemloo.biblionumber %]" size="10" readonly="readonly" />
356
        <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate_[% bibitemloo.biblionumber %]" style="cursor: pointer;" />
357
        <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate_[% bibitemloo.biblionumber %]" style="cursor: pointer;" />
357
        <script language="JavaScript" type="text/javascript">
358
        <script language="JavaScript" type="text/javascript">
Lines 381-393 Link Here
381
        </script>
382
        </script>
382
      <p style="margin:.3em 2em;">
383
      <p style="margin:.3em 2em;">
383
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
384
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
384
    </td>[% END %]
385
                        </td>
385
386
		        [% IF ( OPACItemHolds ) %]
386
                    [% IF ( bibitemloo.holdable ) %]
387
		        <!-- ITEM HOLDS -->
387
		    <!-- HOLD ABLE -->
388
                        <td class="place_on_type" style="display:none">
388
		    [% IF ( OPACItemHolds ) %]
389
		    <!-- ITEM HOLDS -->
390
                                          <td class="place_on_type" style="display:none">
391
                                            <ul>
389
                                            <ul>
392
                                                <li>
390
                                                <li>
393
                                                  [% UNLESS ( bibitemloo.holdable ) %]
391
                                                  [% UNLESS ( bibitemloo.holdable ) %]
(-)a/opac/opac-reserve.pl (-27 / +25 lines)
Lines 48-53 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
48
    }
48
    }
49
);
49
);
50
my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
50
my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
51
my $show_holds_count = C4::Context->preference("OPACShowHoldsCount");
52
51
sub get_out ($$$) {
53
sub get_out ($$$) {
52
	output_html_with_http_headers(shift,shift,shift); # $query, $cookie, $template->output;
54
	output_html_with_http_headers(shift,shift,shift); # $query, $cookie, $template->output;
53
	exit;
55
	exit;
Lines 113-124 $template->param( choose_branch => $OPACChooseBranch); Link Here
113
#
115
#
114
#
116
#
115
117
116
# Hash of biblionumber to biblio/biblioitems record.
118
my %biblioDataHash; # Hash of biblionumber to biblio/biblioitems record.
117
my %biblioDataHash;
119
my %itemInfoHash; # Hash of itemnumber to item info.
118
119
# Hash of itemnumber to item info.
120
my %itemInfoHash;
121
122
foreach my $biblioNumber (@biblionumbers) {
120
foreach my $biblioNumber (@biblionumbers) {
123
121
124
    my $biblioData = GetBiblioData($biblioNumber);
122
    my $biblioData = GetBiblioData($biblioNumber);
Lines 128-160 foreach my $biblioNumber (@biblionumbers) { Link Here
128
126
129
    my $marcrecord= GetMarcBiblio($biblioNumber);
127
    my $marcrecord= GetMarcBiblio($biblioNumber);
130
128
131
	# flag indicating existence of at least one item linked via a host record
129
    # flag indicating existence of at least one item linked via a host record
132
	my $hostitemsflag;
130
    my $hostitemsflag;
133
	# adding items linked via host biblios
131
    # adding items linked via host biblios
134
	my @hostitemInfos = GetHostItemsInfo($marcrecord);
132
    my @hostitemInfos = GetHostItemsInfo($marcrecord);
135
	if (@hostitemInfos){
133
    if (@hostitemInfos){
136
		$hostitemsflag =1;
134
        $hostitemsflag =1;
137
	        push (@itemInfos,@hostitemInfos);
135
        push (@itemInfos,@hostitemInfos);
138
	}
136
    }
139
140
141
137
142
    $biblioData->{itemInfos} = \@itemInfos;
138
    $biblioData->{itemInfos} = \@itemInfos;
143
    foreach my $itemInfo (@itemInfos) {
139
    foreach my $itemInfo (@itemInfos) {
144
        $itemInfoHash{$itemInfo->{itemnumber}} = $itemInfo;
140
        $itemInfoHash{$itemInfo->{itemnumber}} = $itemInfo;
145
    }
141
    }
146
142
147
    # Compute the priority rank.
143
    if ($show_holds_count) {
148
    my ( $rank, $reserves ) = GetReservesFromBiblionumber($biblioNumber,1);
144
        # Compute the priority rank.
149
    $biblioData->{reservecount} = $rank;
145
        my ( $rank, $reserves ) = GetReservesFromBiblionumber($biblioNumber,1);
150
    foreach my $res (@$reserves) {
146
        $biblioData->{reservecount} = $rank;
151
        my $found = $res->{'found'};
147
        foreach my $res (@$reserves) {
152
        if ( $found && ($found eq 'W') ) {
148
            my $found = $res->{'found'};
153
            $rank--;
149
            if ( $found && ($found eq 'W') ) {
150
                $rank--;
151
            }
154
        }
152
        }
153
        $rank++;
154
        $biblioData->{rank} = $rank;
155
    }
155
    }
156
    $rank++;
157
    $biblioData->{rank} = $rank;
158
}
156
}
159
157
160
#
158
#
Lines 528-534 $template->param(itemtable_colspan => $itemTableColspan); Link Here
528
526
529
# display infos
527
# display infos
530
$template->param(bibitemloop => $biblioLoop);
528
$template->param(bibitemloop => $biblioLoop);
531
$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;
529
$template->param( showpriority=>$OPACDisplayRequestPriority);
530
$template->param( showholds=>$show_holds_count);
532
# can set reserve date in future
531
# can set reserve date in future
533
if (
532
if (
534
    C4::Context->preference( 'AllowHoldDateInFuture' ) &&
533
    C4::Context->preference( 'AllowHoldDateInFuture' ) &&
535
- 

Return to bug 7398