Attachment 132474 Details for Bug 30396 – Bug 30396: Convert basket groups page tabs to Bootstrap

[patch] Bug 30396: Convert basket groups page tabs to Bootstrap

Bug-30396-Convert-basket-groups-page-tabs-to-Boots.patch (text/plain), 17.70 KB, created by Lucas Gass (lukeg) on 2022-03-29 15:56:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2022-03-29 15:56:12 UTC

Size: 17.70 KB

patch

obsolete

>From 2d8f554b98675e99f438825391e1dee01423edc5 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 29 Mar 2022 11:48:42 +0000
>Subject: [PATCH] Bug 30396: Convert basket groups page tabs to Bootstrap
>
>This patch replaces the use of jQueryUI tabs on the basket groups page,
>in the view where open and closed basket groups are displayed in
>separate tabs.
>
>This patch includes indentation changes, so please ignore whitespace
>when using your preferred diff tool.
>
>To test you should have at least two basket groups set up in
>Acquisitions, one open and one closed.
>
>Go to Acquisitions -> Vendor -> Basket groups and confirm that the
>"Open" and "Closed" tabs look correct and work correctly.
>
>Under the "Closed" tab, try clicking the "Reopen" button. The page will
>refresh but you should still see the "Closed" tab active.
>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>---
> .../prog/en/modules/acqui/basketgroup.tt      | 169 +++++++++---------
> 1 file changed, 86 insertions(+), 83 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>index 7bf2c17cc7..a7e2a33783 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -106,8 +106,11 @@ fieldset.various li {
>     }
> 
>     $(document).ready(function() {
>-        $("#basket_groups").tabs();
>-
>+        [% IF ( listclosed) %]
>+            $("#basket_groups a[href='#closed']").tab("show");
>+        [% ELSE %]
>+            $("#basket_groups a[href='#opened']").tab("show");
>+        [% END %]
>         $("table").dataTable($.extend(true, {}, dataTablesDefaults, {
>             "aoColumnDefs": [
>                 { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
>@@ -325,94 +328,94 @@ fieldset.various li {
>                     <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
>                     [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
>                     <div id="basket_groups" class="toptabs">
>-                        <ul class="ui-tabs-nav">
>-                            [% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>
>-                            [% ELSE%]<li><a href="#opened">Open</a></li>[% END %]
>-                            [% IF ( listclosed) %]<li class="ui-tabs-active"><a href="#closed">Closed</a></li>
>-                            [% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]
>+                        <ul class="nav nav-tabs" role="tablist">
>+                            <li role="presentation"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open</a></li>
>+                            <li role="presentation"><a href="#closed" aria-controls="closed" role="tab" data-toggle="tab">Closed</a></li>
>                         </ul>
>-                        <div id="opened">
>-                            <table id="basket_group_opened">
>-                                <thead>
>-                                    <tr>
>-                                        <th>Name</th>
>-                                        <th>Number</th>
>-                                        <th>Billing place</th>
>-                                        <th>Delivery place</th>
>-                                        <th>Number of baskets</th>
>-                                        <th>Action</th>
>-                                    </tr>
>-                                </thead>
>-                                <tbody>
>-                                    [% FOREACH basketgroup IN basketgroups %]
>-                                        [% UNLESS ( basketgroup.closed ) %]
>-                                            <tr>
>-                                                <td>[% IF ( basketgroup.name ) %]
>-                                                    [% basketgroup.name | html %]
>-                                                    [% ELSE %]
>-                                                        Basket group no. [% basketgroup.id | html %]
>-                                                    [% END %]
>-                                                </td>
>-                                                <td>[% basketgroup.id | html %]</td>
>-                                                <td>[% Branches.GetName( basketgroup.billingplace ) | html %]</td>
>-                                                <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
>-                                                <td>[% basketgroup.basketsqty | html %]</td>
>-                                                <td>
>-                                                    <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" value="Close and export as PDF" />
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Edit" /></form>
>-                                                    [% UNLESS basketgroup.basketsqty %]
>-                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Delete" /></form>
>-                                                    [% END %]
>-                                                </td>
>-                                            </tr>
>-                                        [% END %]
>-                                    [% END %]
>-                                </tbody>
>-                            </table>
>-                        </div>
>-                        <div id="closed">
>-                            <table id="basket_group_closed">
>-                                <thead>
>-                                    <tr>
>-                                        <th>Name</th>
>-                                        <th>Number</th>
>-                                        <th>Billing place</th>
>-                                        <th>Delivery place</th>
>-                                        <th>Number of baskets</th>
>-                                        <th>Action</th>
>-                                    </tr>
>-                                </thead>
>-                                <tbody>
>-                                    [% FOREACH basketgroup IN basketgroups %]
>-                                        [% IF ( basketgroup.closed ) %]
>-                                            <tr>
>-                                                <td>
>-                                                    [% IF ( basketgroup.name ) %]
>+                        <div class="tab-content">
>+                            <div role="tabpanel" class="tab-pane active" id="opened">
>+                                <table id="basket_group_opened">
>+                                    <thead>
>+                                        <tr>
>+                                            <th>Name</th>
>+                                            <th>Number</th>
>+                                            <th>Billing place</th>
>+                                            <th>Delivery place</th>
>+                                            <th>Number of baskets</th>
>+                                            <th>Action</th>
>+                                        </tr>
>+                                    </thead>
>+                                    <tbody>
>+                                        [% FOREACH basketgroup IN basketgroups %]
>+                                            [% UNLESS ( basketgroup.closed ) %]
>+                                                <tr>
>+                                                    <td>[% IF ( basketgroup.name ) %]
>                                                         [% basketgroup.name | html %]
>                                                         [% ELSE %]
>                                                             Basket group no. [% basketgroup.id | html %]
>                                                         [% END %]
>-                                                </td>
>-                                                <td>[% basketgroup.id | html %]</td>
>-                                                <td>[% Branches.GetName( basketgroup.billingplace ) | html %]</td>
>-                                                <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
>-                                                <td>[% basketgroup.basketsqty | html %]</td>
>-                                                <td>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="View" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Reopen" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as PDF" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as CSV" /></form>
>-                                            [% IF (ediaccount) %]
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Generate EDIFACT order" /></form>
>-                                            [% ELSE %]
>-                                                    <div>No EDIFACT configuration for [% booksellername | html %]</div>
>+                                                    </td>
>+                                                    <td>[% basketgroup.id | html %]</td>
>+                                                    <td>[% Branches.GetName( basketgroup.billingplace ) | html %]</td>
>+                                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
>+                                                    <td>[% basketgroup.basketsqty | html %]</td>
>+                                                    <td>
>+                                                        <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" value="Close and export as PDF" />
>+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Edit" /></form>
>+                                                        [% UNLESS basketgroup.basketsqty %]
>+                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Delete" /></form>
>+                                                        [% END %]
>+                                                    </td>
>+                                                </tr>
>                                             [% END %]
>-                                                </td>
>-                                            </tr>
>                                         [% END %]
>-                                    [% END %]
>-                                </tbody>
>-                            </table>
>+                                    </tbody>
>+                                </table>
>+                            </div>
>+                            <div role="tabpanel" class="tab-pane" id="closed">
>+                                <table id="basket_group_closed">
>+                                    <thead>
>+                                        <tr>
>+                                            <th>Name</th>
>+                                            <th>Number</th>
>+                                            <th>Billing place</th>
>+                                            <th>Delivery place</th>
>+                                            <th>Number of baskets</th>
>+                                            <th>Action</th>
>+                                        </tr>
>+                                    </thead>
>+                                    <tbody>
>+                                        [% FOREACH basketgroup IN basketgroups %]
>+                                            [% IF ( basketgroup.closed ) %]
>+                                                <tr>
>+                                                    <td>
>+                                                        [% IF ( basketgroup.name ) %]
>+                                                            [% basketgroup.name | html %]
>+                                                            [% ELSE %]
>+                                                                Basket group no. [% basketgroup.id | html %]
>+                                                            [% END %]
>+                                                    </td>
>+                                                    <td>[% basketgroup.id | html %]</td>
>+                                                    <td>[% Branches.GetName( basketgroup.billingplace ) | html %]</td>
>+                                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
>+                                                    <td>[% basketgroup.basketsqty | html %]</td>
>+                                                    <td>
>+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="View" /></form>
>+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Reopen" /></form>
>+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as PDF" /></form>
>+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as CSV" /></form>
>+                                                [% IF (ediaccount) %]
>+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Generate EDIFACT order" /></form>
>+                                                [% ELSE %]
>+                                                        <div>No EDIFACT configuration for [% booksellername | html %]</div>
>+                                                [% END %]
>+                                                    </td>
>+                                                </tr>
>+                                            [% END %]
>+                                        [% END %]
>+                                    </tbody>
>+                                </table>
>+                            </div>
>                         </div>
>                     </div>
>                 [% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 30396: 132403 | 132474 | 132914