Update app/internal_loads.py

app/internal_loads.py

@@ -923,161 +923,93 @@ def display_ventilation_infiltration_tab():
             st.session_state.module_rerun_flags["internal_loads"] = True
             st.rerun()
 
-def display_schedules_tab():
-    import streamlit as st
-    from streamlit_vertical_slider import vertical_slider
+import streamlit as st
+from streamlit_vertical_slider import vertical_slider
 
+def display_schedules_tab():
     st.subheader("Schedules Editor")
 
     if "schedule_editor" not in st.session_state:
-        st.session_state.schedule_editor = {}
+        st.session_state.schedule_editor = {
+            "name": "",
+            "description": "",
+            "template": "None",
+            "weekday": [0.0]*24,
+            "weekend": [0.0]*24,
+            "is_edit": False
+        }
 
     editor_state = st.session_state.schedule_editor
-    is_edit = editor_state.get("is_edit", False)
-
-    template_options = list(DEFAULT_SCHEDULE_TEMPLATES.keys())
+    schedules = st.session_state.project_data["internal_loads"]["schedules"]
 
-    name = st.text_input("Schedule Name", value=editor_state.get("name", ""))
-    description = st.text_area("Description", value=editor_state.get("description", ""))
+    with st.form("schedule_form"):
+        name = st.text_input("Schedule Name", value=editor_state["name"])
+        description = st.text_area("Description", value=editor_state["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
+        )
 
-    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
-    )
+        # Load template values and write into st.session_state directly
+        if selected_template != editor_state["template"]:
+            st.session_state.schedule_editor["template"] = selected_template
+            if selected_template != "None":
+                tpl = DEFAULT_SCHEDULE_TEMPLATES[selected_template]
+                for hour in range(24):
+                    st.session_state[f"weekday_{hour}"] = tpl["weekday"][hour]
+                    st.session_state[f"weekend_{hour}"] = tpl["weekend"][hour]
+                st.session_state.schedule_editor["weekday"] = tpl["weekday"]
+                st.session_state.schedule_editor["weekend"] = tpl["weekend"]
 
-    # 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]
-            st.session_state.schedule_editor = {
-                "template": selected_template,
-                "weekday": template_data["weekday"],
-                "weekend": template_data["weekend"],
-                "name": name,
-                "description": description,
-                "is_edit": is_edit,
-            }
-        else:
-            st.session_state.schedule_editor = {
-                "template": "None",
-                "weekday": [0.0] * 24,
-                "weekend": [0.0] * 24,
-                "name": name,
-                "description": description,
-                "is_edit": is_edit,
-            }
-
-        # Clear existing slider keys
+        st.markdown("### Weekday Schedule")
+        cols = st.columns(24)
+        weekday_values = []
         for hour in range(24):
-            st.session_state.pop(f"weekday_{hour}", None)
-            st.session_state.pop(f"weekend_{hour}", None)
-
-        st.rerun()
-
-    weekday_values = editor_state.get("weekday", [0.0] * 24)
-    weekend_values = editor_state.get("weekend", [0.0] * 24)
-
-    # CSS layout and visual fix
-    st.markdown("""
-        <style>
-            .slider-container {
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-start;
-                align-items: flex-end;
-                gap: 6px;
-                padding: 10px;
-                overflow-x: auto;
-                min-width: 100%;
-            }
-            .slider-item {
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-                width: 45px;
-            }
-            .hour-label {
-                text-align: center;
-                font-size: 11px;
-                margin-top: 3px;
-                font-weight: bold;
-                white-space: nowrap;
-            }
-            .stVerticalSlider {
-                height: 150px !important;
-            }
-        </style>
-    """, unsafe_allow_html=True)
+            with cols[hour]:
+                val = st.slider(
+                    label=f"{hour:02d}",
+                    min_value=0.0,
+                    max_value=1.0,
+                    value=st.session_state.get(f"weekday_{hour}", 0.0),
+                    step=0.1,
+                    key=f"weekday_{hour}"
+                )
+                weekday_values.append(val)
 
-    def render_sliders(prefix, values, colour):
-        st.markdown('<div class="slider-container">', unsafe_allow_html=True)
-        sliders = []
+        st.markdown("### Weekend Schedule")
+        cols = st.columns(24)
+        weekend_values = []
         for hour in range(24):
-            st.markdown('<div class="slider-item">', unsafe_allow_html=True)
-            sliders.append(
-                vertical_slider(
-                    label="",
-                    key=f"{prefix}_{hour}",
-                    height=150,
-                    step=0.01,
+            with cols[hour]:
+                val = st.slider(
+                    label=f"{hour:02d}",
                     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
+                    value=st.session_state.get(f"weekend_{hour}", 0.0),
+                    step=0.1,
+                    key=f"weekend_{hour}"
                 )
-            )
-            st.markdown(f'<div class="hour-label">{hour:02d}:00</div>', unsafe_allow_html=True)
-            st.markdown('</div>', unsafe_allow_html=True)
-        st.markdown('</div>', unsafe_allow_html=True)
-        return 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 / update schedule
-    schedules = st.session_state.project_data["internal_loads"]["schedules"]
-    col1, col2 = st.columns(2)
+                weekend_values.append(val)
 
-    with col1:
-        submit_label = "Update Schedule" if is_edit else "Add Schedule"
-        if st.button(submit_label):
+        submitted = st.form_submit_button("Save Schedule")
+        if submitted:
             if not name.strip():
                 st.error("Schedule name is required.")
-            elif name in schedules and not is_edit:
-                st.error("Schedule already exists.")
+            elif name in schedules and not editor_state.get("is_edit"):
+                st.error("A schedule with this name already exists.")
             else:
-                schedule_data = {
+                schedules[name] = {
                     "description": description,
-                    "weekday": weekday_schedule,
-                    "weekend": weekend_schedule
+                    "weekday": weekday_values,
+                    "weekend": weekend_values
                 }
-
-                if is_edit:
-                    original_name = editor_state.get("original_name", name)
-                    if original_name in schedules:
-                        del schedules[original_name]
-                schedules[name] = schedule_data
-
                 st.session_state.schedule_editor = {}
-                st.success(f"Schedule '{name}' saved.")
-                st.rerun()
-
-    with col2:
-        if st.button("Cancel"):
-            st.session_state.schedule_editor = {}
-            st.rerun()
+                st.success(f"Schedule '{name}' saved successfully!")
 
-    # Display saved schedules
-    st.write("**Saved Schedules**")
+    st.write("### Saved Schedules")
     if schedules:
         display_schedules_table(schedules)
     else: