From a61b3b91e8f8d8b4a949e3de89e10cbc827bf6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20R=C3=A4is=C3=A4?= Date: Tue, 30 Sep 2025 11:56:17 +0300 Subject: [PATCH 1/2] Bug 21004: Use modal to add and edit notes on receiving orders/shipments page This patch adds a modal to add and edit notes on the receiving orders/shipments page. Test Plan: 1. Navigate to the receiving orders/shipments page. 2. Add or edit a note. 3. See that a new page opens with a form to add or edit the note. 4. Apply the patch and reload the page. 5. Click to add or edit a note. 6. See that a modal opens with a form to add or edit the note. Sponsored-by: Koha-Suomi Oy --- .../prog/en/modules/acqui/parcel.tt | 170 +++++++++++++++--- 1 file changed, 146 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 410c55d95c..68297f5b22 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -248,22 +248,51 @@
[% IF ( order.order_internalnote ) %]

Internal note: [% order.order_internalnote | html %] [Change internal note]

+ >[% order.order_internalnote | html %] + + Edit internal note + +

[% ELSE %] - [Add internal note] + + Add internal note + [% END %] [% IF ( order.order_vendornote ) %] -

Vendor note: [% order.order_vendornote | html %]

+

+ [% order.order_vendornote | html %] + + Edit vendor note + +

[% ELSE %] - [Add vendor note] + + Add vendor note + [% END %] @@ -333,6 +362,33 @@ + + [% IF (invoiceclosedate) %] View invoice @@ -495,29 +551,71 @@ if ( internal_note != null && internal_note != '' ) { result += '

' + _("Internal note: ") - + '' + escape_str(internal_note) - + ' [' + _("Change internal note") + ']

'; + + '' + + '' + escape_str(row.internal_note) + '' + + ' ' + + ' ' + + _("Edit internal note") + + '' + + '

'; } else { - result += ' [' + _("Add internal note") + ']'; + result += '

' + + ' ' + + _("Add internal note") + + '

'; } var vendor_note = row.vendor_note; if ( vendor_note != null && vendor_note != '' ) { result += '

' + _("Vendor note: ") - + '' + escape_str(vendor_note) + '

'; + + '' + + '' + escape_str(vendor_note) + '' + + ' ' + + ' ' + + _("Edit vendor note") + + '' + + '

'; } else { - result += ' [' + _("Add vendor note") + ']'; + result += '

' + + ' ' + + _("Add vendor note") + + '

'; } - return result; }, "orderable": true, @@ -686,6 +784,7 @@ $('.selOrder', row.node()).prop('checked', true); } }); + setupNoteEditorHandlers(); }); $("#dataPreview").on("hidden.bs.modal", function(){ @@ -719,6 +818,29 @@ + "ordernumber=" + ordernumber window.open(url, 'TransferOrder'); } + function setupNoteEditorHandlers() { + $(".edit_note").on("click", function(e) { + e.preventDefault(); + var ordernumber = $(this).data("ordernumber"); + var note_type = $(this).data("note_type"); + var modalTitle = _("%s (order number %s)").format($(this).attr("title"), ordernumber); + var note_text = $( "#" + note_type + "-note-" + ordernumber ).html(); + $("#noteEditor .modal-title").text(modalTitle); + $("#notes_ordernumber").val( ordernumber ); + $("#ordernotes").html( note_text ); + $("#type").val( note_type ); + $("#noteEditor").modal("show"); + $("#ordernotes").focus(); + }); + $("#noteEditor").on('hidden.bs.modal', function (e) { + $("#noteEditorLabel").html(""); + $("#noteEditor .modal-title").text(""); + $("#ordernotes").html( "" ); + $("#notes_ordernumber").val(""); + $("#type").val(""); + }); + } + setupNoteEditorHandlers(); [% END %] -- 2.34.1