From d28e035f4d0539956c82d82c956081b4e4a94879 Mon Sep 17 00:00:00 2001
From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Date: Mon, 27 Nov 2023 10:42:09 +0000
Subject: [PATCH] Bug 34479: Add new files to templates

This patch adds two newly created files to the templates to allow the patron selection history to be wiped or persisted as appropriate

Test plan as per previous commit

Signed-off-by: Sharon Dugdale <sharon.dugdale@cumberland.gov.uk>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 2de99d0b028fea2b78fed3a8cd9e44c207e92603)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 967294acfa8b37045513b017e7dc5b3e5c915e17)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/en/modules/members/member.tt         | 27 +++----------------
 .../prog/en/modules/members/merge-patrons.tt  |  2 ++
 .../prog/en/modules/tools/modborrowers.tt     |  4 ++-
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 9fa51d3aae..adcf7729bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -140,6 +140,7 @@
                     <div class="modal-footer">
                         <button type="submit" id="add_to_patron_list_submit" class="btn btn-default approve">Submit</button>
                         <button type="button" class="btn btn-default deny" data-dismiss="modal">Cancel</button>
+                        [% PROCESS 'members-patron-selections.inc' id="new-patron-list_form" %]
                     </div> <!-- /.modal-footer -->
                 </form> <!-- /#new-patron-list_form -->
             </div> <!-- /.modal-content -->
@@ -151,12 +152,9 @@
     [% INCLUDE 'columns_settings.inc' %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
+    [% Asset.js("js/members-patron-selections.js") | $raw %]
     [% INCLUDE 'select2.inc' %]
     <script>
-        function showPatronSelections( number ){
-            $("#patron_search_selected").show().find("span").text(_("Patrons selected: " + number ) );
-        }
-
         $(document).ready(function() {
             $('#merge-patrons, #batch-mod-patrons').prop('disabled', true);
             $('#memberresultst').on('change', 'input.selection', function() {
@@ -320,6 +318,8 @@
                             /* Add a new entry to the menu */
                             $("#patronlist-dropdown .divider").before('<li><a class="patron-list-add" href="#" data-listid="' + data.patron_list.patron_list_id + '">' + data.patron_list.name + '</li>');
                         }
+                        persistPatronSelections('new-patron-list_form');
+                        prepSelections();
                     },
                     error: function() {
                         alert( _("An error occurred. Patron list could not be updated.") );
@@ -332,25 +332,6 @@
             }
         }
 
-        function prepSelections(){
-            var selected_patrons = JSON.parse( localStorage.getItem("patron_search_selections") );
-            if( selected_patrons && selected_patrons.length > 0 ){
-                showPatronSelections( selected_patrons.length );
-
-                $('#merge-patrons').prop('disabled', true);
-                $("input.selection").each(function(){
-                    var cardnumber = $(this).val();
-                    if( selected_patrons.indexOf( cardnumber ) >= 0 ){
-                        $(this).prop("checked", true );
-                    }
-                });
-
-                if( selected_patrons.length > 1 ){
-                    $('#batch-mod-patrons, #merge-patrons, #patronlist-menu').removeClass("disabled").prop('disabled', false);
-                }
-            }
-        }
-
         $('#memberresultst tbody').on('click','td',function(e){
             var $checkbox = $(this).find("input[type=checkbox]");
             if (e.target.type != "checkbox") {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
index 65cf0f3781..dca66febc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
@@ -153,6 +153,7 @@
                             [% END %]
                             <input type="hidden" name="action" value="merge" />
                             <input type="submit" id="merge-patrons" class="btn btn-primary" value="Merge patrons" />
+                            [% PROCESS 'members-patron-selections.inc' id="patron-merge-form" %]
                         </fieldset>
 
                     [% ELSE %]
@@ -291,6 +292,7 @@
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
+    [% Asset.js("js/members-patron-selections.js") | $raw %]
     [% Asset.js("lib/jsdiff/jsdiff.min.js") | $raw %]
     <script>
     $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 3aa5ee6356..d4458c5e40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -193,7 +193,7 @@
                     [% END %]
 
                     [% IF ( op == 'show' ) %]
-                    <form name="f" action="modborrowers.pl" method="post">
+                    <form name="f" action="modborrowers.pl" method="post" id="batchmod-borrowers-form">
                         <input type="hidden" name="op" value="do" />
                         [% IF ( borrowers ) %]
                             <div class="btn-toolbar selections-toolbar"><a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" href="#"><i class="fa fa-remove"></i> Clear all</a></div>
@@ -382,6 +382,7 @@
                                 <fieldset class="action">
                                     <input type="submit" name="mainformsubmit" class="btn btn-primary" value="Save" />
                                     <a href="/cgi-bin/koha/tools/modborrowers.pl" class="cancel">Cancel</a>
+                                    [% PROCESS 'members-patron-selections.inc' id="batchmod-borrowers-form" %]
                                 </fieldset>
                             </div>
                         </form>
@@ -409,6 +410,7 @@
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
     [% Asset.js("js/tools-menu.js") | $raw %]
+    [% Asset.js("js/members-patron-selections.js") | $raw %]
     <script>
         var patron_attributes_lib = new Array();
         var patron_attributes_values = new Array();
-- 
2.39.2