Skip to content

Multiple Offerings and Recurring Events Refactor #1349

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
Merged
BrianRamsay merged 76 commits into from
Jan 29, 2025
Merged

Multiple Offerings and Recurring Events Refactor #1349

BrianRamsay merged 76 commits into from
Jan 29, 2025

Conversation

@ojmakinde
Copy link
Contributor

@ojmakinde ojmakinde commented Oct 20, 2024 •
edited
Loading

Issue Description

Fixes #1335

  • Most of the existing logic for our multiple offerings and recurring events are duplicates. We need to merge both functionalities into one, and change the workflow on the frontend.

Changes

  • Added a new integer column, seriesId, into the model.
  • Refactored logic that used MultipleOffering and RecurringId to use the seriesId, merging logic where necessary.
  • Reworked the UI on Create Event to accomodate the change, using a single toggle for both multiple offerings and recurring series, instead of our previous two toggles for multiple offerings and recurring events.
  • Updated tests.

Testing

  • Run the test suite and ensure it is functional.
  • Step through parts of the application and ensure that they are functional despite the many introduced changes.

ojmakinde and others added 30 commits September 19, 2024 17:17
@ojmakinde
Base commit. Added seriesId field
927589e
@ojmakinde
Base ideas for the new modal
55fd613
@vungc
Anna, modified functions and names in events.py to use seriesId and s…
6148e80 
…eries concepts
@vungc
Anna. deleted commented out old functions; concept of multipleOfferin…
5837906 
…g is still separate because of multipleOfferingData (from js) and how it is saved. Flask will probably break.
@vungc
Anna, modifed import statements functions to use new functions; no er…
b2b7700 
…rors in database reset. Flask is running. events saving well. seriesId working for multiple, recurring being saved as a single event
@vungc
Anna, changed some isRepeating back to isRecurring in logic to make s…
8de9608 
…ure events can still be saved. series events saving with seriesId now.
@vungc
deleted some comment and replaced some recurringIds
f528f09
@vungc
Anna, modified the tests, 2 are still failing. Changed isSeries to is…
28322d1 
…MultipleOffering so the concept of isMultipleOffering and isRecurring is still exisitng and is nothing is breaking, will be changed together with front end later
@ojmakinde
James, created basic html + js for the modal changes
982f1e8
@ojmakinde
Added validation and event generation on the modal
adc8a5e
@ojmakinde
Changed isRecurring flag to isRepeating in routes.py, events.py, and …
f9d5b02 
…createEvent.js
@ojmakinde
Added deletion in the modal
84c1ced
@ojmakinde
Anna, James modal can save repeating events through multipleOfferingSave
2dc7aab
@ojmakinde
James, finalized saveOfferingsFromModal() overhaul
5305378
@ojmakinde
James, worked on fixing the event loading into the modal
6126f17
@ojmakinde
James, updated loading to modal for repeatingEvents
12de9b1
@ojmakinde
James, discarded multiple offerings when isRepeating is toggled and v…
528d48c 
…ice versa
@ojmakinde
Removed isRepeating property and attempted to merge the repeating and…
bb609a6 
… nonrepeating series saving mechanism
@ojmakinde
Removed trivial comments
4746e89
@ojmakinde
James, failed attempt at merging. isRepeating not passed into the eve…
81c40bd 
…nt data for some reason.
@ojmakinde
James, merged saving for repeating and non-repeating series. Error: E…
5fe5f7e 
…dit Event page calls the /makeRecurringEvent route unexplainably.
@vungc
Anna, deleted the unncessary calulateRepeatingEventFrequency being ca…
8cee95a 
…lled in the js. error under Edit no longer exist
@vungc
Anna, added default times for repeating timepickers
36f386e
@vungc
Anna, reordered and resized the dates and times for repeating events
c5d5bde
@vungc
Anna, commented out details associated with recurring status and endD…
047b861 
…ates that will no longer be relevant
@ojmakinde
James, removed EndDatePicker code, fixed the repeating toggle and fix…
62e5623 
…ed the generated events display
@ojmakinde
James, changed instances of isRecurring to isRepeating, and it works.…
7c52974 
… ManageVolunteers still needs work
@vungc
Anna, replaced all 'recurring' with 'repeating', nothing broke in Man…
01f0b78 
…age Volunteers page
@vungc
Anna, changed more instances of 'recurring' to 'repeating' on view ne…
986f9d3 
…xt events
@vungc
Anna, undo works for all event types. There is an issue with renaming…
3d41f61 
… repeating events when they are deleted consecutively like deleting week 3 and then delting week 2
@ojmakinde ojmakinde force-pushed the Repeating-Events-Implementation-Clean-Slate branch from 25b21ff to 619c0dd Compare November 8, 2024 20:02
BrianRamsay
BrianRamsay requested changes Nov 18, 2024
View reviewed changes
@ojmakinde ojmakinde force-pushed the Repeating-Events-Implementation-Clean-Slate branch 2 times, most recently from b9050cb to a1abfec Compare November 19, 2024 23:51
@ojmakinde ojmakinde force-pushed the Repeating-Events-Implementation-Clean-Slate branch from a1abfec to 1e44479 Compare November 19, 2024 23:52
@vungc vungc mentioned this pull request Dec 5, 2024
Closed
@github-actions
Copy link

github-actions bot commented Jan 29, 2025

View Code Coverage

@BrianRamsay BrianRamsay merged commit 217248d into development Jan 29, 2025
4 checks passed
@BrianRamsay BrianRamsay deleted the Repeating-Events-Implementation-Clean-Slate branch January 29, 2025 15:46
@Karina-Agliullova Karina-Agliullova mentioned this pull request Sep 25, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BrianRamsay BrianRamsay BrianRamsay requested changes

Assignees

@vungc vungc

@ojmakinde ojmakinde

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Refactor Multiple Event Offering and Recurring Event logic

6 participants

@ojmakinde @thealphagurlux @Karina-Agliullova @BrianRamsay @vungc