From a906f3820300722f5f92391deb6638fdafd37d09 Mon Sep 17 00:00:00 2001 From: Brendan Lawlor Date: Thu, 11 Sep 2025 15:58:35 +0000 Subject: [PATCH] Bug 30303: Add ui for copying values when merging patrons When merging two patrons this patch adds a new checkbox to 'Copy values from the record to be deleted' To test: - Apply patches and restart_all 1. From select two patrons and click 'Merge selected patrons' 2. Select one of the records 3. Check the new box to 'Copy values from the record to be deleted' 4. A diff of the two patrons is shown with checkboxes for each field 5. Confirm checking and un-checking the boxes updates the diff as expected 6. Confirm changing the patron selection updates the diff as expected. 7. Confirm un-checking and re-checking the Copy values from the record to be deleted resets the check boxes for the fields to copy 8. Select some fields to copy values and click merge patrons 9. Confirm the values were copied as expected Sponsored-by: CLAMS Signed-off-by: Lari Taskula Signed-off-by: Emily Lamancusa Signed-off-by: Lucas Gass --- .../prog/en/modules/members/merge-patrons.tt | 162 +++++++++++++++--- 1 file changed, 134 insertions(+), 28 deletions(-) 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 43f89a7612..356ff39060 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 @@ -140,7 +140,7 @@
[% INCLUDE 'csrf-token.inc' %] - +
@@ -176,6 +176,16 @@ [% END %]
 
+ [% IF ( patrons.count == 2 ) %] +
+
+
+ + +
+ +
+ [% END %]
[% FOREACH p IN patrons %] @@ -239,33 +249,35 @@
-
Name:
-
Initials:
-
Other name:
-
Library:
-
Card number:
-
Category:
+
Surname:
+
First name:
+
Preferred name:
+
Initials:
+
Other name:
+
Library:
+
Card number:
+
Category:

-
Address line 1:
-
Address line 2:
-
City:
-
State:
-
ZIP/Postal code:
-
Country:
+
Address line 1:
+
Address line 2:
+
City:
+
State:
+
ZIP/Postal code:
+
Country:

-
Registration date:
-
Renewal date:
-
Expiration date:
-
Date of birth:
-
Restricted:
-
Primary email:
-
Secondary email:
-
Primary phone:
-
Secondary phone:
-
Other phone:
-
Gender:
-
Updated on:
-
Username:
+
Registration date:
+
Renewal date:
+
Expiration date:
+
Date of birth:
+
Restricted:
+
Primary email:
+
Secondary email:
+
Primary phone:
+
Secondary phone:
+
Other phone:
+
Gender:
+
Updated on:
+
Username:
[% FOREACH p IN patrons %] @@ -273,7 +285,9 @@ 
-[% IF ( p.surname ) %][% p.surname | html %], [% p.firstname | html %][% ELSE %]-[% END %]
+[% IF ( p.surname ) %][% p.surname | html %][% ELSE %]-[% END %]
+[% IF ( p.firstname ) %][% p.firstname | html %][% ELSE %]-[% END %]
+[% IF ( p.preferred_name ) %][% p.preferred_name | html %][% ELSE %]-[% END %]
 [% IF ( p.initials ) %][% p.initials | html %][% ELSE %]-[% END %]
 [% IF ( p.othernames ) %][% p.othernames | html %][% ELSE %]-[% END %]
 [% IF ( p.branchcode ) %][% p.branchcode | html %][% ELSE %]-[% END %]
@@ -332,9 +346,13 @@
             $("#patron-merge-table").on("change", "input", function () {
                 if ($(".keeper:checked").length > 0) {
                     controls.prop("disabled", false);
+                    $("#copy-ui").prop("disabled", false);
                 } else {
                     controls.prop("disabled", true);
                 }
+                if ($("#copy-checkbox").is(":checked")) {
+                    loadCopyUI();
+                }
             });
 
             $("#compare_patrons").on("click", function (e) {
@@ -352,13 +370,101 @@
 
                 var diffs = diffString(diff2, diff1);
                 /* Load the diff HTML in the empty columns */
-                $(".col2 pre, .col3 pre").html(diffs);
+                $("#compareModal .col2 pre, #compareModal .col3 pre").html(diffs);
             });
 
             $("#submit-merge-form").on("click", function () {
                 $("#patron-merge-form").submit();
             });
+
+            $("#copy-checkbox").on("change", function () {
+                $("#copy-fields").prop("hidden", !this.checked);
+                $("#compare_patrons").prop("disabled", this.checked);
+                if (this.checked) {
+                    loadCopyUI();
+                }
+            });
         });
+
+        function loadCopyUI() {
+            $("#copy-fields").empty();
+            /* Find which column is the basis for merging */
+            let col0 = $(".keeper:checked").data("borrowernumber");
+            let col1 = $(".keeper:not(:checked)").data("borrowernumber");
+            /* Get the original patron data for comparison */
+            let diff1 = $("#col-" + col0 + "-orig pre")
+                .text()
+                .split("\n")
+                .filter(e => e !== "");
+            let diff2 = $("#col-" + col1 + "-orig pre")
+                .text()
+                .split("\n")
+                .filter(e => e !== "");
+            let labels = $("#col-label strong")
+                .text()
+                .split(":")
+                .filter(e => e !== "");
+            let fields = $("#col-label strong")
+                .map((_, e) => e.dataset.field)
+                .get();
+
+            const container = $("#copy-fields");
+            container.append(
+                `

+                    
` +
+                    _("Field") +
+                    `

+                    
` +
+                    _("Destination record") +
+                    `

+                    
` +
+                    _("Source record") +
+                    `

+                    
` +
+                    _("Copy value") +
+                    `

+                
`
+            );
+
+            labels.forEach((label, i) => {
+                if (diff1[i] !== diff2[i]) {
+                    container.append(
+                        `

+                            

+                                

+                            

+                            

+                            

+                                
+                            

+                        
`
+                    );
+
+                    let diffs = diffString(diff2[i], diff1[i]);
+                    container.find(".row:last-child pre").html(diffs);
+                }
+            });
+
+            $("#copy-fields .row input[type=checkbox]").on("click", function () {
+                let ins = $(this).closest(".row").find(".col2 pre").data("og").toString();
+                let del = $(this).closest(".row").find(".col3 pre").data("og").toString();
+                let diffs = diffString(ins, del);
+
+                $(this).closest(".row").find(".col3 pre, .col2 pre").html(diffs);
+
+                $(this)
+                    .closest(".row")
+                    .find(".col2, .col3")
+                    .each(function () {
+                        $(this).toggleClass("col2", "col3");
+                        $(this).toggleClass("col3", "col2");
+                    });
+            });
+        }
     
 [% END %]