From db81117435ded6070f1f9ff40426d8008270547e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 25 Mar 2020 15:03:10 +0000 Subject: [PATCH] Bug 12187: (follow-up) Reindent new include file This patch re-indents the new include file so that it is consistent with coding guidelines. Taking this opportunity to add a full test plan: Instead of duplicating the code for serial statuses in multiple files, move all of them into single include file, and use that. To test, apply the patch and go to Serials. - Search for a subscription which has multiple issues. - On the subscription detail page, open the "Issues" tab. - Statuses in the "Status" column should display correctly. - Click the "Serial collection" link in the sidebar. - In the table of issues, the "Status" colunn should display the correct information. - Select some isues and click the "Edit serials" button. - In the "Status" column, the options should display correctly. - Test setting various statuses and saving. The statuses should save correctly. - Click "Claims" in the sidebar menu and select a vendor. - In the list of missing issues the "Status" column should show the correct information. - In the catalog, locate the bibliographic record for a subscription with issues. - Under the "Subscriptions" tab check the "Status" column. Status information should be displayed correctly. --- .../prog/en/includes/serials-status.inc | 174 ++++++++++++--------- 1 file changed, 100 insertions(+), 74 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc index 88bdbb998c..90c9c78698 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-status.inc @@ -1,77 +1,103 @@ [% 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 %] + [% 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 %] + [% 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 %] -- 2.11.0