Celts labor restore

app/controllers/main/routes.py

@@ -26,7 +26,7 @@
 from app.models.courseInstructor import CourseInstructor
 from app.models.backgroundCheckType import BackgroundCheckType
 
-from app.logic.events import getUpcomingEventsForUser, getParticipatedEventsForUser, getTrainingEvents, getEventRsvpCountsForTerm, getUpcomingStudentLedCount, getStudentLedEvents, getBonnerEvents, getOtherEvents, getEngagementEvents
+from app.logic.events import getUpcomingEventsForUser, getParticipatedEventsForUser, getTrainingEvents, getEventRsvpCountsForTerm, getUpcomingVolunteerOpportunitiesCount, getVolunteerOpportunities, getBonnerEvents, getCeltsLabor, getEngagementEvents
 from app.logic.transcript import *
 from app.logic.loginManager import logout
 from app.logic.searchUsers import searchUsers
@@ -69,7 +69,7 @@ def landingPage():
 def goToEventsList(programID):
     return {"activeTab": getActiveEventTab(programID)}
 
-@main_bp.route('/eventsList/<selectedTerm>', methods=['GET'], defaults={'activeTab': "studentLedEvents", 'programID': 0})
+@main_bp.route('/eventsList/<selectedTerm>', methods=['GET'], defaults={'activeTab': "volunteerOpportunities", 'programID': 0})
 @main_bp.route('/eventsList/<selectedTerm>/<activeTab>', methods=['GET'], defaults={'programID': 0})
 @main_bp.route('/eventsList/<selectedTerm>/<activeTab>/<programID>', methods=['GET'])
 def events(selectedTerm, activeTab, programID):
@@ -82,36 +82,40 @@ def events(selectedTerm, activeTab, programID):
     participantRSVP = EventRsvp.select(EventRsvp, Event).join(Event).where(EventRsvp.user == g.current_user)
     rsvpedEventsID = [event.event.id for event in participantRSVP]
 
-    term: Term = Term.get_by_id(currentTerm)
+    if isinstance(currentTerm, Term):
+        term = currentTerm
+    else:
+        term = Term.get_or_none(Term.id == currentTerm)
+        if term is None:
+            term = Term.get(Term.isCurrentTerm == True)
 
     currentEventRsvpAmount = getEventRsvpCountsForTerm(term)
-    studentLedEvents = getStudentLedEvents(term)
-    countUpcomingStudentLedEvents = getUpcomingStudentLedCount(term, currentTime)
+    volunteerOpportunities = getVolunteerOpportunities(term)
+    countUpcomingVolunteerOpportunities = getUpcomingVolunteerOpportunitiesCount(term, currentTime)
     trainingEvents = getTrainingEvents(term, g.current_user)
     engagementEvents = getEngagementEvents(term)
     bonnerEvents = getBonnerEvents(term)
-    otherEvents = getOtherEvents(term)
+    celtsLabor = getCeltsLabor(term)
 
     managersProgramDict = getManagerProgramDict(g.current_user)
 
     # Fetch toggle state from session    
     toggleState = request.args.get('toggleState', 'unchecked')
 
-    # compile all student led events into one list
+    # compile all volunteer opportunitiesevents into one list
     studentEvents = []
-    for studentEvent in studentLedEvents.values():
+    for studentEvent in volunteerOpportunities.values():
         studentEvents += studentEvent # add all contents of studentEvent to the studentEvents list
 
     # Get the count of all term events for each category to display in the event list page.
-    studentLedEventsCount: int = len(studentEvents)
+    volunteerOpportunitiesCount: int = len(studentEvents)
     trainingEventsCount: int = len(trainingEvents)
     engagementEventsCount: int = len(engagementEvents)
     bonnerEventsCount: int = len(bonnerEvents)
-    otherEventsCount: int = len(otherEvents)
+    celtsLaborCount: int = len(celtsLabor)
 
     # gets only upcoming events to display in indicators
     if (toggleState == 'unchecked'):
-        studentLedEventsCount: int = sum(list(countUpcomingStudentLedEvents.values()))
         for event in trainingEvents:
             if event.isPastEnd:
                 trainingEventsCount -= 1
@@ -121,28 +125,27 @@ def events(selectedTerm, activeTab, programID):
         for event in bonnerEvents:
             if event.isPastEnd:
                 bonnerEventsCount -= 1
-        for event in otherEvents:
+        for event in celtsLabor:
             if event.isPastEnd:
-                otherEventsCount -= 1
-
+                celtsLaborCount -= 1
+            
     # Handle ajax request for Event category header number notifiers and toggle
     if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
         return jsonify({
-            "studentLedEventsCount": studentLedEventsCount,
+            "volunteerOpportunitiesCount": volunteerOpportunitiesCount,
             "trainingEventsCount": trainingEventsCount,
             "engagementEventsCount": engagementEventsCount,
             "bonnerEventsCount": bonnerEventsCount,
-            "otherEventsCount": otherEventsCount,
+            "celtsLaborCount": celtsLaborCount,
             "toggleStatus": toggleState
         })
-
     return render_template("/events/eventList.html",
                             selectedTerm = term,
-                            studentLedEvents = studentLedEvents,
+                            volunteerOpportunities = volunteerOpportunities,
                             trainingEvents = trainingEvents,
                             engagementEvents = engagementEvents,
                             bonnerEvents = bonnerEvents,
-                            otherEvents = otherEvents,
+                            celtsLabor = celtsLabor,
                             listOfTerms = listOfTerms,
                             rsvpedEventsID = rsvpedEventsID,
                             currentEventRsvpAmount = currentEventRsvpAmount,
@@ -151,7 +154,7 @@ def events(selectedTerm, activeTab, programID):
                             activeTab = activeTab,
                             programID = int(programID),
                             managersProgramDict = managersProgramDict,
-                            countUpcomingStudentLedEvents = countUpcomingStudentLedEvents,
+                            countUpcomingVolunteerOpportunities = countUpcomingVolunteerOpportunities,
                             toggleState = toggleState,
                             )
 

app/logic/events.py

@@ -224,45 +224,55 @@ def saveEventToDb(newEventData, renewedEvent = False):
         eventRecords.append(eventRecord)
     return eventRecords
 
-def getStudentLedEvents(term):
-    studentLedEvents = list(Event.select(Event, Program)
+def getVolunteerOpportunities(term):
+    volunteerOpportunities = list(Event.select(Event, Program)
                                  .join(Program)
-                                 .where(Program.isStudentLed,
-                                        Event.term == term, Event.deletionDate == None)
+                                 .where((Event.term == term) &
+                                        (Event.deletionDate.is_null(True)) &
+                                        (Event.isService == True) &
+                                        ((Event.isLaborOnly == False) | Event.isLaborOnly.is_null(True))
+                                 )
                                  .order_by(Event.startDate, Event.timeStart)
                                  .execute())
 
     programs = {}
 
-    for event in studentLedEvents:
+    for event in volunteerOpportunities:
         programs.setdefault(event.program, []).append(event)
 
     return programs
 
 def getEngagementEvents(term):
     engagementEvents = list(Event.select(Event, Program)
                                  .join(Program)
-                                 .where(Event.isEngagement,
+                                 .where(Event.isEngagement, Event.isLaborOnly == False,
                                         Event.term == term, Event.deletionDate == None)
                                  .order_by(Event.startDate, Event.timeStart)
                                  .execute())
     return engagementEvents
 
-def getUpcomingStudentLedCount(term, currentTime):
+def getUpcomingVolunteerOpportunitiesCount(term, currentTime):
     """
-        Return a count of all upcoming events for each student led program.
+        Return a count of all upcoming events for each volunteer opportunitiesprogram.
     """
 
-    upcomingCount = (Program.select(Program.id, fn.COUNT(Event.id).alias("eventCount"))
-                            .join(Event, on=(Program.id == Event.program_id))
-                            .where(Program.isStudentLed,
-                                    Event.term == term, Event.deletionDate == None,
-                                    (Event.startDate > currentTime) | ((Event.startDate == currentTime) & (Event.timeEnd >= currentTime)),
-                                    Event.isCanceled == False)
-                            .group_by(Program.id))
-
-    programCountDict = {}
+    upcomingCount = (
+        Program
+        .select(Program.id, fn.COUNT(Event.id).alias("eventCount"))
+        .join(Event, on=(Program.id == Event.program_id))
+        .where(
+            (Event.term == term) &
+            (Event.deletionDate.is_null(True)) &
+            (Event.isService == True) &
+            ((Event.isLaborOnly == False) | Event.isLaborOnly.is_null(True)) &
+            ((Event.startDate > currentTime) |
+             ((Event.startDate == currentTime) & (Event.timeEnd >= currentTime))) &
+            (Event.isCanceled == False)
+        )
+        .group_by(Program.id)
+    )
 
+    programCountDict = {}
     for programCount in upcomingCount:
         programCountDict[programCount.id] = programCount.eventCount
     return programCountDict
@@ -279,7 +289,7 @@ def getTrainingEvents(term, user):
     """
     trainingQuery = (Event.select(Event).distinct()
                           .join(Program, JOIN.LEFT_OUTER)
-                          .where(Event.isTraining == True,
+                          .where(Event.isTraining == True, Event.isLaborOnly == False,
                                  Event.term == term, Event.deletionDate == None)
                           .order_by(Event.isAllVolunteerTraining.desc(), Event.startDate, Event.timeStart))
 
@@ -290,36 +300,29 @@ def getTrainingEvents(term, user):
     return list(trainingQuery.execute())
 
 def getBonnerEvents(term):
-    bonnerScholarsEvents = list(Event.select(Event, Program.id.alias("program_id"))
-                                     .join(Program)
-                                     .where(Program.isBonnerScholars,
-                                            Event.term == term, Event.deletionDate == None)
-                                     .order_by(Event.startDate, Event.timeStart)
-                                     .execute())
+    bonnerScholarsEvents = list(
+        Event.select(Event, Program.id.alias("program_id"))
+            .join(Program)
+            .where(
+                Program.isBonnerScholars, Event.isTraining == False, Event.isEngagement == False, Event.isService == False,
+                Event.term == term,
+                Event.deletionDate == None
+            )
+            .order_by(Event.startDate, Event.timeStart)
+            .execute()
+    )
     return bonnerScholarsEvents
 
-def getOtherEvents(term):
+def getCeltsLabor(term):
     """
-
-    Get the list of the events not caught by other functions to be displayed in
-    the Other Events section of the Events List page.
-    :return: A list of Other Event objects
+    Labor tab: events explicitly marked as Labor Only.
     """
-    # Gets all events that are not associated with a program and are not trainings
-    # Gets all events that have a program but don't fit anywhere
-
-    otherEvents = list(Event.select(Event, Program)
-                            .join(Program, JOIN.LEFT_OUTER)
-                            .where(Event.term == term, Event.deletionDate == None,
-                                   Event.isTraining == False,
-                                   Event.isAllVolunteerTraining == False,
-                                   ((Program.isOtherCeltsSponsored) |
-                                   ((Program.isStudentLed == False) &
-                                   (Program.isBonnerScholars == False))))
+    celtsLabor = list(Event.select()
+                            .join(Program, JOIN.LEFT_OUTER, on=(Event.program == Program.id))
+                            .where(Event.term == term, Event.deletionDate == None, Event.isLaborOnly == True)
                             .order_by(Event.startDate, Event.timeStart, Event.id)
                             .execute())
-
-    return otherEvents
+    return celtsLabor
 
 def getUpcomingEventsForUser(user, asOf=datetime.now(), program=None):
     """

app/logic/landingPage.py

@@ -31,11 +31,16 @@ def getManagerProgramDict(user):
             managerProgramDict[row.program]["managers"] = f'{managerProgramDict[row.program]["managers"]}, {row.user.firstName} {row.user.lastName}'
     return managerProgramDict
 
-def getActiveEventTab(programID):
-    program = Program.get_by_id(programID)
-    if program.isBonnerScholars:
+def getActiveEventTab(programID=None, explicit_tab=None):
+    if explicit_tab:
+        return explicit_tab
+    if programID is None:
+        return "celtsLabor"
+    try:
+        program = Program.get_by_id(programID)
+    except Program.DoesNotExist:
+        return "celtsLabor"
+    if getattr(program, "isBonnerScholars", False):
         return "bonnerScholarsEvents"
-    elif program.isStudentLed:
-        return "studentLedEvents"
     else:
-        return "otherEvents"
+        return "celtsLabor"

app/models/program.py

@@ -9,7 +9,6 @@ class Program(baseModel):
     bereaUrl = TextField(null=True)
     programDescription = TextField()
     partner = CharField(null=True)
-    isStudentLed = BooleanField(default=False)
     isBonnerScholars = BooleanField(default=False)
     isOtherCeltsSponsored = BooleanField(default=False)
     contactName = CharField(null=True,default='')

app/models/user.py

@@ -46,7 +46,15 @@ def isBonnerScholar(self):
             self._bsCache = BonnerCohort.select().where(BonnerCohort.user == self).exists()
 
         return self._bsCache
-
+
+    @property
+    def hasCurrentCeltsLabor(self):
+        if self._bsCache is None:
+            from app.models.celtsLabor import CeltsLabor
+            from app.models.term import Term
+            self._bsCache = CeltsLabor.select().where(CeltsLabor.user == self, CeltsLabor.term.isCurrent == True).exists()
+        return self._bsCache 
+
     @property
     def fullName(self):
         return f"{self.firstName} {self.lastName}"

app/static/js/eventList.js

@@ -84,21 +84,21 @@ function updateIndicatorCounts(isChecked){
       toggleState: isChecked ? "checked" : "unchecked",
     },
     success: function(eventsCount) {
-      const studentLedEventsCount = Number(eventsCount.studentLedEventsCount);
+      const volunteerOpportunitiesCount = Number(eventsCount.volunteerOpportunitiesCount);
       const trainingEventsCount = Number(eventsCount.trainingEventsCount);
       const engagementEventsCount = Number(eventsCount.engagementEventsCount);
       const bonnerEventsCount = Number(eventsCount.bonnerEventsCount);
-      const otherEventsCount = Number(eventsCount.otherEventsCount);
+      const celtsLaborCount = Number(eventsCount.celtsLaborCount);
       const toggleStatus = eventsCount.toggleStatus;
 
       $("#viewPastEventsToggle").prop(toggleStatus, true);
 
       // use ternary operators to populate the tab with a number if there are events, and clear the count if there are none
-      studentLedEventsCount > 0 ? $("#studentLedEvents").html(`Student-Led Services (${studentLedEventsCount})`) : $("#studentLedEvents").html(`Student-Led Services`)
+      volunteerOpportunitiesCount > 0 ? $("#volunteerOpportunities").html(`Volunteer Opportunities (${volunteerOpportunitiesCount})`) : $("#volunteerOpportunities").html(`Volunteer Opportunities`)
       trainingEventsCount > 0 ? $("#trainingEvents").html(`Trainings (${trainingEventsCount})`) : $("#trainingEvents").html(`Trainings`)
       engagementEventsCount > 0 ? $("#engagementEvents").html(`Education and Engagement (${engagementEventsCount})`) : $("#engagementEvents").html('Education and Engagement')
       bonnerEventsCount > 0 ? $("#bonnerScholarsEvents").html(`Bonner Scholars (${bonnerEventsCount})`) : $("#bonnerScholarsEvents").html(`Bonner Scholars`)
-      otherEventsCount > 0 ? $("#otherEvents").html(`Other Events (${otherEventsCount})`) : $("#otherEvents").html(`Other Events`)
+      celtsLaborCount > 0 ? $("#celtsLabor").html(`Celts Labor (${celtsLaborCount})`) : $("#celtsLabor").html(`Celts Labor`)
     },
     error: function(request, status, error) {
       console.log(status,error);

app/static/js/landingPage.js

@@ -21,7 +21,7 @@ $(document).ready(function(){
       url: "/goToEventsList/"+programID,
       type: "GET",
       success: function(response) {
-        if (response.activeTab === "studentLedEvents"){
+        if (response.activeTab === "volunteerOpportunities"){
           window.location.href += "eventsList/"+term+"/"+response.activeTab+"/"+programID
         } else {
           window.location.href += "eventsList/"+term+"/"+response.activeTab