Update app/internal_loads.py

app/internal_loads.py

@@ -924,28 +924,19 @@ def display_ventilation_infiltration_tab():
             st.rerun()
 
 def display_schedules_tab():
-    """
-    Display the schedules tab content with vertical sliders for hourly schedules.
-    """
     import streamlit as st
     from streamlit_vertical_slider import vertical_slider
 
     st.subheader("Schedules Editor")
 
-    # Initialise schedule editor state
     if "schedule_editor" not in st.session_state:
         st.session_state.schedule_editor = {}
 
-    if "template_selected" not in st.session_state:
-        st.session_state.template_selected = False
-
     editor_state = st.session_state.schedule_editor
     is_edit = editor_state.get("is_edit", False)
 
-    # Load available templates
     template_options = list(DEFAULT_SCHEDULE_TEMPLATES.keys())
 
-    # Text inputs
     name = st.text_input("Schedule Name", value=editor_state.get("name", ""))
     description = st.text_area("Description", value=editor_state.get("description", ""))
 
@@ -956,7 +947,7 @@ def display_schedules_tab():
         if editor_state.get("template") in template_options else 0
     )
 
-    # Set flag and rerun if new template is selected
+    # If template changed, load new values and reset sliders
     if selected_template != editor_state.get("template", "None"):
         if selected_template != "None":
             template_data = DEFAULT_SCHEDULE_TEMPLATES[selected_template]
@@ -977,13 +968,18 @@ def display_schedules_tab():
                 "description": description,
                 "is_edit": is_edit,
             }
+
+        # Clear existing slider keys
+        for hour in range(24):
+            st.session_state.pop(f"weekday_{hour}", None)
+            st.session_state.pop(f"weekend_{hour}", None)
+
         st.rerun()
 
-    # Get values from editor state
     weekday_values = editor_state.get("weekday", [0.0] * 24)
     weekend_values = editor_state.get("weekend", [0.0] * 24)
 
-    # CSS styling
+    # CSS layout and visual fix
     st.markdown("""
         <style>
             .slider-container {
@@ -1015,44 +1011,45 @@ def display_schedules_tab():
         </style>
     """, unsafe_allow_html=True)
 
-    # Reusable vertical slider row
     def render_sliders(prefix, values, colour):
         st.markdown('<div class="slider-container">', unsafe_allow_html=True)
-        results = []
+        sliders = []
         for hour in range(24):
             st.markdown('<div class="slider-item">', unsafe_allow_html=True)
-            val = vertical_slider(
-                label="",
-                key=f"{prefix}_{hour}",
-                height=150,
-                step=0.01,
-                min_value=0.0,
-                max_value=1.0,
-                default_value=values[hour],
-                slider_color=colour,
-                track_color="#e0e0e0",
-                thumb_color="#333",
-                value_always_visible=False
+            sliders.append(
+                vertical_slider(
+                    label="",
+                    key=f"{prefix}_{hour}",
+                    height=150,
+                    step=0.01,
+                    min_value=0.0,
+                    max_value=1.0,
+                    default_value=values[hour],
+                    slider_color=colour,
+                    track_color="#e0e0e0",
+                    thumb_color="#333",
+                    value_always_visible=False
+                )
             )
             st.markdown(f'<div class="hour-label">{hour:02d}:00</div>', unsafe_allow_html=True)
             st.markdown('</div>', unsafe_allow_html=True)
-            results.append(val)
         st.markdown('</div>', unsafe_allow_html=True)
-        return results
+        return sliders
 
-    # Render sliders
+    # Render weekday/weekend sliders
     st.write("**Weekday Schedule**")
     weekday_schedule = render_sliders("weekday", weekday_values, "#4CAF50")
 
     st.write("**Weekend Schedule**")
     weekend_schedule = render_sliders("weekend", weekend_values, "#2196F3")
 
-    # Save or update
+    # Save / update schedule
     schedules = st.session_state.project_data["internal_loads"]["schedules"]
     col1, col2 = st.columns(2)
 
     with col1:
-        if st.button("Save" if is_edit else "Add"):
+        submit_label = "Update Schedule" if is_edit else "Add Schedule"
+        if st.button(submit_label):
             if not name.strip():
                 st.error("Schedule name is required.")
             elif name in schedules and not is_edit:
@@ -1070,9 +1067,7 @@ def display_schedules_tab():
                         del schedules[original_name]
                 schedules[name] = schedule_data
 
-                # Reset state
                 st.session_state.schedule_editor = {}
-                st.session_state.module_rerun_flags["internal_loads"] = True
                 st.success(f"Schedule '{name}' saved.")
                 st.rerun()
 
@@ -1081,7 +1076,7 @@ def display_schedules_tab():
             st.session_state.schedule_editor = {}
             st.rerun()
 
-    # Show saved schedules (optional)
+    # Display saved schedules
     st.write("**Saved Schedules**")
     if schedules:
         display_schedules_table(schedules)