Merge pull request #4 from mathanamathav/CPGA-bug-fix

CGPA bug fix & enhancement

Author: mathanamathav

__pycache__/bunker_mod.cpython-310.pyc

@@ -8,6 +8,7 @@
 # import plotly.graph_objects as go
 # from plotly.subplots import make_subplots
 import pandas as pd
+import numpy as np
 
 
 # def many_pieplot(res,specs,subplot_titles,labels,total_class,total_present):
@@ -249,7 +250,7 @@ def return_cgpa(session):
             for index,row in enumerate(rows):
 
                 cols = row.find_all('td')
-                cols = [ele.text.strip() for ele in cols]
+                cols = [ele.text for ele in cols]
                 latest_sem_data.append([ele for ele in cols if ele])
         except:
             print("No results available !!")
@@ -271,21 +272,34 @@ def return_cgpa(session):
                 cols = [ele.text.strip() for ele in cols]
                 data.append([ele for ele in cols if ele])
         except:
-            return {"error" : "no data"}
+            print("No Course Info available !!")
     else:
-        return {"error" : "no data"}
-
-    cols = data.pop(0)
-    df = pd.DataFrame(data, columns=cols)
+        print("No Course Info available !!")
+    
+    if len(data) == 0 and len(latest_sem_data) == 0:
+        return {'error': 'No data'}
 
-    # Add latest sem results if available
+    global df
+    global latest_sem_records
+    
+    # Preprocess latest sem results if available
     if len(latest_sem_data) != 0:
         latest_sem_data.pop(0)
         latest_sem_records = pd.DataFrame(latest_sem_data, columns=['COURSE SEM', 'COURSE CODE', 'COURSE TITLE', 'CREDITS', 'GRADE', 'RESULT'])
         latest_sem_records['GRADE'] = latest_sem_records['GRADE'].str.split().str[-1]
+        latest_sem_records['COURSE SEM'] = latest_sem_records['COURSE SEM'].replace(r'^\s*$', np.nan, regex=True)
+        latest_sem_records['COURSE SEM'].fillna(method='ffill', inplace=True)
+
+    try:
+        cols = data.pop(0)
+        df = pd.DataFrame(data, columns=cols)
 
-        df = df.append(latest_sem_records, ignore_index=True)
-        df.drop_duplicates(subset="COURSE CODE", keep="last", inplace=True)
+        # Add latest sem results if available
+        if len(latest_sem_data) != 0:
+            df = df.append(latest_sem_records, ignore_index=True)
+            df.drop_duplicates(subset="COURSE CODE", keep="last", inplace=True)
+    except:
+        df = latest_sem_records.copy()
 
     # CPGA calculation
     latest_sem = df['COURSE SEM'].max()

bunker_mod.py

@@ -36,14 +36,15 @@
 	<br>
 	<br>
 
+	{% if cgpa.get("error", "") == "" %}
 	<hr style="width:50%;height:2px;border: width 6px;">
 	<center class="container">
 		<h3 style="color:blue;font-family: 'Bebas Neue', cursive;">CGPA upto {{ cgpa.get("lastest_sem") }} sem : {{ cgpa.get("latest_sem_cgpa") }}</h5>
+	{% endif %}
 	</center>
-	<hr style="width:50%;height:2px;border: width 6px;">
-
 
 
+<hr style="width:50%;height:2px;border: width 6px;">
 {% for key in data %}
 <br>
 <center>