working new current demands

src/pages/potential_analysis.py

@@ -2218,62 +2218,11 @@ def get_stream_info(stream):
 # Get processes from session state
 processes = st.session_state.get('processes', [])
 
-# Current Demands Section
-with st.expander("Current Energy Demands (They can be added to calculate the improvement with respect to the status quo)", expanded=False):
-    # Create stream options once
-    stream_options = []
-    for idx, process in enumerate(processes):
-        for stream_idx, stream in enumerate(process.get('streams', [])):
-            stream_name = stream.get('name', f'Stream {stream_idx + 1} in {process.get('name', f'Subprocess {idx + 1}')}')
-            stream_options.append((idx, stream_idx, stream_name))
-    
-    all_stream_names = [name for _, _, name in stream_options]
-    
-    # Initialize selected_streams for the first demand if empty
-    if not st.session_state['current_energy_demands'][0]['selected_streams']:
-        st.session_state['current_energy_demands'][0]['selected_streams'] = all_stream_names.copy()
-    
-    # Display each demand
-    demands_to_remove = []
-    for i, demand in enumerate(st.session_state['current_energy_demands']):
-        st.markdown(f"**Demand Set {i+1}**")
-        
-        col1, col2, col3 = st.columns([2, 2, 1])
-        with col1:
-            demand['heat_demand'] = st.number_input(f"Heat Demand (kW) - Set {i+1}", min_value=0.0, step=0.1, value=demand['heat_demand'], key=f"heat_{i}")
-        with col2:
-            demand['cooling_demand'] = st.number_input(f"Cooling Demand (kW) - Set {i+1}", min_value=0.0, step=0.1, value=demand['cooling_demand'], key=f"cooling_{i}")
-        with col3:
-            if i > 0:  # Don't allow deleting the first demand
-                if st.button("🗑️", key=f"delete_{i}"):
-                    demands_to_remove.append(i)
-    
-        demand['selected_streams'] = st.multiselect(
-            f"Streams - Set {i+1}", 
-            all_stream_names, 
-            default=demand['selected_streams'] if demand['selected_streams'] else all_stream_names,
-            key=f"streams_{i}"
-        )
-        st.markdown("---")
-    
-    # Remove demands marked for deletion
-    for i in reversed(demands_to_remove):
-        st.session_state['current_energy_demands'].pop(i)
-    
-    # Add new demand button
-    if st.button("➕ Add Demand Set"):
-        st.session_state['current_energy_demands'].append({
-            'heat_demand': 0.0,
-            'cooling_demand': 0.0,
-            'selected_streams': all_stream_names.copy()
-        })
-        st.rerun()
-
 if not processes:
     st.info("No processes found. Please add processes in the Data Collection page first.")
 else:
-    # Create side-by-side layout: streams on left, map on right
-    streams_col, map_col = st.columns([1, 1])
+    # Create side-by-side layout: streams on left, demands in middle, map on right
+    streams_col, demands_col, map_col = st.columns([0.7, 0.8, 1.2])
     
     # Left column: Display streams with selection checkboxes
     with streams_col:
@@ -2326,6 +2275,58 @@ else:
                     else:
                         stream_cols_inner[2].caption("(incomplete data)")
     
+    # Middle column: Current Energy Demands
+    with demands_col:
+        with st.expander("Current energy demand set", expanded=False):
+            # Create stream options once
+            stream_options = []
+            for idx, process in enumerate(processes):
+                for stream_idx, stream in enumerate(process.get('streams', [])):
+                    stream_name = stream.get('name', f'Stream {stream_idx + 1} in {process.get('name', f'Subprocess {idx + 1}')}')
+                    stream_options.append((idx, stream_idx, stream_name))
+            
+            all_stream_names = [name for _, _, name in stream_options]
+            
+            # Initialize selected_streams for the first demand if empty
+            if not st.session_state['current_energy_demands'][0]['selected_streams']:
+                st.session_state['current_energy_demands'][0]['selected_streams'] = all_stream_names.copy()
+            
+            # Display each demand
+            demands_to_remove = []
+            for i, demand in enumerate(st.session_state['current_energy_demands']):
+                st.markdown(f"**Demand Set {i+1}**")
+                
+                col1, col2, col3 = st.columns([2, 2, 1])
+                with col1:
+                    demand['heat_demand'] = st.number_input(f"Heat Demand (kW) - Set {i+1}", min_value=0.0, step=0.1, value=demand['heat_demand'], key=f"heat_{i}")
+                with col2:
+                    demand['cooling_demand'] = st.number_input(f"Cooling Demand (kW) - Set {i+1}", min_value=0.0, step=0.1, value=demand['cooling_demand'], key=f"cooling_{i}")
+                with col3:
+                    if i > 0:  # Don't allow deleting the first demand
+                        if st.button("🗑️", key=f"delete_{i}"):
+                            demands_to_remove.append(i)
+            
+                demand['selected_streams'] = st.multiselect(
+                    f"Streams - Set {i+1}", 
+                    all_stream_names, 
+                    default=demand['selected_streams'] if demand['selected_streams'] else all_stream_names,
+                    key=f"streams_{i}"
+                )
+                st.markdown("---")
+            
+            # Remove demands marked for deletion
+            for i in reversed(demands_to_remove):
+                st.session_state['current_energy_demands'].pop(i)
+            
+            # Add new demand button
+            if st.button("➕ Add Demand Set"):
+                st.session_state['current_energy_demands'].append({
+                    'heat_demand': 0.0,
+                    'cooling_demand': 0.0,
+                    'selected_streams': all_stream_names.copy()
+                })
+                st.rerun()
+    
     # Right column: Display map with process circles
     with map_col:
         st.markdown("**🗺️ Georeferencing**")