more chnages

templates/teacher-wise/teacher_wise_template.py

@@ -9,6 +9,7 @@ sys.path.insert(0, os.path.join(_ROOT, "controller"))
 
 from xlsx_grid_helper import build_grid_sheet, new_workbook, save_workbook  # noqa: E402
 from template_controller import TIME_SLOTS as GRID_TIME_SLOTS  # noqa: E402
+from template_logger import log_error  # noqa: E402
 
 
 def generate_teacher_wise_templates(sessions, data, output_dir):
@@ -17,18 +18,39 @@ def generate_teacher_wise_templates(sessions, data, output_dir):
         code = instructor["instructor_code"]
         instr_sessions = [s for s in sessions if s["instructor_code"] == code]
 
-        by_day_slot = {}
+        # A teacher can only be in one place at a time: each (day, slot)
+        # must resolve to exactly one session. If the schedule places more
+        # than one, that's a real scheduling error - log it instead of
+        # silently picking/overwriting one.
+        raw_by_day_slot = {}
         for s in instr_sessions:
             for slot_index in s["slot_indices"]:
-                by_day_slot[(s["day"], slot_index)] = s
+                raw_by_day_slot.setdefault((s["day"], slot_index), []).append(s)
 
-        def cell_text(day, slot_index, by_day_slot=by_day_slot):
-            s = by_day_slot.get((day, slot_index))
-            if not s:
+        by_day_slot = {}
+        for (day, slot_index), entries in raw_by_day_slot.items():
+            if len(entries) > 1:
+                course_list = ", ".join(
+                    f'{e["course_id"]} ({e["course_type"]}) for batch(es) {"+".join(e["batch_codes"])} in {e["room_id"]}'
+                    for e in entries
+                )
+                log_error(
+                    f"Teacher conflict: {instructor['instructor_name']} ({code}) is double-booked on "
+                    f"{day} slot {slot_index}: {course_list}"
+                )
+            by_day_slot[(day, slot_index)] = entries[0]
+
+        def cell_text(day, slot_index, raw_by_day_slot=raw_by_day_slot):
+            entries = raw_by_day_slot.get((day, slot_index))
+            if not entries:
                 return ""
+            s = entries[0]
             tag = " (Lab)" if s["course_type"] == "lab" else (" (General)" if s["is_general"] else "")
             batches = "+".join(s["batch_codes"])
-            return f'{s["course_name"]}{tag}\n{batches}\n{s["room_id"]}'
+            text = f'{s["course_name"]}{tag}\n{batches}\n{s["room_id"]}'
+            if len(entries) > 1:
+                text = "CONFLICT!\n" + text
+            return text
 
         wb = new_workbook()
         ws = wb.active