Update app/internal_loads.py

app/internal_loads.py

@@ -925,6 +925,7 @@ def display_ventilation_infiltration_tab():
 
 def display_schedules_tab():
     import streamlit as st
+    import uuid
 
     st.subheader("Schedules Editor")
 
@@ -938,9 +939,11 @@ def display_schedules_tab():
         "original_name": ""
     }
 
-    # Initialize schedule_editor if not present
+    # Initialize schedule_editor and schedule_action if not present
     if "schedule_editor" not in st.session_state:
         st.session_state.schedule_editor = DEFAULT_STATE.copy()
+    if "schedule_action" not in st.session_state:
+        st.session_state.schedule_action = {"action": None, "id": None}
 
     editor_state = st.session_state.schedule_editor
     schedules = st.session_state.project_data["internal_loads"]["schedules"]
@@ -975,12 +978,8 @@ def display_schedules_tab():
 
     # ---------------------- UI FORM for name/description and actions ----------------------
     with st.form("schedule_form"):
-        name = st.text_input("Schedule Name",
-                           value=editor_state.get("name", ""),
-                           key="schedule_name_input")
-        description = st.text_area("Description",
-                                 value=editor_state.get("description", ""),
-                                 key="schedule_description_input")
+        name = st.text_input("Schedule Name", value=editor_state.get("name", ""))
+        description = st.text_area("Description", value=editor_state.get("description", ""))
 
         # ---------------------- SLIDERS LAYOUT ----------------------
         st.markdown("### Schedule Sliders")
@@ -995,12 +994,12 @@ def display_schedules_tab():
             st.markdown("<div style='text-align:center; font-weight:bold; font-size:18px;'>Weekend</div>", unsafe_allow_html=True)
 
         hide_elements = """
-                <style>
-                    div[data-testid="stSliderTickBarMin"],
-                    div[data-testid="stSliderTickBarMax"] {
-                        display: none;
-                    }
-                </style>
+            <style>
+                div[data-testid="stSliderTickBarMin"],
+                div[data-testid="stSliderTickBarMax"] {
+                    display: none;
+                }
+            </style>
         """
         st.markdown(hide_elements, unsafe_allow_html=True)
 
@@ -1043,11 +1042,11 @@ def display_schedules_tab():
         col1, col2, col3 = st.columns(3)
         with col1:
             submit_label = "Update Schedule" if editor_state.get("is_edit") else "Save Schedule"
-            submitted = st.form_submit_button(submit_label, key="save_schedule_button")
+            submitted = st.form_submit_button(submit_label)
         with col2:
-            edit_submitted = st.form_submit_button("Edit Selected Schedule", key="edit_schedule_button")
+            edit_submitted = st.form_submit_button("Edit Selected Schedule")
         with col3:
-            delete_submitted = st.form_submit_button("Delete Selected Schedule", key="delete_schedule_button")
+            delete_submitted = st.form_submit_button("Delete Selected Schedule")
 
         # ---------------------- Saved Schedules Selector ----------------------
         st.markdown("### Saved Schedules")
@@ -1055,73 +1054,84 @@ def display_schedules_tab():
             "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.",
-            key="saved_schedule_select"
+            help="Select a saved schedule to edit or delete."
         )
 
         # ---------------------- Save logic ----------------------
         if submitted:
-            if not name.strip():
-                st.error("Schedule name is required.")
-            elif name in schedules and not editor_state.get("is_edit"):
-                st.error("A schedule with this name already exists.")
-            else:
-                schedules[name] = {
-                    "description": description,
-                    "weekday": weekday_values,
-                    "weekend": weekend_values
-                }
-                if editor_state.get("is_edit") and editor_state.get("original_name") and editor_state.get("original_name") != name:
-                    if editor_state["original_name"] in schedules:
-                        del schedules[editor_state["original_name"]]
-                # Reset editor state and slider values
-                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}' saved successfully.")
-                st.session_state.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+            action_id = str(uuid.uuid4())
+            if st.session_state.schedule_action.get("id") != action_id:
+                st.session_state.schedule_action = {"action": "save", "id": action_id}
+                if not name.strip():
+                    st.error("Schedule name is required.")
+                elif name in schedules and not editor_state.get("is_edit"):
+                    st.error("A schedule with this name already exists.")
+                else:
+                    schedules[name] = {
+                        "description": description,
+                        "weekday": weekday_values,
+                        "weekend": weekend_values
+                    }
+                    if editor_state.get("is_edit") and editor_state.get("original_name") and editor_state.get("original_name") != name:
+                        if editor_state["original_name"] in schedules:
+                            del schedules[editor_state["original_name"]]
+                    # Reset editor state and slider values
+                    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}' saved successfully.")
+                    st.session_state.schedule_action = {"action": None, "id": None}
+                    st.session_state.module_rerun_flags["internal_loads"] = True
+                    st.rerun()
 
         # ---------------------- Edit logic ----------------------
         if edit_submitted and saved_schedule:
-            if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
-                st.error("Default schedules cannot be edited.")
-            else:
-                schedule_data = schedules[saved_schedule]
-                # Update editor state without modifying slider widgets directly
-                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"
-                }
-                # Preload slider values
-                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.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+            action_id = str(uuid.uuid4())
+            if st.session_state.schedule_action.get("id") != action_id:
+                st.session_state.schedule_action = {"action": "edit", "id": action_id}
+                if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
+                    st.error("Default schedules cannot be edited.")
+                else:
+                    schedule_data = schedules[saved_schedule]
+                    # Update editor state
+                    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"
+                    }
+                    # Preload slider values
+                    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": None, "id": None}
+                    st.session_state.module_rerun_flags["internal_loads"] = True
+                    st.rerun()
 
         # ---------------------- Delete logic ----------------------
         if delete_submitted and saved_schedule:
-            if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
-                st.error("Default schedules cannot be deleted.")
-            elif is_schedule_in_use(saved_schedule):
-                st.error(f"Schedule '{saved_schedule}' is in use and cannot be deleted.")
-            else:
-                del schedules[saved_schedule]
-                # Reset editor state and slider values
-                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.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+            action_id = str(uuid.uuid4())
+            if st.session_state.schedule_action.get("id") != action_id:
+                st.session_state.schedule_action = {"action": "delete", "id": action_id}
+                if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
+                    st.error("Default schedules cannot be deleted.")
+                elif is_schedule_in_use(saved_schedule):
+                    st.error(f"Schedule '{saved_schedule}' is in use and cannot be deleted.")
+                else:
+                    del schedules[saved_schedule]
+                    # Reset editor state and slider values
+                    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": None, "id": None}
+                    st.session_state.module_rerun_flags["internal_loads"] = True
+                    st.rerun()
 
 def is_schedule_in_use(schedule_name: str) -> bool:
     """