Update bhavcopy_html.py

bhavcopy_html.py

@@ -1,107 +1,113 @@
-import datetime
-from nsepython import *
-import pandas as pd
-
-def build_bhavcopy_html(date_str):
-
-    # --- Validate ---
-    try:
-        datetime.datetime.strptime(date_str, "%d-%m-%Y")
-    except:
-        return "<h3>Invalid date. Use DD-MM-YYYY.</h3>"
-
-    # --- Fetch ---
-    try:
-        df = nse_bhavcopy(date_str)
-    except Exception as e:
-        return f"<h3>Error fetching bhavcopy: {e}</h3>"
-
-    # --- 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_PER": "perdel"
-    }
-
-    # rename only existing
-    df = df.rename(columns={k:v for k,v in rename_map.items() if k in df.columns})
-
-    # --- Filter Only Required Columns ---
+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"
+    })
+
     required = [
-        "symbol","series","preclose","open","high",
-        "low","close","volume","turnover","order","perdel"
+        "symbol","series","preclose","open","high","low",
+        "close","volume","turnover","order","perdel"
     ]
-
-    # fill missing columns safely
-    for col in required:
-        if col not in df.columns:
-            df[col] = 0
-
-    df = df[required]
-
-    # --- Add 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
-
-    # --- Prepare for Grid ---
-    df_sorted = df.sort_values("perchange", ascending=False)[["symbol", "perchange"]]
-
-    n = len(df_sorted)
-    chunk_size = (n + 4)//5      # divide into 5 equal parts
-
-    chunks = [df_sorted.iloc[i:i+chunk_size] for i in range(0, n, chunk_size)]
-
-    # --- Build HTML ---
-    css = """
+    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)
+
+    # Sorting for grid tables
+    df_sorted = df.sort_values("perchange", ascending=False)
+
+    # ------------------------------
+    # 3) MAIN TABLE (top)
+    # ------------------------------
+    main_table_html = df.to_html(index=False, classes="main-table")
+
+    # ------------------------------
+    # 4) 5-COLUMN GRID (each column scrollable)
+    # ------------------------------
+
+    col_names = ["perchange", "turnover", "order", "volume", "perdel"]
+    tables_html = ""
+
+    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')}
+            </div>
+        </div>
+        """
+
+    full_html = f"""
     <style>
-        .grid5 {
+        .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 */
+        .grid-container {{
             display: grid;
             grid-template-columns: repeat(5, 1fr);
-            gap: 15px;
-            margin-top: 20px;
-        }
-        .colbox {
-            max-height: 500px;
-            overflow-y: scroll;
+            gap: 12px;
+            width: 100%;
+        }}
+
+        .grid-col {{
+            background: white;
             border: 1px solid #ccc;
             padding: 6px;
-            background: #fff;
-        }
-        table {
+            border-radius: 4px;
+        }}
+
+        .grid-scroll {{
+            max-height: 420px;
+            overflow-y: scroll;
+        }}
+
+        .sub-table {{
             width: 100%;
             border-collapse: collapse;
-            font-size: 14px;
-        }
-        th, td {
+        }}
+        .sub-table th, .sub-table td {{
             border: 1px solid #ddd;
-            padding: 4px;
-            text-align: left;
-        }
-        th {
-            background: #f4f4f4;
-        }
+            padding: 4px 6px;
+            font-size: 13px;
+        }}
     </style>
-    """
 
-    html = f"<h2>Bhavcopy Grid – {date_str}</h2>{css}"
-    html += "<div class='grid5'>"
+    <h3>Bhavcopy Table</h3>
+    {main_table_html}
 
-    for chunk in chunks:
-        html += "<div class='colbox'><table>"
-        html += "<tr><th>Symbol</th><th>% Chg</th></tr>"
-        for _, row in chunk.iterrows():
-            html += f"<tr><td>{row['symbol']}</td><td>{row['perchange']:.2f}</td></tr>"
-        html += "</table></div>"
-
-    html += "</div>"
+    <h3>Matrix Grid</h3>
+    <div class="grid-container">
+        {tables_html}
+    </div>
+    """
 
-    return html
+    return full_html