Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32752: Use an include to display the serial status in the staff interface

Browse source 
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.

Sponsored-by: The Research University in the Helmholtz Association (KIT)
Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Katrin Fischer 2023-03-17 09:24:22 +00:00 committed by Tomas Cohen Arazi
parent 129bf4781f
commit b7afb8e8a2
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
5 changed files with 16 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
koha-tmpl/intranet-tmpl/prog/en/includes/serial-status.inc Normal file
View file

@ -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 %]

13
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
View file

@ -798,18 +798,7 @@
<td data-order="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</td>
<td>[% latestserial.publisheddatetext | html %]</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>

9
koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
View file

@ -153,14 +153,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 %]

13
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
View file

@ -287,18 +287,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 %]

18
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
View file

@ -277,23 +277,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 %]