Attachment 143908 Details for Bug 32207 – Bug 32207: Add page-section to some circulation pages

[patch] Bug 32207: Add page-section to some circulation pages

Bug-32207-Add-page-section-to-some-circulation-pag.patch (text/plain), 21.67 KB, created by Katrin Fischer on 2022-11-15 14:57:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-11-15 14:57:47 UTC

Size: 21.67 KB

patch

obsolete

>From 738f32ddc058317b5add1379b11ea24777562575 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 15 Nov 2022 11:47:16 +0000
>Subject: [PATCH] Bug 32207: Add page-section to some circulation pages
>
>This patch adds a .page-section div to various circ-related pages in
>order to provide a consistent page structure.
>
>To test, apply the patch and view the following pages in Circulation to
>confirm that the primary page content is wrapped in a container with a
>white background:
>
>- Overdues
>- Overdues with fines
>- Transfers to receive: Your system should have items which have been
>  transfered from at least two other libraries.
>- Transfers to send: Your system must have one or more items in the
>  branchtransfers table with the datesent value = null.
>- On-site checkouts
>- Catalog -> Bibliographic record -> Items -> View item's checkout
>  history
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/circ/bookcount.tt         | 63 ++++++++-------
> .../prog/en/modules/circ/branchoverdues.tt    | 58 +++++++-------
> .../prog/en/modules/circ/on-site_checkouts.tt | 62 ++++++++-------
> .../prog/en/modules/circ/overdue.tt           |  2 +-
> .../prog/en/modules/circ/transfers_to_send.tt | 78 ++++++++++---------
> .../en/modules/circ/transferstoreceive.tt     |  2 +
> 6 files changed, 139 insertions(+), 126 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>index 9d7954bfdf..43dc82d75f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>@@ -50,38 +50,43 @@
> [% INCLUDE 'blocking_errors.inc' %]
> 
> <h3>Barcode [% barcode | html %]</h3>
>-<table>
>-        <tr><th>Home library</th><th>Current library</th><th>Date arrived<br />at current library </th><th>Number of checkouts<br />since last transfer</th></tr>
>+<div class="page-section">
>+    <table>
>+            <tr><th>Home library</th><th>Current library</th><th>Date arrived<br />at current library </th><th>Number of checkouts<br />since last transfer</th></tr>
> 
>-        <tr><td>[% Branches.GetName( homebranch ) | html %]</td>
>-            <td>[% Branches.GetName( holdingbranch ) | html %]</td>
>-            <td>[% IF ( lastdate ) %][% lastdate | $KohaDates %][% ELSE %]Item has no transfer record[% END %]</td>
>-            <td>[% count | html %]</td>
>-        </tr>
>-</table>
>-<table>
>-    <tr>
>-        <th>Library</th>
>-        <th>No. of times checked out</th>
>-        <th>Last seen</th>
>-    </tr>
>-    [% FOREACH library IN libraries %]
>-    [% IF library.selected %]
>-        <tr class="mybranch">
>-    [% ELSE %]
>+            <tr><td>[% Branches.GetName( homebranch ) | html %]</td>
>+                <td>[% Branches.GetName( holdingbranch ) | html %]</td>
>+                <td>[% IF ( lastdate ) %][% lastdate | $KohaDates %][% ELSE %]Item has no transfer record[% END %]</td>
>+                <td>[% count | html %]</td>
>+            </tr>
>+    </table>
>+</div> 
>+
>+<div class="page-section">
>+    <table>
>         <tr>
>-    [% END %]
>-            <td>[% library.branchname | html %]</td>
>-            <td>[% library.issues | html %]</td>
>-            <td>[% IF library.seen %]
>-                    [% library.seen | $KohaDates  with_hours => 1 %]
>-                [% ELSE %]
>-                    <span>Never</span>
>-                [% END %]
>-            </td>
>+            <th>Library</th>
>+            <th>No. of times checked out</th>
>+            <th>Last seen</th>
>         </tr>
>-    [% END %]
>-</table>
>+        [% FOREACH library IN libraries %]
>+        [% IF library.selected %]
>+            <tr class="mybranch">
>+        [% ELSE %]
>+            <tr>
>+        [% END %]
>+                <td>[% library.branchname | html %]</td>
>+                <td>[% library.issues | html %]</td>
>+                <td>[% IF library.seen %]
>+                        [% library.seen | $KohaDates  with_hours => 1 %]
>+                    [% ELSE %]
>+                        <span>Never</span>
>+                    [% END %]
>+                </td>
>+            </tr>
>+        [% END %]
>+    </table>
>+</div> 
> 
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>index 98280e2000..82cad8605f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>@@ -49,40 +49,42 @@
> </form>
> 
>     [% IF ( overduesloop ) %]
>-        <table style="width:100%;">
>-        <tr>
>-            <th>Date due</th>
>-            <th>Title</th>
>-            <th>Patron</th>
>-            <th>Location</th>
>-        </tr>
>-            [% FOREACH overduesloo IN overduesloop %]
>+        <div class="page-section">
>+            <table style="width:100%;">
>                 <tr>
>-                    <td>
>-                        [% overduesloo.date_due | html %]
>-                    </td>
>-                    <td>
>-                        [% INCLUDE 'biblio-title.inc' biblio=overduesloo link = 1 %] [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %]
>-
>-                            <br />Barcode : [% overduesloo.barcode | html %]
>-                    </td>
>-                    <td>
>-                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber | uri %]">[% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]</a>
>-                        <br />[% overduesloo.cardnumber | html %]
>-                        <br />[% overduesloo.borrowerphone | html %]<br />
>-                    [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail | uri %]?subject=Overdue: [% overduesloo.title | uri %]">
>-                    [% overduesloo.borroweremail | html %]</a>[% END %]
>-                    </td>
>-                    <td>[% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %]
>-                    </td>
>+                    <th>Date due</th>
>+                    <th>Title</th>
>+                    <th>Patron</th>
>+                    <th>Location</th>
>                 </tr>
>-            [% END %]
>-        </table>
>+                [% FOREACH overduesloo IN overduesloop %]
>+                    <tr>
>+                        <td>
>+                            [% overduesloo.date_due | html %]
>+                        </td>
>+                        <td>
>+                            [% INCLUDE 'biblio-title.inc' biblio=overduesloo link = 1 %] [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %]
>+
>+                                <br />Barcode : [% overduesloo.barcode | html %]
>+                        </td>
>+                        <td>
>+                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber | uri %]">[% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]</a>
>+                            <br />[% overduesloo.cardnumber | html %]
>+                            <br />[% overduesloo.borrowerphone | html %]<br />
>+                        [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail | uri %]?subject=Overdue: [% overduesloo.title | uri %]">
>+                        [% overduesloo.borroweremail | html %]</a>[% END %]
>+                        </td>
>+                        <td>[% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %]
>+                        </td>
>+                    </tr>
>+                [% END %]
>+            </table>
>+        </div> 
>     [% ELSE %]
>         <div class="dialog message">There are no overdues for today[% IF ( location ) %] at the selected location[% END %].</div>
>     [% END %]
>     [% IF ( todayoverduesloop ) %]
>-        <div id="branch_odues_today_odues">
>+        <div id="branch_odues_today_odues" class="page-section">
>             <table style="width:100%;">
> 			<caption>Today's notifications</caption>
>             <tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>index 7e23cfd4e1..1124ce92e8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>@@ -47,36 +47,38 @@
> 
>         <h1>Pending on-site checkouts</h1>
>         [% IF pending_onsite_checkouts %]
>-          <table id="pending_onsite_checkout">
>-            <thead>
>-              <tr>
>-                <th>Date</th><th>Patron</th><th>Title</th><th>Call number</th><th>Barcode</th><th>Library</th><th>Location</th>
>-              </tr>
>-            </thead>
>-            <tbody>
>-              [% FOREACH item IN pending_onsite_checkouts %]
>-                <tr>
>-                  <td data-order="[% item.date_due | html %]">
>-                    [% IF item.is_overdue %]<span class="overdue">[% END %]
>-                    [% item.date_due | $KohaDates %]
>-                    [% IF item.is_overdue %]</span>[% END %]
>-                  </td>
>-                  <td>
>-                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber | uri %]">[% item.firstname | html %] [% item.surname | html %]</a>
>-                  </td>
>-                  <td>
>-                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | uri %]"><strong>[% item.title | html %]</strong></a>[% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- <span class="circ-hlt">[% item.itemnotes | $raw %]</span>[% END %]
>-                  </td>
>-                  <td>[% item.itemcallnumber | html %]</td>
>-                  <td>
>-                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a>
>-                  </td>
>-                  <td>[% Branches.GetName(item.branchcode) | html %]</td>
>-                  <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]</td>
>-                </tr>
>-              [% END %]
>-            </tbody>
>-          </table>
>+            <div class="page-section">
>+                <table id="pending_onsite_checkout">
>+                    <thead>
>+                        <tr>
>+                            <th>Date</th><th>Patron</th><th>Title</th><th>Call number</th><th>Barcode</th><th>Library</th><th>Location</th>
>+                        </tr>
>+                    </thead>
>+                    <tbody>
>+                        [% FOREACH item IN pending_onsite_checkouts %]
>+                            <tr>
>+                                <td data-order="[% item.date_due | html %]">
>+                                    [% IF item.is_overdue %]<span class="overdue">[% END %]
>+                                    [% item.date_due | $KohaDates %]
>+                                    [% IF item.is_overdue %]</span>[% END %]
>+                                </td>
>+                                <td>
>+                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber | uri %]">[% item.firstname | html %] [% item.surname | html %]</a>
>+                                </td>
>+                                <td>
>+                                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | uri %]"><strong>[% item.title | html %]</strong></a>[% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- <span class="circ-hlt">[% item.itemnotes | $raw %]</span>[% END %]
>+                                </td>
>+                                <td>[% item.itemcallnumber | html %]</td>
>+                                <td>
>+                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | uri %]&amp;itemnumber=[% item.itemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a>
>+                                </td>
>+                                <td>[% Branches.GetName(item.branchcode) | html %]</td>
>+                                <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]</td>
>+                            </tr>
>+                        [% END %]
>+                    </tbody>
>+                </table>
>+            </div> 
>         [% ELSE %]
>           <h3>No pending on-site checkout.</h3>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>index 206af1e488..bc29885b4d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -80,7 +80,7 @@
>   </p>
> 
>   <div class="sql"><pre>[% sql | html %]</pre></div>
>-  <div class="searchresults">
>+  <div class="page-section searchresults">
>     <table id="overduest">
>       <thead>
>         <tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>index a99c318bb1..38b90835b8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>@@ -51,45 +51,47 @@
>                         <div id="resultlist">
>                             [% FOREACH library IN libraries %]
>                                 [% IF ( library.branchcode ) %]
>-                                <table style="width: 100%" id="transferst[% library.branchcode | html %]">
>-                                    <caption>Sending to [% library.branchname | html %]</caption>
>-                                    <thead>
>-                                        <tr>
>-                                            <th>Date of request</th>
>-                                            <th class="anti-the">Title</th>
>-                                            <th>Reason</th>
>-                                            <th>On loan</th>
>-                                            <th>Home library</th>
>-                                            <th>Call number</th>
>-                                            <th>Actions</th>
>-                                        </tr>
>-                                    </thead>
>-                                    <tbody>
>-                                        [% FOREACH transfer IN library.inbound_transfers %]
>-                                            [% UNLESS transfer.datesent %]
>-                                            <tr>
>-                                                <td data-order="[% transfer.daterequested | html %]">
>-                                                    [% transfer.daterequested | $KohaDates %]
>-                                                </td>
>-                                                <td>
>-                                                    [% INCLUDE 'biblio-title.inc' biblio = transfer.item.biblio link = 1 %][% IF ( transfer.item.biblio.author ) %] by [% transfer.item.biblio.author | html %][% END %]
>-                                                    [% IF ( transfer.item.effective_itemtype ) %] (<b>[% ItemTypes.GetDescription( transfer.item.effective_itemtype ) | html %]</b>)[% END %]
>-                                                    <br />Barcode: [% transfer.item.barcode | html %]
>-                                                </td>
>-                                                <td><p>[% PROCESS transfer_reason transfer=transfer %]</p></td>
>-                                                <td>[% IF transfer.item.onloan %]Due [% transfer.item.onloan | $KohaDates %][% ELSE %]On shelf[% END %]</td>
>-                                                <td>[% Branches.GetName( transfer.item.homebranch ) | html %]</td>
>-                                                <td>[% transfer.item.itemcallnumber | html %]</td>
>-                                                <td class="actions">
>-                                                    [% IF transfer.reason == 'StockrotationAdvance' %]
>-                                                    <a href="/cgi-bin/koha/catalogue/stockrotation.pl?op=toggle_in_demand&stage_id=4&item_id=[% transfer.itemnumber | uri %]&biblionumber=[% transfer.item.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-fire"></i> Mark "In demand"</a>
>+                                    <div class="page-section">
>+                                        <table style="width: 100%" id="transferst[% library.branchcode | html %]">
>+                                            <caption>Sending to [% library.branchname | html %]</caption>
>+                                            <thead>
>+                                                <tr>
>+                                                    <th>Date of request</th>
>+                                                    <th class="anti-the">Title</th>
>+                                                    <th>Reason</th>
>+                                                    <th>On loan</th>
>+                                                    <th>Home library</th>
>+                                                    <th>Call number</th>
>+                                                    <th>Actions</th>
>+                                                </tr>
>+                                            </thead>
>+                                            <tbody>
>+                                                [% FOREACH transfer IN library.inbound_transfers %]
>+                                                    [% UNLESS transfer.datesent %]
>+                                                    <tr>
>+                                                        <td data-order="[% transfer.daterequested | html %]">
>+                                                            [% transfer.daterequested | $KohaDates %]
>+                                                        </td>
>+                                                        <td>
>+                                                            [% INCLUDE 'biblio-title.inc' biblio = transfer.item.biblio link = 1 %][% IF ( transfer.item.biblio.author ) %] by [% transfer.item.biblio.author | html %][% END %]
>+                                                            [% IF ( transfer.item.effective_itemtype ) %] (<b>[% ItemTypes.GetDescription( transfer.item.effective_itemtype ) | html %]</b>)[% END %]
>+                                                            <br />Barcode: [% transfer.item.barcode | html %]
>+                                                        </td>
>+                                                        <td><p>[% PROCESS transfer_reason transfer=transfer %]</p></td>
>+                                                        <td>[% IF transfer.item.onloan %]Due [% transfer.item.onloan | $KohaDates %][% ELSE %]On shelf[% END %]</td>
>+                                                        <td>[% Branches.GetName( transfer.item.homebranch ) | html %]</td>
>+                                                        <td>[% transfer.item.itemcallnumber | html %]</td>
>+                                                        <td class="actions">
>+                                                            [% IF transfer.reason == 'StockrotationAdvance' %]
>+                                                            <a href="/cgi-bin/koha/catalogue/stockrotation.pl?op=toggle_in_demand&stage_id=4&item_id=[% transfer.itemnumber | uri %]&biblionumber=[% transfer.item.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-fire"></i> Mark "In demand"</a>
>+                                                            [% END %]
>+                                                        </td>
>+                                                    </tr>
>                                                     [% END %]
>-                                                </td>
>-                                            </tr>
>-                                            [% END %]
>-                                        [% END %]
>-                                    </tbody>
>-                                </table>
>+                                                [% END %]
>+                                            </tbody>
>+                                        </table>
>+                                    </div> 
>                                 [% END %]
>                             [% END %]
>                         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>index 200f66268b..2834af58b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>@@ -51,6 +51,7 @@
>         <div id="resultlist">
>         [% FOREACH branchesloo IN branchesloop %]
>             [% IF ( branchesloo.branchcode ) %]
>+                <div class="page-section">
>             <table style="width: 100%" id="transferst[% branchesloo.branchcode | html %]">
>             <caption>Coming from [% branchesloo.branchname | html %]</caption>
>             <thead><tr>
>@@ -97,6 +98,7 @@
>                 </tr>
>             [% END %]</tbody>
>             </table>
>+            </div> 
>             [% END %]
>         [% END %]
>         </div>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32207: 143897 | 143906 | 143908