Update app/internal_loads.py

app/internal_loads.py

@@ -739,6 +739,7 @@ def display_ventilation_infiltration_tab():
 def display_schedules_tab():
     import streamlit as st
     import uuid
+    import pandas as pd
 
     st.subheader("Schedules Editor")
 
@@ -846,23 +847,12 @@ def display_schedules_tab():
                 weekend_values.append(val)
 
         # Action Buttons
-        col1, col2, col3 = st.columns(3)
+        col1, col2 = st.columns(2)
         with col1:
             submit_label = "Update Schedule" if editor_state.get("is_edit") else "Save Schedule"
             submitted = st.form_submit_button(submit_label)
         with col2:
-            edit_submitted = st.form_submit_button("Edit Selected Schedule")
-        with col3:
-            delete_submitted = st.form_submit_button("Delete Selected Schedule")
-
-        # Saved Schedules Selector
-        st.markdown("### Saved Schedules")
-        saved_schedule = st.selectbox(
-            "Select Saved Schedule",
-            options=list(schedules.keys()),
-            index=list(schedules.keys()).index(editor_state.get("name", list(schedules.keys())[0])) if editor_state.get("name") in schedules and schedules else 0,
-            help="Select a saved schedule to edit or delete."
-        )
+            refresh = st.form_submit_button("Refresh")
 
         # Save logic
         if submitted:
@@ -888,44 +878,78 @@ def display_schedules_tab():
             st.session_state.schedule_action = {"action": "save", "id": str(uuid.uuid4())}
             st.session_state.internal_loads_rerun_pending = True
 
-        # Edit logic
-        if edit_submitted and saved_schedule:
-            if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
-                st.error("Default schedules cannot be edited.")
-                return
-            schedule_data = schedules[saved_schedule]
-            st.session_state.schedule_editor = {
-                "is_edit": True,
-                "original_name": saved_schedule,
-                "name": saved_schedule,
-                "description": schedule_data.get("description", ""),
-                "weekday": schedule_data.get("weekday", [0.0] * 24),
-                "weekend": schedule_data.get("weekend", [0.0] * 24),
-                "template": "None"
-            }
-            for hour in range(24):
-                st.session_state[f"weekday_slider_{hour}_value"] = schedule_data.get("weekday", [0.0] * 24)[hour]
-                st.session_state[f"weekend_slider_{hour}_value"] = schedule_data.get("weekend", [0.0] * 24)[hour]
-            st.session_state.schedule_action = {"action": "edit", "id": str(uuid.uuid4())}
-            st.session_state.internal_loads_rerun_pending = True
-
-        # Delete logic
-        if delete_submitted and saved_schedule:
-            if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
-                st.error("Default schedules cannot be deleted.")
-                return
-            if is_schedule_in_use(saved_schedule):
-                st.error(f"Schedule '{saved_schedule}' is in use and cannot be deleted.")
-                return
-            del schedules[saved_schedule]
+        # Refresh logic
+        if refresh:
             st.session_state.schedule_editor = DEFAULT_STATE.copy()
             for hour in range(24):
                 st.session_state[f"weekday_slider_{hour}_value"] = 0.0
                 st.session_state[f"weekend_slider_{hour}_value"] = 0.0
-            st.success(f"Schedule '{saved_schedule}' deleted!")
-            st.session_state.schedule_action = {"action": "delete", "id": str(uuid.uuid4())}
+            st.session_state.schedule_action = {"action": "refresh", "id": str(uuid.uuid4())}
             st.session_state.internal_loads_rerun_pending = True
 
+    # Display saved schedules in a table
+    st.subheader("Saved Schedules")
+    if schedules:
+        # Create column headers
+        cols = st.columns([2, 3, 1, 1, 1, 1])
+        cols[0].write("**Name**")
+        cols[1].write("**Description**")
+        cols[2].write("**Weekday Peak**")
+        cols[3].write("**Weekend Peak**")
+        cols[4].write("**Edit**")
+        cols[5].write("**Delete**")
+
+        # Display each schedule
+        for idx, (name, schedule) in enumerate(schedules.items()):
+            cols = st.columns([2, 3, 1, 1, 1, 1])
+            cols[0].write(name)
+            cols[1].write(schedule.get("description", "No description"))
+            cols[2].write(f"{max(schedule.get('weekday', [0])):.2f}")
+            cols[3].write(f"{max(schedule.get('weekend', [0])):.2f}")
+
+            # Edit button
+            edit_key = f"edit_schedule_{name}_{idx}"
+            with cols[4].container():
+                if st.button("Edit", key=edit_key):
+                    if name in DEFAULT_SCHEDULE_TEMPLATES:
+                        st.error("Default schedules cannot be edited.")
+                    else:
+                        schedule_data = schedules[name]
+                        st.session_state.schedule_editor = {
+                            "is_edit": True,
+                            "original_name": name,
+                            "name": name,
+                            "description": schedule_data.get("description", ""),
+                            "weekday": schedule_data.get("weekday", [0.0] * 24),
+                            "weekend": schedule_data.get("weekend", [0.0] * 24),
+                            "template": "None"
+                        }
+                        for hour in range(24):
+                            st.session_state[f"weekday_slider_{hour}_value"] = schedule_data.get("weekday", [0.0] * 24)[hour]
+                            st.session_state[f"weekend_slider_{hour}_value"] = schedule_data.get("weekend", [0.0] * 24)[hour]
+                        st.session_state.schedule_action = {"action": "edit", "id": str(uuid.uuid4())}
+                        st.session_state.internal_loads_rerun_pending = True
+
+            # Delete button
+            delete_key = f"delete_schedule_{name}_{idx}"
+            with cols[5].container():
+                if name in DEFAULT_SCHEDULE_TEMPLATES:
+                    cols[5].write("(Default)")
+                elif is_schedule_in_use(name):
+                    cols[5].write("(In Use)")
+                else:
+                    if st.button("Delete", key=delete_key):
+                        del schedules[name]
+                        st.session_state.schedule_editor = DEFAULT_STATE.copy()
+                        for hour in range(24):
+                            st.session_state[f"weekday_slider_{hour}_value"] = 0.0
+                            st.session_state[f"weekend_slider_{hour}_value"] = 0.0
+                        st.success(f"Schedule '{name}' deleted!")
+                        st.session_state.schedule_action = {"action": "delete", "id": str(uuid.uuid4())}
+                        st.session_state.internal_loads_rerun_pending = True
+    else:
+        st.write("No schedules defined.")
+
 def is_schedule_in_use(schedule_name: str) -> bool:
     """
     Check if a schedule is in use by any people, lighting, equipment, or ventilation/infiltration systems.