Update app.py

app.py

@@ -118,44 +118,46 @@ def leaderboard():
     file_path = os.path.join('/tmp', 'vikor_fix.xlsx')
     final_df = pd.read_excel(file_path)
 
-    df_pending = final_df[final_df['status'] != 'selesai'].copy()
-
-    if df_pending.empty:
-        return render_template('leaderboard.html', keluhan_prioritas=pd.DataFrame())
-
-    f_emosi_plus = df_pending['new_emosi'].max()
-    f_emosi_min = df_pending['new_emosi'].min()
-    f_ranking_plus = df_pending['new_keyword'].max()
+   # Filter hanya data yang belum selesai
+    df_pending = final_df[final_df['status'] != 'selesai']
+    df_pending['keyword'] = df_pending['keyword'].apply(lambda x: ast.literal_eval(x) if isinstance(x, str) else x)
+
+    # ----- Hitung VIKOR -----
+    f_emosi_plus  = df_pending['new_emosi'].max()
+    f_emosi_min   = df_pending['new_emosi'].min()
+    f_ranking_plus= df_pending['new_keyword'].max()
     f_ranking_min = df_pending['new_keyword'].min()
 
-    emosi_denom = f_emosi_plus - f_emosi_min if f_emosi_plus != f_emosi_min else 1
-    ranking_denom = f_ranking_plus - f_ranking_min if f_ranking_plus != f_ranking_min else 1
+    emosi_denom  = f_emosi_plus - f_emosi_min
+    ranking_denom = f_ranking_plus - f_ranking_min
 
-    df_pending['normalisasi_emosi'] = (f_emosi_plus - df_pending['new_emosi']) / emosi_denom
-    df_pending['normalisasi_ranking'] = (f_ranking_plus - df_pending['new_keyword']) / ranking_denom
+    df_pending['normalisasi_emosi'] = (f_emosi_plus - df_pending['new_emosi']) / (emosi_denom if emosi_denom != 0 else 1)
+    df_pending['normalisasi_ranking'] = (f_ranking_plus - df_pending['new_keyword']) / (ranking_denom if ranking_denom != 0 else 1)
 
-    df_pending['normalisasi_bobot_emosi'] = 0.5 * df_pending['normalisasi_emosi']
+    df_pending['normalisasi_bobot_emosi']   = 0.5 * df_pending['normalisasi_emosi']
     df_pending['normalisasi_bobot_ranking'] = 0.5 * df_pending['normalisasi_ranking']
 
     df_pending['ultility'] = df_pending['normalisasi_bobot_emosi'] + df_pending['normalisasi_bobot_ranking']
-    df_pending['regret'] = df_pending[['normalisasi_bobot_emosi', 'normalisasi_bobot_ranking']].max(axis=1)
+    df_pending['regret']   = df_pending[['normalisasi_bobot_emosi', 'normalisasi_bobot_ranking']].max(axis=1)
 
     s_plus = df_pending['ultility'].max()
-    s_min = df_pending['ultility'].min()
+    s_min  = df_pending['ultility'].min()
     r_plus = df_pending['regret'].max()
-    r_min = df_pending['regret'].min()
+    r_min  = df_pending['regret'].min()
 
-    df_pending['vikor'] = 0.5 * ((df_pending['ultility'] - s_min) / (s_plus - s_min if s_plus != s_min else 1)) + \
-                          0.5 * ((df_pending['regret'] - r_min) / (r_plus - r_min if r_plus != r_min else 1))
+    df_pending['vikor'] = 0.5 * ((df_pending['ultility'] - s_min) / (s_plus - s_min)) + \
+                          0.5 * ((df_pending['regret']   - r_min) / (r_plus - r_min))
 
-    df_pending['vikor'] = df_pending['vikor'].fillna(df_pending['vikor'].max() + 1)
-    df_pending['rank'] = df_pending['vikor'].rank(ascending=True, method='dense').astype(int)
+    df_pending['rank'] = df_pending['vikor'].rank(ascending=True).astype(int)
 
+    # ----- Keluhan prioritas (10 skor vikor tertinggi) -------------------
     prioritas_df = df_pending.sort_values(by='vikor', ascending=True).head(10)
 
-    return render_template('leaderboard.html', keluhan_prioritas=prioritas_df)
-
-
+    # ----- Render ke template -------------------------------------------
+    return render_template(
+        'leaderboard.html',
+        keluhan_prioritas = prioritas_df
+    )
 @app.route('/form', methods=['GET', 'POST'])
 def form():
     # Load dataframes