conflict data collection

sample_data/course_selection_data.csv

@@ -6250,8 +6250,6 @@ Pupil #,CrsNo,Description,Alternate?
 4849739,MPHE-08--Y,PHYSICAL AND HEALTH EDUCATION 08,FALSE
 4849739,MSC--08--Y,SCIENCE 08,FALSE
 4849739,XHU--08--F-HUM,HUMANITIES 8,FALSE
-4855075,XAT--12A-S,FLEX SENIOR SEMESTER 1,FALSE
-4855075,XAT--12B-S,FLEX SENIOR SEMESTER 2,FALSE
 4855593,MADDL08--C,INFORMATION TECHNOLOGY 08 (ADST-Digital Literacy),FALSE
 4855593,MADFS08--C,FOOD STUDIES 08 (ADST),FALSE
 4855593,MADMA08--C,VISUAL ARTS 08 (ADST),FALSE

scheduleGenerator/generator.py

@@ -7,6 +7,7 @@ from string import hexdigits
 # Import from custom utilities
 from util.mockStudents import getSampleStudents
 from util.generateCourses import getSampleCourses
+from util.estimateGrade import getGradeFromCourseCode
 
 # Import other utilites
 from util.debug import debug
@@ -52,7 +53,8 @@ def newConflict(pupilNum: str, email: str, conflictType: str, code: str, descrip
     "Email": email,
     "Type": conflictType,
     "Code": code,
-    "Conflict": description
+    "Conflict": description,
+    **({"Data": courseData} if courseData is not None else {})
   }
   if exists: logs[pupilNum].append(log)
   else: logs[pupilNum] = [log]
@@ -359,8 +361,11 @@ def generateScheduleV3(
   studentsCritical, studentsAcceptable = 0, 0
 
   for student in students:
+    # if student["Pupil #"] == "772554": debug("772554")
     blocks = [student["schedule"][block] for block in student["schedule"]]
+    # if student["Pupil #"] == "772554": debug(blocks)
     hasConflicts = True if sum(1 for b in blocks if len(b)>1) > 0 else False
+    # if student["Pupil #"] == "772554": debug(f'Has conflict? {hasConflicts}')
 
     # If there is no conflicts
     # and classes inserted to is equal to expectedClasses
@@ -369,6 +374,7 @@ def generateScheduleV3(
     # continue to next student
     if not hasConflicts and student["classes"] == student["expectedClasses"]: continue
     elif not hasConflicts and (student["expectedClasses"]-2) <= student["classes"] < student["expectedClasses"]:
+      # TODO: Insert alternates if available?
       a_mc_count += 1
       acceptableCount += 1
       if not newConflict(student["Pupil #"], "", "Acceptable", "A-MC", "Missing 1-2 Classses", conflictLogs): studentsAcceptable += 1
@@ -380,6 +386,10 @@ def generateScheduleV3(
     }
 
     if hasConflicts:
+      student["classes"] = 0
+      couldnt_resolve = False
+      missing = []
+      missingSolutions = []
       # Clear student schedule to restructure
       for block in student["schedule"]:
         [running[block][cname]["students"].remove(studentData) for cname in student["schedule"][block]]
@@ -406,6 +416,7 @@ def generateScheduleV3(
               running[block][cname]["students"].append(studentData)
               student["schedule"][block].append(cname)
               availableBlocks.remove(block)
+              student["classes"] += 1
               found = True
               break
 
@@ -429,6 +440,8 @@ def generateScheduleV3(
                 if block == existing or block not in availableBlocks: continue
                 for cname in running[block]:
                   if cname[:-2] == classOut[:-2] and len(running[block][cname]["students"]) < classCap:
+                    student["classes"] += 1
+
                     # Move to existing class elsewhere
                     student["schedule"][block].append(cname)
                     running[block][cname]["students"].append(studentData)
@@ -447,7 +460,17 @@ def generateScheduleV3(
             if len(alternates) == 0: # If no alternates, create critical error
               c_cr_count += 1
               criticalCount += 1
-              if not newConflict(student["Pupil #"], "", "Critical", "C-CR", "Couldn't Resolve", conflictLogs): studentsCritical += 1
+
+              missing.append(classes[index])
+
+              if not newConflict(
+                student["Pupil #"],
+                "", # Student Email
+                "Critical", # Err type
+                "C-CR", # Err code
+                "Couldn't Resolve", # Err msg
+                conflictLogs): # logs dir
+                  studentsCritical += 1
 
             else:
               # Get alternate least run
@@ -467,6 +490,34 @@ def generateScheduleV3(
         classes.remove(classes[index])
         runCounts.remove(runCounts[index])
 
+      # Collect missing course data and solutions
+
+      data = { "missing": [] }
+
+      if student["gradelevel"] is None:
+        for mCname in missing:
+          data["missing"].append({
+            "missing": mCname,
+            "solutions": None,
+            "error": "Unable to find solutions, err no grade" })
+
+      else:
+        for block in student["schedule"]:
+          print(student["schedule"][block])
+          if len(student["schedule"][block]) == 0:
+            blockSolution = { "block": block, "courseSolutions": [] }
+            for cname in running[block]:
+              courseGrade = getGradeFromCourseCode(cname[:-2])
+              if courseGrade is None: continue
+              if (student["gradelevel"] == courseGrade) or (student["gradelevel"] == 12 and courseGrade == 11):
+                if len(running[block][cname]["students"]) < classCap:
+                  blockSolution["courseSolutions"].append({
+                    "CrsNo": cname,
+                    "Description": running[block][cname]["Description"]
+                  })
+
+            data["solutions"].append(blockSolution)
+
     metSelfRequirements = True if student["classes"] == student["expectedClasses"] else False
     if not metSelfRequirements:
       

tinker.py

@@ -61,7 +61,7 @@ if __name__ == '__main__':
     if e.lower().replace('_', '') == 'showerror': showError = True
     if e.lower().replace('_', '') == 'noanim': noAnim = True
 
-  if len(sys.argv) == 1:
+  if len(sys.argv) in (1, 2) and sys.argv[1].lower() not in ('no_refresh', 'errors'):
     print()
 
     st = time() # Start time

util/debug.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
 # Define global debug function
-debug = lambda msg : print(f">> Debug: {msg}")
+debug = lambda data : print(f'>> Debug: {data}') if type(data) == str else print('>> Debug: ', data)

util/estimateGrade.py

@@ -11,6 +11,10 @@ flex = ("XAT--12A-S", "XAT--12B-S")
 
 most_frequent = lambda l : max(set(l), key = l.count)
 
+def getGradeFromCourseCode(code: str) -> int:
+  grades = [int(s) for s in code.split("-") if s.isdigit()]
+  return None if len(grades) == 0 else most_frequent(grades)
+
 def getEstimatedGrade(pupil: dict) -> int:
   grades = [] # List of all possible grades
   for request in (r for r in pupil["requests"] if r not in flex):

util/mockStudents.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import json
 import csv
-from estimateGrade import getEstimatedGrade
+from util.estimateGrade import getEstimatedGrade
 
 flex= ("XAT--12A-S", "XAT--12B-S")