Update extract.py

extract.py

@@ -64,58 +64,55 @@ def scrape_vehicle(driver):
     # except Exception as e:
     #     print("Gagal parsing det_pkb:", e)
 
-
-    rincian_total = {}
-    rincian_pkb = []
-    rincian_swdkllj = []
+    total_tagihan = []
+    try:
+        all_rows = driver.find_elements(By.CSS_SELECTOR, "div.row")
+        for row in all_rows:
+            if "Pokok" in row.text and "Denda" in row.text and "Total" in row.text:
+                cols = row.find_elements(By.TAG_NAME, "p")
+                print(["COLS TOTAL]", cols)
+                if len(cols) >= 3:
+                    total_tagihan.append({
+                        "pokok": cols[0].text.strip(),
+                        "denda": cols[1].text.strip(),
+                        "total": cols[2].text.strip(),
+                    })
+    except Exception as e:
+        print("Gagal parsing total tagihan:", e)
     
+    # ==== 3. Ambil det_pkb ====
+    rincians_pkb = []
     try:
-        container = driver.find_element(By.ID, "det_pkb")
-        rows = container.find_elements(By.CLASS_NAME, "row")
-        
-        current_section = None
-        for row in rows:
+        pkb_rows = driver.find_elements(By.CSS_SELECTOR, "#det_pkb .row")[1:]  # skip header
+        for row in pkb_rows:
             cols = row.find_elements(By.TAG_NAME, "p")
-            print("[COLUMNS]", cols)
-            texts = [col.text.strip() for col in cols if col.text.strip()]
-            print("[TEXTS]", texts)
-            if not texts:
-                continue
-    
-            label = texts[0].lower()
-
-            print("[LABEL]", label)
-    
-            if "total" in label:
-                current_section = "total"
-                continue
-            elif "rincian pkb" in label:
-                current_section = "pkb"
-                continue
-            elif "rincian swdkllj" in label:
-                current_section = "swdkllj"
-                continue
-    
-            if len(texts) >= 3:
-                rincian = {
-                    "pokok": texts[0],
-                    "denda": texts[1],
-                    "total": texts[2]
-                }
-                if len(texts) > 3:
-                    rincian["jenis"] = texts[3].upper()
-    
-                if current_section == "total":
-                    rincian_total = rincian
-                elif current_section == "pkb":
-                    rincian_pkb.append(rincian)
-                elif current_section == "swdkllj":
-                    rincian_swdkllj.append(rincian)
-    
+            print(["COLS PKB]", cols)
+            if len(cols) >= 3:
+                rincians_pkb.append({
+                    "pokok": cols[0].text.strip(),
+                    "denda": cols[1].text.strip(),
+                    "total": cols[2].text.strip()
+                })
     except Exception as e:
         print("Gagal parsing det_pkb:", e)
+    
+    # ==== 4. Ambil det_swd ====
+    rincians_swd = []
+    try:
+        swd_rows = driver.find_elements(By.CSS_SELECTOR, "#det_swd .row")[1:]  # skip header
+        for row in swd_rows:
+            cols = row.find_elements(By.TAG_NAME, "p")
+            print(["COLS SWD]", cols)
+            if len(cols) >= 3:
+                rincians_swd.append({
+                    "pokok": cols[0].text.strip(),
+                    "denda": cols[1].text.strip(),
+                    "total": cols[2].text.strip()
+                })
+    except Exception as e:
+        print("Gagal parsing det_swd:", e)
 
-    rincians = [rincian_total, rincian_pkb, rincian_swdkllj]
+    rincians = [total_tagihan, rincian_pkb, rincian_swd]
     return data_kendaraan, rincians