Merge pull request #10 from Moujuruo/ToList_UserID

将UserID与TodoList进行关联
Moujuruo · May 23, 2024 · 9b12cfc · 9b12cfc
2 parents 91a7438 + 077f84a
commit 9b12cfc
Show file tree

Hide file tree

Showing 6 changed files with 194 additions and 43 deletions.
diff --git a/backend/SqliteUtil.py b/backend/SqliteUtil.py
@@ -203,6 +203,7 @@ def updateActivity(activity):
         print(activity)  # {"UserID": 1, "ActivityName": "Meeting", "ActivityBeginDate": "2024-05-21", "ActivityBeginTime": "10:00:00", "ActivityEndDate": "2024-05-21", "ActivityEndTime": "11:00:00"}
         activity = json.loads(activity)
         activityID = activity.get('ActivityID', 0)
+        UserID = int(activity.get('UserID', 0))
         result = ''
         newActivityID = activityID
 
@@ -244,7 +245,7 @@ def updateActivity(activity):
                     sets += ("'%s'" % value)
                 else:
                     sets += str(value)
-            sql = 'UPDATE TodoActivity SET %s WHERE ActivityID=%d' % (sets, activityID)
+            sql = 'UPDATE TodoActivity SET %s WHERE ActivityID=%d and UserID=%d' % (sets, activityID, UserID)
             cursor.execute(sql)
             conn.commit()
             result = '修改成功'
@@ -253,9 +254,9 @@ def updateActivity(activity):
         print(repr(e))
         return '新增或修改失败'
 
-def getActivities():
+def getActivities(UserID):
     try:
-        sql = 'SELECT * FROM TodoActivity'
+        sql = 'SELECT * FROM TodoActivity where UserID = %d' % UserID
         cursor.execute(sql)
         activities = cursor.fetchall()
         return activities
@@ -291,6 +292,7 @@ def insertOrUpdateTodoItem(item):
         item_id = item.get('ItemID', 0)
         ItemContent = item.get('ItemContent', '')
         ItemLevel = item.get('ItemLevel', 0)
+        # UserID = int(item.get('UserID', 0))
         print(item_id,ItemContent,ItemLevel)
         if item_id == 0:  # 新增
             keys = ''
@@ -385,38 +387,3 @@ def getTodoItemsByActivity(activity_id):
 
 
 
-# # 测试用的数据
-# activity_json = json.dumps({
-#     "UserID": 1,
-#     "ActivityName": "Team Meeting",
-#     "ActivityBeginDate": "2024-05-21",
-#     "ActivityBeginTime": "10:00:00",
-#     "ActivityEndDate": "2024-05-21",
-#     "ActivityEndTime": "11:00:00"
-# })
-
-# # print(insertActivity(activity_json))
-
-# # 获取所有活动
-# activities = getActivities()
-# print(getActivitiesFromData(activities))
-
-# # 删除活动（假设删除ID为1的活动）
-# print(deleteActivity(4))
-
-# item_json = json.dumps({
-#     "ActivityID": 1,
-#     "UserID": 1,
-#     "ItemContent": "Complete project documentation",
-#     "ItemLevel": 1
-# })
-
-# print(insertOrUpdateTodoItem(item_json))
-
-# 获取所有活动
-# items = getTodoItems()
-# print(getTodoItemsFromData(items))
-
-# # 删除活动（假设删除ID为1的活动）
-# print(deleteTodoItem(2))
-
diff --git a/backend/run_app.py b/backend/run_app.py
@@ -101,7 +101,7 @@ def insertActivity():
 @app.route(apiPrefix + 'getActivityList/<int:job>')
 def getActivityList(job):
     try:
-        array = DBUtil.getActivities()
+        array = DBUtil.getActivities(job)
         jsonActivities = DBUtil.getActivitiesFromData(array)
         return json.dumps(jsonActivities)
     except Exception as e:

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/pages/AddItemDialog.tsx b/frontend/src/pages/AddItemDialog.tsx
@@ -43,8 +43,8 @@ const AddItemDialog: React.FC<AddItemDialogProps> = ({ visible, onAdd, onCancel,
             const formattedValues = {
                 ...values,
                 ActivityID: activityId,
-                //ItemId: ItemId,
                 ItemID: editingItem ? editingItem.ItemID : undefined,
+                UserID: localStorage.getItem('userID') || 0
             };
             HttpUtil.post(ApiUtil.API_Item_UPDATE, formattedValues)
                 .then((data: any) => {

diff --git a/frontend/src/pages/InfoDialog.tsx b/frontend/src/pages/InfoDialog.tsx
@@ -48,8 +48,10 @@ const ActivityDialog: React.FC<ActivityDialogProps> = ({ visible, afterClose, on
         ActivityBeginDate: values.ActivityBeginDate.format('YYYY-MM-DD'),
         ActivityEndDate: values.ActivityEndDate.format('YYYY-MM-DD'),
         ActivityBeginTime: values.ActivityBeginTime.format('HH:mm:ss'),
-        ActivityEndTime: values.ActivityEndTime.format('HH:mm:ss')
+        ActivityEndTime: values.ActivityEndTime.format('HH:mm:ss'),
+        UserID:localStorage.getItem('userID')||0
       };
+      console.log("UserID:"+localStorage.getItem('userID'));
       HttpUtil.post(ApiUtil.API_Activity_UPDATE, formattedValues).then((data: any) => {
         setSuccess(true);
         afterClose();

diff --git a/frontend/src/pages/TodoList.tsx b/frontend/src/pages/TodoList.tsx
@@ -102,7 +102,7 @@ class TodoList extends React.Component<{}, TodoListState> {
     }
 
     getData = () => {
-        HttpUtil.get(ApiUtil.API_Activity_LIST + 0)
+        HttpUtil.get(ApiUtil.API_Activity_LIST + localStorage.getItem('userID'))
             .then(async (response) => {
                 const activityList = response as TodoActivity[];
                 const activityListWithItems = await Promise.all(activityList.map(async (activity) => {