Update bhavcopy_html.py

bhavcopy_html.py

@@ -1,113 +1,132 @@
-def build_bhav_html(df):
-    if df is None or df.empty:
-        return "<h3>No Bhavcopy Found</h3>"
-
-    # ------------------------------
-    # 1) RENAME + FILTER REQUIRED COLS
-    # ------------------------------
-    df = df.rename(columns={
-        "CH_PREV_CLOSE": "preclose",
-        "CH_OPENING_PRICE": "open",
-        "CH_CLOSING_PRICE": "close",
-        "CH_TOT_TRADED_QTY": "volume",
-        "CH_TOT_TRADED_VAL": "turnover",
-        "CH_LAST_TRADED_PRICE": "ltp",
-        "CH_TRADED_ORDERS": "order",
-        "CH_DELIV_QTY": "delqty",
-        "CH_DELIV_PER": "perdel"
-    })
-
+import pandas as pd
+import datetime
+
+def build_bhavcopy_html(date_str):
+    # -------------------------------------------------------
+    # 1) Validate Date
+    # -------------------------------------------------------
+    try:
+        datetime.datetime.strptime(date_str, "%d-%m-%Y")
+    except:
+        return "<h3>Invalid date format. Use DD-MM-YYYY.</h3>"
+
+    # -------------------------------------------------------
+    # 2) Fetch using YOUR nse_bhavcopy definition
+    # -------------------------------------------------------
+    try:
+        df = nse_bhavcopy(date_str)   # <-- your custom loader
+    except:
+        return f"<h3>No Bhavcopy found for {date_str}.</h3>"
+
+    # -------------------------------------------------------
+    # 3) Rename columns
+    # -------------------------------------------------------
+    rename_map = {
+        "SYMBOL": "symbol",
+        "SERIES": "series",
+        "PREV_CLOSE": "preclose",
+        "OPEN_PRICE": "open",
+        "HIGH_PRICE": "high",
+        "LOW_PRICE": "low",
+        "CLOSE_PRICE": "close",
+        "TTL_TRD_QNTY": "volume",
+        "TURNOVER_LACS": "turnover",
+        "NO_OF_TRADES": "order",
+        "DELIV_QTY": "del",
+        "DELIV_PER": "perdel",
+    }
+
+    df = df.rename(columns=rename_map)
+
+    # -------------------------------------------------------
+    # 4) Select required columns
+    # -------------------------------------------------------
     required = [
-        "symbol","series","preclose","open","high","low",
-        "close","volume","turnover","order","perdel"
+        "symbol","series","preclose","open","high",
+        "low","close","volume","turnover","order","perdel"
     ]
-    df = df[required].copy()
 
-    # ------------------------------
-    # 2) ADD NEW COLUMNS
-    # ------------------------------
-    df["change"] = df["close"] - df["preclose"]
-    df["perchange"] = (df["change"] / df["preclose"] * 100).round(2)
-    df["pergap"] = ((df["open"] - df["preclose"]) / df["preclose"] * 100).round(2)
+    # ensure missing ones are created
+    for col in required:
+        if col not in df.columns:
+            df[col] = 0
 
-    # Sorting for grid tables
-    df_sorted = df.sort_values("perchange", ascending=False)
+    df = df[required]
 
-    # ------------------------------
-    # 3) MAIN TABLE (top)
-    # ------------------------------
-    main_table_html = df.to_html(index=False, classes="main-table")
+    # -------------------------------------------------------
+    # 5) Add new computed columns
+    # -------------------------------------------------------
+    df["change"] = df["close"] - df["preclose"]
+    df["perchange"] = (df["change"] / df["preclose"].replace(0, 1)) * 100
+    df["pergap"] = ((df["open"] - df["preclose"]) / df["preclose"].replace(0, 1)) * 100
 
-    # ------------------------------
-    # 4) 5-COLUMN GRID (each column scrollable)
-    # ------------------------------
+    # -------------------------------------------------------
+    # 6) Build MAIN TABLE
+    # -------------------------------------------------------
+    main_html = df.to_html(index=False, escape=False)
 
-    col_names = ["perchange", "turnover", "order", "volume", "perdel"]
-    tables_html = ""
+    # -------------------------------------------------------
+    # 7) Build GRID TABLES (5 columns)
+    # -------------------------------------------------------
+    df_sorted = df.sort_values("perchange", ascending=False)
 
-    for col in col_names:
-        sub = df_sorted[["symbol", col]].copy()
-        sub = sub.sort_values(col, ascending=False)
-        tables_html += f"""
-        <div class="grid-col">
-            <h4>{col.upper()}</h4>
-            <div class="grid-scroll">
-                {sub.to_html(index=False, classes='sub-table')}
+    n = len(df_sorted)
+    chunk_size = (n + 4) // 5
+    chunks = [df_sorted.iloc[i:i+chunk_size] for i in range(0, n, chunk_size)]
+
+    # each chunk to HTML
+    col_html = []
+    for ch in chunks:
+        col_html.append(
+            f"""
+            <div class="col">
+                {ch.to_html(index=False, escape=False)}
             </div>
-        </div>
-        """
+            """
+        )
 
-    full_html = f"""
-    <style>
-        .main-table {{
-            width: 100%;
-            border-collapse: collapse;
-            background: white;
-            margin-bottom: 18px;
-        }}
-        .main-table th, .main-table td {{
-            padding: 6px 8px;
-            border: 1px solid #ddd;
-        }}
+    grid_html = """
+    <div class="grid">
+        """ + "\n".join(col_html) + """
+    </div>
+    """
 
-        /* GRID */
-        .grid-container {{
+    # -------------------------------------------------------
+    # 8) CSS for layout
+    # -------------------------------------------------------
+    css = """
+    <style>
+        .grid {
             display: grid;
             grid-template-columns: repeat(5, 1fr);
-            gap: 12px;
-            width: 100%;
-        }}
-
-        .grid-col {{
-            background: white;
-            border: 1px solid #ccc;
-            padding: 6px;
-            border-radius: 4px;
-        }}
-
-        .grid-scroll {{
-            max-height: 420px;
+            gap: 10px;
+            margin-top: 20px;
+        }
+        .col {
+            max-height: 480px;
             overflow-y: scroll;
-        }}
-
-        .sub-table {{
-            width: 100%;
+            border: 1px solid #ccc;
+            padding: 4px;
+            background: #fafafa;
+        }
+        table {
+            font-size: 12px;
             border-collapse: collapse;
-        }}
-        .sub-table th, .sub-table td {{
+        }
+        th, td {
+            padding: 3px 6px;
             border: 1px solid #ddd;
-            padding: 4px 6px;
-            font-size: 13px;
-        }}
+        }
+        th {
+            background: #eee;
+            position: sticky;
+            top: 0;
+            z-index: 1;
+        }
     </style>
-
-    <h3>Bhavcopy Table</h3>
-    {main_table_html}
-
-    <h3>Matrix Grid</h3>
-    <div class="grid-container">
-        {tables_html}
-    </div>
     """
 
-    return full_html
+    # -------------------------------------------------------
+    # 9) Final Combined Output
+    # -------------------------------------------------------
+    return css + "<h2>Main Bhavcopy Table</h2>" + main_html + "<h2>5-Column Grid View</h2>" + grid_html