Update app.py

app.py

@@ -1,70 +1,72 @@
 import gradio as gr
 import pandas as pd
 
-# === In-memory Data ===
+# In-memory data
 df = pd.DataFrame(columns=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"])
-users_df = pd.DataFrame([{"USERNAME": "admin", "PASSWORD": "admin"}])  # Default login user
+users_df = pd.DataFrame([{"USERNAME": "admin", "PASSWORD": "admin"}])
 
-# === Utility ===
 def to_upper(df):
     return df.applymap(lambda x: str(x).upper() if pd.notnull(x) else x)
 
-def get_active_data():
-    data = df[df["REMARK"] != "DELETE"].copy()
-    data.index.name = "Index"
-    return data.reset_index()
+def get_active_data_with_select():
+    active = df[df["REMARK"] != "DELETE"].copy()
+    active["SELECT"] = False
+    return active.reset_index()
 
 def show_users():
     return users_df.copy()
 
-# === Login ===
 def login(username, password):
     username = username.strip().upper()
     password = password.strip()
     matched = users_df[(users_df["USERNAME"] == username) & (users_df["PASSWORD"] == password)]
     if not matched.empty:
-        return "", gr.update(visible=False), gr.update(visible=True), True, get_active_data(), show_users()
+        return "", gr.update(visible=False), gr.update(visible=True), True, get_active_data_with_select(), show_users()
     else:
         return "Invalid credentials", gr.update(visible=True), gr.update(visible=False), False, pd.DataFrame(), pd.DataFrame()
 
-# === Bulk Create ===
 def bulk_create_or_update(bulk_df):
     global df
     bulk_df = pd.DataFrame(bulk_df).dropna(how='all')
     if bulk_df.empty:
-        return get_active_data()
+        return get_active_data_with_select()
 
     bulk_df = to_upper(bulk_df)
-
     required_cols = ["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"]
     bulk_df = bulk_df[required_cols].dropna()
-
-    # Remove duplicates
     pk_cols = required_cols
     bulk_df = bulk_df.drop_duplicates(subset=pk_cols)
-    
-    # Only add rows not already in df
+
     temp_df = pd.concat([df, bulk_df], ignore_index=True)
     df = temp_df.drop_duplicates(subset=pk_cols, keep=False)
     df = pd.concat([df, bulk_df], ignore_index=True)
+    return get_active_data_with_select()
 
-    return get_active_data()
-
-# === Soft Delete using selected index ===
-def delete_selected_rows(selected_rows):
+def delete_selected_rows(table_with_select):
     global df
-    if not selected_rows:
-        return "No rows selected.", get_active_data()
-    
-    for idx in selected_rows:
-        try:
-            original_index = int(idx)
-            df.at[original_index, "REMARK"] = "DELETE"
-        except:
-            continue
-    return "Rows marked as DELETE.", get_active_data()
-
-# === User Management ===
+    df_view = pd.DataFrame(table_with_select)
+    if "SELECT" not in df_view.columns:
+        return "No SELECT column found.", get_active_data_with_select()
+
+    selected_indexes = df_view[df_view["SELECT"] == True].index.tolist()
+    if not selected_indexes:
+        return "No rows selected.", get_active_data_with_select()
+
+    for idx in selected_indexes:
+        row = df_view.loc[idx]
+        mask = (
+            (df["USERNAME"] == row["USERNAME"]) &
+            (df["COUNTRYCODE"] == row["COUNTRYCODE"]) &
+            (df["SBUCODE"] == row["SBUCODE"]) &
+            (df["BRANDCODE"] == row["BRANDCODE"]) &
+            (df["CONCEPTCODE"] == row["CONCEPTCODE"]) &
+            (df["CHANNEL"] == row["CHANNEL"]) &
+            (df["REMARK"] != "DELETE")
+        )
+        df.loc[mask, "REMARK"] = "DELETE"
+
+    return "Marked selected as DELETE.", get_active_data_with_select()
+
 def add_user(new_username, new_password):
     global users_df
     new_username = new_username.strip().upper()
@@ -84,7 +86,6 @@ def delete_user(del_username):
     users_df = users_df[users_df["USERNAME"] != del_username].reset_index(drop=True)
     return f"User {del_username} dihapus.", show_users()
 
-# === UI ===
 with gr.Blocks() as app:
     logged_in = gr.State(False)
 
@@ -107,7 +108,7 @@ with gr.Blocks() as app:
             )
             bulk_btn = gr.Button("Submit Data")
 
-        result_table = gr.Dataframe(label="Active Data", interactive=False, row_selectable="multi")
+        result_table = gr.Dataframe(label="Data with Select", interactive=True)
         delete_btn = gr.Button("Delete Selected Rows")
         delete_status = gr.Textbox(visible=True, interactive=False, show_label=False)
 
@@ -125,13 +126,10 @@ with gr.Blocks() as app:
         user_status = gr.Textbox(visible=True, interactive=False, show_label=False)
         user_table = gr.Dataframe(label="User List", interactive=False)
 
-    # === Events ===
     login_btn.click(fn=login, inputs=[login_user, login_pass],
                     outputs=[login_error, login_section, main_section, logged_in, result_table, user_table])
-
     bulk_btn.click(fn=bulk_create_or_update, inputs=bulk_df, outputs=result_table)
     delete_btn.click(fn=delete_selected_rows, inputs=result_table, outputs=[delete_status, result_table])
-
     add_user_btn.click(fn=add_user, inputs=[new_username, new_password], outputs=[user_status, user_table])
     del_user_btn.click(fn=delete_user, inputs=del_user, outputs=[user_status, user_table])