Update app.py

app.py

@@ -1,76 +1,76 @@
 import gradio as gr
 import pandas as pd
 
-# === In-memory data ===
-df = pd.DataFrame(columns=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"])
-users_df = pd.DataFrame([{"USERNAME": "ADMIN", "PASSWORD": "ADMIN"}])  # default admin login
+# === In-memory Data ===
+df = pd.DataFrame(columns=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"])
+users_df = pd.DataFrame([{"USERNAME": "ADMIN", "PASSWORD": "ADMIN"}])  # Default user
 
 # === Utility Functions ===
 def to_upper(df):
     return df.applymap(lambda x: str(x).upper() if pd.notnull(x) else x)
 
-def show_data():
-    display_df = df.copy()
+def get_active_data():
+    display_df = df[df["REMARK"] != "DELETE"].copy()
     display_df.index.name = 'Index'
     return display_df.reset_index()
 
 def show_users():
     return users_df.copy()
 
-# === Login ===
+# === Login Function ===
 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, show_data()
+        return "", gr.update(visible=False), gr.update(visible=True), True, get_active_data(), show_users()
     else:
-        return "Invalid credentials", gr.update(visible=True), gr.update(visible=False), False, pd.DataFrame()
+        return "Invalid credentials", gr.update(visible=True), gr.update(visible=False), False, pd.DataFrame(), pd.DataFrame()
 
-# === Bulk Create / Update ===
-def bulk_create_or_update(bulk_df):
+# === Bulk Create/Update ===
+def bulk_create_or_update(bulk_df, session_user):
     global df
+    session_user = session_user.strip().upper()
     bulk_df = pd.DataFrame(bulk_df).dropna(how='all')
     if bulk_df.empty:
-        return show_data()
+        return get_active_data()
 
     bulk_df = to_upper(bulk_df)
 
-    bulk_df = bulk_df[["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"]]
+    required_cols = ["COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"]
+    bulk_df = bulk_df[required_cols].dropna()
 
-    merge_keys = ["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"]
+    # Tambahkan kolom USERNAME dari session
+    bulk_df["USERNAME"] = session_user
 
-    # Remove exact duplicates
-    df_merge = pd.merge(bulk_df, df, on=merge_keys, how='inner')
-    bulk_df = pd.concat([bulk_df, df_merge]).drop_duplicates(keep=False)
+    # Buang data duplikat berdasarkan PK
+    pk_cols = ["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"]
+    bulk_df = bulk_df.drop_duplicates(subset=pk_cols)
 
-    existing_usernames = df["USERNAME"].unique()
-    bulk_existing = bulk_df[bulk_df["USERNAME"].isin(existing_usernames)]
-    bulk_new = bulk_df[~bulk_df["USERNAME"].isin(existing_usernames)]
+    # Buang yang sudah ada (duplikat di df)
+    df_temp = pd.concat([df, bulk_df], ignore_index=True)
+    df_temp = df_temp.drop_duplicates(subset=pk_cols, keep=False)
 
-    for _, row in bulk_existing.iterrows():
-        df.loc[df["USERNAME"] == row["USERNAME"], ["COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"]] = \
-            row[["COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"]].values
+    df_new = df_temp[df_temp["USERNAME"] == session_user]
+    df_new = df_new[pk_cols]
 
-    df_new = pd.DataFrame(bulk_new)
     df = pd.concat([df, df_new], ignore_index=True)
+    return get_active_data()
 
-    return show_data()
-
-# === Delete Entry ===
+# === Soft Delete Function ===
 def delete_entry(index):
     global df
     try:
         idx = int(index)
         if 0 <= idx < len(df):
-            df = df.drop(idx).reset_index(drop=True)
-            return "Deleted.", show_data()
+            df.at[idx, "REMARK"] = "DELETE"
+            return "Tandai DELETE", get_active_data()
         else:
-            return "Index out of range.", show_data()
+            return "Index tidak valid.", get_active_data()
     except:
-        return "Invalid index.", show_data()
+        return "Index tidak valid.", get_active_data()
 
-# === User Management ===
+# === User Management Functions ===
 def add_user(new_username, new_password):
     global users_df
     new_username = new_username.strip().upper()
@@ -95,6 +95,7 @@ def delete_user(del_username):
 # === UI ===
 with gr.Blocks() as app:
     logged_in = gr.State(False)
+    session_user = gr.State("")
 
     with gr.Column(visible=True) as login_section:
         gr.Markdown("## Login")
@@ -108,7 +109,7 @@ with gr.Blocks() as app:
 
         with gr.Tab("Bulk Create/Update"):
             bulk_df = gr.Dataframe(
-                headers=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"],
+                headers=["COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"],
                 row_count=5,
                 col_count=(6, "fixed"),
                 label="Paste or type data"
@@ -116,7 +117,6 @@ with gr.Blocks() as app:
             bulk_btn = gr.Button("Submit Bulk Data")
             bulk_table = gr.Dataframe(label="Resulting Data", interactive=False)
 
-
         with gr.Tab("List Data"):
             view_btn = gr.Button("Refresh Table")
             view_table = gr.Dataframe(label="All Data", interactive=False)
@@ -135,12 +135,15 @@ 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)
 
+    # === Event Bindings ===
     login_btn.click(fn=login, inputs=[login_user, login_pass],
-                    outputs=[login_error, login_section, main_section, logged_in, view_table])
-    
-    bulk_btn.click(fn=bulk_create_or_update, inputs=bulk_df, outputs=bulk_table)
+                    outputs=[login_error, login_section, main_section, logged_in, view_table, user_table])\
+             .then(lambda u: u.strip().upper(), inputs=login_user, outputs=session_user)
+
+    bulk_btn.click(fn=bulk_create_or_update, inputs=[bulk_df, session_user], outputs=[bulk_table])
+    view_btn.click(fn=get_active_data, outputs=view_table)
+
     del_btn.click(fn=delete_entry, inputs=del_index, outputs=[del_status, del_table])
-    view_btn.click(fn=show_data, outputs=view_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])