Update app.py

app.py

@@ -355,12 +355,21 @@ def _parse_pop_khusus(path_xlsx: str) -> pd.DataFrame:
     if c_mix is None:
         raise ValueError("POP_KHUSUS: kolom gabungan Provinsi/Kab/Kota tidak ditemukan.")
 
+    # =========================
+    # UPDATE SESUAI REQUEST:
+    # POP khusus ada di kolom POP_KHUSUS
+    # target 68% khusus ada di kolom SAMPEL_KHUSUS_68%
+    # =========================
     c_target = pick_col(df, [
+        "SAMPEL_KHUSUS_68%", "Sampel_Khusus_68%", "sampel_khusus_68%",
+        "SAMPEL_KHUSUS_68", "Sampel_Khusus_68", "sampel_khusus_68",
         "target_total_68","Target_Total_68","TARGET_68","target_68",
         "sampel_total","Sampel_total","TOTAL_SAMPEL","total_sampel",
         "target","Target","Sampel"
     ])
+
     c_pop = pick_col(df, [
+        "POP_KHUSUS", "Pop_Khusus", "pop_khusus",
         "total_populasi","Total Populasi","POPULASI","populasi",
         "jumlah_penduduk","Jumlah Penduduk","PENDUDUK","penduduk",
         "total_penduduk","Total Penduduk","TOTAL_PENDUDUK","total_pend",
@@ -397,6 +406,31 @@ def _parse_pop_khusus(path_xlsx: str) -> pd.DataFrame:
     if pop.empty:
         return pop
 
+    pop["kab_key"] = pop["Kab_Kota_Label"].apply(norm_kab_label)
+    pop["prov_key"] = pop["Provinsi_Label"].apply(norm_prov_label)
+
+    pop["Target68_Total_Jenis"] = pd.to_numeric(pop["Target68_Total_Jenis"], errors="coerce")
+    pop["Pop_Total_Jenis"] = pd.to_numeric(pop["Pop_Total_Jenis"], errors="coerce")
+
+    # fallback POP dari target
+    m_need_pop = pop["Pop_Total_Jenis"].isna() & pop["Target68_Total_Jenis"].notna() & (pop["Target68_Total_Jenis"] > 0)
+    pop.loc[m_need_pop, "Pop_Total_Jenis"] = pop.loc[m_need_pop, "Target68_Total_Jenis"] / float(FALLBACK_TARGET_RATIO)
+
+    # fallback target dari POP
+    m_need_target = pop["Target68_Total_Jenis"].isna() & pop["Pop_Total_Jenis"].notna() & (pop["Pop_Total_Jenis"] > 0)
+    pop.loc[m_need_target, "Target68_Total_Jenis"] = pop.loc[m_need_target, "Pop_Total_Jenis"] * float(FALLBACK_TARGET_RATIO)
+
+    # agregat per kab (tetap seperti sebelumnya)
+    pop = pop.groupby("kab_key", as_index=False).agg({
+        "Kab_Kota_Label": "first",
+        "Provinsi_Label": "first",
+        "Target68_Total_Jenis": "max",
+        "Pop_Total_Jenis": "max",
+        "prov_key": "first",
+    })
+    return pop
+
+
     pop["kab_key"] = pop["Kab_Kota_Label"].apply(norm_kab_label)
     pop["prov_key"] = pop["Provinsi_Label"].apply(norm_prov_label)