To recreate: - Enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Look at the tabs above each table, no style. (To be staged, Staged & ready, etc )
Created attachment 170828 [details] [review] Bug 37761: Fixed styling of Tabs on curbside_pickups.tt page To test: - Enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Look at the tabs above each table, no style. (To be staged, Staged & ready, etc ) Apply patch and notice each tab has the correct style.
Sorry we were both working on this at the same time. I have a patch ready which converts the tabs to use WRAPPER syntax which I think is the correct long-term solution.
Created attachment 170833 [details] [review] Bug 37761: Use tab WRAPPER for circulation curbside pickups tabs The tabs on Circulation -> Curbside pickups look broken because they were not updated to use the tab WRAPPER markup. This patch revises the template so that the tabs look correct and makes additional changes to ensure that the correct tab is preselected. To test: - Apply the patch and enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Confirm that the tabs look correct. The first tab should be active by default. - Confirm that the right content is displayed when you click each tab. - Under the "Schedule pickup" tab, search for a patron. - After you submit the search the page should reload and the "Schedule pickup" tab should be open. Sponsored-by: Athens County Public Libraries
CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
Created attachment 171023 [details] [review] Bug 37761: Use tab WRAPPER for circulation curbside pickups tabs The tabs on Circulation -> Curbside pickups look broken because they were not updated to use the tab WRAPPER markup. This patch revises the template so that the tabs look correct and makes additional changes to ensure that the correct tab is preselected. To test: - Apply the patch and enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Confirm that the tabs look correct. The first tab should be active by default. - Confirm that the right content is displayed when you click each tab. - Under the "Schedule pickup" tab, search for a patron. - After you submit the search the page should reload and the "Schedule pickup" tab should be open. Sponsored-by: Athens County Public Libraries
Created attachment 171029 [details] [review] Bug 37761: Use tab WRAPPER for circulation curbside pickups tabs The tabs on Circulation -> Curbside pickups look broken because they were not updated to use the tab WRAPPER markup. This patch revises the template so that the tabs look correct and makes additional changes to ensure that the correct tab is preselected. To test: - Apply the patch and enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Confirm that the tabs look correct. The first tab should be active by default. - Confirm that the right content is displayed when you click each tab. - Under the "Schedule pickup" tab, search for a patron. - After you submit the search the page should reload and the "Schedule pickup" tab should be open. Sponsored-by: Athens County Public Libraries Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Hum actually found a bug. If you auto refresh you want to stay on the tab you were. To recreate: click the "patron is outside" tab Tick refresh every 3 seconds => The page refreshes positioned on the first tab. The expected behaviour is to stay on the "patron is outside" tab.
Created attachment 171098 [details] [review] Bug 37761: Use tab WRAPPER for circulation curbside pickups tabs The tabs on Circulation -> Curbside pickups look broken because they were not updated to use the tab WRAPPER markup. This patch revises the template so that the tabs look correct and makes additional changes to ensure that the correct tab is preselected. To test: - Apply the patch and enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Confirm that the tabs look correct. The first tab should be active by default. - Confirm that the right content is displayed when you click each tab. - Under the "Schedule pickup" tab, search for a patron. - After you submit the search the page should reload and the "Schedule pickup" tab should be open. Sponsored-by: Athens County Public Libraries
Everything is working fine except the schedule pickup tab. When searching for a patron the page does refresh but it sends me back to the To be staged tab instead of staying on the Schedule Pickup tab.
Created attachment 171415 [details] [review] Bug 37761: Fix redirection on the tabs and buttons To test: - Apply the patch and enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Confirm that the tabs look correct. The first tab should be active by default. - Confirm that the right content is displayed when you click each tab. - Under the "Schedule pickup" tab, search for a patron. - After you submit the search the page should reload and the "Schedule pickup" tab should be open. - Go on each tab and try each button to verify you're staying on the same tab.
I ran into some odd behaviour while working on the patch. After you search in the "Schedule Pickup" tab and submit, the system keeps you on the same tab, which is fine. But here’s where it gets strange: once you press a button in a tab or use the refresh button under "Curbside Pickups," that tab becomes the new reference point. So if you refresh the page with your browser (not the in-app refresh button), it always takes you back to that tab. Here’s how you can recreate this issue: - After testing the patch in the "Schedule Pickup" tab, go to the "Stage & Ready" tab. - Click any button within this tab (Patron has arrived, Mark as delivered or Mark as to be staged). - Switch to another tab, like "Patron is Outside." - Refresh the browser(not the refresh button under curbside pickups). You’ll find yourself back on the "Stage & Ready" tab. You can see something similar with the refresh button under "Curbside Pickups": - After testing the patch in the "Schedule Pickup" tab, go to the "Stage & Ready" tab. - Click the refresh button under "Curbside Pickups." - Switch to a different tab, like "To Be Staged." - Refresh the browser. You’ll end up back on the "Stage & Ready" tab. In both cases, once you press a button or use the refresh button, the tab you’re on becomes the new reference point.
439 <a title="Search for another patron" href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=schedule-pickup"><i class="fa fa-search"></i></a> I am expecting tab to be suffixed with _panel here
528 $('#schedule-pickup-tab').on('click', function() { 529 $('#input-patron-cardnumber').focus(); 530 }); This is not working.
(In reply to Jonathan Druart from comment #13) > 528 $('#schedule-pickup-tab').on('click', function() { > 529 $('#input-patron-cardnumber').focus(); > 530 }); > > This is not working. Actually broken by bug 30965.
(In reply to Jonathan Druart from comment #14) > (In reply to Jonathan Druart from comment #13) > > 528 $('#schedule-pickup-tab').on('click', function() { > > 529 $('#input-patron-cardnumber').focus(); > > 530 }); > > > > This is not working. > > Actually broken by bug 30965. Reported on bug 37983.
I guess we also need that: + [% IF tab == 'schedule-pickup_panel' %] + $('#find-patron').focus(); + [% END %] But with bug 37983 I am not sure how to order the change, as the first patch from 37983 will need to be backported and this one will need to be adjusted for backport :-/
Created attachment 174643 [details] [review] Bug 37761: Use tab WRAPPER for circulation curbside pickups tabs The tabs on Circulation -> Curbside pickups look broken because they were not updated to use the tab WRAPPER markup. This patch revises the template so that the tabs look correct and makes additional changes to ensure that the correct tab is preselected. To test: - Apply the patch and enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Confirm that the tabs look correct. The first tab should be active by default. - Confirm that the right content is displayed when you click each tab. - Under the "Schedule pickup" tab, search for a patron. - After you submit the search the page should reload and the "Schedule pickup" tab should be open. Sponsored-by: Athens County Public Libraries
Created attachment 174644 [details] [review] Bug 37761: Fix redirection on the tabs and buttons To test: - Apply the patch and enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Confirm that the tabs look correct. The first tab should be active by default. - Confirm that the right content is displayed when you click each tab. - Under the "Schedule pickup" tab, search for a patron. - After you submit the search the page should reload and the "Schedule pickup" tab should be open. - Go on each tab and try each button to verify you're staying on the same tab.
Created attachment 174645 [details] [review] Bug 37761: Add focus on patron search when on the tab