Update app/internal_loads.py

app/internal_loads.py

@@ -934,7 +934,8 @@ def display_schedules_tab():
         "template": "None",
         "weekday": [0.0] * 24,
         "weekend": [0.0] * 24,
-        "is_edit": False
+        "is_edit": False,
+        "original_name": ""
     }
 
     if "schedule_editor" not in st.session_state:
@@ -962,97 +963,149 @@ def display_schedules_tab():
             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.experimental_rerun()
+        st.rerun()
 
-    # ---------------------- UI FORM for name/description only ----------------------
+    # ---------------------- 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", ""))
-        submitted = st.form_submit_button("Save Schedule")
 
-    # ---------------------- SLIDERS LAYOUT ----------------------
-    st.markdown("### Schedule Sliders")
+        # ---------------------- SLIDERS LAYOUT ----------------------
+        st.markdown("### Schedule Sliders")
 
-    # Table headers
-    col_hour, col_wd, col_we = st.columns([0.4, 2.0, 2.0])
-    with col_hour:
-        st.markdown("<div style='text-align:center; font-weight:bold; font-size:18px;'>Hour</div>", unsafe_allow_html=True)
-    with col_wd:
-        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)
+        # Table headers
+        col_hour, col_wd, col_we = st.columns([0.4, 2.0, 2.0])
+        with col_hour:
+            st.markdown("<div style='text-align:center; font-weight:bold; font-size:18px;'>Hour</div>", unsafe_allow_html=True)
+        with col_wd:
+            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"],
-                div[data-testid="stSliderTickBarMax"] {
-                    display: none;
-                }
-            </style>
-    """
-    
-    st.markdown(hide_elements, unsafe_allow_html=True)
+        hide_elements = """
+                <style>
+                    div[data-testid="stSliderTickBarMin"],
+                    div[data-testid="stSliderTickBarMax"] {
+                        display: none;
+                    }
+                </style>
+        """
+        
+        st.markdown(hide_elements, unsafe_allow_html=True)
 
-    weekday_values = []
-    weekend_values = []
+        weekday_values = []
+        weekend_values = []
 
-    for hour in range(24):
-        col_hour, col_wd, col_we = st.columns([0.4, 2.0, 2.0])
+        for hour in range(24):
+            col_hour, col_wd, col_we = st.columns([0.4, 2.0, 2.0])
 
-        with col_hour:
-            st.markdown(f"<div style='text-align:center; font-size:12px'>{hour:02d}</div>", unsafe_allow_html=True)
+            with col_hour:
+                st.markdown(f"<div style='text-align:center; font-size:12px'>{hour:02d}</div>", unsafe_allow_html=True)
 
-        with col_wd:
-            val = st.slider(
-                label=f"Weekday {hour:02d}",
-                key=f"weekday_slider_{hour}",
-                min_value=0.0,
-                max_value=1.0,
-                step=0.1,
-                value=st.session_state.get(f"weekday_slider_{hour}", 0.0),
-                label_visibility="collapsed",
-                format=None  # hides value text below slider
-            )
-            weekday_values.append(val)
+            with col_wd:
+                val = st.slider(
+                    label=f"Weekday {hour:02d}",
+                    key=f"weekday_slider_{hour}",
+                    min_value=0.0,
+                    max_value=1.0,
+                    step=0.1,
+                    value=st.session_state.get(f"weekday_slider_{hour}", 0.0),
+                    label_visibility="collapsed",
+                    format=None
+                )
+                weekday_values.append(val)
 
-        with col_we:
-            val = st.slider(
-                label=f"Weekend {hour:02d}",
-                key=f"weekend_slider_{hour}",
-                min_value=0.0,
-                max_value=1.0,
-                step=0.1,
-                value=st.session_state.get(f"weekend_slider_{hour}", 0.0),
-                label_visibility="collapsed",
-                format=None
-            )
-            weekend_values.append(val)
+            with col_we:
+                val = st.slider(
+                    label=f"Weekend {hour:02d}",
+                    key=f"weekend_slider_{hour}",
+                    min_value=0.0,
+                    max_value=1.0,
+                    step=0.1,
+                    value=st.session_state.get(f"weekend_slider_{hour}", 0.0),
+                    label_visibility="collapsed",
+                    format=None
+                )
+                weekend_values.append(val)
 
-    # ---------------------- Save logic ----------------------
-    if submitted:
-        if not name.strip():
-            st.error("Schedule name is required.")
-        elif name in schedules and not editor_state.get("is_edit"):
-            st.error("A schedule with this name already exists.")
-        else:
-            schedules[name] = {
-                "description": description,
-                "weekday": weekday_values,
-                "weekend": weekend_values
-            }
+        # ---------------------- Action Buttons ----------------------
+        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)
+        with col2:
+            edit_submitted = st.form_submit_button("Edit Selected Schedule")
+        with col3:
+            delete_submitted = st.form_submit_button("Delete Selected Schedule")
 
-            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.")
-           
-    # ---------------------- Show Saved ----------------------
-    st.markdown("### Saved Schedules")
-    if schedules:
-        display_schedules_table(schedules)
-    else:
-        st.info("No schedules saved yet.")
+        # ---------------------- 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."
+        )
+
+        # ---------------------- Save logic ----------------------
+        if submitted:
+            if not name.strip():
+                st.error("Schedule name is required.")
+            elif name in schedules and not editor_state.get("is_edit"):
+                st.error("A schedule with this name already exists.")
+            else:
+                schedules[name] = {
+                    "description": description,
+                    "weekday": weekday_values,
+                    "weekend": weekend_values
+                }
+                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"]]
+                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.session_state.module_rerun_flags["internal_loads"] = True
+                st.rerun()
+
+        # ---------------------- Edit logic ----------------------
+        if edit_submitted and saved_schedule:
+            if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
+                st.error("Default schedules cannot be edited.")
+            else:
+                schedule_data = schedules[saved_schedule]
+                st.session_state.schedule_editor = {
+                    "is_edit": True,
+                    "original_name": saved_schedule,
+                    "name": saved_schedule,
+                    "description": schedule_data.get("description", ""),
+                    "weekday": schedule_data.get("weekday", [0.0] * 24),
+                    "weekend": schedule_data.get("weekend", [0.0] * 24),
+                    "template": "None"
+                }
+                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.module_rerun_flags["internal_loads"] = True
+                st.rerun()
+
+        # ---------------------- Delete logic ----------------------
+        if delete_submitted and saved_schedule:
+            if saved_schedule in DEFAULT_SCHEDULE_TEMPLATES:
+                st.error("Default schedules cannot be deleted.")
+            elif is_schedule_in_use(saved_schedule):
+                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!")
+                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.module_rerun_flags["internal_loads"] = True
+                st.rerun()
 
 def is_schedule_in_use(schedule_name: str) -> bool:
     """