Update app.py

app.py

@@ -4,7 +4,6 @@ import pandas as pd
 
 EXCEL_FILE = "database.xlsx"
 
-# ======= Helper functions for Excel storage =======
 def load_data():
     if os.path.exists(EXCEL_FILE):
         try:
@@ -14,8 +13,7 @@ def load_data():
             return df_data, df_users
         except Exception as e:
             print(f"Error loading Excel file: {e}")
-            # fallback empty
-    # If file does not exist or error, create empty
+    # create empty defaults if file not found or error
     df_data = pd.DataFrame(columns=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"])
     df_users = pd.DataFrame([{"USERNAME": "ADMIN", "PASSWORD": "ADMIN"}])
     save_data(df_data, df_users)
@@ -26,10 +24,8 @@ def save_data(df_data, df_users):
         df_data.to_excel(writer, sheet_name="DATA", index=False)
         df_users.to_excel(writer, sheet_name="USERS", index=False)
 
-# ======= Global Data Store =======
 df, users_df = load_data()
 
-# ======= Your existing helper functions =======
 def to_upper(df_input):
     return df_input.applymap(lambda x: str(x).upper().strip() if pd.notnull(x) else x)
 
@@ -56,7 +52,7 @@ def bulk_submit(dataframe):
     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)
-    save_data(df, users_df)  # SAVE after submit
+    save_data(df, users_df)
     return get_active_data()
 
 def delete_selected_rows(selected_df):
@@ -75,7 +71,7 @@ def delete_selected_rows(selected_df):
                 (df["REMARK"].str.upper() != "DELETE")
             )
             df.loc[mask, "REMARK"] = "DELETE"
-        save_data(df, users_df)  # SAVE after delete
+        save_data(df, users_df)
         return "Berhasil dihapus.", get_active_data()
     except Exception as e:
         return f"Error: {e}", get_active_data()
@@ -89,7 +85,7 @@ def add_user(username, password):
     if username in users_df["USERNAME"].values:
         return "Username sudah ada", show_users()
     users_df = pd.concat([users_df, pd.DataFrame([{"USERNAME": username, "PASSWORD": password}])], ignore_index=True)
-    save_data(df, users_df)  # SAVE after add user
+    save_data(df, users_df)
     return f"User {username} ditambahkan", show_users()
 
 def delete_user(username):
@@ -98,7 +94,7 @@ def delete_user(username):
     if username == "ADMIN":
         return "ADMIN tidak boleh dihapus", show_users()
     users_df = users_df[users_df["USERNAME"] != username].reset_index(drop=True)
-    save_data(df, users_df)  # SAVE after delete user
+    save_data(df, users_df)
     return f"User {username} dihapus", show_users()
 
 def show_users():
@@ -118,7 +114,6 @@ def show_guide():
     4. **Data yang dihapus tidak benar-benar dihapus**, hanya ditandai `REMARK = DELETE`.
     """
 
-# ======= UI Layout and Events (unchanged) =======
 with gr.Blocks() as app:
     gr.Markdown("## Login")
     login_box = gr.Column(visible=True)
@@ -135,22 +130,15 @@ with gr.Blocks() as app:
             df_list = gr.Dataframe(
                 label="List Data Aktif",
                 interactive=False,
-                column_widths=["auto"]*7,
                 wrap=True,
-                show_copy_button=True,
-                show_download_button=True,
-                show_fullscreen_button=True,
-                show_search=True,
-                show_row_numbers=True,
-                pinned_columns=["USERNAME"]
+                value=get_active_data()
             )
             selected_df = gr.Dataframe(visible=False)
-            gr.Line()
             gr.Markdown("### Input Data Baru")
             df_input = gr.Dataframe(
                 headers=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL", "REMARK"],
                 row_count=5,
-                col_count=(7, "fixed"),
+                col_count=7,
                 label="Form Input"
             )
             btn_submit = gr.Button("Submit Data")
@@ -165,16 +153,14 @@ with gr.Blocks() as app:
             del_user = gr.Textbox(label="Delete Username")
             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)
+            user_table = gr.Dataframe(label="User List", interactive=False, value=show_users())
 
         with gr.Tab("User Guide"):
             gr.Markdown(show_guide())
 
-    # ==== Events ====
     btn_login.click(fn=login, inputs=[user, pw], outputs=[login_msg, login_box, tab_section, df_list, user_table])
     btn_submit.click(fn=bulk_submit, inputs=[df_input], outputs=[df_list])
-    df_list.select(fn=lambda df, evt: df.iloc[[evt.index]] if evt.index is not None else pd.DataFrame(),
-                   inputs=[df_list], outputs=[selected_df])
+    df_list.select(fn=lambda df, evt: df.iloc[[evt.index]] if evt.index is not None else pd.DataFrame(), inputs=[df_list], outputs=[selected_df])
     btn_delete.click(fn=delete_selected_rows, inputs=[selected_df], outputs=[delete_msg, df_list])
     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])