Update app/internal_loads.py

app/internal_loads.py

@@ -927,51 +927,63 @@ 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 editor state if not present
+    # 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)
 
-    # Schedule name and description
-    name = st.text_input(
-        "Schedule Name",
-        value=editor_state.get("name", ""),
-        help="Enter a unique name for this schedule."
-    )
+    # Load available templates
+    template_options = list(DEFAULT_SCHEDULE_TEMPLATES.keys())
 
-    description = st.text_area(
-        "Description",
-        value=editor_state.get("description", ""),
-        help="Describe the schedule's purpose or usage."
-    )
+    # Text inputs
+    name = st.text_input("Schedule Name", value=editor_state.get("name", ""))
+    description = st.text_area("Description", value=editor_state.get("description", ""))
 
-    # Template selection
-    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="Select a template to prefill the schedule, or 'None' to start from scratch."
+        if editor_state.get("template") in template_options else 0
     )
 
-    # Load or initialise weekday/weekend values
-    if is_edit and editor_state.get("weekday") and editor_state.get("weekend"):
-        weekday_values = editor_state["weekday"]
-        weekend_values = editor_state["weekend"]
-    elif selected_template != "None":
-        template_data = DEFAULT_SCHEDULE_TEMPLATES.get(selected_template, DEFAULT_SCHEDULE_TEMPLATES["custom"])
-        weekday_values = template_data.get("weekday", [0.0] * 24)
-        weekend_values = template_data.get("weekend", [0.0] * 24)
-    else:
-        weekday_values = [0.0] * 24
-        weekend_values = [0.0] * 24
+    # Set flag and rerun if new template is selected
+    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,
+            }
+        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 for layout and styling
+    # CSS styling
     st.markdown("""
         <style>
             .slider-container {
@@ -983,15 +995,12 @@ def display_schedules_tab():
                 padding: 10px;
                 overflow-x: auto;
                 min-width: 100%;
-                box-sizing: border-box;
             }
             .slider-item {
                 display: flex;
                 flex-direction: column;
                 align-items: center;
                 width: 45px;
-                min-width: 45px;
-                margin: 0 2px;
             }
             .hour-label {
                 text-align: center;
@@ -1003,68 +1012,51 @@ def display_schedules_tab():
             .stVerticalSlider {
                 height: 150px !important;
             }
-            .stVerticalSlider .slider-track {
-                background: #e0e0e0 !important;
-            }
-            .stVerticalSlider .slider-thumb {
-                background: #333 !important;
-                border: 2px solid #fff !important;
-            }
         </style>
     """, unsafe_allow_html=True)
 
-    # Reusable block for rendering vertical sliders
-    def render_hourly_slider_block(prefix: str, values: list[float], slider_colour: str) -> list[float]:
-        sliders = []
+    # Reusable vertical slider row
+    def render_sliders(prefix, values, colour):
         st.markdown('<div class="slider-container">', unsafe_allow_html=True)
+        results = []
         for hour in range(24):
-            with st.container():
-                st.markdown('<div class="slider-item">', unsafe_allow_html=True)
-                val = vertical_slider(
-                    label="",
-                    key=f"{prefix}_{hour}",
-                    height=150,
-                    thumb_shape="circle",
-                    step=0.01,
-                    default_value=float(values[hour]) if hour < len(values) else 0.0,
-                    min_value=0.0,
-                    max_value=1.0,
-                    track_color="#e0e0e0",
-                    slider_color=slider_colour,
-                    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)
-                sliders.append(val if val is not None else float(values[hour]))
+            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
+            )
+            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 sliders
+        return results
 
-    # Weekday schedule
+    # Render sliders
     st.write("**Weekday Schedule**")
-    weekday_schedule = render_hourly_slider_block("weekday", weekday_values, "#4CAF50")
+    weekday_schedule = render_sliders("weekday", weekday_values, "#4CAF50")
 
-    # Weekend schedule
     st.write("**Weekend Schedule**")
-    weekend_schedule = render_hourly_slider_block("weekend", weekend_values, "#2196F3")
+    weekend_schedule = render_sliders("weekend", weekend_values, "#2196F3")
 
-    # Display saved schedules
-    st.write("**Saved Schedules**")
+    # Save or update
     schedules = st.session_state.project_data["internal_loads"]["schedules"]
-    if schedules:
-        display_schedules_table(schedules)
-    else:
-        st.write("No schedules available.")
-
-    # Action buttons
     col1, col2 = st.columns(2)
+
     with col1:
-        submit_label = "Update Schedule" if is_edit else "Add Schedule"
-        if st.button(submit_label):
+        if st.button("Save" if is_edit else "Add"):
             if not name.strip():
                 st.error("Schedule name is required.")
             elif name in schedules and not is_edit:
-                st.error("A schedule with this name already exists.")
+                st.error("Schedule already exists.")
             else:
                 schedule_data = {
                     "description": description,
@@ -1072,28 +1064,30 @@ def display_schedules_tab():
                     "weekend": weekend_schedule
                 }
 
-                # Update or add
-                if is_edit and editor_state.get("original_name"):
-                    original_name = editor_state["original_name"]
-                    if original_name != name and original_name in schedules:
+                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.success(f"Schedule '{name}' updated successfully!")
-                else:
-                    schedules[name] = schedule_data
-                    st.success(f"Schedule '{name}' added successfully!")
+                schedules[name] = schedule_data
 
-                # Reset
+                # Reset state
                 st.session_state.schedule_editor = {}
                 st.session_state.module_rerun_flags["internal_loads"] = True
+                st.success(f"Schedule '{name}' saved.")
                 st.rerun()
 
     with col2:
         if st.button("Cancel"):
             st.session_state.schedule_editor = {}
-            st.session_state.module_rerun_flags["internal_loads"] = True
             st.rerun()
 
+    # Show saved schedules (optional)
+    st.write("**Saved Schedules**")
+    if schedules:
+        display_schedules_table(schedules)
+    else:
+        st.info("No schedules saved yet.")
+
 def is_schedule_in_use(schedule_name: str) -> bool:
     """
     Check if a schedule is in use by any people, lighting, equipment, or ventilation/infiltration systems.