Reorder traffic analysis pivot columns to display voice before data and pre before post periods

apps/kpi_analysis/trafic_analysis.py

@@ -183,6 +183,24 @@ def merge_and_compare(df_2g, df_3g, df_lte, pre_range, post_range, last_period_r
             / sum_pivot.get(f"{metric}_pre", 1)
         ) * 100
 
+    # Reorder sum_pivot columns: voice before data, pre before post
+    sum_order = [
+        "code",
+        "total_voice_trafic_pre",
+        "total_voice_trafic_post",
+        "total_voice_trafic_diff",
+        "total_voice_trafic_diff_pct",
+        "total_data_trafic_pre",
+        "total_data_trafic_post",
+        "total_data_trafic_diff",
+        "total_data_trafic_diff_pct",
+    ]
+    sum_existing_cols = [col for col in sum_order if col in sum_pivot.columns]
+    sum_remaining_cols = [
+        col for col in sum_pivot.columns if col not in sum_existing_cols
+    ]
+    sum_pivot = sum_pivot[sum_existing_cols + sum_remaining_cols]
+
     avg_pivot = (
         comparison.groupby(["code", "period"])[
             ["total_voice_trafic", "total_data_trafic"]
@@ -221,6 +239,24 @@ def merge_and_compare(df_2g, df_3g, df_lte, pre_range, post_range, last_period_r
         }
     )
 
+    # Reorder avg_pivot columns: voice before data, pre before post
+    avg_order = [
+        "code",
+        "avg_voice_trafic_pre",
+        "avg_voice_trafic_post",
+        "avg_voice_trafic_diff",
+        "avg_voice_trafic_diff_pct",
+        "avg_data_trafic_pre",
+        "avg_data_trafic_post",
+        "avg_data_trafic_diff",
+        "avg_data_trafic_diff_pct",
+    ]
+    avg_existing_cols = [col for col in avg_order if col in avg_pivot.columns]
+    avg_remaining_cols = [
+        col for col in avg_pivot.columns if col not in avg_existing_cols
+    ]
+    avg_pivot = avg_pivot[avg_existing_cols + avg_remaining_cols]
+
     return df, last_period, sum_pivot.round(2), avg_pivot.round(2)