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

(-)a/circ/waitingreserves.pl (+6 lines)
Lines 28-33 use Date::Calc qw( Date_to_Days Today ); Link Here
28
use C4::Reserves qw( ModReserve ModReserveCancelAll );
28
use C4::Reserves qw( ModReserve ModReserveCancelAll );
29
use Koha::DateUtils qw( dt_from_string output_pref );
29
use Koha::DateUtils qw( dt_from_string output_pref );
30
use Koha::BiblioFrameworks;
30
use Koha::BiblioFrameworks;
31
use Koha::Hold::CancellationRequests;
31
use Koha::Items;
32
use Koha::Items;
32
use Koha::ItemTypes;
33
use Koha::ItemTypes;
33
use Koha::Patrons;
34
use Koha::Patrons;
Lines 116-121 while ( my $hold = $holds->next ) { Link Here
116
    
117
    
117
}
118
}
118
119
120
my $holds_with_cancellation_requests =
121
  Koha::Hold::CancellationRequests->filter_by_current->search( {},
122
    { distinct => 'hold_id' } )->get_column('hold_id');
123
119
$template->param(cancel_result => \@cancel_result) if @cancel_result;
124
$template->param(cancel_result => \@cancel_result) if @cancel_result;
120
125
121
$template->param(
126
$template->param(
Lines 123-128 $template->param( Link Here
123
    reservecount => scalar @reserve_loop,
128
    reservecount => scalar @reserve_loop,
124
    overloop    => \@over_loop,
129
    overloop    => \@over_loop,
125
    overcount   => scalar @over_loop,
130
    overcount   => scalar @over_loop,
131
    cancel_reqs => $holds_with_cancellation_requests,
126
    show_date   => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
132
    show_date   => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
127
    tab => $tab,
133
    tab => $tab,
128
);
134
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-1 / +12 lines)
Lines 88-93 Link Here
88
                        Holds waiting over [% Koha.Preference('ReservesMaxPickUpDelay') | html %] days: [% overcount | html %]
88
                        Holds waiting over [% Koha.Preference('ReservesMaxPickUpDelay') | html %] days: [% overcount | html %]
89
                    </a>
89
                    </a>
90
                </li>
90
                </li>
91
                <li role="presentation">
92
                    <a href="#holds-with-cancellation-requests" aria-controls="holds-with-cancellation-requests" role="tab" data-toggle="tab">
93
                        Holds with cancellation requests: [% cancel_reqs | html %]
94
                    </a>
95
                </li>
91
            </ul>
96
            </ul>
92
            <div class="tab-content">
97
            <div class="tab-content">
93
            <div role="tabpanel" class="tab-pane active" id="holdswaiting">
98
            <div role="tabpanel" class="tab-pane active" id="holdswaiting">
Lines 125-130 Link Here
125
                <div class="dialog message">No holds found.</div>
130
                <div class="dialog message">No holds found.</div>
126
            [% END %]
131
            [% END %]
127
        </div>
132
        </div>
133
        <div role="tabpanel" class="tab-pane" id="holds-with-cancellation-requests">
134
            [% IF cancel_reqs %]
135
                <div class="dialog message">Table goes here.</div>
136
            [% ELSE %]
137
                <div class="dialog message">No holds found.</div>
138
            [% END %]
139
        </div>
128
        </div>
140
        </div>
129
    [% END %]
141
    [% END %]
130
142
131
- 

Return to bug 22456