Multiple offering events

app/controllers/admin/routes.py

@@ -30,7 +30,8 @@
 from app.logic.createLogs import createActivityLog
 from app.logic.certification import getCertRequirements, updateCertRequirements
 from app.logic.utils import selectSurroundingTerms, getFilesFromRequest, getRedirectTarget, setRedirectTarget
-from app.logic.events import cancelEvent, deleteEvent, attemptSaveEvent, preprocessEventData, calculateRecurringEventFrequency, deleteEventAndAllFollowing, deleteAllRecurringEvents, getBonnerEvents,addEventView, getEventRsvpCount, copyRsvpToNewEvent, getCountdownToEvent
+from app.logic.events import cancelEvent, deleteEvent, attemptSaveEvent, preprocessEventData, calculateRecurringEventFrequency, deleteEventAndAllFollowing, deleteAllRecurringEvents, getBonnerEvents,addEventView, getEventRsvpCount, copyRsvpToNewEvent, getCountdownToEvent, calculateNewMultipleOfferingId
+from app.logic.events import cancelEvent, deleteEvent, attemptSaveEvent, preprocessEventData, calculateRecurringEventFrequency, deleteEventAndAllFollowing, deleteAllRecurringEvents, getBonnerEvents,addEventView, getEventRsvpCount, copyRsvpToNewEvent, getCountdownToEvent, calculateNewMultipleOfferingId
 from app.logic.participants import getParticipationStatusForTrainings, checkUserRsvp
 from app.logic.minor import getMinorInterest
 from app.logic.fileHandler import FileHandler
@@ -82,6 +83,7 @@ def templateSelect():
 
 @admin_bp.route('/eventTemplates/<templateid>/<programid>/create', methods=['GET','POST'])
 def createEvent(templateid, programid):
+    savedEventsList = []
     if not (g.current_user.isAdmin or g.current_user.isProgramManagerFor(programid)):
         abort(403)
 
@@ -114,13 +116,31 @@ def createEvent(templateid, programid):
     # Try to save the form
     if request.method == "POST":
         eventData.update(request.form.copy())
-        try:
-            savedEvents, validationErrorMessage = attemptSaveEvent(eventData, getFilesFromRequest(request))
+        if eventData.get('isMultipleOffering'):
+            multipleOfferingId = calculateNewMultipleOfferingId()
+
+            multipleOfferingData = json.loads(eventData.get('multipleOfferingData'))
+            for event in multipleOfferingData:
+                multipleOfferingDict = eventData.copy()
+                multipleOfferingDict.update({
+                    'name': event['eventName'],
+                    'startDate': event['eventDate'],
+                    'timeStart': event['startTime'],
+                    'timeEnd': event['endTime'],
+                    'multipleOfferingId': multipleOfferingId
+                    })
+                try:
+                    savedEvents, validationErrorMessage = attemptSaveEvent(multipleOfferingDict, getFilesFromRequest(request))
+                    savedEventsList.append(savedEvents)
+
+                except Exception as e:
+                    print("Failed saving multi event", e)
 
-        except Exception as e:
-            print("Error saving event:", e)
-            savedEvents = False
-            validationErrorMessage = "Unknown Error Saving Event. Please try again"
+        else:
+            try:
+                savedEvents, validationErrorMessage = attemptSaveEvent(eventData, getFilesFromRequest(request))
+            except Exception as e:
+                    print("Failed saving regular event", e)
 
         if savedEvents:
             rsvpcohorts = request.form.getlist("cohorts[]")
@@ -129,14 +149,32 @@ def createEvent(templateid, programid):
                 addBonnerCohortToRsvpLog(int(year), savedEvents[0].id)
 
 
-            noun = (eventData['isRecurring'] == 'on' and "Events" or "Event") # pluralize
+            noun = ((eventData.get('isRecurring') or eventData.get('isMultipleOffering')) and "Events" or "Event") # pluralize
             flash(f"{noun} successfully created!", 'success')
-
+
+
             if program:
-                if len(savedEvents) > 1:
+                if len(savedEvents) > 1 and eventData.get('isRecurring'):
                     createActivityLog(f"Created a recurring event, <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name}</a>, for {program.programName}, with a start date of {datetime.strftime(eventData['startDate'], '%m/%d/%Y')}. The last event in the series will be on {datetime.strftime(savedEvents[-1].startDate, '%m/%d/%Y')}.")
+
+                elif len(savedEventsList) >= 1 and eventData.get('isMultipleOffering'):
+                    modifiedSavedEvents = [item for sublist in savedEventsList for item in sublist]
+
+                    event_dates = [event_data[0].startDate.strftime('%m/%d/%Y') for event_data in savedEventsList]
+
+                    event_list = ', '.join(f"<a href=\"{url_for('admin.eventDisplay', eventId=event.id)}\">{event.name}</a>" for event in modifiedSavedEvents)
+
+                    if len(modifiedSavedEvents) > 1:
+                        #creates list of events created in a multiple series to display in the logs
+                        event_list = ', '.join(event_list.split(', ')[:-1]) + f', and ' + event_list.split(', ')[-1]
+                        #get last date and stick at the end after 'and' so that it reads like a sentence in admin log
+                        last_event_date = event_dates[-1]
+                        event_dates = ', '.join(event_dates[:-1]) + f', and {last_event_date}'
+
+                    createActivityLog(f"Created events {event_list} for {program.programName}, with start dates of {event_dates}.")
+
                 else:
-                    createActivityLog(f"Created <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name}</a> for {program.programName}, with a start date of {datetime.strftime(eventData['startDate'], '%m/%d/%Y')}.")
+                    createActivityLog(f"Created events <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name}</a> for {program.programName}, with a start date of {datetime.strftime(eventData['startDate'], '%m/%d/%Y')}.")
             else:
                 createActivityLog(f"Created a non-program event, <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name}</a>, with a start date of {datetime.strftime(eventData['startDate'], '%m/%d/%Y')}.")
 
@@ -203,7 +241,8 @@ def renewEvent(eventId):
                     'location': formData['location'],
                     'startDate': f'{formData["startDate"][-4:]}-{formData["startDate"][0:-5]}',
                     'endDate': f'{formData["endDate"][-4:]}-{formData["endDate"][0:-5]}',
-                    'isRecurring': bool(priorEvent['recurringId'])
+                    'isRecurring': bool(priorEvent['recurringId']),
+                    'isMultipleOffering': bool(priorEvent['multipleOffeirngId']),
                     })
         newEvent, message = attemptSaveEvent(newEventDict, renewedEvent = True)
         if message:

app/logic/events.py

@@ -67,35 +67,40 @@ def deleteEvent(eventId):
 
         event.delete_instance(recursive = True, delete_nullable = True)
 
+
 def deleteEventAndAllFollowing(eventId):
         """
         Deletes a recurring event and all the recurring events after it.
+        Modified to also apply to the case of events with multiple offerings
         """
         event = Event.get_or_none(Event.id == eventId)
         if event:
-            if event.recurringId:
+            if event.recurringId or event.multipleOfferingId:
                 recurringId = event.recurringId
-                recurringSeries = list(Event.select().where((Event.recurringId == recurringId) & (Event.startDate >= event.startDate)))
+                multipleOfferingId = event.multipleOfferingId
+                recurringSeries = list(Event.select().where((Event.recurringId == recurringId or Event.multipleOfferingId== multipleOfferingId) & (Event.startDate >= event.startDate)))
         for seriesEvent in recurringSeries:
             seriesEvent.delete_instance(recursive = True)
 
 def deleteAllRecurringEvents(eventId):
         """
         Deletes all recurring events.
+        Modified to also apply for events with multiple offerings
         """
         event = Event.get_or_none(Event.id == eventId)
         if event:
-            if event.recurringId:
+            if event.recurringId or event.multipleOfferingId:
                 recurringId = event.recurringId
-                allRecurringEvents = list(Event.select().where(Event.recurringId == recurringId))
+                MultipleOfferingId = event.multipleOfferingId
+                allRecurringEvents = list(Event.select().where(Event.recurringId == recurringId or Event.multipleOfferingId == MultipleOfferingId))
             for aRecurringEvent in allRecurringEvents:
                 aRecurringEvent.delete_instance(recursive = True)
 
 
 def attemptSaveEvent(eventData, attachmentFiles = None, renewedEvent = False):
     """
     Tries to save an event to the database:
-    Checks that the event data is valid and if it is it continus to saves the new
+    Checks that the event data is valid and if it is, it continues to save the new
     event to the database and adds files if there are any.
     If it is not valid it will return a validation error.
 
@@ -107,6 +112,7 @@ def attemptSaveEvent(eventData, attachmentFiles = None, renewedEvent = False):
     # automatically changed from "" to 0
     if eventData["rsvpLimit"] == "":
         eventData["rsvpLimit"] = None
+
     newEventData = preprocessEventData(eventData)
 
     isValid, validationErrorMessage = validateNewEventData(newEventData)
@@ -136,17 +142,26 @@ def saveEventToDb(newEventData, renewedEvent = False):
 
     eventsToCreate = []
     recurringSeriesId = None
+    multipleSeriesId = None
     if (isNewEvent and newEventData['isRecurring']) and not renewedEvent:
         eventsToCreate = calculateRecurringEventFrequency(newEventData)
         recurringSeriesId = calculateNewrecurringId()
+
+    #temporarily applying the append for single events for now to tests  
+    elif(isNewEvent and newEventData['isMultipleOffering']) and not renewedEvent:
+        eventsToCreate.append({'name': f"{newEventData['name']}",
+                                'date':newEventData['startDate'],
+                                "week":1})
+        multipleSeriesId = newEventData['multipleOfferingId']
+
     else:
         eventsToCreate.append({'name': f"{newEventData['name']}",
                                 'date':newEventData['startDate'],
                                 "week":1})
         if renewedEvent:
             recurringSeriesId = newEventData.get('recurringId')
     eventRecords = []
-    for eventInstance in eventsToCreate:
+    for eventInstance in eventsToCreate: 
         with mainDB.atomic():
 
             eventData = {
@@ -172,6 +187,7 @@ def saveEventToDb(newEventData, renewedEvent = False):
             if isNewEvent:
                 eventData['program'] = newEventData['program']
                 eventData['recurringId'] = recurringSeriesId
+                eventData['multipleOfferingId'] = multipleSeriesId
                 eventData["isAllVolunteerTraining"] = newEventData['isAllVolunteerTraining']
                 eventRecord = Event.create(**eventData)
             else:
@@ -296,14 +312,18 @@ def getUpcomingEventsForUser(user, asOf=datetime.now(), program=None):
 
     events_list = []
     shown_recurring_event_list = []
+    shown_multiple_offering_event_list = []
 
     # removes all recurring events except for the next upcoming one
     for event in events:
-        if event.recurringId:
+        if event.recurringId or event.multipleOfferingId:
             if not event.isCanceled:
                 if event.recurringId not in shown_recurring_event_list:
                     events_list.append(event)
                     shown_recurring_event_list.append(event.recurringId)
+                if event.multipleOfferingId not in shown_multiple_offering_event_list:
+                    events_list.append(event)
+                    shown_multiple_offering_event_list.append(event.multipleOfferingId)
         else:
             if not event.isCanceled:
                 events_list.append(event)
@@ -344,7 +364,7 @@ def validateNewEventData(data):
         Returns 3 values: (boolean success, the validation error message, the data object)
     """
 
-    if 'on' in [data['isFoodProvided'], data['isRsvpRequired'], data['isTraining'], data['isService'], data['isRecurring']]:
+    if 'on' in [data['isFoodProvided'], data['isRsvpRequired'], data['isTraining'], data['isService'], data['isRecurring'], data['isMultipleOffering']]:
         return (False, "Raw form data passed to validate method. Preprocess first.")
 
     if data['isRecurring'] and data['endDate']  <  data['startDate']:
@@ -386,6 +406,15 @@ def calculateNewrecurringId():
         return recurringId + 1
     else:
         return 1
+def calculateNewMultipleOfferingId():
+    """
+    Gets the highest recurring Id so that a new recurring Id can be assigned
+    """
+    multipleOfferingId = Event.select(fn.MAX(Event.multipleOfferingId)).scalar()
+    if multipleOfferingId:
+        return multipleOfferingId + 1
+    else:
+        return 1
 
 def getPreviousRecurringEventData(recurringId):
     """
@@ -397,6 +426,16 @@ def getPreviousRecurringEventData(recurringId):
                                    .where(Event.recurringId==recurringId))
     return previousEventVolunteers
 
+def getPreviousMultipleOfferingEventData(multipleOfferingId):
+    """
+    Joins the User db table and Event Participant db table so that we can get the information of a participant if they attended an event
+    """
+    previousEventVolunteers = (User.select(User).distinct()
+                                   .join(EventParticipant)
+                                   .join(Event)
+                                   .where(Event.multipleOfferingId == multipleOfferingId))
+    return previousEventVolunteers
+
 def calculateRecurringEventFrequency(event):
     """
         Calculate the events to create based on a recurring event start and end date. Takes a
@@ -411,6 +450,7 @@ def calculateRecurringEventFrequency(event):
 
     if event['endDate'] == event['startDate']:
         raise Exception("This event is not a recurring event")
+
     return [ {'name': f"{event['name']} Week {counter+1}",
               'date': event['startDate'] + timedelta(days=7*counter),
               "week": counter+1}
@@ -427,7 +467,7 @@ def preprocessEventData(eventData):
         - Look up matching certification requirement if necessary
     """
     ## Process checkboxes
-    eventCheckBoxes = ['isFoodProvided', 'isRsvpRequired', 'isService', 'isTraining', 'isRecurring', 'isAllVolunteerTraining']
+    eventCheckBoxes = ['isFoodProvided', 'isRsvpRequired', 'isService', 'isTraining', 'isRecurring', 'isMultipleOffering', 'isAllVolunteerTraining']
 
     for checkBox in eventCheckBoxes:
         if checkBox not in eventData:
@@ -445,7 +485,7 @@ def preprocessEventData(eventData):
         elif not isinstance(eventData[eventDate], date):
             eventData[eventDate] = ''
 
-    # If we aren't recurring, all of our events are single-day
+    # If we aren't recurring, all of our events are single-day or mutliple offerings, which also have the same start and end date
     if not eventData['isRecurring']:
         eventData['endDate'] = eventData['startDate']
 
@@ -595,4 +635,4 @@ def copyRsvpToNewEvent(priorEvent, newEvent):
         newRsvp.save()
     numRsvps = len(rsvpInfo)
     if numRsvps:
-        createRsvpLog(newEvent, f"Copied {numRsvps} Rsvps from {priorEvent['name']} to {newEvent.name}")
+        createRsvpLog(newEvent, f"Copied {numRsvps} Rsvps from {priorEvent['name']} to {newEvent.name}")

app/models/event.py

@@ -19,6 +19,7 @@ class Event(baseModel):
     startDate = DateField()
     endDate = DateField(null=True)
     recurringId = IntegerField(null=True)
+    multipleOfferingId = IntegerField(null=True)
     contactEmail = CharField(null=True)
     contactName = CharField(null=True)
     program = ForeignKeyField(Program)
@@ -50,6 +51,10 @@ def isFirstRecurringEvent(self):
         firstRecurringEvent = Event.select().where(Event.recurringId==self.recurringId).order_by(Event.id).get()
         return firstRecurringEvent.id == self.id
 
+    @property
+    def isMultipleOffering(self):
+        return bool(self.multipleOfferingId)
+
     @property
     def relativeTime(self):
         relativeTime = datetime.combine(self.startDate, self.timeStart) - datetime.now()
@@ -69,4 +74,4 @@ def relativeTime(self):
         else:
             return f"happening now"
 
-
+

app/static/css/base.css

@@ -53,7 +53,7 @@ select.empty {
   text-align: center !important;
   height: 80px;
   line-height: 80px; /* Vertically center the text */
-  position:relative;
+  position: relative;
   z-index:10
 }
 
@@ -110,4 +110,17 @@ select.empty {
   font-weight: bolder; /* make it bold */
   vertical-align: middle; /* Align vertically with the text */
   line-height: 1; /* Match the line height of the parent text */
+}
+
+form {
+  margin-bottom: 5em;
+}
+
+.saveBtn {
+  z-index: 10;
+  text-align: center;
+}
+
+.saveBtnDiv {
+  text-align: center;
 }