Changes to the invite cohort

app/controllers/admin/routes.py

@@ -10,6 +10,7 @@
 from app.models.program import Program
 from app.models.event import Event
 from app.models.eventRsvp import EventRsvp
+from app.models.eventCohort import EventCohort
 from app.models.eventParticipant import EventParticipant
 from app.models.user import User
 from app.models.course import Course
@@ -41,6 +42,57 @@
 from app.logic.spreadsheet import createSpreadsheet
 
 
+@admin_bp.route('/event/<eventId>/invite-cohorts', methods=['POST'])
+def inviteCohorts(eventId):
+    if not (g.current_user.isCeltsAdmin or g.current_user.isProgramManagerForEvent(Event.get_by_id(eventId))):
+        abort(403)
+
+    try:
+        event = Event.get_by_id(eventId)
+        cohort_years = request.json.get('cohorts', [])
+
+        for year in cohort_years:
+            try:
+                EventCohort.create(
+                    event=event,
+                    year=int(year),
+                    invited=True,
+                    invited_at=datetime.now()
+                )
+                addBonnerCohortToRsvpLog(int(year), event.id)
+                rsvpForBonnerCohort(int(year), event.id)
+
+            except IntegrityError:
+                continue
+
+        createActivityLog(f"Invited Bonner cohorts {', '.join(map(str, cohort_years))} to event {event.name}")
+        return jsonify({
+            "success": True,
+            "message": "Cohorts successfully invited",
+            "invited_cohorts": cohort_years
+        })
+
+    except Exception as e:
+        print(f"Error inviting cohorts: {e}")
+        return jsonify({
+            "success": False,
+            "message": "Error inviting cohorts"
+        }), 500
+
+@admin_bp.route('/event/<eventId>/cohort-status', methods=['GET'])
+def getCohortStatus(eventId):
+    try:
+        invited_cohorts = EventCohort.select().where(
+            EventCohort.event_id == eventId,
+            EventCohort.invited == True
+        )
+        return jsonify({
+            "invited_cohorts": [{"year": inv.year, "invited_at": inv.invited_at} for inv in invited_cohorts]
+        })
+    except Exception as e:
+        print(f"Error getting cohort status: {e}")
+        return jsonify({"error": "Error fetching cohort status"}), 500
+
 @admin_bp.route('/admin/reports')
 def reports():
     academicYears = Term.select(Term.academicYear).distinct().order_by(Term.academicYear.desc())
@@ -314,6 +366,14 @@ def eventDisplay(eventId):
     if eventData['program'] and eventData['program'].isBonnerScholars:
         requirements = getCertRequirements(Certification.BONNER)
         bonnerCohorts = getBonnerCohorts(limit=5)
+
+        invited_cohorts = list(EventCohort.select().where(
+            EventCohort.event_id == eventId,
+            EventCohort.invited == True
+        ))
+        invited_years = [inv.year for inv in invited_cohorts]
+    else:
+        requirements, bonnerCohorts, invited_years = [], [], []
 
     rule = request.url_rule
 
@@ -325,6 +385,7 @@ def eventDisplay(eventId):
                                 event = event,
                                 requirements = requirements,
                                 bonnerCohorts = bonnerCohorts,
+                                invited_years = invited_years, 
                                 userHasRSVPed = userHasRSVPed,
                                 isProgramManager = isProgramManager,
                                 filepaths = filepaths)

app/logic/bonner.py

@@ -90,4 +90,4 @@ def addBonnerCohortToRsvpLog(year, event):
                                     .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/models/eventCohort.py

@@ -0,0 +1,15 @@
+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 = BooleanField(default=False)
+    invited_at = DateTimeField(default=datetime.now)
+
+    class Meta:
+        indexes = ( (('event', 'year'), True), )
+
+#wouldn't it be more logic to add columns in the bonnerCohort table instead?

app/static/js/createEvents.js

@@ -484,3 +484,88 @@ $(".startDatePicker, .endDatePicker").change(function () {
 
   setCharacterLimit($("#inputCharacters"), "#remainingCharacters"); 
 });
+
+function inviteCohorts(eventId, selectedCohorts) {
+  return $.ajax({
+    type: "POST",
+    url: `/event/${eventId}/invite-cohorts`,
+    contentType: "application/json",
+    data: JSON.stringify({
+      cohorts: selectedCohorts
+    }),
+    success: function(response) {
+      if (response.success) {
+        msgFlash("Cohorts successfully invited!", "success");
+        updateCohortStatus(eventId);
+      } else {
+        msgFlash("Error inviting cohorts", "danger");
+      }
+    }
+  });
+}
+
+function getCohortStatus(eventId) {
+  return $.ajax({
+    type: "GET",
+    url: `/event/${eventId}/cohort-status`,
+    success: function(response) {
+      displayCohortStatus(response.invited_cohorts);
+    }
+  });
+}
+
+function displayCohortStatus(invitedCohorts) {
+  $(".cohort-status").remove();
+
+  invitedCohorts.forEach(cohort => {
+    const invitedDate = new Date(cohort.invited_at).toLocaleDateString();
+    const cohortElement = $(`#cohort-${cohort.year}`);
+
+    if (cohortElement.length) {
+      const statusHtml = `
+        <div class="cohort-status mt-1 ml-4">
+          <small class="text-success">
+            <i class="fas fa-check-circle"></i>
+            Invited on ${invitedDate}
+          </small>
+        </div>
+      `;
+      cohortElement.closest('.form-check').append(statusHtml);
+      cohortElement.prop('disabled', true);
+      cohortElement.closest('.form-check-label').addClass('text-muted');
+    }
+  });
+}
+
+function updateCohortStatus(eventId) {
+  getCohortStatus(eventId);
+}
+
+$(document).ready(function() {
+  const eventId = $("#eventId").val();
+
+  if (eventId) {
+    updateCohortStatus(eventId);
+  }
+
+  $("#inviteCohortForm").on("submit", function(e) {
+    e.preventDefault();
+
+    const selectedCohorts = [];
+    $("input[name='cohorts[]']:checked").each(function() {
+      selectedCohorts.push($(this).val());
+    });
+
+    if (selectedCohorts.length === 0) {
+      msgFlash("Please select at least one cohort to invite", "warning");
+      return;
+    }
+
+    inviteCohorts(eventId, selectedCohorts).then(() => {
+      $("input[name='cohorts[]']:checked").each(function() {
+        $(this).prop('checked', false);
+      });
+      saveSelectedCohorts();
+    });
+  });
+});

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>