Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Conversation

@moliholy
Copy link
Contributor

@moliholy moliholy commented Apr 13, 2025

Closes #6811
Closes #6568

Description

This PR:

  • Shows bookings to link with, starting from the event's date instead of the current date.
  • Allows the user to link with any existing booking. Currently only those that overlap were shown.
  • Adds a filter to display bookings that do not overlap with the event's dates.

Screenshots

Screenshot 2025-04-13 at 20 12 19

photo_2025-04-13_20-12-01

@moliholy moliholy changed the title Feat/booking linking Improve Booking Linking Apr 13, 2025
indico/modules/rb/operations/bookings.py Outdated Show resolved Hide resolved
@moliholy
Copy link
Contributor Author

@ThiefMaster ready for review!

@ThiefMaster ThiefMaster force-pushed the feat/booking-linking branch from dbea03b to 1177eb2 Compare April 15, 2025 20:09
@ThiefMaster
Copy link
Member

ThiefMaster commented Apr 15, 2025

Works much better now, thanks! What do you think about somehow (red? some icon?) highlighting the "Booked for ..." if the booking cannot be linked because it's for someone else.

indico/modules/rb/client/js/common/linking/LinkBar.jsx Outdated Show resolved Hide resolved
indico/modules/rb/client/js/modules/calendar/actions.js Outdated Show resolved Hide resolved
indico/modules/rb/operations/bookings.py Outdated Show resolved Hide resolved
indico/modules/rb/client/js/common/linking/reducers.js Outdated Show resolved Hide resolved
@moliholy
Copy link
Contributor Author

What do you think about somehow (red? some icon?) highlighting the "Booked for ..." if the booking cannot be linked because it's for someone else.

If I'd have to say one thing I'm not good at, it'd be UI. A red-ish color is fine for me, but simply because it does the job and it's the easiest to implement. But here's your call, I'd say.

@GovernmentPlates
Copy link
Member

image

Something that we missed on the original PR: it might be nice to have the event name that you are linking to, in the confirmation prompt (e.g. "Are you sure you want to link this event (<event_name>) to this booking?").

@ThiefMaster
Copy link
Member

Hrm, not sure. You get to linking mode from your event's management area, so it should be very clear what you're linking. It's also shown in the linking mode bar.

The prompt is mainly so you don't accidentally click thinking there's another dialog or whatever before the link is actually created.

(in any case it'd probably trivial to do since the information is in the state)

@OmeGak
Copy link
Member

OmeGak commented Apr 16, 2025

Works much better now, thanks! What do you think about somehow (red? some icon?) highlighting the "Booked for ..." if the booking cannot be linked because it's for someone else.

How about using stripped diagonal lines as background (like in the screenshot below) for those cases? Red seems too aggressive for something that is not an error or anything of the sort.

image

CHANGES.rst Outdated Show resolved Hide resolved
indico/modules/rb/client/js/common/linking/reducers.js Outdated Show resolved Hide resolved
indico/modules/rb/client/js/modules/calendar/actions.js Outdated Show resolved Hide resolved
indico/modules/rb/operations/bookings.py Show resolved Hide resolved
@ThiefMaster ThiefMaster force-pushed the feat/booking-linking branch from eee3400 to 6affcdd Compare June 19, 2025 12:39
@ThiefMaster ThiefMaster force-pushed the feat/booking-linking branch 3 times, most recently from 98fa35b to d23262e Compare July 11, 2025 08:44
indico/modules/rb/client/js/modules/calendar/actions.js Outdated Show resolved Hide resolved
@ThiefMaster ThiefMaster force-pushed the feat/booking-linking branch 2 times, most recently from b942ed6 to 0af2b36 Compare July 11, 2025 14:09
@ThiefMaster ThiefMaster force-pushed the feat/booking-linking branch from 0af2b36 to c2d3570 Compare July 11, 2025 14:17
@ThiefMaster ThiefMaster added this to the v3.3 milestone Jul 11, 2025
@ThiefMaster ThiefMaster enabled auto-merge (squash) July 11, 2025 16:22
@ThiefMaster ThiefMaster merged commit fac6249 into indico:master Jul 11, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Allow linking to bookings outside of event time/date Improve "Link existing booking" feature

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.