Update app.py

app.py

@@ -390,93 +390,55 @@ def process_dataframe(df):
 
 @app.route("/report")
 def report_view():
-    
     report_type = request.args.get('report_type', 'pred')
     try:
         page = int(request.args.get('page', 1))
     except ValueError:
         page = 1
-    per_page = 15  # records per page
+    per_page = 15
 
-    # Read the appropriate CSV file.
+    # load CSV
     if report_type == 'pred':
         df = pd.read_csv(PRED_OUTPUT_FILE)
     else:
         df = pd.read_csv(CLASS_OUTPUT_FILE)
 
-    start_idx = (page - 1) * per_page
-    end_idx = start_idx + per_page
-    total_records = len(df)
-    
-    df_page = df.iloc[start_idx:end_idx]
-
-    # 3. build df & html
-    df = pd.DataFrame({
-        "EngCts":           df["EngCts"],
-        "Makable_Predicted": labels,
-        "Makable_Diff":      df["EngCts"].astype(float) - label_enc.transform(labels)
-    })
+    # page slice
+    start = (page - 1) * per_page
+    end   = start + per_page
+    df_page = df.iloc[start:end].copy()
 
-    table_html = df.to_html(classes="report-table", index=False)
-
-    return render_template(
-        "output.html",
-        report_type="pred",
-        page=1,
-        has_prev=False,
-        has_next=False,
-        table_html=table_html
-    )
-    
-     # -------------------------------------V Colored CHnages --------------------------------------
-    '''
+    # optional: colored arrow in Makable_Predicted
     def add_colored_arrow(row):
         try:
             pred = float(row['Makable_Predicted'])
             diff = float(row['Makable_Diff'])
-            if np.isnan(pred) or np.isnan(diff):
-                return '-'
-            if diff > 0:
-                return f'{pred:.3f} <span style="color:green;">↑</span>'
-            else:
-                return f'{pred:.3f} <span style="color:red;">↓</span>'
+            arrow = '↑' if diff > 0 else '↓'
+            color = 'green' if diff > 0 else 'red'
+            return f"{pred:.3f} <span style='color:{color};'>{arrow}</span>"
         except:
-            return row['Makable_Predicted'] or []
+            return row.get('Makable_Predicted', '')
 
     df_page['Makable_Predicted'] = df_page.apply(add_colored_arrow, axis=1)
-    # -------------------------------------V Colored CHnages --------------------------------------
-    # # -------------------------------------V Icon CHnages --------------------------------------
-    # def add_fa_icon(row):
-    #     try:
-    #         pred = float(row['Makable_Predicted'])
-    #         diff = float(row['Makable_Diff'])
-    #         if np.isnan(pred) or np.isnan(diff):
-    #             return '-'
-    #         if diff > 0:
-    #             return f'{pred:.3f} <i class="fas fa-arrow-up" style="color:green;"></i>'
-    #         else:
-    #             return f'{pred:.3f} <i class="fas fa-arrow-down" style="color:red;"></i>'
-    #     except:
-    #         return row['Makable_Predicted']
-
-    # df_page['Makable_Predicted'] = df_page.apply(add_fa_icon, axis=1)
-    # # -------------------------------------V Icon CHnages --------------------------------------
-
-    table_html = df_page.to_html(classes="data-table", index=False, escape=False)
-    
+
+    # render to HTML (allow our <span> tags)
+    table_html = df_page.to_html(
+        classes="report-table",
+        index=False,
+        escape=False
+    )
+
     has_prev = page > 1
-    has_next = end_idx < total_records
-
-    print("------------------------------------------------------------------------------------------------")    
-    print("df_page ---------> ", df_page.columns)
-    print("------------------------------------------------------------------------------------------------")    
-    print("df_page['EngCts']", df_page['EngCts'])
-    print("------------------------------------------------------------------------------------------------")    
-    print("df_page['Makable_Predicted']", df_page['Makable_Predicted'])
-    print("------------------------------------------------------------------------------------------------")    
-    print("df_page['Makable_Diff']", df_page['Makable_Diff'])
-    print("------------------------------------------------------------------------------------------------")
-    ''' 
+    has_next = end < len(df)
+
+    return render_template(
+        "output.html",
+        report_type=report_type,
+        page=page,
+        has_prev=has_prev,
+        has_next=has_next,
+        table_html=table_html
+    )
 
 # ------------------------------
 # Download Routes