Changes to the invite cohort

app/controllers/admin/routes.py

@@ -20,6 +20,7 @@
 from app.models.eventRsvpLog import EventRsvpLog
 from app.models.attachmentUpload import AttachmentUpload
 from app.models.bonnerCohort import BonnerCohort
+from app.models.eventCohort import EventCohort
 from app.models.certification import Certification
 from app.models.user import User
 from app.models.term import Term
@@ -30,7 +31,7 @@
 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 attemptSaveMultipleOfferings, cancelEvent, deleteEvent, attemptSaveEvent, preprocessEventData, getRecurringEventsData, deleteEventAndAllFollowing, deleteAllRecurringEvents, getBonnerEvents,addEventView, getEventRsvpCount, copyRsvpToNewEvent, getCountdownToEvent, calculateNewMultipleOfferingId
+from app.logic.events import attemptSaveMultipleOfferings, cancelEvent, deleteEvent, attemptSaveEvent, preprocessEventData, getRecurringEventsData, deleteEventAndAllFollowing, deleteAllRecurringEvents, getBonnerEvents,addEventView, getEventRsvpCount, copyRsvpToNewEvent, getCountdownToEvent, calculateNewMultipleOfferingId, inviteCohortsToEvent, updateEventCohorts
 from app.logic.participants import getParticipationStatusForTrainings, checkUserRsvp
 from app.logic.minor import getMinorInterest
 from app.logic.fileHandler import FileHandler
@@ -131,11 +132,11 @@ def createEvent(templateid, programid):
                 validationErrorMessage = "Failed to save event."
 
         if savedEvents:
-            rsvpcohorts = request.form.getlist("cohorts[]")
-            for year in rsvpcohorts:
-                rsvpForBonnerCohort(int(year), savedEvents[0].id)
-                addBonnerCohortToRsvpLog(int(year), savedEvents[0].id)
-
+            rsvpCohorts = request.form.getlist("cohorts[]")
+            if rsvpCohorts:
+                success, message, invitedCohorts = inviteCohortsToEvent(savedEvents[0], rsvpCohorts)
+                if not success:
+                    flash(message, 'warning')
 
             noun = ((eventData.get('isRecurring') or eventData.get('isMultipleOffering')) and "Events" or "Event") # pluralize
             flash(f"{noun} successfully created!", 'success')
@@ -177,7 +178,14 @@ def createEvent(templateid, programid):
     requirements, bonnerCohorts = [], []
     if eventData['program'] is not None and eventData['program'].isBonnerScholars:
         requirements = getCertRequirements(Certification.BONNER)
-        bonnerCohorts = getBonnerCohorts(limit=5)
+        rawBonnerCohorts = getBonnerCohorts(limit=5)
+        bonnerCohorts = {}
+
+        for year, cohort in rawBonnerCohorts.items():
+            if cohort:
+                bonnerCohorts[year] = cohort
+
+
     return render_template(f"/events/{template.templateFile}",
                            template = template,
                            eventData = eventData,
@@ -259,6 +267,10 @@ def eventDisplay(eventId):
     # Validate given URL
     try:
         event = Event.get_by_id(eventId)
+        invitedCohorts = list(EventCohort.select().where(
+            EventCohort.event == event
+        ))
+        invitedYears = [str(cohort.year) for cohort in invitedCohorts]
     except DoesNotExist as e:
         print(f"Unknown event: {eventId}")
         abort(404)
@@ -293,8 +305,9 @@ def eventDisplay(eventId):
 
 
         if savedEvents:
-            rsvpcohorts = request.form.getlist("cohorts[]")
-            for year in rsvpcohorts:
+            rsvpCohorts = request.form.getlist("cohorts[]")
+            updateEventCohorts(savedEvents[0], rsvpCohorts)
+            for year in rsvpCohorts:
                 rsvpForBonnerCohort(int(year), event.id)
                 addBonnerCohortToRsvpLog(int(year), event.id)
 
@@ -314,18 +327,34 @@ def eventDisplay(eventId):
 
     if eventData['program'] and eventData['program'].isBonnerScholars:
         requirements = getCertRequirements(Certification.BONNER)
-        bonnerCohorts = getBonnerCohorts(limit=5)
+        rawBonnerCohorts = getBonnerCohorts(limit=5)
+        bonnerCohorts = {}
+
+        for year, cohort in rawBonnerCohorts.items():
+            if cohort:
+                bonnerCohorts[year] = cohort
+
+        print(1000*"*")
+        print("The bonner cohorts are ", bonnerCohorts)
+
+        invitedCohorts = list(EventCohort.select().where(
+            EventCohort.event_id == eventId,
+        ))
+        invitedYears = [str(cohort.year) for cohort in invitedCohorts]
+    else:
+        requirements, bonnerCohorts, invitedYears = [], [], []
 
     rule = request.url_rule
 
     # Event Edit
     if 'edit' in rule.rule:
         return render_template("events/createEvent.html",
                                 eventData = eventData,
-                                futureTerms=futureTerms,
+                                futureTerms = futureTerms,
                                 event = event,
                                 requirements = requirements,
                                 bonnerCohorts = bonnerCohorts,
+                                invitedYears = invitedYears, 
                                 userHasRSVPed = userHasRSVPed,
                                 isProgramManager = isProgramManager,
                                 filepaths = filepaths)
@@ -350,6 +379,8 @@ def eventDisplay(eventId):
         currentEventRsvpAmount = getEventRsvpCount(event.id)
 
         userParticipatedTrainingEvents = getParticipationStatusForTrainings(eventData['program'], [g.current_user], g.current_term)
+
+
 
         return render_template("events/eventView.html",
                                 eventData=eventData,
@@ -361,6 +392,7 @@ def eventDisplay(eventId):
                                 filepaths=filepaths,
                                 image=image,
                                 pageViewsCount=pageViewsCount,
+                                invitedYears=invitedYears,
                                 eventCountdown=eventCountdown
                                 )
 

app/logic/bonner.py

@@ -8,6 +8,7 @@
 from app.models.bonnerCohort import BonnerCohort
 from app.models.eventRsvp import EventRsvp
 from app.models.user import User
+from app.models.eventCohort import EventCohort
 from app.logic.createLogs import createRsvpLog
 
 def makeBonnerXls():
@@ -83,11 +84,27 @@ def rsvpForBonnerCohort(year, event):
                                       .where(BonnerCohort.year == year),
                                       [EventRsvp.user, EventRsvp.event, EventRsvp.rsvpTime]).on_conflict(action='IGNORE').execute()
 
+# def updateEventBonnerCohort(year, event):
+#     """
+#     Updates the Bonner Cohorts for a given event
+#     """
+#     eventCohort = EventCohort.select(EventCohort.where(event == event))
+#     EventCohort.update()
+
+
+# def AddEventBonnerCohort(year, event):
+#     """
+#     Adds the Bonner Cohorts for a given event
+#     """
+#     eventCohort = EventCohort.create(event == event, year == year, invited_at =)
+#     EventCohort.update()
+
+
 def addBonnerCohortToRsvpLog(year, event):
     """ This method adds the table information in the RSVP Log page"""
     bonnerCohort = list(BonnerCohort.select(fn.CONCAT(User.firstName, ' ', User.lastName).alias("fullName"))
                                     .join(User, on=(User.username == BonnerCohort.user))
                                     .where(BonnerCohort.year == year))
     for bonner in bonnerCohort:
         fullName = bonner.fullName
-        createRsvpLog(eventId=event, content=f"Added {fullName} to RSVP list.")
+        createRsvpLog(eventId=event, content=f"Added {fullName} to RSVP list.") 

app/logic/events.py

@@ -17,7 +17,9 @@
 from app.models.requirementMatch import RequirementMatch
 from app.models.certificationRequirement import CertificationRequirement
 from app.models.eventViews import EventView
+from app.models.eventCohort import EventCohort
 
+from app.logic.bonner import rsvpForBonnerCohort, addBonnerCohortToRsvpLog
 from app.logic.createLogs import createActivityLog, createRsvpLog
 from app.logic.utils import format24HourTime
 from app.logic.fileHandler import FileHandler
@@ -706,3 +708,77 @@ def copyRsvpToNewEvent(priorEvent, newEvent):
     numRsvps = len(rsvpInfo)
     if numRsvps:
         createRsvpLog(newEvent, f"Copied {numRsvps} Rsvps from {priorEvent['name']} to {newEvent.name}")
+
+
+def inviteCohortsToEvent(event, cohortYears):
+    """
+    Invites cohorts to a newly created event by associating the cohorts directly.
+    """
+    invitedCohorts = []
+    try:
+        for year in cohortYears:
+            year = int(year)
+            EventCohort.get_or_create(
+                event=event,
+                year=year,
+                defaults={'invited_at': datetime.now()}
+            )
+
+            addBonnerCohortToRsvpLog(year, event.id)
+            rsvpForBonnerCohort(year, event.id)
+            invitedCohorts.append(year)
+
+        if invitedCohorts:
+            cohortList = ', '.join(map(str, invitedCohorts))
+            createActivityLog(f"Added Bonner cohorts {cohortList} for newly created event {event.name}")
+
+        return True, "Cohorts successfully added to new event", invitedCohorts
+
+    except Exception as e:
+        print(f"Error inviting cohorts to new event: {e}")
+        return False, f"Error adding cohorts to new event: {e}", []
+
+
+def updateEventCohorts(event, cohortYears):
+    """
+    Updates the cohorts for an existing event by adding new ones and removing outdated ones.
+    """
+    invitedCohorts = []
+    try:
+        precedentInvitedCohorts = list(EventCohort.select().where(EventCohort.event == event))
+        precedentInvitedYears = [str(precedentCohort.year) for precedentCohort in precedentInvitedCohorts]
+
+        yearsToAdd = [int(year) for year in cohortYears if year not in precedentInvitedYears]
+
+        if not cohortYears:
+            yearsToRemove = [int(year) for year in precedentInvitedYears]
+        else:
+            yearsToRemove = [int(year) for year in precedentInvitedYears if year not in cohortYears]
+
+        if yearsToRemove:
+            EventCohort.delete().where(
+                (EventCohort.event == event) & (EventCohort.year.in_(yearsToRemove))
+            ).execute()
+
+        for year in yearsToAdd:
+            EventCohort.get_or_create(
+                event=event,
+                year=year,
+                defaults={'invited_at': datetime.now()}
+            )
+
+            addBonnerCohortToRsvpLog(year, event.id)
+            rsvpForBonnerCohort(year, event.id)
+            invitedCohorts.append(year)
+
+        if yearsToAdd or yearsToRemove:
+            cohortList = ', '.join(map(str, invitedCohorts))
+            createActivityLog(f"Updated Bonner cohorts for event {event.name}. Added: {yearsToAdd}, Removed: {yearsToRemove}")
+
+        return True, "Cohorts successfully updated for event", invitedCohorts
+
+    except Exception as e:
+        print(f"Error updating cohorts for event: {e}")
+        return False, f"Error updating cohorts for event: {e}", []
+
+

app/models/eventCohort.py

@@ -0,0 +1,13 @@
+from datetime import datetime
+from app.models import*
+from app.models.event import Event
+from app.models.bonnerCohort import BonnerCohort
+
+class EventCohort(baseModel):
+    event = ForeignKeyField(Event)
+    year = IntegerField()  
+    invited_at = DateTimeField(default=datetime.now)
+
+    class Meta:
+        indexes = ( (('event', 'year'), True), )
+

app/static/js/createEvents.js

@@ -332,11 +332,12 @@ function formatDate(originalDate) {
  */
 $(document).ready(function() {
   //makes sure bonners toggle will stay on between event pages
-  if (window.location.pathname == '/event/' + $('#newEventID').val() + '/edit') {
-    if ($("#checkBonners")) {
-      $("#checkBonners").prop('checked', true);
+    if (window.location.pathname == '/event/' + $('#newEventID').val() + '/edit') {
+      if ($("#checkBonners")) {
+        $("#checkBonners").prop('checked', true);
+    }
   }
-}
+
 // Initialize datepicker with proper options
 $.datepicker.setDefaults({
   dateFormat: 'yy/mm/dd', // Ensures compatibility across browsers

app/templates/events/createEvent.html

@@ -235,11 +235,17 @@ <h1 id="pageTitle">{{page_title}}</h1>
       <div class="row col-md-12 mb-4">
         <div class="form-group">
           <label class="form-label fw-bold">Invite Cohort(s)</label>
-          {% for year,students in bonnerCohorts.items()|reverse %}
+          {% for year, students in bonnerCohorts.items() | reverse %}
           <div class="form-check">
-            <input class="form-check-input" type="checkbox" value="{{year}}" name="cohorts[]" id="cohort-{{year}}">
-            <label class="form-check-label text-truncate w-100" for="cohort-{{year}}">{{year}}-{{year+1}}
-              <span class="text-muted">({{students|map(attribute='fullName')|join(", ")}})</span>
+            <input class="form-check-input" type="checkbox" value="{{year}}" name="cohorts[]" id="cohort-{{year}}"
+            {% if invitedYears and year|string in invitedYears %}
+              checked
+            {% endif %}>
+            <label class="form-check-label text-truncate w-100" for="cohort-{{year}}">
+              {{year}}-{{year+1}}
+              <span class="text-muted">
+                ({{students | map(attribute='fullName') | join(", ")}})
+              </span>
             </label>
           </div>
           {% endfor %}

app/templates/sidebar.html

@@ -33,7 +33,7 @@
       {% if g.current_user.isAdmin %}
       <li>
         <a href="/eventTemplates" class="nav-link text-white {{'active' if 'eventTemplates' in request.path}}" {{"aria-current='page'" if 'eventTemplates' in request.path}}>
-          Create Event
+          Create Event    
         </a>
       </li>
       <li>

database/migrate_db.sh

@@ -70,6 +70,7 @@ pem add app.models.eventRsvpLog.EventRsvpLog
 pem add app.models.celtsLabor.CeltsLabor
 pem add app.models.communityEngagementRequest.CommunityEngagementRequest
 pem add app.models.individualRequirement.IndividualRequirement
+pem add app.models.eventCohort.EventCohort
 
 
 pem watch