Update app.py

app.py

@@ -1,125 +1,119 @@
 import gradio as gr
 import pandas as pd
 
-# ===== In-memory Datastore =====
+# ===== Global Storage =====
 df = pd.DataFrame(columns=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"])
-users_df = pd.DataFrame([{"USERNAME": "admin", "PASSWORD": "admin"}])  # Default admin user
+users_df = pd.DataFrame([{"USERNAME": "ADMIN", "PASSWORD": "ADMIN"}])
 
-# ===== Utility Functions =====
-def to_upper(df):
-    return df.applymap(lambda x: str(x).upper() if pd.notnull(x) else x)
+# ===== Helper Functions =====
+def to_upper(df_input):
+    return df_input.applymap(lambda x: str(x).upper().strip() if pd.notnull(x) else x)
 
 def get_active_data():
-    return df[df["REMARK"] != "DELETE"].reset_index(drop=True)
+    return df[df["REMARK"].str.upper() != "DELETE"].reset_index(drop=True)
 
 def login(username, password):
-    username = username.strip()
+    username = username.strip().upper()
     password = password.strip()
-    if not users_df[(users_df["USERNAME"] == username) & (users_df["PASSWORD"] == password)].empty:
+    is_valid = not users_df[(users_df["USERNAME"] == username) & (users_df["PASSWORD"] == password)].empty
+    if is_valid:
         return "", gr.update(visible=False), gr.update(visible=True), get_active_data(), show_users()
-    else:
-        return "Invalid credentials", gr.update(visible=True), gr.update(visible=False), pd.DataFrame(), pd.DataFrame()
+    return "Invalid login", gr.update(visible=True), gr.update(visible=False), pd.DataFrame(), pd.DataFrame()
 
-def show_users():
-    return users_df.copy()
-
-# ===== Bulk Create/Update =====
 def bulk_submit(dataframe):
     global df
     new_df = pd.DataFrame(dataframe).dropna(how="all")
     if new_df.empty:
         return get_active_data()
-
     new_df = to_upper(new_df)
-
     required = ["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"]
     new_df = new_df[required].dropna()
 
     pk_cols = required
-    existing = df[pk_cols]
-    combined = pd.concat([existing, new_df])
-    dedup = combined.duplicated(keep=False)
-
-    df_new = new_df[~dedup[len(existing):]].copy()
-    df = pd.concat([df, df_new], ignore_index=True)
+    # Filter out duplicates based on all PK cols
+    merged = pd.merge(new_df, df[pk_cols], on=pk_cols, how="left", indicator=True)
+    df_filtered = new_df[merged["_merge"] == "left_only"]
 
+    df = pd.concat([df, df_filtered], ignore_index=True)
     return get_active_data()
 
-# ===== Delete Selected Entries =====
-def delete_selected(selected_indices):
+def delete_selected(selected_idxs):
     global df
     try:
-        selected_indices = [int(i) for i in selected_indices]
         active_df = get_active_data()
-        for idx in selected_indices:
-            actual_idx = active_df.index[idx]
-            df.loc[actual_idx, "REMARK"] = "DELETE"
-        return "Data ditandai DELETE.", get_active_data()
+        for i in selected_idxs:
+            idx = active_df.index[i]
+            df.loc[idx, "REMARK"] = "DELETE"
+        return "Berhasil dihapus (soft delete).", get_active_data()
     except Exception as e:
-        return f"Gagal menghapus: {e}", get_active_data()
+        return f"Error: {e}", get_active_data()
 
-# ===== User Management =====
 def add_user(username, password):
     global users_df
     username = username.strip().upper()
     password = password.strip()
     if not username or not password:
-        return "Username/password tidak boleh kosong.", show_users()
+        return "Username/password tidak boleh kosong", show_users()
     if username in users_df["USERNAME"].values:
-        return "Username sudah ada.", show_users()
+        return "Username sudah ada", show_users()
     users_df = pd.concat([users_df, pd.DataFrame([{"USERNAME": username, "PASSWORD": password}])], ignore_index=True)
-    return f"User {username} ditambahkan.", show_users()
+    return f"User {username} ditambahkan", show_users()
 
 def delete_user(username):
     global users_df
     username = username.strip().upper()
     if username == "ADMIN":
-        return "User ADMIN tidak bisa dihapus.", show_users()
+        return "ADMIN tidak boleh dihapus", show_users()
     users_df = users_df[users_df["USERNAME"] != username].reset_index(drop=True)
-    return f"User {username} dihapus.", show_users()
+    return f"User {username} dihapus", show_users()
+
+def show_users():
+    return users_df.copy()
 
-# ===== UI =====
+# ===== Gradio UI =====
 with gr.Blocks() as app:
-    with gr.State() as login_state:
-        gr.Markdown("## Login")
-        login_user = gr.Textbox(label="Username")
-        login_pass = gr.Textbox(label="Password", type="password")
-        login_btn = gr.Button("Login")
-        login_msg = gr.Textbox(visible=False, interactive=False, show_label=False)
-
-    with gr.Tabs(visible=False) as main_tabs:
+    gr.Markdown("## Login")
+    login_box = gr.Column(visible=True)
+    with login_box:
+        user = gr.Textbox(label="Username")
+        pw = gr.Textbox(label="Password", type="password")
+        btn_login = gr.Button("Login")
+        login_msg = gr.Textbox(visible=True, interactive=False, show_label=False)
+
+    tab_section = gr.Tabs(visible=False)
+    with tab_section:
         with gr.Tab("Input Data"):
             gr.Markdown("### Input dan Monitoring Data")
-            bulk_input = gr.Dataframe(
+            df_input = gr.Dataframe(
                 headers=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"],
                 row_count=5,
                 col_count=(7, "fixed"),
-                label="Masukkan Data Baru"
+                label="Input Data Baru"
             )
-            submit_btn = gr.Button("Submit Data")
+            btn_submit = gr.Button("Submit Data")
             gr.Markdown("### Data Aktif")
-            data_table = gr.Dataframe(label="List Data", interactive=False, row_selectable=True)
-            delete_btn = gr.Button("Delete Selected")
+            df_list = gr.Dataframe(label="List Data Aktif", interactive=False, row_selectable=True)
+            btn_delete = gr.Button("Delete Selected")
             delete_msg = gr.Textbox(visible=True, interactive=False, show_label=False)
 
         with gr.Tab("User Management"):
             gr.Markdown("### Manajemen User Login")
             new_user = gr.Textbox(label="New Username")
             new_pass = gr.Textbox(label="New Password")
-            add_btn = gr.Button("Add User")
+            btn_add = gr.Button("Add User")
             del_user = gr.Textbox(label="Delete Username")
-            del_btn = gr.Button("Delete User")
+            btn_del = gr.Button("Delete User")
             user_msg = gr.Textbox(visible=True, interactive=False, show_label=False)
             user_table = gr.Dataframe(label="User List", interactive=False)
 
-    # === Event Binding ===
-    login_btn.click(fn=login, inputs=[login_user, login_pass],
-                    outputs=[login_msg, login_state, main_tabs, data_table, user_table])
+    # ==== Events ====
+    btn_login.click(fn=login, inputs=[user, pw], 
+                    outputs=[login_msg, login_box, tab_section, df_list, user_table])
 
-    submit_btn.click(fn=bulk_submit, inputs=[bulk_input], outputs=[data_table])
-    delete_btn.click(fn=delete_selected, inputs=[data_table.selected], outputs=[delete_msg, data_table])
+    btn_submit.click(fn=bulk_submit, inputs=[df_input], outputs=[df_list])
+    btn_delete.click(fn=delete_selected, inputs=[df_list.selected], outputs=[delete_msg, df_list])
 
-    add_btn.click(fn=add_user, inputs=[new_user, new_pass], outputs=[user_msg, user_table])
-    del_btn.click(fn=delete_user, inputs=[del_user], outputs=[user_msg, user_table])
+    btn_add.click(fn=add_user, inputs=[new_user, new_pass], outputs=[user_msg, user_table])
+    btn_del.click(fn=delete_user, inputs=[del_user], outputs=[user_msg, user_table])
 
 app.launch()