Update app.py

app.py

@@ -10,7 +10,7 @@ if "teachers" not in st.session_state:
 if "rooms" not in st.session_state:
     st.session_state.rooms = []
 if "subjects" not in st.session_state:
-    st.session_state.subjects = []
+    st.session_state.subjects = {}
 if "availability" not in st.session_state:
     st.session_state.availability = {}
 
@@ -21,54 +21,67 @@ st.title("Professional Timetable Generator")
 st.sidebar.header("Add Data")
 
 # Add teachers
+teacher = st.sidebar.text_input("Enter Teacher Name")
 if st.sidebar.button("Add Teacher"):
-    teacher = st.sidebar.text_input("Enter Teacher Name")
     if teacher:
         st.session_state.teachers.append(teacher)
         st.success(f"Added Teacher: {teacher}")
+    else:
+        st.error("Teacher name cannot be empty!")
 
 # Add rooms
+room = st.sidebar.text_input("Enter Room Name")
 if st.sidebar.button("Add Room"):
-    room = st.sidebar.text_input("Enter Room Name")
     if room:
         st.session_state.rooms.append(room)
         st.success(f"Added Room: {room}")
+    else:
+        st.error("Room name cannot be empty!")
 
-# Add subjects
+# Add subjects with weekly slots
+subject = st.sidebar.text_input("Enter Subject Name")
+slots = st.sidebar.number_input("Number of Weekly Slots", min_value=1, max_value=10, step=1)
 if st.sidebar.button("Add Subject"):
-    subject = st.sidebar.text_input("Enter Subject Name")
-    if subject:
-        st.session_state.subjects.append(subject)
-        st.success(f"Added Subject: {subject}")
+    if subject and slots > 0:
+        st.session_state.subjects[subject] = slots
+        st.success(f"Added Subject: {subject} with {slots} slots per week")
+    else:
+        st.error("Subject name cannot be empty, and slots must be greater than 0!")
 
 # Show existing data
 st.write("### Current Data")
 st.write("**Teachers:**", st.session_state.teachers)
 st.write("**Rooms:**", st.session_state.rooms)
-st.write("**Subjects:**", st.session_state.subjects)
+st.write("**Subjects and Weekly Slots:**", st.session_state.subjects)
 
 # Timetable generation logic
-def generate_timetable(teachers, subjects, rooms, time_slots):
+def generate_timetable(teachers, subjects, rooms, time_slots, days):
     model = cp_model.CpModel()
     schedule = {}
-    
-    for subject in subjects:
+
+    # Variables for each subject-teacher-room-time-slot combination
+    for subject, slots in subjects.items():
         for teacher in teachers:
             for room in rooms:
-                for time_slot in time_slots:
-                    schedule[(subject, teacher, room, time_slot)] = model.NewBoolVar(
-                        f"{subject}_{teacher}_{room}_{time_slot}"
-                    )
+                for day in days:
+                    for time_slot in time_slots:
+                        schedule[(subject, teacher, room, day, time_slot)] = model.NewBoolVar(
+                            f"{subject}_{teacher}_{room}_{day}_{time_slot}"
+                        )
 
-    # Constraints
-    for subject in subjects:
+    # Constraints: Each subject should have the required number of slots per week
+    for subject, slots in subjects.items():
         model.Add(
-            sum(schedule[(subject, teacher, room, time_slot)] 
-                for teacher in teachers 
-                for room in rooms 
-                for time_slot in time_slots) == 1
+            sum(
+                schedule[(subject, teacher, room, day, time_slot)]
+                for teacher in teachers
+                for room in rooms
+                for day in days
+                for time_slot in time_slots
+            ) == slots
         )
 
+    # Solve the model
     solver = cp_model.CpSolver()
     status = solver.Solve(model)
 
@@ -84,13 +97,13 @@ def generate_timetable(teachers, subjects, rooms, time_slots):
 # Generate timetable button
 if st.button("Generate Timetable"):
     time_slots = [f"{hour}:00 - {hour+1}:00" for hour in range(8, 18)]  # 8 AM to 6 PM
+    days = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
     timetable = generate_timetable(
-        st.session_state.teachers, st.session_state.subjects, st.session_state.rooms, time_slots
+        st.session_state.teachers, st.session_state.subjects, st.session_state.rooms, time_slots, days
     )
     if timetable:
         for entry in timetable:
-            subject, teacher, room, time_slot = entry
-            day = "Monday"  # Simplify for demo purposes
+            subject, teacher, room, day, time_slot = entry
             st.session_state.timetable = pd.concat(
                 [st.session_state.timetable, pd.DataFrame([[day, time_slot, subject, teacher, room]],
                                                           columns=["Day", "Time", "Subject", "Teacher", "Room"])],