From ee9587f983fafa4c47e809c301b4f3698be9215c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 12 Aug 2019 17:57:55 +0000 Subject: [PATCH] Bug 23448: Clean up subscription detail template This patch makes a number of corrections to the subscription detail page: Re-indented consistently with four spaces. Removed invalid attributes. Added missing . To test, apply the patch and go to Serials. Search for a subscription and view the details page. The page should look correct. Validating the source should return no errors. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../en/modules/serials/subscription-detail.tt | 850 +++++++++--------- 1 file changed, 438 insertions(+), 412 deletions(-) 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 983a7a8056..55684b2860 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 @@ -28,431 +28,457 @@
- [% INCLUDE 'serials-toolbar.inc' %] - [% INCLUDE 'mana/mana-comment-status.inc' %] + [% INCLUDE 'serials-toolbar.inc' %] + [% INCLUDE 'mana/mana-comment-status.inc' %] -

Subscription for [% bibliotitle | html %] [% IF closed %](closed)[% END %]

- [% IF ( abouttoexpire ) %] - [% UNLESS closed %] -
Subscription will expire [% enddate | html %]. Renew this subscription.
- [% END %] - [% END %] - [% IF ( NEEDSCONFIRMATION ) %] -
-

Please confirm subscription deletion

+

Subscription for [% bibliotitle | html %] [% IF closed %](closed)[% END %]

-
    - [% IF ( NOTEXPIRED ) %]
  • The subscription has not expired yet
    • [% END %] - [% IF ( LINKEDISSUES ) %]
  • The subscription has linked issues
    • [% END %] - [% IF ( LINKEDITEMS ) %]
  • The subscription has linked items
    Those items won't be deleted
    • [% END %] -
-
- - - - -
-
- - -
+ [% IF ( abouttoexpire ) %] + [% UNLESS closed %] +
Subscription will expire [% enddate | html %]. Renew this subscription.
+ [% END %] + [% END %] -
- [% END %] - [% IF mana_code.defined %] -
-

- [% mana_code | html %] -

-
- [% END %] + [% IF ( NEEDSCONFIRMATION ) %] +
+

Please confirm subscription deletion

-
- +
    + [% IF ( NOTEXPIRED ) %]
  • The subscription has not expired yet
    • [% END %] + [% IF ( LINKEDISSUES ) %]
  • The subscription has linked issues
    • [% END %] + [% IF ( LINKEDITEMS ) %]
  • The subscription has linked items
    Those items won't be deleted
    • [% END %] +
-
-
-
-
-
    -
  1. Subscription ID: [% subscriptionid | html %]
    2. -
  2. Librarian identity: [% librarian | html %]
    3. -
  3. Vendor: [% aqbooksellername | html %]
    4. -
  4. Biblio: [% bibliotitle | html %] ([% bibnum | html %])
    5. - [% IF ( OPACBaseURL ) %] -
  5. - OPAC view: - Open in new window. -
    6. - [% END %] -[% IF ( branchcode ) %]
  6. Library: [% Branches.GetName( branchcode ) | html %]
    7. [% END %] - [% IF ( serialsadditems ) %] -
  7. Items: Serial receipt creates an item record.
    8. - [% ELSE %] -
  8. Items: Serial receipt does not create an item record.
    9. - [% END %] -
  9. - Serial number: - [% IF skip_serialseq %] - Serial number is skipped when an irregularity is found. - [% ELSE %] - Serial number is kept when an irregularity is found. - [% END %] -
    10. -
  10. Grace period: [% graceperiod | html %]
    11. -
-
-
-
-
-
    - [% IF ( location ) %]
  1. Location: [% location | html %]
    2. [% END %] - [% IF ( callnumber ) %]
  2. Call number: [% callnumber | html %]
    3. [% END %] - [% IF ( staffdisplaycount ) %]
  3. Number of issues to display to staff:[% staffdisplaycount | html %]
    4. [% END %] - [% IF ( opacdisplaycount ) %]
  4. Number of issues to display in OPAC:[% opacdisplaycount | html %]
    5. [% END %] - [% IF ( letter ) %] -
  5. - Patron notification: [% letter | html %] - (subscribers) -
    6. - [% END %] - [% IF ( hasRouting ) %]
  6. Routing: yes
    7. [% END %] -
-
-
-
+
+ + + + +
- [% IF available_additional_fields %] -
-
-
-

Additional fields:

-
-
    - [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] -
-
-
-
- [% END %] -
+
+ + +
+
+ [% END %] -
-
-
-
-
    -
  1. Beginning date: [% startdate | html %] -
    2. -
  2. Frequency: - [% frequency.description | html %] -
    3. -
  3. - Manual history: - [% IF ( manualhistory ) %] - Enabled Edit history - [% ELSE %] - Disabled - [% END %] -
    4. -
  4. Number pattern: - [% numberpattern.label | html %] -
    5. -
  5. - - - [% IF (has_X) %] - + [% IF mana_code.defined %] +
    +

    + [% mana_code | html %] +

    +
    [% END %] - [% IF (has_Y) %] - - [% END %] - [% IF (has_Z) %] - - [% END %] - - - - [% IF (has_X) %] - - [% END %] - [% IF (has_Y) %] - - [% END %] - [% IF (has_Z) %] - - [% END %] - -
    Starting with:[% lastvalue1 | html %][% lastvalue2 | html %][% lastvalue3 | html %]
    Rollover:[% numberpattern.whenmorethan1 | html %][% numberpattern.whenmorethan2 | html %][% numberpattern.whenmorethan3 | html %]
    6. - [% IF ( irregular_issues ) %] -
  6. Irregularity: [% irregular_issues | html %] issues -
    7. - [% END %] -
  7. First arrival: [% firstacquidate | html %] -
    8. - [% IF ( numberlength ) %]
  8. Number of issues: [% numberlength | html %]
    9. [% END %] - [% IF ( weeklength ) %]
  9. Number of weeks: [% weeklength | html %]
    10. [% END %] - [% IF ( monthlength ) %]
  10. Number of months: [% monthlength | html %]
    11. [% END %] -
-
-
-
-
- -
- - - - - - - - - [% FOREACH serialslis IN serialslist %] - - - - - - - - [% END %] -
Issue numberPlanned datePublished datePublished date (text)Status
- [% serialslis.serialseq | html %] - - [% IF serialslis.planneddate %] - [% serialslis.planneddate | html %] - [% ELSE %] - Unknown - [% END %] - - [% IF serialslis.publisheddate %] - [% serialslis.publisheddate | html %] - [% ELSE %] - Unknown - [% END %] - - [% 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 %] -
-
-
-
-
-
-
    -
  1. Start date: [% startdate | html %]
    2. -
  2. End date: [% enddate | html %]
    3. -
  3. History start date: [% histstartdate | html %]
    4. -
  4. History end date: [% histenddate | html %]
    5. -
  5. Received issues:[% recievedlist | html | html_line_break %]
    6. -
  6. Missing issues:[% missinglist | html | html_line_break %]
    7. -
  7. Nonpublic note:[% internalnotes | html | html_line_break %]
    8. -
  8. Public note:[% notes | html | html_line_break %]
    9. -
  9. History staff note:[% librariannote | html | html_line_break %]
    10. -
  10. History OPAC note:[% opacnote | html | html_line_break %]
    11. -
-
-
-
-
- [% IF orders_grouped.size %] -
-

Acquisition details

- - +
+ -
- - - - - - - - - - - - - - - - - [% FOR ordernumber IN orders_grouped.keys %] - [% SET parent_tree_id = loop.count %] - [% SET parent_order = orders_grouped.$ordernumber %] - - [%# invoice %] - - [%# ordernumber %] - - - - [%# internalnote %] - [%# vendornote %] - [%# fund %] - - - - - [% FOR order IN parent_order.orders %] - - - [%# basket %] - - - - - - - - - -
- - Hide already received orders - | Show all orders - | Expand all - | Collapse all - -
InvoiceBasketOrder numberCreation dateReceive dateStatusInternal noteVendor noteFundQuantityOrderedSpent
- [% IF CAN_user_acquisition_order_manage %] - [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %]) - [% ELSE %] - [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %]) - [% END %] - [% parent_order.basket.creationdate | $KohaDates %][% parent_order.datereceived | $KohaDates %] - [% SWITCH parent_order.orderstatus %] - [% CASE 'new' %]New - [% CASE 'ordered' %]Ordered - [% CASE 'partial' %]Partial - [% CASE 'complete' %]Complete - [% CASE 'cancelled' %]Cancelled - [% END %] - [% parent_order.quantity | html %][% parent_order.ecost_tax_excluded | $Price %] / [% parent_order.ecost_tax_included | $Price %][% parent_order.unitprice_tax_excluded | $Price %] / [% parent_order.unitprice_tax_included | $Price %]
- [% IF order.invoice %] - [% IF CAN_user_acquisition %] - - [% order.invoice.invoicenumber | html %] - [% ELSE %] - [% order.invoice.invoicenumber | html %] - [% END %] +
+
+
+
+
    +
  1. Subscription ID: [% subscriptionid | html %]
    2. +
  2. Librarian identity: [% librarian | html %]
    3. +
  3. Vendor: [% aqbooksellername | html %]
    4. +
  4. Biblio: [% bibliotitle | html %] ([% bibnum | html %])
    5. + [% IF ( OPACBaseURL ) %] +
  5. + OPAC view: + Open in new window. +
    6. + [% END %] + [% IF ( branchcode ) %] +
  6. Library: [% Branches.GetName( branchcode ) | html %]
    7. + [% END %] + [% IF ( serialsadditems ) %] +
  7. Items: Serial receipt creates an item record.
    8. + [% ELSE %] +
  8. Items: Serial receipt does not create an item record.
    9. + [% END %] +
  9. + Serial number: + [% IF skip_serialseq %] + Serial number is skipped when an irregularity is found. + [% ELSE %] + Serial number is kept when an irregularity is found. + [% END %] +
    10. +
  10. Grace period: [% graceperiod | html %]
    11. +
+
+
+
+
+
    + [% IF ( location ) %]
  1. Location: [% location | html %]
    2. [% END %] + [% IF ( callnumber ) %]
  2. Call number: [% callnumber | html %]
    3. [% END %] + [% IF ( staffdisplaycount ) %]
  3. Number of issues to display to staff:[% staffdisplaycount | html %]
    4. [% END %] + [% IF ( opacdisplaycount ) %]
  4. Number of issues to display in OPAC:[% opacdisplaycount | html %]
    5. [% END %] + [% IF ( letter ) %] +
  5. + Patron notification: [% letter | html %] + (subscribers) +
    6. + [% END %] + [% IF ( hasRouting ) %]
  6. Routing: yes
    7. [% END %] +
+
+
+
+ + [% IF available_additional_fields %] +
+
+
+

Additional fields:

+
+
    + [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] +
+
+
+
[% END %] -
[% order.ordernumber | html %][% order.basket.creationdate | $KohaDates%][% IF order.datereceived %][% order.datereceived | $KohaDates %][% END %] - [% SWITCH order.orderstatus %] - [% CASE 'new' %]New - [% CASE 'ordered' %]Ordered - [% CASE 'partial' %]Partial - [% CASE 'complete' %]Complete - [% CASE 'cancelled' %]Cancelled - [% END %] - [% order.order_internalnote | html %][% order.order_vendornote | html %][% order.fund.budget_name | html %][% order.quantity | html %] - [% UNLESS order.datereceived %] - [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] - [% END %] - - [% IF order.datereceived %] - [%# FIXME What if unitprice has not been filled? %] - [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %] + + +
+
+
+
+
    +
  1. + Beginning date: + [% startdate | html %] +
    2. +
  2. + Frequency: + [% frequency.description | html %] +
    3. +
  3. + Manual history: + [% IF ( manualhistory ) %] + Enabled Edit history + [% ELSE %] + Disabled + [% END %] +
    4. +
  4. + Number pattern: + [% numberpattern.label | html %] +
    5. +
  5. + + + + [% IF (has_X) %] + + [% END %] + [% IF (has_Y) %] + + [% END %] + [% IF (has_Z) %] + + [% END %] + + + + [% IF (has_X) %] + + [% END %] + [% IF (has_Y) %] + + [% END %] + [% IF (has_Z) %] + + [% END %] + +
    Starting with:[% lastvalue1 | html %][% lastvalue2 | html %][% lastvalue3 | html %]
    Rollover:[% numberpattern.whenmorethan1 | html %][% numberpattern.whenmorethan2 | html %][% numberpattern.whenmorethan3 | html %]
    +
    6. + [% IF ( irregular_issues ) %] +
  6. + Irregularity: + [% irregular_issues | html %] issues +
    7. + [% END %] +
  7. + First arrival: + [% firstacquidate | html %] +
    8. + [% IF ( numberlength ) %]
  8. + Number of issues: + [% numberlength | html %]
    9. + [% END %] + [% IF ( weeklength ) %]
  9. + Number of weeks: + [% weeklength | html %]
    10. + [% END %] + [% IF ( monthlength ) %]
  10. + Number of months: + [% monthlength | html %]
    11. + [% END %] +
+
+
+
+
+ + +
+ + + + + + + + + [% FOREACH serialslis IN serialslist %] + + + + + + + [% END %] - - - [% END %] - [% END %] - -
Issue numberPlanned datePublished datePublished date (text)Status
+ [% serialslis.serialseq | html %] + + [% IF serialslis.planneddate %] + [% serialslis.planneddate | html %] + [% ELSE %] + Unknown + [% END %] + + [% IF serialslis.publisheddate %] + [% serialslis.publisheddate | html %] + [% ELSE %] + Unknown + [% END %] + + [% 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 %] +
-
- [% END %] +
+
+ +
+
+
+
+
    +
  1. Start date: [% startdate | html %]
    2. +
  2. End date: [% enddate | html %]
    3. +
  3. History start date: [% histstartdate | html %]
    4. +
  4. History end date: [% histenddate | html %]
    5. +
  5. Received issues:[% recievedlist | html | html_line_break %]
    6. +
  6. Missing issues:[% missinglist | html | html_line_break %]
    7. +
  7. Nonpublic note:[% internalnotes | html | html_line_break %]
    8. +
  8. Public note:[% notes | html | html_line_break %]
    9. +
  9. History staff note:[% librariannote | html | html_line_break %]
    10. +
  10. History OPAC note:[% opacnote | html | html_line_break %]
    11. +
+
+
+
+
+ [% IF orders_grouped.size %] +
+

Acquisition details

+ + + + + + + + + + + + + + + + + + + + [% FOR ordernumber IN orders_grouped.keys %] + [% SET parent_tree_id = loop.count %] + [% SET parent_order = orders_grouped.$ordernumber %] + + [%# invoice %] + + [%# ordernumber %] + + + + [%# internalnote %] + [%# vendornote %] + [%# fund %] + + + + + [% FOR order IN parent_order.orders %] + + + [%# basket %] + + + + + + + + + + + + [% END %] + [% END %] + +
+ + Hide already received orders + | Show all orders + | Expand all + | Collapse all + +
InvoiceBasketOrder numberCreation dateReceive dateStatusInternal noteVendor noteFundQuantityOrderedSpent
+ [% IF CAN_user_acquisition_order_manage %] + [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %]) + [% ELSE %] + [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %]) + [% END %] + [% parent_order.basket.creationdate | $KohaDates %][% parent_order.datereceived | $KohaDates %] + [% SWITCH parent_order.orderstatus %] + [% CASE 'new' %]New + [% CASE 'ordered' %]Ordered + [% CASE 'partial' %]Partial + [% CASE 'complete' %]Complete + [% CASE 'cancelled' %]Cancelled + [% END %] + [% parent_order.quantity | html %][% parent_order.ecost_tax_excluded | $Price %] / [% parent_order.ecost_tax_included | $Price %][% parent_order.unitprice_tax_excluded | $Price %] / [% parent_order.unitprice_tax_included | $Price %]
+ [% IF order.invoice %] + [% IF CAN_user_acquisition %] + + [% order.invoice.invoicenumber | html %] + [% ELSE %] + [% order.invoice.invoicenumber | html %] + [% END %] + [% END %] + [% order.ordernumber | html %][% order.basket.creationdate | $KohaDates%][% IF order.datereceived %][% order.datereceived | $KohaDates %][% END %] + [% SWITCH order.orderstatus %] + [% CASE 'new' %]New + [% CASE 'ordered' %]Ordered + [% CASE 'partial' %]Partial + [% CASE 'complete' %]Complete + [% CASE 'cancelled' %]Cancelled + [% END %] + [% order.order_internalnote | html %][% order.order_vendornote | html %][% order.fund.budget_name | html %][% order.quantity | html %] + [% UNLESS order.datereceived %] + [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] + [% END %] + + [% IF order.datereceived %] + [%# FIXME What if unitprice has not been filled? %] + [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %] + [% END %] +
+
+ [% END %] +
-- 2.39.5