Attachment 145565 Details for Bug 32688 – Bug 32688: Convert recalls awaiting pickup tabs to Bootstrap

[patch] Bug 32688: Convert recalls awaiting pickup tabs to Bootstrap

Bug-32688-Convert-recalls-awaiting-pickup-tabs-to-.patch (text/plain), 18.43 KB, created by David Nind on 2023-01-22 17:20:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-01-22 17:20:58 UTC

Size: 18.43 KB

patch

obsolete

>From 3cbe217366e22fd40bc0da0fc5d9a6564bc6add1 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 20 Jan 2023 11:56:55 +0000
>Subject: [PATCH] Bug 32688: Convert recalls awaiting pickup tabs to Bootstrap
>
>This patch updates the recalls awaiting pickup template
>(recalls_waiting.tt) to replace a set of jQueryUI tabs. They are
>converted to Bootstrap in order to complete Bug 29226.
>
>To test, apply the patch and make sure the "UseRecalls" system
>preference is enabled.
>
>- Go to Circulation -> Recalls awaiting pickup.
>- You should see two tabs, "Recalls waiting" and "Recalls waiting over X
>  days."
>- The tabs should look correct and work correctly.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../en/modules/recalls/recalls_waiting.tt     | 206 +++++++++---------
> 1 file changed, 104 insertions(+), 102 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
>index 162d1a03fb..a0686c1fa4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
>@@ -32,107 +32,112 @@
> 
>                 <div id="results" class="toptabs">
> 
>-                    <ul>
>-                        <li><a href="#recallswaiting">Recalls waiting: [% recalls.count | html %]</a></li>
>-                        <li><a href="#recallsover">Recalls waiting over [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days: [% over.count | html %]</a></li>
>+                    <ul class="nav nav-tabs" role="tablist">
>+                        <li role="presentation" class="active">
>+                            <a href="#recallswaiting" aria-controls="recallswaiting" role="tab" data-toggle="tab">Recalls waiting: [% recalls.count | html %]</a>
>+                        </li>
>+                        <li role="presentation">
>+                            <a href="#recallsover" aria-controls="recallsover" role="tab" data-toggle="tab">Recalls waiting over [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days: [% over.count | html %]</a>
>+                        </li>
>                     </ul>
> 
>-                    <div id="recallswaiting">
>-                        [% IF ( recalls ) %]
>-                            <table id="recallswaiting-table">
>-                                <thead><tr>
>-                                    <th class="recall-waitingdate title-string">Available since</th>
>-                                    <th class="recall-title anti-the">Title</th>
>-                                    <th class="recall-patron">Requested by</th>
>-                                    <th class="recall-library">Pickup location</th>
>-                                    <th class="recall-action nosort">&nbsp;</th>
>-                                </tr></thead>
>-                                <tbody>
>-                                    [% FOREACH recall IN recalls %]<tr>
>-                                        <td class="recall-waitingdate">[% recall.waiting_date | $KohaDates %]</td>
>-                                        <td class="recall-title">
>-                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblio_id | uri %]">
>-                                                [% recall.biblio.title | html %]
>-                                                [% FOREACH s IN recall.biblio.subtitle %]
>-                                                    [% s | html %]
>-                                                [% END %]
>-                                            </a>
>-                                            [% recall.biblio.author | html %]
>-                                            <br><i>Barcode: [% recall.item.barcode | html %]</i>
>-                                        </td>
>-                                        <td class="recall-patron">
>-                                             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.patron_id | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
>-                                             [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
>-                                             [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
>-                                        </td>
>-                                        <td class="recall-library">[% recall.library.branchname | html %]</td>
>-                                        <td class="recall-action actions">
>-                                            <form action="/cgi-bin/koha/recalls/recalls_waiting.pl" method="post">
>-                                                <input type="hidden" name="recall_id" value="[% recall.id | html %]">
>-                                                <input type="hidden" name="op" value="modify">
>-                                                <fieldset class="action">
>-                                                    <input type="submit" name="revert" class="revert_recall" value="Revert waiting status">
>-                                                    <input type="submit" name="expire" class="expire_recall" value="Expire recall">
>-                                                </fieldset>
>-                                            </form>
>-                                        </td>
>-                                    </tr>[% END %]
>-                                </tbody>
>-                            </table>
>-                        [% ELSE %]
>-                            <div class="dialog message">There are no recalls to show.</div>
>-                        [% END %]
>-                    </div> 
>-
>-                    <div id="recallsover">
>-                        [% IF ( over.size ) %]
>-                            [% IF ( Koha.Preference('RecallsMaxPickUpDelay') ) %]<p>Recalls listed here have been awaiting pickup for more than [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days.</p>[% END %]
>-                            <table id="recallsover-table">
>-                                <thead><tr>
>-                                    <th class="recall-waitingdate title-string">Available since</th>
>-                                    <th class="recall-title anti-the">Title</th>
>-                                    <th class="recall-patron">Requested by</th>
>-                                    <th class="recall-library">Pickup location</th>
>-                                    <th class="recall-action nosort">&nbsp;</th>
>-                                </tr></thead>
>-                                <tbody>
>-                                    [% FOREACH recall IN over %]<tr>
>-                                        <td class="recall-waitingdate">[% recall.waiting_date | $KohaDates %]</td>
>-                                        <td class="recall-title">
>-                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblio_id | uri %]">
>-                                                [% recall.biblio.title | html %]
>-                                                [% FOREACH s IN recall.biblio.subtitles %]
>-                                                    [% s | html %]
>-                                                [% END %]
>-                                                [% recall.item.enumchron | html %]
>-                                            </a>
>-                                            [% recall.biblio.author | html %]
>-                                            <br><i>Barcode: [% recall.item.barcode | html %]</i>
>-                                        </td>
>-                                        <td class="recall-patron">
>-                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.patron_id | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
>-                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
>-                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
>-                                        </td>
>-                                        <td class="recall-library">[% recall.library.branchname | html %]</td>
>-                                        <td class="recall-action actions">
>-                                            <form action="/cgi-bin/koha/recalls/recalls_waiting.pl" method="post">
>-                                                <input type="hidden" name="recall_id" value="[% recall.id | html %]">
>-                                                <input type="hidden" name="op" value="modify">
>-                                                <fieldset class="action">
>-                                                    <input type="submit" name="revert" class="revert_recall" value="Revert waiting status">
>-                                                    <input type="submit" name="expire" class="expire_recall" value="Expire recall">
>-                                                </fieldset>
>-                                            </form>
>-                                        </td>
>-                                    </tr>[% END %]
>-                                </tbody>
>-                            </table>
>-                        [% ELSE %]
>-                            <div class="dialog message">There are no recalls to show.</div>
>-                        [% END %]
>-                    </div> 
>-
>+                    <div class="tab-content">
>+                        <div id="recallswaiting" role="tabpanel" class="tab-pane active">
>+                            [% IF ( recalls ) %]
>+                                <table id="recallswaiting-table">
>+                                    <thead><tr>
>+                                        <th class="recall-waitingdate title-string">Available since</th>
>+                                        <th class="recall-title anti-the">Title</th>
>+                                        <th class="recall-patron">Requested by</th>
>+                                        <th class="recall-library">Pickup location</th>
>+                                        <th class="recall-action nosort">&nbsp;</th>
>+                                    </tr></thead>
>+                                    <tbody>
>+                                        [% FOREACH recall IN recalls %]<tr>
>+                                            <td class="recall-waitingdate">[% recall.waiting_date | $KohaDates %]</td>
>+                                            <td class="recall-title">
>+                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblio_id | uri %]">
>+                                                    [% recall.biblio.title | html %]
>+                                                    [% FOREACH s IN recall.biblio.subtitle %]
>+                                                        [% s | html %]
>+                                                    [% END %]
>+                                                </a>
>+                                                [% recall.biblio.author | html %]
>+                                                <br><i>Barcode: [% recall.item.barcode | html %]</i>
>+                                            </td>
>+                                            <td class="recall-patron">
>+                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.patron_id | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
>+                                                [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
>+                                                [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
>+                                            </td>
>+                                            <td class="recall-library">[% recall.library.branchname | html %]</td>
>+                                            <td class="recall-action actions">
>+                                                <form action="/cgi-bin/koha/recalls/recalls_waiting.pl" method="post">
>+                                                    <input type="hidden" name="recall_id" value="[% recall.id | html %]">
>+                                                    <input type="hidden" name="op" value="modify">
>+                                                    <fieldset class="action">
>+                                                        <input type="submit" name="revert" class="revert_recall" value="Revert waiting status">
>+                                                        <input type="submit" name="expire" class="expire_recall" value="Expire recall">
>+                                                    </fieldset>
>+                                                </form>
>+                                            </td>
>+                                        </tr>[% END %]
>+                                    </tbody>
>+                                </table>
>+                            [% ELSE %]
>+                                <div class="dialog message">There are no recalls to show.</div>
>+                            [% END %]
>+                        </div> 
>+
>+                        <div id="recallsover" role="tabpanel" class="tab-pane">
>+                            [% IF ( over.size ) %]
>+                                [% IF ( Koha.Preference('RecallsMaxPickUpDelay') ) %]<p>Recalls listed here have been awaiting pickup for more than [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days.</p>[% END %]
>+                                <table id="recallsover-table">
>+                                    <thead><tr>
>+                                        <th class="recall-waitingdate title-string">Available since</th>
>+                                        <th class="recall-title anti-the">Title</th>
>+                                        <th class="recall-patron">Requested by</th>
>+                                        <th class="recall-library">Pickup location</th>
>+                                        <th class="recall-action nosort">&nbsp;</th>
>+                                    </tr></thead>
>+                                    <tbody>
>+                                        [% FOREACH recall IN over %]<tr>
>+                                            <td class="recall-waitingdate">[% recall.waiting_date | $KohaDates %]</td>
>+                                            <td class="recall-title">
>+                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblio_id | uri %]">
>+                                                    [% recall.biblio.title | html %]
>+                                                    [% FOREACH s IN recall.biblio.subtitles %]
>+                                                        [% s | html %]
>+                                                    [% END %]
>+                                                    [% recall.item.enumchron | html %]
>+                                                </a>
>+                                                [% recall.biblio.author | html %]
>+                                                <br><i>Barcode: [% recall.item.barcode | html %]</i>
>+                                            </td>
>+                                            <td class="recall-patron">
>+                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.patron_id | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
>+                                                [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
>+                                                [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
>+                                            </td>
>+                                            <td class="recall-library">[% recall.library.branchname | html %]</td>
>+                                            <td class="recall-action actions">
>+                                                <form action="/cgi-bin/koha/recalls/recalls_waiting.pl" method="post">
>+                                                    <input type="hidden" name="recall_id" value="[% recall.id | html %]">
>+                                                    <input type="hidden" name="op" value="modify">
>+                                                    <fieldset class="action">
>+                                                        <input type="submit" name="revert" class="revert_recall" value="Revert waiting status">
>+                                                        <input type="submit" name="expire" class="expire_recall" value="Expire recall">
>+                                                    </fieldset>
>+                                                </form>
>+                                            </td>
>+                                        </tr>[% END %]
>+                                    </tbody>
>+                                </table>
>+                            [% ELSE %]
>+                                <div class="dialog message">There are no recalls to show.</div>
>+                            [% END %]
>+                        </div> 
>+                    </div> 
>                 </div> 
> 
>                 [% ELSE %]
>@@ -151,15 +156,12 @@
>         [% END %]
> 
>     </div> 
>-</div>
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>     <script>
>         $(document).ready(function() {
>-            $('#results').tabs();
>-
>             $("#recallswaiting-table, #recallsover-table").dataTable($.extend(true, {}, dataTablesDefaults, {
>                 "autoWidth": false,
>                 "aoColumnDefs": [
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32688: 145508 | 145565 | 145566 | 145643