Update app.py

app.py

@@ -1,6 +1,5 @@
 import gradio as gr
 import datetime
-import pandas as pd
 import json
 import os
 
@@ -23,58 +22,46 @@ def load_data():
 
 # 保存活动记录
 def save_activity(activity):
-    timestamp = datetime.datetime.now()
-    record = {"活動": activity, "時間": timestamp.strftime("%Y-%m-%d %H:%M:%S")}
+    timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    record = {"活動": activity, "時間": timestamp}
     data = load_data()
     data.append(record)
     with open(data_file, "w") as file:
         json.dump(data, file)
     return update_activity_display()
 
-# 删除记录功能
+# 删除记录
 def delete_activity(index):
     data = load_data()
-    try:
-        index = int(index)
-        if 0 <= index < len(data):
-            del data[index]
-            with open(data_file, "w") as file:
-                json.dump(data, file)
-    except:
-        pass
+    if 0 <= index < len(data):
+        data.pop(index)
+        with open(data_file, "w") as file:
+            json.dump(data, file)
     return update_activity_display()
 
-# 更新显示活动记录 (仅显示最近 5 条)
+# 显示最近的活动记录 (限制为5条或全部显示)
 def update_activity_display(show_all=False):
     data = load_data()
-    df = pd.DataFrame(data)
-    if df.empty:
-        return [], []
     if not show_all:
-        df = df.tail(5).reset_index(drop=True)
-    
-    # 构建展示用的行数据和删除按钮
+        data = data[-5:]  # 取最近5条记录
     rows = []
-    delete_buttons = []
-    for i, row in df.iterrows():
-        rows.append(f"{row['活動']} - {row['時間']}")
-        delete_buttons.append(gr.Button(value="❌", elem_id=f"delete_{i}"))
-    return rows, delete_buttons
+    for i, record in enumerate(data):
+        rows.append([record["活動"], record["時間"], i])  # i 为删除按钮的索引
+    return rows
 
 # 主界面
 def main_interface():
     init_data_file()
+
     custom_css = """
     .custom-btn {
-        width: 100%;
         padding: 10px;
-        margin: 5px 0;
+        margin: 5px;
         color: white;
         border: none;
         font-size: 16px;
-        text-align: center;
-        cursor: pointer;
         border-radius: 5px;
+        cursor: pointer;
     }
     .btn-poop { background-color: #FF6347; } /* Tomato */
     .btn-pee { background-color: #4682B4; } /* SteelBlue */
@@ -84,9 +71,9 @@ def main_interface():
     """
 
     with gr.Blocks(css=custom_css) as app:
-        gr.Markdown("## 🐾 狗狗活动记录器")
+        gr.Markdown("## 🐾 狗狗活動記錄器")
 
-        # 记录活动按钮 (不同颜色 + icon)
+        # 活动按钮
         with gr.Row():
             poop_btn = gr.Button("💩 拉屎", elem_classes="custom-btn btn-poop")
             pee_btn = gr.Button("💦 尿尿", elem_classes="custom-btn btn-pee")
@@ -94,46 +81,39 @@ def main_interface():
             half_eat_btn = gr.Button("🍛 吃了一半", elem_classes="custom-btn btn-half")
             no_eat_btn = gr.Button("🥄 没怎么吃", elem_classes="custom-btn btn-no-eat")
 
-        # 活动记录部分
-        gr.Markdown("### 📊 最近活动记录 (最多显示最近5条)")
-        record_list = gr.State([])  # 存储记录
-        delete_buttons = gr.State([])
+        # 记录显示区域
+        gr.Markdown("### 📋 最近活動記錄")
+        record_table = gr.Dataframe(headers=["活動", "時間", "刪除"], interactive=False, height=200)
+        show_more_btn = gr.Button("顯示更多記錄")
+        show_less_btn = gr.Button("顯示最近5條", visible=False)
 
-        with gr.Row():
-            record_display = gr.Column()
-            delete_button_display = gr.Column()
+        # 刷新记录显示
+        def refresh_records(show_all=False):
+            records = update_activity_display(show_all=show_all)
+            return records, gr.update(visible=not show_all), gr.update(visible=show_all)
 
-        # 显示更多按钮
-        show_more_btn = gr.Button("显示更多记录")
-        show_less_btn = gr.Button("显示最近5条", visible=False)
+        # 删除指定记录
+        def delete_record(index):
+            delete_activity(index)
+            return refresh_records()
 
-        # 更新显示逻辑
-        def refresh_display(show_all=False):
-            rows, buttons = update_activity_display(show_all)
-            return rows, buttons, gr.update(visible=not show_all), gr.update(visible=show_all)
+        # 按钮点击逻辑
+        poop_btn.click(lambda: save_activity("拉屎"), outputs=[record_table, show_more_btn, show_less_btn])
+        pee_btn.click(lambda: save_activity("尿尿"), outputs=[record_table, show_more_btn, show_less_btn])
+        eat_btn.click(lambda: save_activity("全吃了"), outputs=[record_table, show_more_btn, show_less_btn])
+        half_eat_btn.click(lambda: save_activity("吃了一半"), outputs=[record_table, show_more_btn, show_less_btn])
+        no_eat_btn.click(lambda: save_activity("沒怎麼吃"), outputs=[record_table, show_more_btn, show_less_btn])
 
+        show_more_btn.click(lambda: refresh_records(show_all=True), outputs=[record_table, show_more_btn, show_less_btn])
+        show_less_btn.click(lambda: refresh_records(show_all=False), outputs=[record_table, show_more_btn, show_less_btn])
+
+        # 删除记录按钮
         def on_delete(index):
             delete_activity(index)
-            return refresh_display()
-
-        # 添加活动逻辑
-        poop_btn.click(lambda: save_activity("拉屎"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
-        pee_btn.click(lambda: save_activity("尿尿"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
-        eat_btn.click(lambda: save_activity("全吃了"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
-        half_eat_btn.click(lambda: save_activity("吃了一半"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
-        no_eat_btn.click(lambda: save_activity("没怎么吃"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
-
-        # 显示更多/更少逻辑
-        show_more_btn.click(lambda: refresh_display(show_all=True), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
-        show_less_btn.click(lambda: refresh_display(show_all=False), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
-
-        # 动态绑定删除按钮事件
-        for i in range(5):  # 最多5条删除按钮
-            delete_button = gr.Button(visible=False, value="❌")
-            delete_button.click(lambda idx=i: on_delete(idx), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
-
-        # 初始显示
-        app.load(lambda: refresh_display(), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+            return refresh_records()
+
+        # 初始化加载记录
+        app.load(lambda: refresh_records(), outputs=[record_table, show_more_btn, show_less_btn])
 
     return app