Update app.py

app.py

@@ -355,109 +355,98 @@ with tab1:
                 combined_df_list.append(df_kdp)
                 st.success("✓ KDP.xlsx diproses")
 
-                    # --- PROSES GABUNGAN ---
-                    # 1. Bersihkan setiap dataframe di awal
-                    cleaned_list = []
-                    for name, df in dfs.items():
-                        df = df.loc[:, ~df.columns.duplicated()].copy()
-                        df = df.reset_index(drop=True)
-                        cleaned_list.append(df)
-                    
-                    # 2. Gabungkan (Concat)
-                    combined_df = pd.concat(cleaned_list, ignore_index=True, sort=False)
-                    combined_df = combined_df.reset_index(drop=True)
-                    combined_df = combined_df.loc[:, ~combined_df.columns.duplicated()].copy()
-                    
-                    # 3. Rename & Standarisasi
-                    col_mapping = {
-                        'ID': 'ID ANGGOTA', 'KELOMPOK': 'KEL',
-                        'Db Sihara': 'Db HariRaya', 'Cr Sihara': 'Cr HariRaya',
-                        'Db Hariraya': 'Db HariRaya', 'Cr Hariraya': 'Cr HariRaya',
-                        'Db Total 2': 'Db Total2', 'Cr Total 2': 'Cr Total2',
-                        'Db Total Simpanan': 'Db Total', 'Cr Total Simpanan': 'Cr Total',
-                        'Db Total Pinjaman': 'Db Total2', 'Cr Total Pinjaman': 'Cr Total2'
-                    }
-                    combined_df = combined_df.rename(columns=col_mapping)
-                    # Penting: Buang duplikat SETELAH rename
-                    combined_df = combined_df.loc[:, ~combined_df.columns.duplicated()].copy()
-                    
-                    # 4. Susun Kolom (Metode Rekonstruksi - Anti Reindex Error)
-                    final_df = pd.DataFrame(index=combined_df.index)
-                    
-                    # Tentukan daftar kolom yang diinginkan (Desired + Others)
-                    existing_cols = [c for c in DESIRED_ORDER if c in combined_df.columns]
-                    other_cols = [c for c in combined_df.columns if c not in DESIRED_ORDER]
-                    all_target_cols = list(dict.fromkeys(DESIRED_ORDER + other_cols))
-                    
-                    for col in all_target_cols:
-                        if col in combined_df.columns:
-                            col_data = combined_df[col]
-                            # Jika masih ada duplikat (kemungkinan kecil), ambil kolom pertama
-                            if isinstance(col_data, pd.DataFrame):
-                                final_df[col] = col_data.iloc[:, 0]
-                            else:
-                                final_df[col] = col_data
+            if combined_df_list:
+                # 1. Concat semua df
+                cleaned_list = []
+                for df in combined_df_list:
+                    df = df.loc[:, ~df.columns.duplicated()].copy()
+                    df = df.reset_index(drop=True)
+                    cleaned_list.append(df)
+
+                combined_df = pd.concat(cleaned_list, ignore_index=True, sort=False)
+                combined_df = combined_df.reset_index(drop=True)
+                combined_df = combined_df.loc[:, ~combined_df.columns.duplicated()].copy()
+
+                # 2. Rename & Standarisasi
+                col_mapping = {
+                    'ID': 'ID ANGGOTA', 'KELOMPOK': 'KEL',
+                    'Db Sihara': 'Db HariRaya', 'Cr Sihara': 'Cr HariRaya',
+                    'Db Hariraya': 'Db HariRaya', 'Cr Hariraya': 'Cr HariRaya',
+                    'Db Total 2': 'Db Total2', 'Cr Total 2': 'Cr Total2',
+                    'Db Total Simpanan': 'Db Total', 'Cr Total Simpanan': 'Cr Total',
+                    'Db Total Pinjaman': 'Db Total2', 'Cr Total Pinjaman': 'Cr Total2'
+                }
+                combined_df = combined_df.rename(columns=col_mapping)
+                combined_df = combined_df.loc[:, ~combined_df.columns.duplicated()].copy()
+
+                # 3. Susun Kolom (Anti Reindex Error)
+                other_cols = [c for c in combined_df.columns if c not in DESIRED_ORDER]
+                all_target_cols = list(dict.fromkeys(DESIRED_ORDER + other_cols))
+
+                final_df = pd.DataFrame(index=combined_df.index)
+                for col in all_target_cols:
+                    if col in combined_df.columns:
+                        col_data = combined_df[col]
+                        if isinstance(col_data, pd.DataFrame):
+                            final_df[col] = col_data.iloc[:, 0]
                         else:
-                            # Jika kolom tidak ada di file asli, isi 0
-                            final_df[col] = 0
-                    
-                    combined_df = final_df.copy()
-                    
-                    st.divider()
-                    st.subheader("🔍 Tahap 2: Proses Final (Estimasi & Anomali)")
-                    
-                    # 5. Tambah Estimasi
-                    df_hasil_raw = tambah_kolom_estimasi(combined_df.copy())
-                    
-                    # 6. Susun Kolom Akhir (Metode Rekonstruksi)
-                    final_col_order = list(dict.fromkeys(DESIRED_ORDER + ESTIMASI_COLS))
-                    df_final = pd.DataFrame(index=df_hasil_raw.index)
-                    
-                    for col in final_col_order:
-                        if col in df_hasil_raw.columns:
-                            col_data = df_hasil_raw[col]
-                            if isinstance(col_data, pd.DataFrame):
-                                df_final[col] = col_data.iloc[:, 0]
-                            else:
-                                df_final[col] = col_data
+                            final_df[col] = col_data
+                    else:
+                        final_df[col] = 0
+
+                combined_df = final_df.copy()
+
+                st.divider()
+                st.subheader("🔍 Tahap 2: Proses Final (Estimasi & Anomali)")
+
+                # 4. Tambah Estimasi
+                df_hasil_raw = tambah_kolom_estimasi(combined_df.copy())
+
+                # 5. Susun Kolom Akhir
+                final_col_order = list(dict.fromkeys(DESIRED_ORDER + ESTIMASI_COLS))
+                df_final = pd.DataFrame(index=df_hasil_raw.index)
+                for col in final_col_order:
+                    if col in df_hasil_raw.columns:
+                        col_data = df_hasil_raw[col]
+                        if isinstance(col_data, pd.DataFrame):
+                            df_final[col] = col_data.iloc[:, 0]
                         else:
-                            df_final[col] = 0
-                    
-                    df_hasil = df_final.copy()
-                    
-                    # Metrics
-                    col1, col2 = st.columns(2)
-                    with col1:
-                        st.metric("📊 Total Baris Data", len(df_hasil))
-                    with col2:
-                        anomali_count = df_hasil["Final Filter"].sum()
-                        st.metric("⚠️ Anomali Terdeteksi", int(anomali_count))
-                    
-                    st.divider()
-                    st.write("📋 Preview hasil akhir (20 baris pertama):")
-                    st.dataframe(df_hasil.head(20), use_container_width=True)
-                    
-                    # Download
-                    output = io.BytesIO()
-                    with pd.ExcelWriter(output, engine='xlsxwriter') as writer:
-                        df_hasil.to_excel(writer, index=False, sheet_name='THC Hasil')
-                    output.seek(0)
-                    
-                    st.download_button(
-                        label="📥 Download Data Lengkap (Estimasi + Final Filter)",
-                        data=output.getvalue(),
-                        file_name="THC_Gabungan_dan_Final_Hasil.xlsx",
-                        mime="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-                    )
-                    
+                            df_final[col] = col_data
+                    else:
+                        df_final[col] = 0
+
+                df_hasil = df_final.copy()
+
+                # Metrics
+                col1, col2 = st.columns(2)
+                with col1:
+                    st.metric("📊 Total Baris Data", len(df_hasil))
+                with col2:
+                    anomali_count = df_hasil["Final Filter"].sum()
+                    st.metric("⚠️ Anomali Terdeteksi", int(anomali_count))
+
+                st.divider()
+                st.write("📋 Preview hasil akhir (20 baris pertama):")
+                st.dataframe(df_hasil.head(20), use_container_width=True)
+
+                # Download
+                output = io.BytesIO()
+                with pd.ExcelWriter(output, engine='xlsxwriter') as writer:
+                    df_hasil.to_excel(writer, index=False, sheet_name='THC Hasil')
+                output.seek(0)
+
+                st.download_button(
+                    label="📥 Download Data Lengkap (Estimasi + Final Filter)",
+                    data=output.getvalue(),
+                    file_name="THC_Gabungan_dan_Final_Hasil.xlsx",
+                    mime="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                )
+
         except Exception as e:
             import traceback
             st.error(f"❌ Error: {str(e)}")
             st.code(traceback.format_exc())
-            # Debug: Cek kolom duplikat
-            if 'duplicate labels' in str(e).lower():
-                st.warning("⚠️ Terdeteksi kolom ganda. Cek daftar kolom ini:")
-                st.write(combined_df.columns[combined_df.columns.duplicated()].tolist())
+
 
 # ── TAB 2: ANALISA SIMPANAN ──────────────────────────────────────────────────
 with tab2: