Bug 40504: Preparation: Abstract 'managed by' functionality from suggestions

Move 'managed by' and 'restore previous manager' form and show
functionality to reusable .inc files

Signed-off-by: Jeremy Evans <Jeremy.Evans@ukhsa.gov.uk>
Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com>
This commit is contained in:
Pedro Amorim 2025-10-15 08:56:40 +00:00 committed by Martin Renvoize
parent 59890fa4da
commit 09742f82c7
No known key found for this signature in database
GPG Key ID: 2D86E0EAEC83711B
3 changed files with 142 additions and 102 deletions

View File

@ -0,0 +1,62 @@
[% BLOCK select_manager_show %]
[% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ manager.borrowernumber %]
[% IF display == 'fieldset' %]
<li class="managedby">
<span class="label managedby">Managed by:</span>
<a href="[% borrowerlink | url %]" title="View manager details"> [% manager.firstname _ " " _ manager.surname _ " [" _ manager.cardnumber _ "]" | html %] </a>
</li>
[% ELSIF display == 'table' %]
<tr>
<th>Managed by:</th>
<td>[% manageddate | $KohaDates %]</td>
<td>
[% IF ( manager.borrowernumber ) %]
<a href="[% borrowerlink | url %]">[% manager.surname | html %], [% manager.firstname | html %] ([% manager.cardnumber | html %])</a>
[% Branches.GetName( manager.branchcode ) | html %] ([% manager.category.description | html %])
[% END %]
</td>
</tr>
[% ELSE %]
<!-- Fallback for unknown display -->
<p>Error: Unknown display "[% display | html %]".</p>
[% END %]
[% END %]
[% BLOCK select_manager_form %]
<li>
<label for="managedby_name">by:</label>
<div>
<span id="managedby_name" name="managedby_name">
[% IF required_permission %]
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
[% ELSE %]
Nobody
[% END %]
</span>
[% IF manager.borrowernumber && logged_in_user.borrowernumber != manager.borrowernumber %]
| Previously was [% INCLUDE 'patron-title.inc' patron=manager hide_patron_infos_if_needed=1 %] [% Branches.GetName( manager.branchcode ) | html %] ([% manager.category.description | html %])
[% END %]
<br />
<a href="#patron_search_modal_manager" id="edit_manager" data-bs-toggle="modal"><i class="fa fa-search"></i> Select manager</a>
[% IF manager.borrowernumber && logged_in_user.borrowernumber != manager.borrowernumber %]
<a id="restore_previous_manager" href="#"><i class="fa fa-trash-can"></i> Keep existing manager</a>
[% END %]
[% IF required_permission %]
<input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
[% END %]
<br />
[% IF notify_option %]
<label for="notify">Notify manager:</label>
<input
type="checkbox"
id="notify"
name="notify"
value="notify"
disabled="disabled"
title="A NOTIFY_MANAGER notice will be generated and send to the manager if a valid email address is defined. This can be checked if a new manager has been selected."
/>
[% END %]
</div>
</li>
[% END %]

View File

@ -0,0 +1,67 @@
[% PROCESS 'patron-search.inc' %]
[% IF add_modal %]
[% SET columns = ['cardnumber','name','category','branch','action'] %]
[% SET filter = filter %]
[% PROCESS patron_search_modal
columns => columns,
modal_title => t("Select manager"),
patron_search_modal_id => 'patron_search_modal_manager',
table_id => 'patron_search_modal_manager_table'
%]
[% PROCESS patron_search_js
columns => columns,
actions => ["select"],
preview_on_name_click => 1,
table_id => 'patron_search_modal_manager_table',
callback => 'select_manager'
%]
[% END %]
<script>
function select_manager(borrowernumber, borrower) {
let tab = $('#suggestiontabs .active table').data('tab-name');
if ( tab ) {
var managedby_name = $("#managedby_name-"+tab);
var managedby = $("#managedby-"+tab);
} else {
var managedby_name = $("#managedby_name");
var managedby = $("#managedby");
}
managedby_name.empty();
managedby.val('');
var borrowername = borrower.firstname + ' ' + borrower.surname;
if (borrowernumber) {
var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
+ '?borrowernumber=' + borrowernumber + '">'
+ borrowername + '</a>';
managedby_name.html(managerlink);
managedby.val(borrowernumber);
}
var notify = $('#notify');
if ( notify.length ) {
[% IF manager %]
if ( borrowernumber == [% logged_in_user.borrowernumber | html %] || borrowernumber == [% manager.borrowernumber | html %] ) {
[% ELSE %]
if ( borrowernumber == [% logged_in_user.borrowernumber | html %] ) {
[% END %]
$(notify).prop('checked', false).prop('disabled', true);
} else {
$(notify).prop('disabled', false);
}
}
}
$("#restore_previous_manager").on("click",function(e){
e.preventDefault();
$("#managedby_name").empty();
$("#managedby").val('');
var borrowername = "[% manager.firstname | html %] [% manager.surname | html %]";
var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
+ '?borrowernumber=[% manager.borrowernumber | html %]">'
+ borrowername + '</a>';
$('#managedby_name').html(managerlink);
$('#managedby').val([% manager.borrowernumber | html %]);
$('#notify').prop('checked', false).prop('disabled', true);
});
</script>

View File

@ -8,6 +8,7 @@
[% USE TablesSettings %]
[% PROCESS 'i18n.inc' %]
[% PROCESS 'patron-search.inc' %]
[% PROCESS 'manageable-mixin.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title
@ -257,18 +258,10 @@
[% END %]
</td>
</tr>
<tr>
<th>Managed by:</th>
<td>[% suggestion.manageddate | $KohaDates %]</td>
<td>
[% IF ( suggestion.manager.borrowernumber ) %]
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestion.manager.borrowernumber | uri %]"
>[% suggestion.manager.surname | html %], [% suggestion.manager.firstname | html %] ([% suggestion.manager.cardnumber | html %])</a
>
[% Branches.GetName( suggestion.manager.branchcode ) | html %] ([% suggestion.manager.category.description | html %])
[% END %]
</td>
</tr>
[% PROCESS select_manager_show
manager => suggestion.manager
display => "table"
%]
<tr>
<th>Accepted on:</th>
<td>[% suggestion.accepteddate | $KohaDates %]</td>
@ -602,42 +595,11 @@
<label for="managedon">Managed on:</label>
<input type="text" id="managedon" name="manageddate" class="flatpickr" size="10" maxlength="10" value="[% default_manageddate | html %]" />[% INCLUDE 'date-format.inc' %]
</li>
<li>
<label for="managedby_name">by:</label>
<div>
<span id="managedby_name" name="managedby_name">
[% IF CAN_user_suggestions_suggestions_manage %]
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
[% ELSE %]
Nobody
[% END %]
</span>
[% IF suggestion.manager.borrowernumber && logged_in_user.borrowernumber != suggestion.manager.borrowernumber %]
| Previously was [% INCLUDE 'patron-title.inc' patron=suggestion.manager hide_patron_infos_if_needed=1 %] [% Branches.GetName( suggestion.manager.branchcode ) | html %]
([% suggestion.manager.category.description | html %])
[% END %]
<br />
<a href="#patron_search_modal_manager" id="edit_manager" data-bs-toggle="modal"><i class="fa fa-search"></i> Select manager</a>
[% IF suggestion.manager.borrowernumber && logged_in_user.borrowernumber != suggestion.manager.borrowernumber %]
<a id="restore_previous_manager" href="#"><i class="fa fa-trash-can"></i> Keep existing manager</a>
[% END %]
[% IF CAN_user_suggestions_suggestions_manage %]
<input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
[% END %]
<br />
<label for="notify">Notify manager:</label>
<input
type="checkbox"
id="notify"
name="notify"
value="notify"
disabled="disabled"
title="A NOTIFY_MANAGER notice will be generated and send to the manager if a valid email address is defined. This can be checked if a new manager has been selected."
/>
</div>
<!-- /div -->
</li>
[% PROCESS select_manager_form
manager => suggestion.manager
notify_option => 1
required_permission => CAN_user_suggestions_suggestions_manage
%]
</ol>
</fieldset>
@ -1251,45 +1213,10 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'select_manager.inc'
manager => suggestion.manager
%]
<script nonce="[% Koha.CSPNonce | $raw %]">
const logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
const managedby_patron_borrowernumber = "[% suggestion.manager.borrowernumber | html %]";
const op = "[% op | html %]";
</script>
<script nonce="[% Koha.CSPNonce | $raw %]">
function select_manager(borrowernumber, borrower) {
let tab = $("#suggestiontabs .active table").data("tab-name");
if (tab) {
var managedby_name = $("#managedby_name-" + tab);
var managedby = $("#managedby-" + tab);
} else {
var managedby_name = $("#managedby_name");
var managedby = $("#managedby");
}
managedby_name.empty();
managedby.val("");
var borrowername = borrower.firstname + " " + borrower.surname;
if (borrowernumber) {
var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl' + "?borrowernumber=" + borrowernumber + '">' + borrowername + "</a>";
managedby_name.html(managerlink);
managedby.val(borrowernumber);
}
if (op == "save") {
var notify = $("#notify");
if (notify.length) {
if (
(managedby_patron_borrowernumber && (borrowernumber == logged_in_user_borrowernumber || borrowernumber == managedby_patron_borrowernumber)) ||
(!managedby_patron_borrowernumber && borrowernumber == logged_in_user_borrowernumber)
) {
$(notify).prop("checked", false).prop("disabled", true);
} else {
$(notify).prop("disabled", false);
}
}
}
}
function select_suggester(borrowernumber, borrower) {
$.ajax({
type: "GET",
@ -1694,22 +1621,6 @@
$(".select-reason").show().find("option[value='']").attr("selected","selected");
$("#other_reason").hide();
});
$("#restore_previous_manager").on("click",function(e){
e.preventDefault();
$("#managedby_name").empty();
$("#managedby").val('');
var borrowername = "[% suggestion.manager.firstname | html %] [% suggestion.manager.surname | html %]";
var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
+ '?borrowernumber=[% suggestion.manager.borrowernumber | html %]">'
+ borrowername + '</a>';
$('#managedby_name').html(managerlink);
$('#managedby').val([% suggestion.manager.borrowernumber | html %]);
$('#notify').prop('checked', false).prop('disabled', true);
});
});
</script>
[% END %]