Update app.py

app.py

@@ -1,5 +1,5 @@
 # app.py
-# @title Beer Game Final Version (v4.25 - Based on v4.21 Logic + UI Fixes)
+# @title Beer Game Final Version (v4.25 - Based on v4.21 Logic + UI Fixes v2)
 
 # -----------------------------------------------------------------------------
 # 1. Import Libraries
@@ -506,41 +506,33 @@ else:
                     st.write(f"Incoming Order (This Week): **{current_incoming_order}**") 
                                             
                     if name == "Factory":
-                        arriving_this_week = list(state['factory_production_pipeline'])[0] if state['factory_production_pipeline'] else 0
-                        st.write(f"Completing This Week: **{arriving_this_week}**")
+                        # FIX: 'Arriving This Week' (Completing This Week) removed from UI
                         
                         # FIX: 'Next week' for Factory is the order it just received from Distributor
                         prod_completing_next = state['last_week_orders'].get("Distributor", 0)
                         
                         st.write(f"Completing Next Week: **{prod_completing_next}**")
                     else:
-                        arriving_this_week = list(e['incoming_shipments'])[0] if e['incoming_shipments'] else 0
-                        st.write(f"Arriving This Week: **{arriving_this_week}**")
+                        # FIX: 'Arriving This Week' removed from UI
                         
                         arriving_next = 0
                         
-                        # FIX: Add special case for Distributor
+                        # FIX: Logic to correctly calculate 'Arriving Next Week'
                         if name == 'Distributor':
                             # 'Next week' for Distributor is what's in the factory pipeline
                             if state['factory_production_pipeline']:
                                 arriving_next = list(state['factory_production_pipeline'])[0]
                         
-                        # Original logic for R/W (q_len > 1)
                         elif len(e['incoming_shipments']) > 1:
+                            # R/W: q_len=2, 'next' is [1]
                             arriving_next = list(e['incoming_shipments'])[1]
                         
-                        # Original logic for R/W (q_len = 1 or 0)
-                        elif name in ('Wholesaler', 'Retailer') and e['incoming_shipments'].maxlen == 2:
-                            # 如果队列长度为1，说明下周的货在[0]，这周的货是0
-                            if len(e['incoming_shipments']) == 1:
-                                arriving_next = list(e['incoming_shipments'])[0]
-                                arriving_this_week = 0 # 覆盖
-                            else: # 队列为0
-                                arriving_next = 0
-                                arriving_this_week = 0 # 覆盖
-                            
-                            # 重新显示修正后的"Arriving This Week"
-                            st.write(f"Arriving This Week: **{arriving_this_week}**")
+                        elif len(e['incoming_shipments']) == 1 and name in ('Wholesaler', 'Retailer'):
+                            # R/W: q_len=1, 'next' is [0] (as 'this' is 0)
+                             arriving_next = list(e['incoming_shipments'])[0]
+                        
+                        # (if q_len=0, arriving_next remains 0)
+                        # (if q_len=1 and is Distributor, arriving_next remains 0, which is correct)
                         
                         st.write(f"Arriving Next Week: **{arriving_next}**")
         
@@ -562,11 +554,9 @@ else:
                 st.write(f"**Incoming Order (This Week):**\n# {current_incoming_order}")
                 
             with col3:
-                # Arriving THIS week (Step 1)
-                arriving_this_week = list(e['incoming_shipments'])[0] if e['incoming_shipments'] else 0
-                st.write(f"**Shipment Arriving (This Week):**\n# {arriving_this_week}")
+                # FIX: 'Arriving This Week' removed from UI
                 
-                # Arriving NEXT week (Distributor的队列长度为1，所以[1]永远是0)
+                # Arriving NEXT week (Distributor的队列长度为1，所以[1]永远是0, this is correct for local view)
                 arriving_next = 0
                 st.write(f"**Shipment Arriving (Next Week):**\n# {arriving_next}")
 
@@ -576,6 +566,7 @@ else:
         st.header("Your Decision (Step 4)")
 
         # Prepare the state snapshot for the AI prompt (State AFTER arrivals/orders, BEFORE shipping)
+        # This logic remains correct and is NOT a UI element
         all_decision_point_states = {}
         for name in echelon_order:
             e_curr = echelons[name] # This is END OF LAST WEEK state
@@ -646,16 +637,18 @@ else:
             else:
                 try:
                     history_df = pd.json_normalize(state['logs'])
+                    # FIX: Removed 'Arrived This Week' from log UI
                     human_cols = {
                         'week': 'Week', f'{human_role}.opening_inventory': 'Opening Inv.',
-                        f'{human_role}.opening_backlog': 'Opening Backlog', f'{human_role}.arrived_this_week': 'Arrived This Week',
+                        f'{human_role}.opening_backlog': 'Opening Backlog', 
                         f'{human_role}.incoming_order': 'Incoming Order', f'{human_role}.initial_order': 'Your Initial Order',
                         f'{human_role}.ai_suggestion': 'AI Suggestion', f'{human_role}.order_placed': 'Your Final Order',
                         f'{human_role}.arriving_next_week': 'Arriving Next Week', f'{human_role}.weekly_cost': 'Weekly Cost',
                     }
+                    # FIX: Removed 'Arrived This Week' from log UI
                     ordered_display_cols_keys = [
                         'week', f'{human_role}.opening_inventory', f'{human_role}.opening_backlog',
-                        f'{human_role}.arrived_this_week', f'{human_role}.incoming_order',
+                        f'{human_role}.incoming_order',
                         f'{human_role}.initial_order', f'{human_role}.ai_suggestion', f'{human_role}.order_placed',
                         f'{human_role}.arriving_next_week', f'{human_role}.weekly_cost'
                     ]