From 1b0d9cd3da5c16fa34f1b4530d833108ebbc49a7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 28 Mar 2022 19:21:55 +0000 Subject: [PATCH] Bug 30389: Switch to Bootstrap tabs on the page for adding orders from MARC file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch updates addorderiso2709.tt so that it uses Bootstrap tabs intead of jQuery. The patch contains indentation changes, so diff accordingly. To test apply the patch and go to Acquisitions -> Vendor -> Basket -> Add to basket -> From a staged file. - Click "Add orders" next to the staged file you want to use. - On the "Add orders" page, test that the tabs work correctly. Signed-off-by: Séverine Queune Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/acqui/addorderiso2709.tt | 713 +++++++++--------- .../intranet-tmpl/prog/js/addorderiso2709.js | 1 - 2 files changed, 357 insertions(+), 357 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 9b2f5f9043..3cb1ee24ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -63,402 +63,403 @@
-
    -
  • Select to import
    • -
  • Item information
    • -
  • Default accounting details
    • + -
    -
    -
    - Select all - | - Clear all - | - - - + + + [% FOREACH available_matcher IN available_matchers %] + [% IF ( available_matcher.code == current_matcher_code ) %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] - - - | - - - - -
    -
    + + + | + + + + +
    +
- - - - - + + + + + - [% FOREACH biblio IN biblio_list %] -
- - - - ( MARC | Card | Add order ) - - -
-
    -
  1. - - [% IF ( biblio_lis.overlay_status == 'no_match' ) %] + [% FOREACH biblio IN biblio_list %] +
    + + + + ( MARC | Card | Add order ) + + +
    +
      +
    1. + + [% IF ( biblio_lis.overlay_status == 'no_match' ) %] No match - [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %] + [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %] Match applied - [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] + [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] Match found - [% ELSE %] - [% biblio_lis.overlay_status | html %] - [% END %] - [% IF ( biblio.match_biblionumber ) %] + [% ELSE %] + [% biblio_lis.overlay_status | html %] + [% END %] + [% IF ( biblio.match_biblionumber ) %] Matches biblio [% biblio.match_biblionumber | uri %] (score = [% biblio.match_score | html %]): [% biblio.match_citation | html %] - [% END %] - -
      2. -
    2. - - - Required -
      3. -
    3. - - -
      4. -
    4. - - -
      5. -
    5. - - % -
      If empty, discount rate from vendor will be used
      -
      6. -
    6. - [% IF ( close ) %] - - [% Budget_name | html %] - [% ELSE %] - - + Required +
      7. +
    7. + + +
      8. +
    8. + + +
      9. +
    9. + + % +
      If empty, discount rate from vendor will be used
      +
      10. +
    10. + [% IF ( close ) %] + + [% Budget_name | html %] + [% ELSE %] + + - - [% END %] -
      11. -
    11. - - -
      12. -
    12. - - -
      13. -
    -
    -
    - [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %] - [% FOREACH item IN biblio.iteminfos %] -
    - Item record [% item.item_id | html %] -
      -
    1. - - -
      2. + + [% END %] + +
    2. + + +
      3. +
    3. + + +
      4. +
    +
    +
    + [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %] + [% FOREACH item IN biblio.iteminfos %] +
    + Item record [% item.item_id | html %] +
      +
    1. + + +
      2. -
    2. - - + [% FOREACH l IN libraries %] + [% IF l.branchcode == item.holdingbranch %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] - -
      3. -
    3. - - +
      4. +
    4. + + -
      5. + + -
    5. - - -
      6. -
    6. - - -
      7. -
    7. - - +
      8. +
    8. + + +
      9. +
    9. + + -
      10. + + -
    10. - - + + [% FOREACH ccodeloo IN ccodeloop %] + [% IF ( ccodeloo.code ) == (item.ccode) %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] - -
      11. + + -
    11. - - + + [% FOREACH n IN notforloanloop %] + [% IF n.code == item.notforloan %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] - -
      12. -
    12. - - -
      13. -
    13. - - -
      14. -
    14. - - +
      15. +
    15. + + +
      16. +
    16. + + +
      17. +
    17. + + - Required -
      18. -
    18. - - -
      19. -
    19. - - -
      20. -
    20. - - -
      21. -
    -
    - [% END # /FOREACH item %] -
    -
    - - [% END # /FOREACH biblio %] -
    2. +
  2. + + +
    3. +
  3. + + +
    4. +
  4. + + +
    5. +
+
+ [% END # /FOREACH item %] - - - - + -
-

Item information

-

Import all the checked items in the basket with the following parameters:

+ [% END # /FOREACH biblio %] + +
- [% IF ( items ) %] -
- Item - [% IF ( NoACQframework ) %] -
No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used
- [% END %] - [% FOREACH item IN items %] -
-
-
    - [% FOREACH iteminformatio IN item.iteminformation %] -
  1. -
    - [% IF (iteminformatio.mandatory) %] - - [% ELSE %] - - [% END %] +
    +

    Item information

    +

    Import all the checked items in the basket with the following parameters:

    + + [% IF ( items ) %] +
    + Item + [% IF ( NoACQframework ) %] +
    No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used
    + [% END %] + [% FOREACH item IN items %] +
    +
    +
      + [% FOREACH iteminformatio IN item.iteminformation %] +
    1. +
      + [% IF (iteminformatio.mandatory) %] + + [% ELSE %] + + [% END %] - [% IF ( iteminformatio.marc_value.type == 'select' ) %] - + [% FOREACH value IN iteminformatio.marc_value.values %] + [% IF ( value == iteminformatio.marc_value.default ) %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] - - [% ELSE %] - [% iteminformatio.marc_value | $raw %] - [% END %] - - - - - - [% IF ( iteminformatio.mandatory ) %] - Required - [% END %] -
      -
      2. - [% END %] -
    -
    -
    - [% END #/FOREACH item %] -
    - [% END # /IF items %] -
    + + [% ELSE %] + [% iteminformatio.marc_value | $raw %] + [% END %] + + + + + + [% IF ( iteminformatio.mandatory ) %] + Required + [% END %] +
    +
    2. + [% END %] +
+
+
+ [% END #/FOREACH item %] +
+ [% END # /IF items %] + -
-

Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):

-
- Accounting details -
    -
  1. - - -
    2. - [% IF ( close ) %] +
    +

    Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):

    +
    + Accounting details +
    1. - Fund: - [% Budget_name | html %] + +
      2. - [% ELSE %] -
    2. - - [% Budget_name | html %] +
      3. + [% ELSE %] +
    3. + + + +
      4. +
    4. + + + + +
      5. + [% END #/IF close %] +
    5. + +
    6. - - - - + + +
      7. +
    7. +
      The 2 following fields are available for your own usage. They can be useful for statistical purposes
      + + +
      8. +
    8. + +
      9. - [% END #/IF close %] -
    9. - - -
      10. -
    10. - - -
      11. -
    11. -
      The 2 following fields are available for your own usage. They can be useful for statistical purposes
      - - -
      12. -
    12. - - -
      13. -
    -
    -
    +
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js b/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js index a499d79ba3..34785cda2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js +++ b/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js @@ -84,7 +84,6 @@ $(document).ready(function() { $(this.form).submit(); }); - $('#tabs').tabs(); $(".previewData").on("click", function(e){ e.preventDefault(); var ltitle = $(this).text(); -- 2.39.5