Update app.py

app.py

@@ -1,136 +1,125 @@
 import gradio as gr
 import pandas as pd
 
-# In-memory data
+# ===== In-memory Datastore =====
 df = pd.DataFrame(columns=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"])
-users_df = pd.DataFrame([{"USERNAME": "admin", "PASSWORD": "admin"}])
+users_df = pd.DataFrame([{"USERNAME": "admin", "PASSWORD": "admin"}])  # Default admin user
 
+# ===== Utility Functions =====
 def to_upper(df):
     return df.applymap(lambda x: str(x).upper() if pd.notnull(x) else x)
 
-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()
+def get_active_data():
+    return df[df["REMARK"] != "DELETE"].reset_index(drop=True)
 
 def login(username, password):
     username = username.strip()
     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_with_select(), show_users()
+    if not users_df[(users_df["USERNAME"] == username) & (users_df["PASSWORD"] == password)].empty:
+        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), False, pd.DataFrame(), pd.DataFrame()
+        return "Invalid credentials", gr.update(visible=True), gr.update(visible=False), pd.DataFrame(), pd.DataFrame()
+
+def show_users():
+    return users_df.copy()
 
-def bulk_create_or_update(bulk_df):
+# ===== Bulk Create/Update =====
+def bulk_submit(dataframe):
     global df
-    bulk_df = pd.DataFrame(bulk_df).dropna(how='all')
-    if bulk_df.empty:
-        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()
-    pk_cols = required_cols
-    bulk_df = bulk_df.drop_duplicates(subset=pk_cols)
-
-    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()
-
-def delete_selected_rows(table_with_select):
+    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)
+
+    return get_active_data()
+
+# ===== Delete Selected Entries =====
+def delete_selected(selected_indices):
     global df
-    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):
+    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()
+    except Exception as e:
+        return f"Gagal menghapus: {e}", get_active_data()
+
+# ===== User Management =====
+def add_user(username, password):
     global users_df
-    new_username = new_username.strip().upper()
-    new_password = new_password.strip()
-    if not new_username or not new_password:
+    username = username.strip().upper()
+    password = password.strip()
+    if not username or not password:
         return "Username/password tidak boleh kosong.", show_users()
-    if new_username in users_df["USERNAME"].values:
+    if username in users_df["USERNAME"].values:
         return "Username sudah ada.", show_users()
-    users_df = pd.concat([users_df, pd.DataFrame([{"USERNAME": new_username, "PASSWORD": new_password}])], ignore_index=True)
-    return f"User {new_username} ditambahkan.", show_users()
+    users_df = pd.concat([users_df, pd.DataFrame([{"USERNAME": username, "PASSWORD": password}])], ignore_index=True)
+    return f"User {username} ditambahkan.", show_users()
 
-def delete_user(del_username):
+def delete_user(username):
     global users_df
-    del_username = del_username.strip().upper()
-    if del_username == "ADMIN":
+    username = username.strip().upper()
+    if username == "ADMIN":
         return "User ADMIN tidak bisa dihapus.", show_users()
-    users_df = users_df[users_df["USERNAME"] != del_username].reset_index(drop=True)
-    return f"User {del_username} dihapus.", show_users()
+    users_df = users_df[users_df["USERNAME"] != username].reset_index(drop=True)
+    return f"User {username} dihapus.", show_users()
 
+# ===== UI =====
 with gr.Blocks() as app:
-    logged_in = gr.State(False)
-
-    with gr.Column(visible=True) as login_section:
+    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_error = gr.Textbox(visible=False, interactive=False, show_label=False)
-
-    with gr.Column(visible=False) as main_section:
-        gr.Markdown("## Input & View Data")
+        login_msg = gr.Textbox(visible=False, interactive=False, show_label=False)
 
-        with gr.Row():
-            bulk_df = gr.Dataframe(
+    with gr.Tabs(visible=False) as main_tabs:
+        with gr.Tab("Input Data"):
+            gr.Markdown("### Input dan Monitoring Data")
+            bulk_input = gr.Dataframe(
                 headers=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"],
                 row_count=5,
                 col_count=(7, "fixed"),
-                label="Input Data"
+                label="Masukkan Data Baru"
             )
-            bulk_btn = gr.Button("Submit Data")
-
-        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)
-
-        gr.Markdown("---")
-
-        gr.Markdown("## User Management (Login Access Only)")
-        with gr.Row():
-            new_username = gr.Textbox(label="New Username")
-            new_password = gr.Textbox(label="New Password")
-            add_user_btn = gr.Button("Add User")
-        with gr.Row():
-            del_user = gr.Textbox(label="Username to Delete")
-            del_user_btn = gr.Button("Delete User")
+            submit_btn = 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")
+            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")
+            del_user = gr.Textbox(label="Delete Username")
+            del_btn = 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])
 
-        user_status = gr.Textbox(visible=True, interactive=False, show_label=False)
-        user_table = gr.Dataframe(label="User List", interactive=False)
+    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])
 
-    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])
+    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])
 
 app.launch()