From 0681794af6e4231b6f3b27a89ed368258821b054 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 11 Sep 2020 16:33:15 +0000 Subject: [PATCH] Bug 27607: Add the ability to compare patron records during merge process This patch adds an option to compare two patron records during the patron merge process. It can't work with more than two patrons, so the option only appears if one has selected only two patrons to merge. This patch also adds links to the patron names for opening the patron record in a new tab. To test, apply the patch and perform a search for patrons in the staff client Patrons module. - Select two patrons in the list of search results and click "Merge selected patrons." - On the merge patron records page, confirm that the two patron names are links which, when clicked, open the patron details in another tab. - Click a radio button to select the patron whose record will be the basis of the merge. The "Compare patrons" button and "Merge patrons" should go from disabled to enabled. - Click the "Compare patrons" button. A modal window should display highlighting the differences in some selected values in the patron record. The patron you selected as the basis for the merge should appear on the left. - Close the modal and select the other patron as the basis of the merge. "Compare patrons" again. The other patron should now appear in the left pane of the comparison. - Repeat the same process above but select more than two patrons for merging. The "Compare patrons" button should not appear. --- .../prog/en/modules/members/merge-patrons.tt | 176 ++++++++++++++++++++- 1 file changed, 168 insertions(+), 8 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 3ac0fbe1cc..cfed3299dd 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 @@ -7,7 +7,43 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › Merge patron records [% INCLUDE 'doc-head-close.inc' %] - +[% FILTER collapse %] + +[% END %] [% INCLUDE 'header.inc' %] @@ -52,7 +88,18 @@ [% IF action == 'show' %] [% IF patrons.count > 1 %] + [% IF ( patrons.count == 2 ) %] +
+
+ +
+
+ [% END %] +

Select patron to keep. Data from the other patrons will be transferred to this patron record and the remaining patron records will be deleted.

+
@@ -70,13 +117,18 @@ [% FOREACH p IN patrons %] - + - + @@ -90,7 +142,7 @@ [% END %] - + [% ELSE %] @@ -139,21 +191,129 @@ + + + [% MACRO jsinclude BLOCK %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - + [% Asset.js("lib/jsdiff/jsdiff.min.js") | $raw %] [% END %] -- 2.11.0
[% INCLUDE 'patron-title.inc' patron = p %] + + [% INCLUDE 'patron-title.inc' patron = p %] + + + [% p.dateofbirth | $KohaDates %] [% Categories.GetName( p.categorycode ) | html %] ([% p.categorycode | html %]) [% Branches.GetName( p.branchcode ) | html %]