Bugzilla – Attachment 161121 Details for
Bug 33464
Report "Orders by fund" is missing page-section class on results
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33464: Add page-section to "Orders by fund" result list
Bug-33464-Add-page-section-to-Orders-by-fund-resul.patch (text/plain), 6.35 KB, created by
David Nind
on 2024-01-17 21:56:55 UTC
(
hide
)
Description:
Bug 33464: Add page-section to "Orders by fund" result list
Filename:
MIME Type:
Creator:
David Nind
Created:
2024-01-17 21:56:55 UTC
Size:
6.35 KB
patch
obsolete
>From 24660310c6ef0cfa77fecd466b9a4f831cb053c5 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Sat, 13 Jan 2024 18:15:03 +0000 >Subject: [PATCH] Bug 33464: Add page-section to "Orders by fund" result list > >This updates the results table for the "Orders by fund" >report with the common white background. > >To test: >* Go to Reports > Orders by fund >* Search for orders (you might have to add one) >* Verify the results table is missing the common > white background >* Appyl patch >* Reload page and verify styling is improved > >Signed-off-by: David Nind <david@davidnind.com> >--- > .../en/modules/reports/orders_by_budget.tt | 102 +++++++++--------- > 1 file changed, 52 insertions(+), 50 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index 80f0100fbe..abd91f0d36 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -49,56 +49,58 @@ > [% END %] > > [% IF ( get_orders ) %] >- >- [% IF ( ordersloop ) %]<table id="funds"> >- <thead> >- <tr> >- <th>Fund</th> >- <th>Basket</th> >- <th>Basket name</th> >- <th>Basket by</th> >- <th>Title</th> >- <th>Currency</th> >- <th>List price</th> >- <th>RRP</th> >- <th>Budgeted cost</th> >- <th>Quantity</th> >- <th>Total RRP</th> >- <th>Total cost</th> >- <th>Entry date</th> >- <th>Date received</th> >- <th>Internal note</th> >- <th>Vendor note</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH ordersloo IN ordersloop %] >- [% UNLESS ( loop.odd ) %]<tr class="highlight"> >- [% ELSE %] <tr> >- [% END %] >- <td>[% ordersloo.budget_name | html %]</td> >- <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno | uri %]"> [% ordersloo.basketno | html %]</a></td> >- <td>[% ordersloo.basketname | html %]</td> >- <td>[% ordersloo.authorisedbyname | html %]</td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | uri %]"> [% ordersloo.title | html %]</a></td> >- <td>[% ordersloo.currency | html %]</td> >- <td>[% ordersloo.listprice | $Price %]</td> >- <td>[% ordersloo.rrp | $Price %]</td> >- <td>[% ordersloo.ecost | $Price %]</td> >- <td>[% ordersloo.quantity | html %]</td> >- <td>[% ordersloo.total_rrp | $Price %]</td> >- <td>[% ordersloo.total_ecost | $Price %]</td> >- <td data-order="[% ordersloo.entrydate | html %]">[% ordersloo.entrydate | $KohaDates %]</td> >- <td data-order="[% ordersloo.datereceived | html %]">[% ordersloo.datereceived | $KohaDates %]</td> >- <td>[% ordersloo.order_internalnote | html %]</td> >- <td>[% ordersloo.order_vendornote | html %]</td> >- </tr> >- [% END %] >- </tbody> >- <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity | html %]</th><th>[% total_rrp | $Price %]</th><th>[% total_ecost | $Price %]</th><th></th><th></th><th></th><th></th></tr></tfoot> >- </table> >+ [% IF ( ordersloop ) %] >+ <div class="page-section"> >+ <table id="funds"> >+ <thead> >+ <tr> >+ <th>Fund</th> >+ <th>Basket</th> >+ <th>Basket name</th> >+ <th>Basket by</th> >+ <th>Title</th> >+ <th>Currency</th> >+ <th>List price</th> >+ <th>RRP</th> >+ <th>Budgeted cost</th> >+ <th>Quantity</th> >+ <th>Total RRP</th> >+ <th>Total cost</th> >+ <th>Entry date</th> >+ <th>Date received</th> >+ <th>Internal note</th> >+ <th>Vendor note</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH ordersloo IN ordersloop %] >+ [% UNLESS ( loop.odd ) %]<tr class="highlight"> >+ [% ELSE %] <tr> >+ [% END %] >+ <td>[% ordersloo.budget_name | html %]</td> >+ <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno | uri %]"> [% ordersloo.basketno | html %]</a></td> >+ <td>[% ordersloo.basketname | html %]</td> >+ <td>[% ordersloo.authorisedbyname | html %]</td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | uri %]"> [% ordersloo.title | html %]</a></td> >+ <td>[% ordersloo.currency | html %]</td> >+ <td>[% ordersloo.listprice | $Price %]</td> >+ <td>[% ordersloo.rrp | $Price %]</td> >+ <td>[% ordersloo.ecost | $Price %]</td> >+ <td>[% ordersloo.quantity | html %]</td> >+ <td>[% ordersloo.total_rrp | $Price %]</td> >+ <td>[% ordersloo.total_ecost | $Price %]</td> >+ <td data-order="[% ordersloo.entrydate | html %]">[% ordersloo.entrydate | $KohaDates %]</td> >+ <td data-order="[% ordersloo.datereceived | html %]">[% ordersloo.datereceived | $KohaDates %]</td> >+ <td>[% ordersloo.order_internalnote | html %]</td> >+ <td>[% ordersloo.order_vendornote | html %]</td> >+ </tr> >+ [% END %] >+ </tbody> >+ <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity | html %]</th><th>[% total_rrp | $Price %]</th><th>[% total_ecost | $Price %]</th><th></th><th></th><th></th><th></th></tr></tfoot> >+ </table> >+ </div> > [% END %] >- [% ELSE %] >+[% ELSE %] > <form name="f" action="/cgi-bin/koha/reports/orders_by_fund.pl" method="post"> > <fieldset class="rows"> > <legend>Filters</legend> >@@ -155,7 +157,7 @@ > <input type="hidden" name="get_orders" value="1" /></fieldset> > </form> > >- [% END %] >+[% END %] > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33464
:
161020
|
161121
|
161125