Update app/internal_loads.py

app/internal_loads.py

@@ -943,70 +943,82 @@ def display_schedules_tab():
     editor_state = st.session_state.schedule_editor
     schedules = st.session_state.project_data["internal_loads"]["schedules"]
 
-    # ---------------------- UI FORM for metadata ----------------------
+    # ---------------------- Handle template change (force update) ----------------------
+    template_options = list(DEFAULT_SCHEDULE_TEMPLATES.keys())
+    selected_template = st.selectbox(
+        "Select Template",
+        options=["None"] + template_options,
+        index=template_options.index(editor_state.get("template", "custom")) + 1
+        if editor_state.get("template") in template_options else 0,
+        help="Choose a base schedule to prefill values."
+    )
+
+    if selected_template != editor_state.get("template", "None"):
+        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"]
+
+            # Update individual slider keys to force redraw
+            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.rerun()  # Rerun to refresh sliders after template update
+
+    # ---------------------- UI FORM for name/description only ----------------------
     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", ""))
-        template_options = list(DEFAULT_SCHEDULE_TEMPLATES.keys())
-        selected_template = st.selectbox(
-            "Select Template",
-            options=["None"] + template_options,
-            index=template_options.index(editor_state.get("template", "custom")) + 1
-            if editor_state.get("template") in template_options else 0
-        )
+        submitted = st.form_submit_button("Save Schedule")
 
-        # Load selected template into sliders
-        if selected_template != editor_state.get("template", "None"):
-            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"]
+    # ---------------------- SLIDERS LAYOUT ----------------------
+    st.markdown("### Schedule Sliders")
 
-        submitted = st.form_submit_button("Save Schedule")
+    # Table headers
+    col_hour, col_wd, col_we = st.columns([0.7, 2.0, 2.0])
+    with col_hour:
+        st.markdown("**Hour**")
+    with col_wd:
+        st.markdown("**Weekday**")
+    with col_we:
+        st.markdown("**Weekend**")
 
-    weekday_values = st.session_state.schedule_editor.get("weekday", [0.0] * 24)
-    weekend_values = st.session_state.schedule_editor.get("weekend", [0.0] * 24)
+    weekday_values = []
+    weekend_values = []
 
-    # ---------------------- UI SLIDERS ----------------------
-    st.markdown("### Schedule Profile")
-    col1, col2 = st.columns(2)
+    for hour in range(24):
+        col_hour, col_wd, col_we = st.columns([0.7, 2.0, 2.0])
 
-    with col1:
-        st.markdown("#### Weekday")
-        weekday_result = []
-        for hour in range(24):
+        with col_hour:
+            st.markdown(f"<div style='text-align:right; font-size:11px'>{hour:02d}</div>", unsafe_allow_html=True)
+
+        with col_wd:
             val = st.slider(
-                label=f"{hour:02d}:00",
+                label=f"Weekday {hour:02d}",
+                key=f"weekday_slider_{hour}",
                 min_value=0.0,
                 max_value=1.0,
                 step=0.1,
-                value=weekday_values[hour],
-                key=f"weekday_slider_{hour}",
-                label_visibility="collapsed",  # cleaner interface
-                help=f"Weekday value for {hour:02d}:00"
+                value=st.session_state.get(f"weekday_slider_{hour}", 0.0),
+                label_visibility="collapsed"
             )
-            weekday_result.append(val)
-            st.markdown(f"<small style='font-size:10px;'>{hour:02d}:00 – {val:.1f}</small>", unsafe_allow_html=True)
+            weekday_values.append(val)
 
-    with col2:
-        st.markdown("#### Weekend")
-        weekend_result = []
-        for hour in range(24):
+        with col_we:
             val = st.slider(
-                label=f"{hour:02d}:00",
+                label=f"Weekend {hour:02d}",
+                key=f"weekend_slider_{hour}",
                 min_value=0.0,
                 max_value=1.0,
                 step=0.1,
-                value=weekend_values[hour],
-                key=f"weekend_slider_{hour}",
-                label_visibility="collapsed",
-                help=f"Weekend value for {hour:02d}:00"
+                value=st.session_state.get(f"weekend_slider_{hour}", 0.0),
+                label_visibility="collapsed"
             )
-            weekend_result.append(val)
-            st.markdown(f"<small style='font-size:10px;'>{hour:02d}:00 – {val:.1f}</small>", unsafe_allow_html=True)
+            weekend_values.append(val)
 
-    # ---------------------- Handle Save ----------------------
+    # ---------------------- Save logic ----------------------
     if submitted:
         if not name.strip():
             st.error("Schedule name is required.")
@@ -1015,13 +1027,17 @@ def display_schedules_tab():
         else:
             schedules[name] = {
                 "description": description,
-                "weekday": weekday_result,
-                "weekend": weekend_result
+                "weekday": weekday_values,
+                "weekend": weekend_values
             }
 
-            # Reset editor to default state
+            # Reset safely without losing structure
             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.success(f"Schedule '{name}' saved successfully.")
+            st.rerun()
 
     # ---------------------- Show Saved ----------------------
     st.markdown("### Saved Schedules")