Update app/internal_loads.py

app/internal_loads.py

@@ -938,13 +938,14 @@ def display_schedules_tab():
         "original_name": ""
     }
 
+    # Initialize schedule_editor if not present
     if "schedule_editor" not in st.session_state:
         st.session_state.schedule_editor = DEFAULT_STATE.copy()
 
     editor_state = st.session_state.schedule_editor
     schedules = st.session_state.project_data["internal_loads"]["schedules"]
 
-    # ---------------------- Handle template change (force update) ----------------------
+    # ---------------------- Handle template change ----------------------
     template_options = list(DEFAULT_SCHEDULE_TEMPLATES.keys())
     selected_template = st.selectbox(
         "Select Template",
@@ -954,21 +955,32 @@ def display_schedules_tab():
         help="Choose a base schedule to prefill values."
     )
 
-    if selected_template != editor_state.get("template", "None"):
+    # Update sliders only if template changes and not in edit mode
+    if selected_template != editor_state.get("template", "None") and not editor_state.get("is_edit"):
         st.session_state.schedule_editor["template"] = selected_template
         if selected_template != "None":
             tpl = DEFAULT_SCHEDULE_TEMPLATES[selected_template]
             st.session_state.schedule_editor["weekday"] = tpl["weekday"]
             st.session_state.schedule_editor["weekend"] = tpl["weekend"]
+            # Store slider values in session state for preloading
             for hour in range(24):
-                st.session_state[f"weekday_slider_{hour}"] = tpl["weekday"][hour]
-                st.session_state[f"weekend_slider_{hour}"] = tpl["weekend"][hour]
+                st.session_state[f"weekday_slider_{hour}_value"] = tpl["weekday"][hour]
+                st.session_state[f"weekend_slider_{hour}_value"] = tpl["weekend"][hour]
+        else:
+            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.session_state.module_rerun_flags["internal_loads"] = True
         st.rerun()
 
     # ---------------------- UI FORM for name/description and actions ----------------------
     with st.form("schedule_form"):
-        name = st.text_input("Schedule Name", value=editor_state.get("name", ""))
-        description = st.text_area("Description", value=editor_state.get("description", ""))
+        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")
 
         # ---------------------- SLIDERS LAYOUT ----------------------
         st.markdown("### Schedule Sliders")
@@ -981,7 +993,7 @@ def display_schedules_tab():
             st.markdown("<div style='text-align:center; font-weight:bold; font-size:18px;'>Weekday</div>", unsafe_allow_html=True)
         with col_we:
             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"],
@@ -990,7 +1002,6 @@ def display_schedules_tab():
                     }
                 </style>
         """
-        
         st.markdown(hide_elements, unsafe_allow_html=True)
 
         weekday_values = []
@@ -1009,7 +1020,7 @@ def display_schedules_tab():
                     min_value=0.0,
                     max_value=1.0,
                     step=0.1,
-                    value=st.session_state.get(f"weekday_slider_{hour}", 0.0),
+                    value=st.session_state.get(f"weekday_slider_{hour}_value", 0.0),
                     label_visibility="collapsed",
                     format=None
                 )
@@ -1022,7 +1033,7 @@ def display_schedules_tab():
                     min_value=0.0,
                     max_value=1.0,
                     step=0.1,
-                    value=st.session_state.get(f"weekend_slider_{hour}", 0.0),
+                    value=st.session_state.get(f"weekend_slider_{hour}_value", 0.0),
                     label_visibility="collapsed",
                     format=None
                 )
@@ -1032,19 +1043,20 @@ 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)
+            submitted = st.form_submit_button(submit_label, key="save_schedule_button")
         with col2:
-            edit_submitted = st.form_submit_button("Edit Selected Schedule")
+            edit_submitted = st.form_submit_button("Edit Selected Schedule", key="edit_schedule_button")
         with col3:
-            delete_submitted = st.form_submit_button("Delete Selected Schedule")
+            delete_submitted = st.form_submit_button("Delete Selected Schedule", key="delete_schedule_button")
 
         # ---------------------- 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 else 0,
-            help="Select a saved schedule to edit or delete."
+            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"
         )
 
         # ---------------------- Save logic ----------------------
@@ -1062,10 +1074,11 @@ def display_schedules_tab():
                 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.pop(f"weekday_slider_{hour}", None)
-                    st.session_state.pop(f"weekend_slider_{hour}", None)
+                    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()
@@ -1076,6 +1089,7 @@ def display_schedules_tab():
                 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,
@@ -1085,9 +1099,10 @@ def display_schedules_tab():
                     "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}"] = schedule_data.get("weekday", [0.0] * 24)[hour]
-                    st.session_state[f"weekend_slider_{hour}"] = schedule_data.get("weekend", [0.0] * 24)[hour]
+                    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()
 
@@ -1099,11 +1114,12 @@ def display_schedules_tab():
                 st.error(f"Schedule '{saved_schedule}' is in use and cannot be deleted.")
             else:
                 del schedules[saved_schedule]
-                st.success(f"Schedule '{saved_schedule}' deleted!")
+                # Reset editor state and slider values
                 st.session_state.schedule_editor = DEFAULT_STATE.copy()
                 for hour in range(24):
-                    st.session_state.pop(f"weekday_slider_{hour}", None)
-                    st.session_state.pop(f"weekend_slider_{hour}", None)
+                    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()