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.

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

Renew/Reschedule Canceled Events Issue 986 #1091

Merged
merged 48 commits into from
Mar 19, 2024
Merged

Conversation

andersoncedu
Copy link
Contributor

@andersoncedu andersoncedu commented Oct 13, 2023

Issue:
There was a request to have a button to be able to renew/reschedule a canceled event.

Fix:
Added modal which allows supervisors to reschedule previously canceled events. We take data from the page of the canceled event and send that data to a route which uses the current event's information to copy the event contents over.

Test:

  1. Reset database
  2. Create a new event from the create event option in the sidebar
  3. Add RSVP and waitlister students from the track volunteers page
  4. cancel the event from the event view page
  5. Try different dates to see if the new event reflects changes and ensure rsvps were properly copied to new event

Fixes #986

@andersoncedu andersoncedu marked this pull request as draft October 13, 2023 15:17
@andersoncedu andersoncedu marked this pull request as ready for review October 20, 2023 15:02
Copy link
Collaborator

@qasema qasema left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to validate the start and end times of the event. It should not allow the start time to be after the end time

qasema
qasema previously requested changes Oct 26, 2023
Copy link
Collaborator

@qasema qasema left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when renewing an event I get this error!
Screenshot 2023-10-26 at 7 44 18 PM

could you double-check that?

@gahimbaref gahimbaref self-requested a review November 3, 2023 16:47
app/controllers/admin/routes.py Outdated Show resolved Hide resolved
@gahimbaref
Copy link
Contributor

gahimbaref commented Feb 1, 2024

image

It creates separate entries for the same renewed event, is this the expected behavior?

@andersoncedu
Copy link
Contributor Author

image

You can only renew a canceled event once. If you cancel it the second time and try to renew it without changing any details, you get this error message.

This has been resolved.

@andersoncedu
Copy link
Contributor Author

image

We can only see half of the calendar pop up.

I couldn't replicate this.

Copy link
Contributor

@bledsoef bledsoef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot_20240212_112343

When trying to renew an event with rsvp'd volunteers and waitlisted volunteers, we get two different errors. The first is that "An error occured, contact system support." The other is "this event already exists" but it leaves you on the edit event screen of the cancelled event.

@azabeli
Copy link
Contributor

azabeli commented Feb 12, 2024

image

I find it confusing to have both "Save" and "Renew Event" buttons when editing a canceled event. As in which button to click on since they both are saving changes. Also, Why do we need to save changes for canceled events? In my opinion, I would think having just the Renew Event button should be good for canceled events instead of confusing the user.

Copy link
Contributor

@bledsoef bledsoef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will look back over code more in depth once the errors are resolved, overall looks alright, will say it would be great if some more comments and docstrings could be added in. Some of the copying stuff is not the most intuitive. Good work though!

app/controllers/admin/routes.py Outdated Show resolved Hide resolved
app/logic/events.py Outdated Show resolved Hide resolved
Copy link
Contributor

@bledsoef bledsoef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All pretty small things, I think otherwise it looks and works really well!

app/controllers/admin/routes.py Show resolved Hide resolved
app/logic/events.py Outdated Show resolved Hide resolved
app/logic/events.py Show resolved Hide resolved
app/templates/admin/createEvent.html Outdated Show resolved Hide resolved
app/templates/admin/createEvent.html Outdated Show resolved Hide resolved
app/templates/admin/createEvent.html Outdated Show resolved Hide resolved
tests/code/test_events.py Show resolved Hide resolved
Copy link
Contributor

@bledsoef bledsoef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good but it breaks because of a missing import.

app/logic/events.py Outdated Show resolved Hide resolved
app/static/js/createEvents.js Outdated Show resolved Hide resolved
app/static/js/createEvents.js Outdated Show resolved Hide resolved
app/controllers/admin/routes.py Show resolved Hide resolved
Copy link

View Code Coverage

Copy link
Contributor

@bledsoef bledsoef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything seems to work and look good, couldn't break it 😞 I would just talk to Brian about whether a new issue is necessary to renew past events. Nice work!

@bledsoef bledsoef dismissed stale reviews from AndersonStettner, gahimbaref, and qasema March 19, 2024 19:27

Stale

@bledsoef bledsoef merged commit 503ecc2 into development Mar 19, 2024
5 checks passed
@bledsoef bledsoef deleted the 986-Renew-Reschedule branch March 19, 2024 19:31
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.

Add a Renew/Reschedule button to Canceled Events
9 participants