Update app.py

app.py

@@ -1,18 +1,19 @@
 import gradio as gr
 import datetime
+import pandas as pd
 import json
 import os
 
-# 数据存储文件
+# 數據存儲文件
 data_file = "dog_activity_data.json"
 
-# 初始化数据文件
+# 初始化數據文件
 def init_data_file():
     if not os.path.exists(data_file):
         with open(data_file, "w") as file:
             json.dump([], file)
 
-# 加载活动记录
+# 加載活動記錄
 def load_data():
     try:
         with open(data_file, "r") as file:
@@ -20,48 +21,59 @@ def load_data():
     except:
         return []
 
-# 保存活动记录
+# 保存活動記錄
 def save_activity(activity):
-    timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    record = {"活動": activity, "時間": timestamp}
+    timestamp = datetime.datetime.now()
+    record = {"活動": activity, "時間": timestamp.strftime("%Y-%m-%d %H:%M:%S")}
     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()
-    if 0 <= index < len(data):
-        data.pop(index)
-        with open(data_file, "w") as file:
-            json.dump(data, file)
-    return update_activity_display()
-
-# 显示最近的活动记录 (限制为5条或全部显示)
+# 更新顯示活動記錄 (增加索引列)
 def update_activity_display(show_all=False):
     data = load_data()
+    if not data:
+        return pd.DataFrame(columns=["#(行號)", "活動", "時間"])
+    
+    # 添加索引列
+    df = pd.DataFrame(data)
+    df.insert(0, "#(行號)", range(0, len(df)))
+    
     if not show_all:
-        data = data[-5:]  # 取最近5条记录
-    rows = []
-    for i, record in enumerate(data):
-        rows.append([record["活動"], record["時間"], i])  # 添加索引用于删除
-    return rows
+        df = df.tail(5)  # 顯示最近 5 條
+    return df
+
+# 刪除記錄功能
+def delete_activity(row_index):
+    data = load_data()
+    try:
+        row_index = int(row_index)
+        if 0 <= row_index < len(data):
+            del data[row_index]
+            with open(data_file, "w") as file:
+                json.dump(data, file)
+            return "記錄刪除成功", update_activity_display()
+        else:
+            return "錯誤: 行號超出範圍", update_activity_display()
+    except ValueError:
+        return "錯誤: 請輸入有效的數字行號", update_activity_display()
 
 # 主界面
 def main_interface():
     init_data_file()
-
     custom_css = """
     .custom-btn {
+        width: 100%;
         padding: 10px;
-        margin: 5px;
+        margin: 5px 0;
         color: white;
         border: none;
         font-size: 16px;
-        border-radius: 5px;
+        text-align: center;
         cursor: pointer;
+        border-radius: 5px;
     }
     .btn-poop { background-color: #FF6347; } /* Tomato */
     .btn-pee { background-color: #4682B4; } /* SteelBlue */
@@ -69,49 +81,58 @@ def main_interface():
     .btn-half { background-color: #FFD700; } /* Gold */
     .btn-no-eat { background-color: #D3D3D3; } /* LightGray */
     """
-
     with gr.Blocks(css=custom_css) as app:
         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")
             eat_btn = gr.Button("🍽️ 全吃了", elem_classes="custom-btn btn-eat")
             half_eat_btn = gr.Button("🍛 吃了一半", elem_classes="custom-btn btn-half")
-            no_eat_btn = gr.Button("🥄 没怎么吃", elem_classes="custom-btn btn-no-eat")
+            no_eat_btn = gr.Button("🥄 沒怎麼吃", elem_classes="custom-btn btn-no-eat")
 
-        # 记录显示区域
-        gr.Markdown("### 📋 最近活動記錄")
-        record_table = gr.Dataframe(headers=["活動", "時間", "刪除"], interactive=False, row_count=5)
+        # 活動記錄表格
+        gr.Markdown("### 📊 最近活動記錄 (僅顯示最近5條)")
+        data_table = gr.Dataframe(update_activity_display(), interactive=False)
+
+        # 顯示更多按鈕
         show_more_btn = gr.Button("顯示更多記錄")
         show_less_btn = gr.Button("顯示最近5條", visible=False)
 
-        # 刷新记录显示
-        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)
-
-        # 删除记录按钮
-        def delete_record(index):
-            delete_activity(index)
-            return refresh_records()
-
-        # 按钮点击逻辑
-        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])
-
-        # 初始化加载记录
-        app.load(lambda: refresh_records(), outputs=[record_table, show_more_btn, show_less_btn])
+        # 刪除記錄功能
+        gr.Markdown("### 🗑️ 刪除記錄")
+        row_to_delete = gr.Textbox(label="輸入要刪除的行號 (從 0 開始)")
+        delete_btn = gr.Button("刪除記錄")
+        delete_msg = gr.Textbox(label="刪除狀態", interactive=False)
+
+        # 綁定活動按鈕邏輯
+        poop_btn.click(lambda: save_activity("拉屎"), outputs=[data_table])
+        pee_btn.click(lambda: save_activity("尿尿"), outputs=[data_table])
+        eat_btn.click(lambda: save_activity("全吃了"), outputs=[data_table])
+        half_eat_btn.click(lambda: save_activity("吃了一半"), outputs=[data_table])
+        no_eat_btn.click(lambda: save_activity("沒怎麼吃"), outputs=[data_table])
+
+        # 綁定顯示更多邏輯
+        show_more_btn.click(
+            lambda: (update_activity_display(show_all=True), gr.update(visible=False), gr.update(visible=True)),
+            inputs=[],
+            outputs=[data_table, show_more_btn, show_less_btn]
+        )
+        show_less_btn.click(
+            lambda: (update_activity_display(show_all=False), gr.update(visible=True), gr.update(visible=False)),
+            inputs=[],
+            outputs=[data_table, show_more_btn, show_less_btn]
+        )
+
+        # 刪除記錄邏輯
+        delete_btn.click(
+            delete_activity, 
+            inputs=[row_to_delete], 
+            outputs=[delete_msg, data_table]
+        )
 
     return app
 
-
-# 启动应用
+# 啟動應用
 main_interface().launch(share=True, server_name="0.0.0.0", server_port=7860)