Update app/internal_loads.py

app/internal_loads.py

@@ -934,8 +934,7 @@ def display_schedules_tab():
         "template": "None",
         "weekday": [0.0] * 24,
         "weekend": [0.0] * 24,
-        "is_edit": False,
-        "original_name": ""
+        "is_edit": False
     }
 
     if "schedule_editor" not in st.session_state:
@@ -963,162 +962,95 @@ 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.rerun()
+        st.experimental_rerun()
 
-    # ---------------------- UI FORM for name/description and actions ----------------------
+    # ---------------------- UI FORM for name/description only ----------------------
     with st.form("schedule_form"):
-        name = st.text_input("Schedule Name", value=editor_state.get("name", ""), disabled=editor_state.get("is_edit", False))
+        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")
 
-        # Action buttons
-        col1, col2, col3 = st.columns(3)
-        with col1:
-            submit_label = "Update Schedule" if editor_state.get("is_edit", False) else "Save Schedule"
-            submit = st.form_submit_button(submit_label)
-        with col2:
-            cancel = st.form_submit_button("Cancel")
-        with col3:
-            delete = st.form_submit_button("Delete") if editor_state.get("is_edit", False) and name not in DEFAULT_SCHEDULE_TEMPLATES else None
-
-        # ---------------------- 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)
-
-        hide_elements = """
-                <style>
-                    div[data-testid="stSliderTickBarMin"],
-                    div[data-testid="stSliderTickBarMax"] {
-                        display: none;
-                    }
-                </style>
-        """
-        st.markdown(hide_elements, unsafe_allow_html=True)
+    # ---------------------- SLIDERS LAYOUT ----------------------
+    st.markdown("### Schedule Sliders")
 
-        weekday_values = []
-        weekend_values = []
+    # 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)
 
-        for hour in range(24):
-            col_hour, col_wd, col_we = st.columns([0.4, 2.0, 2.0])
+    weekday_values = []
+    weekend_values = []
 
-            with col_hour:
-                st.markdown(f"<div style='text-align:center; font-size:12px'>{hour:02d}</div>", unsafe_allow_html=True)
+    for hour in range(24):
+        col_hour, col_wd, col_we = st.columns([0.4, 2.0, 2.0])
 
-            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_hour:
+            st.markdown(f"<div style='text-align:center; font-size:12px'>{hour:02d}</div>", unsafe_allow_html=True)
 
-            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_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)
 
-        # ---------------------- Save/Update logic ----------------------
-        if submit:
-            if not name.strip():
-                st.error("Schedule name is required.")
-            elif name in schedules and not editor_state.get("is_edit", False):
-                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", False) and editor_state.get("original_name") != name:
-                    if editor_state.get("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}' {'updated' if editor_state.get('is_edit', False) else 'saved'} successfully.")
-                st.session_state.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+        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)
 
-        # ---------------------- Delete logic ----------------------
-        if delete and editor_state.get("is_edit", False):
-            if name in DEFAULT_SCHEDULE_TEMPLATES:
-                st.error("Cannot delete default schedule templates.")
-            elif is_schedule_in_use(name):
-                st.error(f"Cannot delete schedule '{name}' because it is in use.")
-            else:
-                del schedules[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}' deleted successfully.")
-                st.session_state.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+    # ---------------------- 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
+            }
 
-        # ---------------------- Cancel logic ----------------------
-        if cancel:
             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()
-
+            st.success(f"Schedule '{name}' saved successfully.")
+           
     # ---------------------- Show Saved ----------------------
     st.markdown("### Saved Schedules")
     if schedules:
-        table_data = [
-            {"Name": name, "Description": schedule.get("description", "No description")}
-            for name, schedule in schedules.items()
-        ]
-        df = pd.DataFrame(table_data)
-        st.dataframe(df, use_container_width=True)
-
-        # Action buttons for selecting/editing schedules
-        st.write("**Select Schedule to Edit:**")
-        for i, row in enumerate(table_data):
-            schedule_name = row["Name"]
-            col1, col2 = st.columns([2, 1])
-            with col1:
-                st.write(f"{i+1}. {schedule_name}")
-            with col2:
-                if st.button("Edit", key=f"edit_schedule_{schedule_name}_{i}"):
-                    schedule_data = schedules[schedule_name]
-                    st.session_state.schedule_editor = {
-                        "is_edit": True,
-                        "original_name": schedule_name,
-                        "name": schedule_name,
-                        "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()
+        display_schedules_table(schedules)
     else:
         st.info("No schedules saved yet.")