From 0663e654da2818ac580020bb068e54f34bb6dc6d Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 24 Aug 2018 12:28:34 +0300 Subject: [PATCH] Bug 12187: Duplicate TT code for serial statuses Instead of duplicating the code for serial statuses in multiple files, move all of them into single include file, and use that. Needs a test plan, but I haven't used serials. Rebased Signed-off-by: David Nind --- .../prog/en/includes/serials-status.inc | 77 ++++++++++++++ .../prog/en/modules/catalogue/detail.tt | 15 +-- .../prog/en/modules/serials/claims.tt | 11 +- .../prog/en/modules/serials/serials-collection.tt | 13 +-- .../prog/en/modules/serials/serials-edit.tt | 116 +-------------------- .../prog/en/modules/serials/subscription-detail.tt | 18 +--- 6 files changed, 83 insertions(+), 167 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc new file mode 100644 index 0000000000..88bdbb998c --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc @@ -0,0 +1,77 @@ +[% IF ( ShowOptions ) %] + [% IF ( serial.status1 ) %] + + [% ELSIF ( not HideStatuses.match('\b1\b') ) %] + + [% END %] + [% IF ( serial.status2 ) %] + + [% ELSIF ( not HideStatuses.match('\b2\b') ) %] + + [% END %] + [% IF ( serial.status3 ) %] + + [% ELSIF ( not HideStatuses.match('\b3\b') ) %] + + [% END %] + [% IF ( serial.status4 ) %] + + [% ELSIF ( not HideStatuses.match('\b4\b') ) %] + + [% END %] + [% IF ( serial.status41 ) %] + + [% ELSIF ( not HideStatuses.match('\b41\b') ) %] + + [% END %] + [% IF ( serial.status42 ) %] + + [% ELSIF ( not HideStatuses.match('\b42\b') ) %] + + [% END %] + [% IF ( serial.status43 ) %] + + [% ELSIF ( not HideStatuses.match('\b43\b') ) %] + + [% END %] + [% IF ( serial.status44 ) %] + + [% ELSIF ( not HideStatuses.match('\b44\b') ) %] + + [% END %] + [% IF ( serial.status7 ) %] + + [% ELSIF ( not HideStatuses.match('\b7\b') ) %] + + [% END %] + [% IF ( serial.status5 ) %] + + [% ELSIF ( not HideStatuses.match('\b5\b') ) %] + + [% END %] + [% IF ( serial.status6 ) %] + + [% ELSIF ( not HideStatuses.match('\b6\b') ) %] + + [% END %] + [% IF serial.status8 %] + + [% ELSIF ( not HideStatuses.match('\b8\b') ) %] + + [% END %] +[% ELSE %] + [% IF ( serial.status1 ) %]Expected[% END %] + [% IF ( serial.status2 ) %]Arrived[% END %] + [% IF ( serial.status3 ) %]Late[% END %] + [% IF ( serial.status4 ) %]Missing[% END %] + [% IF ( serial.status41 ) %]Missing (never received)[% END %] + [% IF ( serial.status42 ) %]Missing (sold out)[% END %] + [% IF ( serial.status43 ) %]Missing (damaged)[% END %] + [% IF ( serial.status44 ) %]Missing (lost)[% END %] + [% IF ( serial.status5 ) %]Not issued[% END %] + [% IF ( serial.status6 ) %]Delete[% END %] + [% IF ( serial.status7 ) %]Claimed + [% IF ( serial.claimdate ) %][% serial.claimdate | html %][% END %] + [% END %] + [% IF ( serial.status8 ) %]Stopped[% END %] +[% 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 6ef518489b..80ab2a251b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -582,20 +582,7 @@ Note that permanent location is a code, and location may be an authval. [% latestserial.serialseq | html %] [% latestserial.planneddate | $KohaDates %] [% latestserial.publisheddate | $KohaDates %] - - [% IF ( latestserial.status1 ) %]Expected[% END %] - [% IF ( latestserial.status2 ) %]Arrived[% END %] - [% IF ( latestserial.status3 ) %]Late[% END %] - [% IF ( latestserial.status4 ) %]Missing[% END %] - [% IF ( latestserial.status41 ) %]Missing (never received)[% END %] - [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %] - [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %] - [% IF ( latestserial.status44 ) %]Missing (lost)[% END %] - [% IF ( latestserial.status5 ) %]Not issued[% END %] - [% IF ( latestserial.status6 ) %]Delete[% END %] - [% IF ( latestserial.status7 ) %]Claimed[% END %] - [% IF ( latestserial.status8 ) %]Stopped[% END %] - + [% PROCESS 'serials-status.inc' serial=latestserial ShowOptions=0 %] [% latestserial.notes | html %] [% END %] 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 d25a515675..edc03326c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -132,16 +132,7 @@ [% missingissue.issn | html %] [% missingissue.serialseq | html %] - - [% IF ( missingissue.status1 ) %]Expected[% END %] - [% IF ( missingissue.status3 ) %]Late[% END %] - [% IF ( missingissue.status4 ) %]Missing[% END %] - [% IF ( missingissue.status41 ) %]Missing (never received)[% END %] - [% IF ( missingissue.status42 ) %]Missing (sold out)[% END %] - [% IF ( missingissue.status43 ) %]Missing (damaged)[% END %] - [% IF ( missingissue.status44 ) %]Missing (lost)[% END %] - [% IF ( missingissue.status7 ) %]Claimed[% END %] - + [% INCLUDE 'serials-status.inc' serial=missingissue ShowOptions=0 %] [% IF ( missingissue.planneddate ) %] [% missingissue.planneddate | html %] 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 192565e88f..0ac2354601 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 @@ -257,18 +257,7 @@ [% END %] - [% IF ( serial.status1 ) %]Expected[% END %] - [% IF ( serial.status2 ) %]Arrived[% END %] - [% IF ( serial.status3 ) %]Late[% END %] - [% IF ( serial.status4 ) %]Missing[% END %] - [% IF ( serial.status41 ) %]Missing (never received)[% END %] - [% IF ( serial.status42 ) %]Missing (sold out)[% END %] - [% IF ( serial.status43 ) %]Missing (damaged)[% END %] - [% IF ( serial.status44 ) %]Missing (lost)[% END %] - [% IF ( serial.status5 ) %]Not issued[% END %] - [% IF ( serial.status6 ) %]Delete[% END %] - [% IF ( serial.status7 ) %]Claimed[% END %] - [% IF ( serial.status8 ) %]Stopped[% END %] + [% INCLUDE 'serials-status.inc' ShowOptions=0 %] [% serial.notes | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 8fe16b99fb..1893b34fe1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -148,64 +148,7 @@ $(document).ready(function() { @@ -304,62 +247,7 @@ $(document).ready(function() { 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 03a7bc9592..9984b90958 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 @@ -328,23 +328,7 @@ [% serialslis.publisheddatetext | html %] - [% IF ( serialslis.status1 ) %]Expected[% END %] - [% IF ( serialslis.status2 ) %]Arrived[% END %] - [% IF ( serialslis.status3 ) %]Late[% END %] - [% IF ( serialslis.status4 ) %]Missing[% END %] - [% IF ( serialslis.status41 ) %]Missing (never received)[% END %] - [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %] - [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %] - [% IF ( serialslis.status44 ) %]Missing (lost)[% END %] - [% IF ( serialslis.status5 ) %]Not issued[% END %] - [% IF ( serialslis.status6 ) %]Delete[% END %] - [% IF ( serialslis.status7 ) %] - Claimed - [% IF ( serialslis.claimdate ) %] - [% serialslis.claimdate | html %] - [% END %] - [% END %] - [% IF ( serialslis.status8 ) %]Stopped[% END %] + [% PROCESS 'serials-status.inc' serial=serialslis ShowOptions=0 %] [% END # /FOREACH serialslist %] -- 2.11.0