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,177 +963,164 @@ 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.session_state.module_rerun_flags["internal_loads"] = True
         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", ""))
+        name = st.text_input("Schedule Name", value=editor_state.get("name", ""), disabled=editor_state.get("is_edit", False))
         description = st.text_area("Description", value=editor_state.get("description", ""))
-        submitted = st.form_submit_button("Save Schedule")
 
-    # ---------------------- SLIDERS LAYOUT ----------------------
-    st.markdown("### Schedule Sliders")
+        # 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
 
-    # 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 slider values, min, and max labels
-    hide_elements = """
-        <style>
-            div[data-testid="stSliderTickBarMin"],
-            div[data-testid="stSliderTickBarMax"],
-            div.stSlider > div > div > div > div[data-testid="stTickBar"] > div > div {
-                display: none;
-            }
-            div.stSlider > div > div > div > div > div > div {
-                visibility: hidden;
-            }
-        </style>
-    """
-    st.markdown(hide_elements, unsafe_allow_html=True)
-
-    weekday_values = []
-    weekend_values = []
+        # ---------------------- SLIDERS LAYOUT ----------------------
+        st.markdown("### Schedule Sliders")
 
-    for hour in range(24):
+        # Table headers
         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)
-
+            st.markdown("<div style='text-align:center; font-weight:bold; font-size:18px;'>Hour</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="%.1f"
-            )
-            weekday_values.append(val)
-
+            st.markdown("<div style='text-align:center; font-weight:bold; font-size:18px;'>Weekday</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="%.1f"
-            )
-            weekend_values.append(val)
+            st.markdown("<div style='text-align:center; font-weight:bold; font-size:18px;'>Weekend</div>", unsafe_allow_html=True)
 
-    # ---------------------- 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") != name:
-                # Remove old schedule name if renamed
-                if editor_state.get("original_name") in schedules:
-                    del schedules[editor_state["original_name"]]
+        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 = []
+
+        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_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)
+
+        # ---------------------- 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()
+
+        # ---------------------- 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()
+
+        # ---------------------- 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.success(f"Schedule '{name}' saved successfully.")
             st.session_state.module_rerun_flags["internal_loads"] = True
             st.rerun()
 
     # ---------------------- Show Saved ----------------------
     st.markdown("### Saved Schedules")
     if schedules:
-        display_schedules_table(schedules)
-    else:
-        st.info("No schedules saved yet.")
-
-def display_schedules_table(schedules: Dict[str, Any]):
-    """Display schedules in a table format with edit/delete buttons."""
-    if not schedules:
-        return
-    
-    # Create table data
-    table_data = []
-    for name, schedule in schedules.items():
-        weekday_peak = max(schedule.get("weekday", [0]))
-        weekend_peak = max(schedule.get("weekend", [0]))
-        
-        table_data.append({
-            "Name": name,
-            "Description": schedule.get("description", "No description"),
-            "Weekday Peak": f"{weekday_peak:.2f}",
-            "Weekend Peak": f"{weekend_peak:.2f}",
-            "Actions": name
-        })
-    
-    if table_data:
+        table_data = [
+            {"Name": name, "Description": schedule.get("description", "No description")}
+            for name, schedule in schedules.items()
+        ]
         df = pd.DataFrame(table_data)
-        
-        # Display table
-        st.dataframe(df.drop('Actions', axis=1), use_container_width=True)
-        
-        # Display action buttons
-        st.write("**Actions:**")
+        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["Actions"]
-            
-            col1, col2, col3 = st.columns([2, 1, 1])
-            
+            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}"):
-                    # Set up editor for editing
                     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", ""),
-                        "template": "None",
                         "weekday": schedule_data.get("weekday", [0.0] * 24),
-                        "weekend": schedule_data.get("weekend", [0.0] * 24)
+                        "weekend": schedule_data.get("weekend", [0.0] * 24),
+                        "template": "None"
                     }
-                    # Initialize sliders with current values
                     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()
-            
-            with col3:
-                # Check if schedule is in use or a default template before allowing deletion
-                if schedule_name not in DEFAULT_SCHEDULE_TEMPLATES:
-                    if is_schedule_in_use(schedule_name):
-                        st.write("(In Use)")
-                    else:
-                        if st.button("Delete", key=f"delete_schedule_{schedule_name}_{i}"):
-                            # Delete schedule
-                            del schedules[schedule_name]
-                            st.success(f"Schedule '{schedule_name}' deleted!")
-                            st.session_state.module_rerun_flags["internal_loads"] = True
-                            st.rerun()
-                else:
-                    st.write("(Default)")
+    else:
+        st.info("No schedules saved yet.")
 
 def is_schedule_in_use(schedule_name: str) -> bool:
     """