Attachment 81802 Details for Bug 21467 – Bug 21467: Add treetable to subscription detail to group orders by parent ordernumber

[patch] Bug 21467: Add treetable to subscription detail to group orders by parent ordernumber

Bug-21467-Add-treetable-to-subscription-detail-to-.patch (text/plain), 3.77 KB, created by Katrin Fischer on 2018-11-01 13:50:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2018-11-01 13:50:28 UTC

Size: 3.77 KB

patch

obsolete

>From 065158755f0c80d6570dfb671e9a7ff0c68c9085 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 1 Oct 2018 20:44:29 -0300
>Subject: [PATCH] Bug 21467: Add treetable to subscription detail to group
> orders by parent ordernumber
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Sponsored-by: BULAC - http://www.bulac.fr/
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/serials/subscription-detail.tt | 28 ++++++++++++++++++----
> 1 file changed, 23 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>index f37f5e4e51..1dcac0f3f9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>@@ -11,6 +11,7 @@
> <title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid | html %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") | $raw %]
>+[% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %]
> </head>
> 
> <body id="ser_subscription-detail" class="ser">
>@@ -357,6 +358,7 @@
> 
>                 <thead>
>                     <tr>
>+                        <th class="NoVisible">Timestamp</th>
>                         <th>Invoice</th>
>                         <th>Basket</th>
>                         <th>Order number</th>
>@@ -372,7 +374,12 @@
>                 </thead>
>                 <tbody>
>                 [% FOR order IN orders %]
>-                    <tr>
>+                    [% IF order.parent_ordernumber != order.ordernumber %]
>+                        <tr data-tt-id="[% order.ordernumber | html %]" data-tt-parent-id="[% order.parent_ordernumber | html %]">
>+                    [% ELSE %]
>+                        <tr data-tt-id="[% order.parent_ordernumber | html %]">
>+                    [% END %]
>+                        <td>[% order.timestamp | html %]</td>
>                         <td>
>                         [% IF order.invoice %]
>                             [% IF CAN_user_acquisition %]
>@@ -440,6 +447,7 @@
>     </script>
>     [% Asset.js("js/serials-toolbar.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>+    [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %]
>     [% INCLUDE 'columns_settings.inc' %]
>     <script>
>         // the english words used in display purposes
>@@ -454,14 +462,24 @@
> 
>             var columns_settings = [% ColumnsSettings.GetColumns( 'serials', 'subscription-detail', 'orders', 'json' ) | $raw %];
>             var table = KohaTable("orders", {
>-                'bPaginate': false,
>-                'bAutoWidth': false,
>-                "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber
>                 "aoColumnDefs": [
>+                    { "bVisible": false, "aTargets": [ 'NoVisible' ] },
>+                    { "bSortable": false, "aTargets": ["_all"] },
>                     { "aTargets": "title-string", "sType": "title-string" }
>-                ]
>+                ],
>+
>+                'bPaginate': false,
>+                'bAutoWidth': false,
>+                'bSort': true,
>+                'aaSortingFixed': [[ 0, 'desc' ]],
>+                "bSortCellsTop": true
>             }, columns_settings);
> 
>+            $(table).treetable({
>+                expandable: true
>+            });
>+            $(table).treetable('expandAll');
>+
>             $("#hide_received_orders").click(function(e){
>                 e.preventDefault();
>                 table.fnFilter( '^$', 4, true ); // Not empty "Receive date" columns
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21467: 79801 | 79802 | 79834 | 79835 | 79836 | 79837 | 79838 | 80546 | 80706 | 80707 | 80717 | 80718 | 80719 | 80720 | 80721 | 80722 | 80723 | 80724 | 81394 | 81395 | 81396 | 81397 | 81398 | 81399 | 81400 | 81430 | 81797 | 81798 | 81799 | 81800 | 81801 | 81802 | 81803 | 81804 | 81805 | 81806 | 81807 | 81808 | 81809 | 81810 | 81811 | 82117 | 82122 | 82123 | 82124 | 82125 | 82126 | 82127 | 82128 | 82129 | 82130 | 82131 | 82132