Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show cancelled/rejected occurrences #3742

Merged
merged 10 commits into from Feb 5, 2019
Merged

Show cancelled/rejected occurrences #3742

merged 10 commits into from Feb 5, 2019

Conversation

mic4ael
Copy link
Member

@mic4ael mic4ael commented Feb 1, 2019

closes #3715

screenshot from 2019-02-01 14-42-23

@ThiefMaster
Copy link
Member

ThiefMaster commented Feb 1, 2019 •
edited

Inactive occurrences should be below active ones. It doesn't make much sense to have a valid booking partially hidden by a cancelled/rejected one.

image

@ThiefMaster
Copy link
Member

What about hiding the cancelled/rejected legend unless they are enabled?

@mic4ael
Copy link
Member Author

mic4ael commented Feb 4, 2019

As to the legend, I will see how easy it is.

@mic4ael mic4ael force-pushed the show-cancelled-occurrences branch 2 times, most recently from 00eaa70 to f337173 Compare February 4, 2019 09:08
@mic4ael
Copy link
Member Author

mic4ael commented Feb 4, 2019

Updated

@mvidalgarcia
Copy link
Member

What about displaying the rejection reason as we have in other places?

@mic4ael
Copy link
Member Author

mic4ael commented Feb 5, 2019

Yeah, good idea.

@mic4ael
Copy link
Member Author

mic4ael commented Feb 5, 2019

Mhm, apparently it was a bug. I was missing the necessary data to show the rejection reason.

@ThiefMaster
Copy link
Member

ThiefMaster commented Feb 5, 2019 •
edited

The label when filtering by equipment looks pretty massive now:

image

(i fixed that)

@ThiefMaster ThiefMaster changed the title Show cancelled occurrences Show cancelled/rejected occurrences Feb 5, 2019
@ThiefMaster ThiefMaster merged commit 9d94d22 into indico:master Feb 5, 2019
@mic4ael mic4ael deleted the show-cancelled-occurrences branch February 6, 2019 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ThiefMaster ThiefMaster ThiefMaster approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add option to show rejected/canceled bookings/occurrences
3 participants
@mic4ael @ThiefMaster @mvidalgarcia