Update app.py

app.py

@@ -3,21 +3,21 @@ import pandas as pd
 
 # === In-memory Data ===
 df = pd.DataFrame(columns=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"])
-users_df = pd.DataFrame([{"USERNAME": "ADMIN", "PASSWORD": "ADMIN"}])  # Default user
+users_df = pd.DataFrame([{"USERNAME": "admin", "PASSWORD": "admin"}])  # Default login user
 
-# === Utility Functions ===
+# === Utility ===
 def to_upper(df):
     return df.applymap(lambda x: str(x).upper() if pd.notnull(x) else x)
 
 def get_active_data():
-    display_df = df[df["REMARK"] != "DELETE"].copy()
-    display_df.index.name = 'Index'
-    return display_df.reset_index()
+    data = df[df["REMARK"] != "DELETE"].copy()
+    data.index.name = "Index"
+    return data.reset_index()
 
 def show_users():
     return users_df.copy()
 
-# === Login Function ===
+# === Login ===
 def login(username, password):
     username = username.strip().upper()
     password = password.strip()
@@ -27,60 +27,52 @@ def login(username, password):
     else:
         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, session_user):
+# === Bulk Create ===
+def bulk_create_or_update(bulk_df):
     global df
-    session_user = session_user.strip().upper()
     bulk_df = pd.DataFrame(bulk_df).dropna(how='all')
     if bulk_df.empty:
         return get_active_data()
 
     bulk_df = to_upper(bulk_df)
 
-    required_cols = ["COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"]
+    required_cols = ["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"]
     bulk_df = bulk_df[required_cols].dropna()
 
-    # Tambahkan kolom USERNAME dari session
-    bulk_df["USERNAME"] = session_user
-
-    # Buang data duplikat berdasarkan PK
-    pk_cols = ["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"]
+    # 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)
 
-    # 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)
-
-    df_new = df_temp[df_temp["USERNAME"] == session_user]
-    df_new = df_new[pk_cols]
-
-    df = pd.concat([df, df_new], ignore_index=True)
     return get_active_data()
 
-# === Soft Delete Function ===
-def delete_entry(index):
+# === Soft Delete using selected index ===
+def delete_selected_rows(selected_rows):
     global df
-    try:
-        idx = int(index)
-        if 0 <= idx < len(df):
-            df.at[idx, "REMARK"] = "DELETE"
-            return "Tandai DELETE", get_active_data()
-        else:
-            return "Index tidak valid.", get_active_data()
-    except:
-        return "Index tidak valid.", get_active_data()
-
-# === User Management Functions ===
+    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 ===
 def add_user(new_username, new_password):
     global users_df
     new_username = new_username.strip().upper()
     new_password = new_password.strip()
     if not new_username or not new_password:
         return "Username/password tidak boleh kosong.", show_users()
-
     if new_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()
 
@@ -95,7 +87,6 @@ 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")
@@ -105,45 +96,41 @@ with gr.Blocks() as app:
         login_error = gr.Textbox(visible=False, interactive=False, show_label=False)
 
     with gr.Column(visible=False) as main_section:
-        gr.Markdown("## Input Data User Brand Performance")
+        gr.Markdown("## Input & View Data")
 
-        with gr.Tab("Bulk Create/Update"):
+        with gr.Row():
             bulk_df = gr.Dataframe(
-                headers=["COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"],
+                headers=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"],
                 row_count=5,
-                col_count=(6, "fixed"),
-                label="Paste or type data"
+                col_count=(7, "fixed"),
+                label="Input Data"
             )
-            bulk_btn = gr.Button("Submit Bulk Data")
-            bulk_table = gr.Dataframe(label="Resulting Data", interactive=False)
+            bulk_btn = gr.Button("Submit Data")
 
-        with gr.Tab("List Data"):
-            view_btn = gr.Button("Refresh Table")
-            view_table = gr.Dataframe(label="All Data", interactive=False)
+        result_table = gr.Dataframe(label="Active Data", interactive=False, row_selectable="multi")
+        delete_btn = gr.Button("Delete Selected Rows")
+        delete_status = gr.Textbox(visible=True, interactive=False, show_label=False)
 
-            del_index = gr.Textbox(label="Index to Delete")
-            del_btn = gr.Button("Delete")
-            del_status = gr.Textbox(visible=True, interactive=False, show_label=False)
-            del_table = gr.Dataframe(label="Data", interactive=False)
+        gr.Markdown("---")
 
-        with gr.Tab("User Management"):
+        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")
-            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, user_table])\
-             .then(lambda u: u.strip().upper(), inputs=login_user, outputs=session_user)
+        user_status = gr.Textbox(visible=True, interactive=False, show_label=False)
+        user_table = gr.Dataframe(label="User List", interactive=False)
 
-    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)
+    # === Events ===
+    login_btn.click(fn=login, inputs=[login_user, login_pass],
+                    outputs=[login_error, login_section, main_section, logged_in, result_table, user_table])
 
-    del_btn.click(fn=delete_entry, inputs=del_index, outputs=[del_status, del_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])