Update app.py

app.py

@@ -10,22 +10,41 @@ def login(username, password):
     else:
         return gr.update(visible=True, value="Invalid credentials"), gr.update(visible=False), False, pd.DataFrame()
 
-def add_entry(username, countrycode, sbucode, brandcode, conceptcode, channel):
-    global df
-    new_row = {
-        "USERNAME": username,
-        "COUNTRYCODE": countrycode,
-        "SBUCODE": sbucode,
-        "BRANDCODE": brandcode,
-        "CONCEPTCODE": conceptcode,
-        "CHANNEL": channel
-    }
-    df = pd.concat([df, pd.DataFrame([new_row])], ignore_index=True)
-    return show_data()
+def to_upper(df):
+    return df.applymap(lambda x: str(x).upper() if pd.notnull(x) else x)
 
-def bulk_input(bulk_df):
+def bulk_create_or_update(bulk_df):
     global df
-    df = pd.concat([df, pd.DataFrame(bulk_df).dropna(how='all')], ignore_index=True)
+    bulk_df = pd.DataFrame(bulk_df).dropna(how='all')
+    if bulk_df.empty:
+        return show_data()
+
+    bulk_df = to_upper(bulk_df)
+
+    # Hanya ambil kolom penting
+    bulk_df = bulk_df[["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"]]
+
+    # Buat index gabungan
+    merge_keys = ["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"]
+
+    # 1. Remove exact duplicates (same row exists in both)
+    df_merge = pd.merge(bulk_df, df, on=merge_keys, how='inner')
+    bulk_df = pd.concat([bulk_df, df_merge]).drop_duplicates(keep=False)
+
+    # 2. Pisahkan insert dan update
+    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)]
+
+    # Update: overwrite rows with same USERNAME
+    for _, row in bulk_existing.iterrows():
+        df.loc[df["USERNAME"] == row["USERNAME"], ["COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"]] = \
+            row[["COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"]].values
+
+    # Insert: append rows
+    df_new = pd.DataFrame(bulk_new)
+    df = pd.concat([df, df_new], ignore_index=True)
+
     return show_data()
 
 def delete_entry(index):
@@ -34,23 +53,23 @@ def delete_entry(index):
         idx = int(index)
         if 0 <= idx < len(df):
             df = df.drop(idx).reset_index(drop=True)
-            return show_data()
+            return gr.Textbox.update(value="Deleted."), show_data()
         else:
-            return gr.Textbox.update(value=f"Index {index} out of range"), show_data()
-    except Exception as e:
-        return gr.Textbox.update(value=f"Error: {e}"), show_data()
+            return gr.Textbox.update(value="Index out of range."), show_data()
+    except:
+        return gr.Textbox.update(value="Invalid index."), show_data()
 
 def update_entry(index, username, countrycode, sbucode, brandcode, conceptcode, channel):
     global df
     try:
         idx = int(index)
         if 0 <= idx < len(df):
-            df.at[idx, "USERNAME"] = username
-            df.at[idx, "COUNTRYCODE"] = countrycode
-            df.at[idx, "SBUCODE"] = sbucode
-            df.at[idx, "BRANDCODE"] = brandcode
-            df.at[idx, "CONCEPTCODE"] = conceptcode
-            df.at[idx, "CHANNEL"] = channel
+            df.at[idx, "USERNAME"] = username.upper()
+            df.at[idx, "COUNTRYCODE"] = countrycode.upper()
+            df.at[idx, "SBUCODE"] = sbucode.upper()
+            df.at[idx, "BRANDCODE"] = brandcode.upper()
+            df.at[idx, "CONCEPTCODE"] = conceptcode.upper()
+            df.at[idx, "CHANNEL"] = channel.upper()
             return show_data()
         else:
             return gr.Textbox.update(value=f"Index {index} out of range"), show_data()
@@ -73,41 +92,19 @@ 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("## CRUD App - Logged in as Admin")
-
-        with gr.Tab("Add Entry"):
-            with gr.Row():
-                username = gr.Textbox(label="USERNAME")
-                countrycode = gr.Textbox(label="COUNTRYCODE")
-                sbucode = gr.Textbox(label="SBUCODE")
-                brandcode = gr.Textbox(label="BRANDCODE")
-                conceptcode = gr.Textbox(label="CONCEPTCODE")
-                channel = gr.Textbox(label="CHANNEL")
-            add_btn = gr.Button("Add")
-            add_table = gr.Dataframe(label="Data", interactive=False)
-
-        with gr.Tab("Bulk Input"):
+        gr.Markdown("## Bulk CRUD App (Auto Uppercase + Smart Merge)")
+
+        with gr.Tab("Bulk Create/Update"):
             bulk_df = gr.Dataframe(
                 headers=["USERNAME", "COUNTRYCODE", "SBUCODE", "BRANDCODE", "CONCEPTCODE", "CHANNEL"],
                 row_count=5,
                 col_count=(6, "fixed"),
-                label="Paste or type your data here"
+                label="Paste or type data (seperti Excel)"
             )
             bulk_btn = gr.Button("Submit Bulk Data")
-            bulk_table = gr.Dataframe(label="Data", interactive=False)
-
-        with gr.Tab("Update Entry"):
-            upd_index = gr.Textbox(label="Index to Update")
-            upd_username = gr.Textbox(label="USERNAME")
-            upd_country = gr.Textbox(label="COUNTRYCODE")
-            upd_sbu = gr.Textbox(label="SBUCODE")
-            upd_brand = gr.Textbox(label="BRANDCODE")
-            upd_concept = gr.Textbox(label="CONCEPTCODE")
-            upd_channel = gr.Textbox(label="CHANNEL")
-            update_btn = gr.Button("Update Entry")
-            upd_table = gr.Dataframe(label="Data", interactive=False)
-
-        with gr.Tab("Delete Entry"):
+            bulk_table = gr.Dataframe(label="Resulting Data", interactive=False)
+
+        with gr.Tab("Manual Delete"):
             del_index = gr.Textbox(label="Index to Delete")
             del_btn = gr.Button("Delete")
             del_status = gr.Textbox(visible=True, interactive=False, show_label=False)
@@ -115,23 +112,13 @@ with gr.Blocks() as app:
 
         with gr.Tab("View Data"):
             view_btn = gr.Button("Refresh Table")
-            view_table = gr.Dataframe(label="Data", interactive=False)
+            view_table = gr.Dataframe(label="All Data", interactive=False)
 
-    login_btn.click(fn=login, inputs=[login_user, login_pass], 
+    login_btn.click(fn=login, inputs=[login_user, login_pass],
                     outputs=[login_error, main_section, logged_in, view_table])
 
-    add_btn.click(add_entry, 
-                  inputs=[username, countrycode, sbucode, brandcode, conceptcode, channel], 
-                  outputs=add_table)
-
-    bulk_btn.click(bulk_input, inputs=bulk_df, outputs=bulk_table)
-
-    update_btn.click(update_entry, 
-                     inputs=[upd_index, upd_username, upd_country, upd_sbu, upd_brand, upd_concept, upd_channel], 
-                     outputs=[upd_table])
-
-    del_btn.click(delete_entry, inputs=del_index, outputs=[del_status, del_table])
-
-    view_btn.click(show_data, outputs=view_table)
+    bulk_btn.click(fn=bulk_create_or_update, inputs=bulk_df, outputs=bulk_table)
+    del_btn.click(fn=delete_entry, inputs=del_index, outputs=[del_status, del_table])
+    view_btn.click(fn=show_data, outputs=view_table)
 
 app.launch()