Merge branch 'EventsHeader' of https://github.com/BCStudentSoftwareDevTeam/celts into EventsHeader

Author: bakobagassas

README.md

@@ -1,7 +1,7 @@
 # Flask application to manage CELTS programs
 
 ## Requirements
- * Python 3.7+
+ * Python 3.10+
 
 **Packages (Ubuntu)**
  * python3-dev

app/logic/bonner.py

@@ -15,7 +15,7 @@
 from app.models.eventCohort import EventCohort
 from app.models.term import Term
 from app.logic.createLogs import createRsvpLog
-
+from app.models.certification import Certification
 def makeBonnerXls(selectedYear, noOfYears=1):
     """
     Create and save a BonnerStudents.xlsx file with all of the current and former bonner students.
@@ -44,10 +44,8 @@ def makeBonnerXls(selectedYear, noOfYears=1):
     worksheet.set_column('D:D', 20)
 
     # bonner event titles
-    bonnerEventsId = 1
-    bonnerEvents = CertificationRequirement.select().where(CertificationRequirement.certification==bonnerEventsId).order_by(CertificationRequirement.order.asc())
+    bonnerEvents = CertificationRequirement.select().where(CertificationRequirement.certification==Certification.BONNER).order_by(CertificationRequirement.order.asc())
     bonnerEventInfo = {bonnerEvent.id:(bonnerEvent.name, index + 4) for index, bonnerEvent in enumerate(bonnerEvents)}
-    allBonnerSpreadsheetPosition = 7
     currentLetter = "E" # next column
     for bonnerEvent in bonnerEvents:
         worksheet.write(f"{currentLetter}1", bonnerEvent.name, bold)
@@ -84,21 +82,19 @@ def makeBonnerXls(selectedYear, noOfYears=1):
             .join(EventParticipant, on=(RequirementMatch.event == EventParticipant.event))
             .join(CertificationRequirement, on=(RequirementMatch.requirement == CertificationRequirement.id))
             .join(User, on=(EventParticipant.user == User.username))
-            .where((CertificationRequirement.certification_id == bonnerEventsId) & (User.username == student.user.username))
+            .where((CertificationRequirement.certification_id == Certification.BONNER) & (User.username == student.user.username))
         )
 
-        allBonnerMeetingDates = []
+        certRequirementDates = {}
         for attendedEvent in bonnerEventsAttended:
             if bonnerEventInfo.get(attendedEvent.requirement.id):
                 completedEvent = bonnerEventInfo[attendedEvent.requirement.id]
-                worksheet.write(row, completedEvent[1], attendedEvent.event.startDate.strftime('%m/%d/%Y'))
-                if completedEvent[0] == "All Bonner Meeting":
-                    allBonnerMeetingDates.append(attendedEvent.event.startDate.strftime('%m/%d/%Y'))
-            else:
-                raise Exception("Untracked requirements found in attended events. Debug required.")
-    
-        worksheet.write(row, allBonnerSpreadsheetPosition, ", ".join(sorted(allBonnerMeetingDates)))
+                if completedEvent[1] not in certRequirementDates:
+                    certRequirementDates[completedEvent[1]] = []
+                certRequirementDates[completedEvent[1]].append(attendedEvent.event.startDate.strftime('%m/%d/%Y'))
 
+        for tableIndex, dates in certRequirementDates.items():
+            worksheet.write(row, tableIndex, ", ".join(sorted(dates)))
         row += 1
 
     workbook.close()

app/logic/events.py

@@ -118,8 +118,9 @@ def attemptSaveMultipleOfferings(eventData, attachmentFiles = None):
 
     seriesId = calculateNewSeriesId()
 
-    # Create separate event data inheriting from the original eventData
-    seriesData = eventData.get('seriesData')
+    # Create separate event data for each event in the series, inheriting from the original eventData
+
+    seriesData = sorted(eventData.get('seriesData'), key=lambda x: datetime.strptime(f"{x['eventDate']} {x['startTime']}",'%Y-%m-%d %H:%M'))
     isRepeating = bool(eventData.get('isRepeating'))
     with mainDB.atomic() as transaction:
         for index, event in enumerate(seriesData):
@@ -129,8 +130,9 @@ def attemptSaveMultipleOfferings(eventData, attachmentFiles = None):
                 'startDate': event['eventDate'],
                 'timeStart': event['startTime'],
                 'timeEnd': event['endTime'],
+                'location': event['eventLocation'],
                 'seriesId': seriesId,
-                'isRepeating': bool(isRepeating)
+                'isRepeating': bool(isRepeating), 
                 })
             # Try to save each offering
             savedEvents, validationErrorMessage = attemptSaveEvent(eventInfo, attachmentFiles)
@@ -484,7 +486,9 @@ def getRepeatingEventsData(eventData):
 
     return [ {'name': f"{eventData['name']} Week {counter+1}",
               'date': eventData['startDate'] + timedelta(days=7*counter),
-              "week": counter+1}
+              "week": counter+1,
+              'location': eventData['location']
+            }
             for counter in range(0, ((eventData['endDate']-eventData['startDate']).days//7)+1)]
 
 def preprocessEventData(eventData):

app/static/js/bonnerManagement.js

@@ -76,7 +76,7 @@ $(document).ready(function(){
         } else {
             fileName = `Bonner Spreadsheet, ${Number(startingYear) - Number(noOfYears)} - ${startingYear}`;
         }
-
+        
         $.ajax({
             url: url,
             method: "GET",