Bugzilla – Attachment 148358 Details for
Bug 32752
Add new serial issue status: "Out for binding", "Bound", and "Circulating"
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32752: Use an include to display the serial status in the staff interface
Bug-32752-Use-an-include-to-display-the-serial-sta.patch (text/plain), 10.97 KB, created by
Katrin Fischer
on 2023-03-17 14:54:35 UTC
(
hide
)
Description:
Bug 32752: Use an include to display the serial status in the staff interface
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-03-17 14:54:35 UTC
Size:
10.97 KB
patch
obsolete
>From c0c7f5b2f7f52edcfa11ee7f88eb9b301d1f29f8 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer@bsz-bw.de> >Date: Fri, 17 Mar 2023 09:24:22 +0000 >Subject: [PATCH] Bug 32752: Use an include to display the serial status in the > staff interface > >This moves the identical code used to display the serial status >from the different templates into one common include. > >To test: >* Add a subscription >* Receive several issues, make sure 2 are late >* Claim one of the late issues >* Verify the status displays nicely on these pages: > * Subscription detail page > issues tab > * Catalog detail page > subscription tab > * Serial claims page > * Serial collection page of your subscription > >Note: there was some code for the subscription detail page >that should have displayed the claim date, but didn't work. >To keep things simpler and identical to before, I have left >that bit out for now. >--- > .../prog/en/includes/serial-status.inc | 12 ++++++++++++ > .../prog/en/modules/catalogue/detail.tt | 13 +------------ > .../prog/en/modules/serials/claims.tt | 9 +-------- > .../en/modules/serials/serials-collection.tt | 13 +------------ > .../en/modules/serials/subscription-detail.tt | 18 +----------------- > 5 files changed, 16 insertions(+), 49 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/serial-status.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serial-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serial-status.inc >new file mode 100644 >index 0000000000..456171ecf2 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serial-status.inc >@@ -0,0 +1,12 @@ >+[% IF ( serial.status1 ) %]<span>Expected</span>[% END %] >+[% IF ( serial.status2 ) %]<span>Arrived</span>[% END %] >+[% IF ( serial.status3 ) %]<span>Late</span>[% END %] >+[% IF ( serial.status4 ) %]<span>Missing</span>[% END %] >+ [% IF ( serial.status41 ) %]<span>Missing (never received)</span>[% END %] >+ [% IF ( serial.status42 ) %]<span>Missing (sold out)</span>[% END %] >+ [% IF ( serial.status43 ) %]<span>Missing (damaged)</span>[% END %] >+ [% IF ( serial.status44 ) %]<span>Missing (lost)</span>[% END %] >+[% IF ( serial.status5 ) %]<span>Not available</span>[% END %] >+[% IF ( serial.status6 ) %]<span>Delete</span>[% END %] >+[% IF ( serial.status7 ) %]<span>Claimed</span>[% END %] >+[% IF ( serial.status8 ) %]<span>Stopped</span>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 707a5d7cf3..936490bbad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -807,18 +807,7 @@ Note that permanent location is a code, and location may be an authval. > <td data-order="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</td> > <td data-order="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</td> > <td> >- [% IF ( latestserial.status1 ) %]<span>Expected</span>[% END %] >- [% IF ( latestserial.status2 ) %]<span>Arrived</span>[% END %] >- [% IF ( latestserial.status3 ) %]<span>Late</span>[% END %] >- [% IF ( latestserial.status4 ) %]<span>Missing</span>[% END %] >- [% IF ( latestserial.status41 ) %]<span>Missing (never received)</span>[% END %] >- [% IF ( latestserial.status42 ) %]<span>Missing (sold out)</span>[% END %] >- [% IF ( latestserial.status43 ) %]<span>Missing (damaged)</span>[% END %] >- [% IF ( latestserial.status44 ) %]<span>Missing (lost)</span>[% END %] >- [% IF ( latestserial.status5 ) %]<span>Not issued</span>[% END %] >- [% IF ( latestserial.status6 ) %]<span>Delete</span>[% END %] >- [% IF ( latestserial.status7 ) %]<span>Claimed</span>[% END %] >- [% IF ( latestserial.status8 ) %]<span>Stopped</span>[% END %] >+ [% INCLUDE 'serial-status.inc' serial = latestserial %] > </td> > <td>[% latestserial.notes | html %]</td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index 7d161effd3..650e23d0f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -159,14 +159,7 @@ > <td>[% missingissue.issn | html %]</td> > <td>[% missingissue.serialseq | html %]</td> > <td> >- [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %] >- [% IF ( missingissue.status3 ) %]<span class="status-late">Late</span>[% END %] >- [% IF ( missingissue.status4 ) %]<span class="status-missing">Missing</span>[% END %] >- [% IF ( missingissue.status41 ) %]<span class="status-missing_never_received">Missing (never received)</span>[% END %] >- [% IF ( missingissue.status42 ) %]<span class="status-missing_sold_out">Missing (sold out)</span>[% END %] >- [% IF ( missingissue.status43 ) %]<span class="status-missing_damaged">Missing (damaged)</span>[% END %] >- [% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %] >- [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %] >+ [% INCLUDE 'serial-status.inc' serial = missingissue %] > </td> > <td class="planneddate" data-order="[% missingissue.planneddate | html %]"> > [% missingissue.planneddate | $KohaDates %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 19cc576664..785b3fcfea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -290,18 +290,7 @@ > [% END %] > </td> > <td> >- [% IF ( serial.status1 ) %]<span>Expected</span>[% END %] >- [% IF ( serial.status2 ) %]<span>Arrived</span>[% END %] >- [% IF ( serial.status3 ) %]<span>Late</span>[% END %] >- [% IF ( serial.status4 ) %]<span>Missing</span>[% END %] >- [% IF ( serial.status41 ) %]<span>Missing (never received)</span>[% END %] >- [% IF ( serial.status42 ) %]<span>Missing (sold out)</span>[% END %] >- [% IF ( serial.status43 ) %]<span>Missing (damaged)</span>[% END %] >- [% IF ( serial.status44 ) %]<span>Missing (lost)</span>[% END %] >- [% IF ( serial.status5 ) %]<span>Not issued</span>[% END %] >- [% IF ( serial.status6 ) %]<span>Delete</span>[% END %] >- [% IF ( serial.status7 ) %]<span>Claimed</span>[% END %] >- [% IF ( serial.status8 ) %]<span>Stopped</span>[% END %] >+ [% INCLUDE 'serial-status.inc' serial = serial %] > </td> > <td> > [% serial.notes | html %] >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 8fac9a8cfc..bc7f46f09a 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 >@@ -288,23 +288,7 @@ > [% serialslis.publisheddatetext | html %] > </td> > <td> >- [% IF ( serialslis.status1 ) %]<span>Expected</span>[% END %] >- [% IF ( serialslis.status2 ) %]<span>Arrived</span>[% END %] >- [% IF ( serialslis.status3 ) %]<span>Late</span>[% END %] >- [% IF ( serialslis.status4 ) %]<span>Missing</span>[% END %] >- [% IF ( serialslis.status41 ) %]<span>Missing (never received)</span>[% END %] >- [% IF ( serialslis.status42 ) %]<span>Missing (sold out)</span>[% END %] >- [% IF ( serialslis.status43 ) %]<span>Missing (damaged)</span>[% END %] >- [% IF ( serialslis.status44 ) %]<span>Missing (lost)</span>[% END %] >- [% IF ( serialslis.status5 ) %]<span>Not issued</span>[% END %] >- [% IF ( serialslis.status6 ) %]<span>Delete</span>[% END %] >- [% IF ( serialslis.status7 ) %] >- <span>Claimed</span> >- [% IF ( serialslis.claimdate ) %] >- [% serialslis.claimdate | html %] >- [% END %] >- [% END %] >- [% IF ( serialslis.status8 ) %]<span>Stopped</span>[% END %] >+ [% INCLUDE 'serial-status.inc' serial = serialslis %] > </td> > </tr> > [% END # /FOREACH serialslist %] >-- >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 32752
:
148320
|
148321
|
148322
|
148323
|
148353
|
148354
|
148355
|
148356
|
148357
|
148358
|
148359
|
148360
|
148362
|
148363
|
148364
|
148365
|
148366
|
148367
|
148368
|
148369
|
148370
|
148371
|
148372
|
148373
|
148490
|
150051
|
150052
|
150053
|
150054