From ebfaaa16455b300c96cc86187f10ffe3fce38466 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 4 Jan 2024 16:13:49 +0100 Subject: [PATCH] Bug 35329: move patron search to modal - Add guarantor This is the first of many patches to come. We will rewrite the patron search popup to convert it to a Bootstrap's modal. I faced different problems on different pages, it is preferable to test each page on top of the whole patchset, to make sure a futur change will not break previous pages (and this is why they are all on the same bug report). For each page we will test that: * the different filters work * the "Clear" filters button work * the "Add" or "Select" patron button works * the nested modal to display patron's details (when clicking on their name or cardnumber) works On this patch we are testing the guarantor search: Create a edit a patron and click "Add guarantor" to open the modal. Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize --- .../prog/css/src/staff-global.scss | 32 +++++ .../prog/en/includes/patron-search.inc | 117 +++++++++++------- .../prog/en/modules/members/memberentrygen.tt | 9 +- koha-tmpl/intranet-tmpl/prog/js/members.js | 5 - 4 files changed, 113 insertions(+), 50 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 0723e230690..8d44878a641 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2349,6 +2349,38 @@ td.bundle { &.modal-wide { width: 80%; } + +} + +.modal-full { + top: -5px; + + .modal-dialog { + width: 95%; + } +} + +.basicModal { + background: #FFF; + left: 50%; + margin-left: -300px; + max-height: 100%; + max-width: 600px; + min-height: 350px; + min-width: 575px; + opacity: 0; + padding: 1em; + pointer-events: none; + position: fixed; + top: 25%; + transition: all .1s ease-out; + z-index: 1100; +} + +.basicModal.show { + box-shadow: 0 5px 15px rgba( 0, 0, 0, .5 ); + opacity: 1; + pointer-events: auto; } #cartDetails { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index 58c77183964..0de1d7506b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -2,6 +2,7 @@ [% USE I18N %] [% USE Branches %] [% USE ExtendedAttributeTypes %] +[% USE Categories %] [% USE raw %] [% USE Asset %] [% USE To %] @@ -55,7 +56,7 @@ @@ -109,6 +110,10 @@ [%# columns: See patron_search_js %] [% BLOCK patron_search_table %] + [% UNLESS table_id %] + [% SET table_id = "memberresultst" %] + [% END %] + [% IF filter == 'suggestions_managers' %]
Only staff with superlibrarian or suggestions_manage permissions are returned in the search results
[% ELSIF filter == 'orders_managers' OR filter == 'baskets_managers' %] @@ -130,7 +135,6 @@ [% END %] -

Patrons found for: