From f29ee7a379fbb1ca002849cd9e319dbc34856952 Mon Sep 17 00:00:00 2001
From: kongkongNG <1298974109@qq.com>
Date: Fri, 29 May 2020 06:26:34 +0800
Subject: [PATCH 1/3] finish message frontend

---
 backend/vue2-forntend/src/api/message.js      | 19 +++++
 .../vue2-forntend/src/views/Message/index.vue | 69 ++++++++++++-------
 2 files changed, 64 insertions(+), 24 deletions(-)
 create mode 100644 backend/vue2-forntend/src/api/message.js

diff --git a/backend/vue2-forntend/src/api/message.js b/backend/vue2-forntend/src/api/message.js
new file mode 100644
index 0000000..b18e8ae
--- /dev/null
+++ b/backend/vue2-forntend/src/api/message.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+export function getMessage(uid, type) {
+    return request({
+      url: `/api/user/${uid}/message`,
+      method: 'get',
+      uid,
+      params: { type }
+    })
+  }
+
+  export function readMessage(uid, mid) {
+    return request({
+      url: `/api/user/${uid}/message/${mid}/read`,
+      method: 'post',
+      uid,
+      mid
+    })
+  }
\ No newline at end of file
diff --git a/backend/vue2-forntend/src/views/Message/index.vue b/backend/vue2-forntend/src/views/Message/index.vue
index d818148..d32a42a 100644
--- a/backend/vue2-forntend/src/views/Message/index.vue
+++ b/backend/vue2-forntend/src/views/Message/index.vue
@@ -9,7 +9,7 @@
             active-class="deep-purple--text text--accent-4"
           >
             <v-chip v-for="tag in tags" :key="tag" @click="choose(tag)">
-              {{ tag }}
+              {{ tag.text }}
             </v-chip>
           </v-chip-group>
         </v-card-title>
@@ -29,8 +29,8 @@
                   <v-list-item-content :class="[item.has_read?'font-weight-light':'font-weight-bold']">
                     <v-list-item-title v-text="item.title"></v-list-item-title>
                     <v-list-item-subtitle class="my-2">{{ item.content | ellipsis }}</v-list-item-subtitle>
-                    <!-- <v-list-item-subtitle class="d-flex justify-end">发布时间: {{item.release_time}}</v-list-item-subtitle> -->
-                    <v-list-item-subtitle>{{item.author}}   发布于: {{item.release_time}}</v-list-item-subtitle>
+                    <!-- <v-list-item-subtitle class="d-flex justify-end">发布时间: {{item.publish_time}}</v-list-item-subtitle> -->
+                    <v-list-item-subtitle>{{item.author}}   发布于: {{item.publish_time}}</v-list-item-subtitle>
                   </v-list-item-content>
                    
                   <!-- <v-list-item-action>
@@ -58,7 +58,7 @@
               </v-card-title>
 
               <v-card-subtitle class="mt-3">
-                {{ msgOpened.author }} 发布于 {{ msgOpened.release_time }}
+                {{ msgOpened.author }} 发布于 {{ msgOpened.publish_time }}
               </v-card-subtitle>
 
               <v-card-text class="font-weight-medium">
@@ -87,43 +87,50 @@
 </template>
 
 <script>
+import { getMessage, readMessage } from '@/api/message'
+
 export default {
   data: () => ({
     tags: [
-      '未读',
-      '已读',
-      '团体',
-      '分享'
+      {text: '未读', value: 'unread'},
+      {text: '已读', value: 'read'},
+      {text: '团体', value: 'group'},
+      {text: '分享', value: 'resource'},
+      {text: '系统', value: 'system'},
+      {text: '作业', value: 'homework'}
     ],
 
     msgs: [],
     msgOpened: {
       title: '',
       content: '',
-      release_time: '',
+      publish_time: '',
       author: 'No One'
     },
     dialog: false,
 
     items: [
         {
+          mid: 1,
           title: '这是一则会议消息',
           content: '会议balabalabalabalabalabalabalabalabalabala',
-          release_time: '2020-05-01',
+          publish_time: '2020-05-01',
           author: 'No One',
           has_read: false
         },
         {
+          mid: 2,
           title: '这是一则分享通知',
           content: '分享balabalabalabalabalabala',
-          release_time: '2020-05-01',
+          publish_time: '2020-05-01',
           author: 'No One',
           has_read: false
         },
         {
+          mid: 3,
           title: '这是一则其他通知',
           content: '其他balabalabalabalabalabala',
-          release_time: '2020-05-01',
+          publish_time: '2020-05-01',
           author: 'No One',
           has_read: false
         },
@@ -139,24 +146,38 @@ export default {
       return value
     }
   },
-  created() {
-    initialize()
-  },
+  // created() {
+  //   initialize()
+  // },
   methods: {
-    initialize() {
-
-      // todo: get data from backend and screen
-
-    },
     choose(tag) {
       console.log(tag)
+      getMessage(this.$store.getters.uid, tag.value).then(res => {
+        let resItems = res
+        console.log(resItems)  
+        for (let i = 0; i < resItems.length; i++)
+        {
+          this.items.push({
+            title: resItems[i].title,
+            content: resItems[i].content,
+            has_read: resItems[i].is_read,
+            author: resItems[i].publisher,
+            publish_time: resItems[i].publish_time,
+            mid: resItems[i].mid
+          })
+        }
+      })
     },
     readMsg(item) {
-      // console.log(item)
-      item.has_read = true
-      this.msgOpened = item
-      this.dialog = true
+      console.log(item)
       // todo: post backend to modify "has_read" term
+      readMessage(this.$store.getters.uid, item.mid).then(res => {
+        console.log(res)
+        item.has_read = true
+        this.msgOpened = item
+        this.dialog = true
+      })
+      
     }
   }
 }
-- 
Gitee


From 39fa47b332a6410b5a7437e85e88cd0760a052ad Mon Sep 17 00:00:00 2001
From: kongkongNG <1298974109@qq.com>
Date: Fri, 29 May 2020 08:26:47 +0800
Subject: [PATCH 2/3] finish frontend backend message center

---
 backend/ddl_killer/admin.py                   |  5 +-
 .../migrations/0024_message_usermessage.py    | 34 ++++++++
 backend/ddl_killer/models.py                  |  4 +-
 backend/ddl_killer/urls.py                    |  4 +-
 backend/ddl_killer/views.py                   | 25 +++---
 .../src/views/Eventlist/index.vue             |  3 -
 .../vue2-forntend/src/views/Message/index.vue | 86 +++++++------------
 7 files changed, 90 insertions(+), 71 deletions(-)
 create mode 100644 backend/ddl_killer/migrations/0024_message_usermessage.py

diff --git a/backend/ddl_killer/admin.py b/backend/ddl_killer/admin.py
index 44c9da9..24df73e 100644
--- a/backend/ddl_killer/admin.py
+++ b/backend/ddl_killer/admin.py
@@ -141,4 +141,7 @@ admin.site.register(Course, CourseAdmin)
 admin.site.register(UserCourse, UserCourseAdmin)
 admin.site.register(CourseResource, CourseResourceAdmin)
 admin.site.register(CourseTask, CourseTaskAdmin)
-admin.site.register(CourseNote, CourseNoteAdmin)
\ No newline at end of file
+admin.site.register(CourseNote, CourseNoteAdmin)
+admin.site.register(Message)
+admin.site.register(UserMessage)
+
diff --git a/backend/ddl_killer/migrations/0024_message_usermessage.py b/backend/ddl_killer/migrations/0024_message_usermessage.py
new file mode 100644
index 0000000..a0b2db3
--- /dev/null
+++ b/backend/ddl_killer/migrations/0024_message_usermessage.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.0.5 on 2020-05-29 06:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ddl_killer', '0023_securitykeypair'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Message',
+            fields=[
+                ('mid', models.AutoField(primary_key=True, serialize=False)),
+                ('title', models.CharField(max_length=100)),
+                ('content', models.TextField(blank=True, null=True)),
+                ('category', models.CharField(max_length=100)),
+                ('publish_time', models.CharField(blank=True, max_length=50, null=True)),
+                ('publisher', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ddl_killer.User')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='UserMessage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_read', models.BooleanField(default=False)),
+                ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ddl_killer.Message')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ddl_killer.User')),
+            ],
+        ),
+    ]
diff --git a/backend/ddl_killer/models.py b/backend/ddl_killer/models.py
index 232c16f..8011125 100644
--- a/backend/ddl_killer/models.py
+++ b/backend/ddl_killer/models.py
@@ -89,12 +89,12 @@ class Message(models.Model):
     title = models.CharField(max_length=100)
     content = models.TextField(null=True, blank=True)
     category = models.CharField(max_length=100)
-    publisher = models.ForeignKey('User')
+    publisher = models.ForeignKey('User', on_delete=models.CASCADE)
     publish_time = models.CharField(max_length=50,null=True, blank=True)
 
 class UserMessage(models.Model):
     user = models.ForeignKey('User', on_delete=models.CASCADE)
-    message = models.ForeginKey('Message', on_delete=models.CASCADE)
+    message = models.ForeignKey('Message', on_delete=models.CASCADE)
     is_read = models.BooleanField(default=False)
 
 class UserTask(models.Model):
diff --git a/backend/ddl_killer/urls.py b/backend/ddl_killer/urls.py
index 490bf4d..c2eaf3d 100644
--- a/backend/ddl_killer/urls.py
+++ b/backend/ddl_killer/urls.py
@@ -40,6 +40,6 @@ urlpatterns = [
     path(r'user/<int:uid>/tasks/<int:tid>/delete', views.delete_task),
     path(r'user/<int:uid>/settings', views.personal_setting),
     path(r'security/pub-key', views.get_security_public_key),  # allow: GET
-    path(r'user/<int:uid>/message', view.show_user_message),
-    path(r'user/<int:uid>/message/<int:mid>/read', view.get_message_read),
+    path(r'user/<int:uid>/message', views.show_user_message),
+    path(r'user/<int:uid>/message/<int:mid>/read', views.get_message_read),
 ]
diff --git a/backend/ddl_killer/views.py b/backend/ddl_killer/views.py
index 6801011..fe5a76b 100644
--- a/backend/ddl_killer/views.py
+++ b/backend/ddl_killer/views.py
@@ -855,10 +855,11 @@ def show_user_message(request, uid):
         return JsonResponse(response, json_dumps_params={'ensure_ascii':False}, charset='utf_8_sig')
     user = User.objects.get(uid=uid)
     
+    print(request.GET.get('type'))
     response['data'] = []
     try:
-        type = request.GET.get('type')
-        if type=="read":
+        category = str(request.GET.get('type'))
+        if category=="read":
             for um in UserMessage.objects.filter(user__uid=user.uid):
                 m = um.message
                 if um.is_read==True:
@@ -868,10 +869,10 @@ def show_user_message(request, uid):
                         'content': m.content,
                         'is_read': um.is_read,
                         'category': m.category,
-                        'publisher': m.publisher,
+                        'publisher': m.publisher.name,
                         'publish_time': m.publish_time 
                     })
-        elif type=="unread":
+        elif category=="unread":
             for um in UserMessage.objects.filter(user__uid=user.uid):
                 m = um.message
                 if um.is_read==False:
@@ -881,22 +882,23 @@ def show_user_message(request, uid):
                         'content': m.content,
                         'is_read': um.is_read,
                         'category': m.category,
-                        'publisher': m.publisher,
+                        'publisher': m.publisher.name,
                         'publish_time': m.publish_time 
                     })
         else:
             for um in UserMessage.objects.filter(user__uid=user.uid):
                 m = um.message
-                if m.category==type:
+                #print(m.category==category)
+                if m.category==category:
                     response['data'].append({
                         'mid': m.mid,
                         'title': m.title,
                         'content': m.content,
                         'is_read': um.is_read,
                         'category': m.category,
-                        'publisher': m.publisher,
+                        'publisher': m.publisher.name,
                         'publish_time': m.publish_time 
-                    })
+	    			})
         response['code'] = 200
         response['msg'] = "Success."
     except:
@@ -914,17 +916,20 @@ def get_message_read(request, uid, mid):
         return JsonResponse(response, json_dumps_params={'ensure_ascii':False}, charset='utf_8_sig')
     user = User.objects.get(uid=uid)
     message = Message.objects.get(mid=mid)
-    if not messgae:
+    if not message:
         response['code'] = 404
         response['msg'] = "Message Not Found!"
     else:
-        um = UserMessage.objects.filter(user__uid=user.uid, message__mid=message.mid)
+        um = UserMessage.objects.filter(user__uid=uid, message__mid=mid)
+        print(um.exists())
         if not um.exists():
             response['code'] = 404
             response['msg'] = "You have no rights to access this messgae!"
         else:
+            um = um[0]
             um.is_read=True
             um.save()
             response['code'] = 200
             response['msg'] = "Success."
+    print('return')
     return JsonResponse(response, json_dumps_params={'ensure_ascii':False}, charset='utf_8_sig')
diff --git a/backend/vue2-forntend/src/views/Eventlist/index.vue b/backend/vue2-forntend/src/views/Eventlist/index.vue
index 026cd5a..fa06ed7 100644
--- a/backend/vue2-forntend/src/views/Eventlist/index.vue
+++ b/backend/vue2-forntend/src/views/Eventlist/index.vue
@@ -346,10 +346,7 @@ export default {
     },
     */
     created () {
-      console.log('start initialize')
       this.initialize()
-      
-      console.log('end initialize')
     },
     methods: {
       initialize() {
diff --git a/backend/vue2-forntend/src/views/Message/index.vue b/backend/vue2-forntend/src/views/Message/index.vue
index d32a42a..0265c7e 100644
--- a/backend/vue2-forntend/src/views/Message/index.vue
+++ b/backend/vue2-forntend/src/views/Message/index.vue
@@ -18,19 +18,19 @@
             <v-list-item-group v-model="model">
               <!-- <template v-for="(item, i) in items"> -->
                 <v-list-item
+                  v-for="(item, i) in items"
                   :key="i"
                   :value="item"
-                  v-for="(item, i) in items"
                   @click="readMsg(item)"
                 >
                   <!-- <v-list-item-icon>
                     <v-icon v-text="item.icon"></v-icon>
                   </v-list-item-icon> -->
-                  <v-list-item-content :class="[item.has_read?'font-weight-light':'font-weight-bold']">
+                  <v-list-item-content :class="[item.is_read?'font-weight-light':'font-weight-bold']">
                     <v-list-item-title v-text="item.title"></v-list-item-title>
                     <v-list-item-subtitle class="my-2">{{ item.content | ellipsis }}</v-list-item-subtitle>
                     <!-- <v-list-item-subtitle class="d-flex justify-end">发布时间: {{item.publish_time}}</v-list-item-subtitle> -->
-                    <v-list-item-subtitle>{{item.author}}   发布于: {{item.publish_time}}</v-list-item-subtitle>
+                    <v-list-item-subtitle>{{item.publisher}}   发布于: {{item.publish_time}}</v-list-item-subtitle>
                   </v-list-item-content>
                    
                   <!-- <v-list-item-action>
@@ -58,7 +58,7 @@
               </v-card-title>
 
               <v-card-subtitle class="mt-3">
-                {{ msgOpened.author }} 发布于 {{ msgOpened.publish_time }}
+                {{ msgOpened.publisher }} 发布于 {{ msgOpened.publish_time }}
               </v-card-subtitle>
 
               <v-card-text class="font-weight-medium">
@@ -72,7 +72,7 @@
                 <v-btn
                   color="primary"
                   text
-                  @click="dialog = false"
+                  @click="closeDialog()"
                 >
                   I accept
                 </v-btn>
@@ -90,6 +90,7 @@
 import { getMessage, readMessage } from '@/api/message'
 
 export default {
+  inject: ['reload'],
   data: () => ({
     tags: [
       {text: '未读', value: 'unread'},
@@ -105,37 +106,13 @@ export default {
       title: '',
       content: '',
       publish_time: '',
-      author: 'No One'
+      publisher: 'No One'
     },
     dialog: false,
 
-    items: [
-        {
-          mid: 1,
-          title: '这是一则会议消息',
-          content: '会议balabalabalabalabalabalabalabalabalabala',
-          publish_time: '2020-05-01',
-          author: 'No One',
-          has_read: false
-        },
-        {
-          mid: 2,
-          title: '这是一则分享通知',
-          content: '分享balabalabalabalabalabala',
-          publish_time: '2020-05-01',
-          author: 'No One',
-          has_read: false
-        },
-        {
-          mid: 3,
-          title: '这是一则其他通知',
-          content: '其他balabalabalabalabalabala',
-          publish_time: '2020-05-01',
-          author: 'No One',
-          has_read: false
-        },
-      ],
-      model: 1
+    ctag: '', //short for current tag
+    items: [],
+    model: 1
   }),
   filters: {
     ellipsis (value) {
@@ -146,38 +123,41 @@ export default {
       return value
     }
   },
-  // created() {
-  //   initialize()
-  // },
+  created() {
+    this.initialize()
+  },
   methods: {
+    initialize() {
+      this.ctag = 'unread'
+      getMessage(this.$store.getters.uid, this.ctag).then(res => {
+        this.items = res.data
+      })
+    }, 
     choose(tag) {
-      console.log(tag)
+      this.ctag = tag.value
+      console.log(this.ctag)
       getMessage(this.$store.getters.uid, tag.value).then(res => {
-        let resItems = res
-        console.log(resItems)  
-        for (let i = 0; i < resItems.length; i++)
-        {
-          this.items.push({
-            title: resItems[i].title,
-            content: resItems[i].content,
-            has_read: resItems[i].is_read,
-            author: resItems[i].publisher,
-            publish_time: resItems[i].publish_time,
-            mid: resItems[i].mid
-          })
-        }
+        this.items = res.data
       })
     },
     readMsg(item) {
       console.log(item)
-      // todo: post backend to modify "has_read" term
+      // todo: post backend to modify "is_read" term
       readMessage(this.$store.getters.uid, item.mid).then(res => {
         console.log(res)
-        item.has_read = true
+        item.is_read = true
         this.msgOpened = item
         this.dialog = true
       })
-      
+    },
+    closeDialog() {
+      this.dialog = false
+      if (this.ctag=="unread") {
+        getMessage(this.$store.getters.uid, this.ctag).then(res => {
+          this.items = res.data
+        })
+        this.reload()
+      }
     }
   }
 }
-- 
Gitee


From 5e1b802d5bcc02fab51651ae09458b83ba764c88 Mon Sep 17 00:00:00 2001
From: kongkongNG <1298974109@qq.com>
Date: Fri, 29 May 2020 08:35:39 +0800
Subject: [PATCH 3/3] fix url bug and show user name in resource sharing

---
 backend/ddl_killer/views.py | 66 ++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/backend/ddl_killer/views.py b/backend/ddl_killer/views.py
index fe5a76b..b794915 100644
--- a/backend/ddl_killer/views.py
+++ b/backend/ddl_killer/views.py
@@ -583,39 +583,37 @@ def show_course_tasks(request, uid, cid): #用户uid,相应课程cid
     response['code']=200
     response['msg']='Success.'
     response['data'] =[]
-    print(uid)
-    print(cid)
-    usertask = UserTask.objects.filter(user__uid=uid, is_deleted=False) #从该用户的所有task中筛选出和cid建立联系的task
-    for ut in usertask:
-        ct=CourseTask.objects.filter(course__cid=cid,task__tid=ut.task.tid)
-        if t.task.urls:
-             if "submissionId=" in t.task.urls:
-                 homework_url = t.task.urls+"sakai_action=doView_grade"
-             elif "assignmentReference=" in t.task.urls:
-                 homework_url = t.task.urls+"sakai_action=doView_submission"
-             else:
-                 homework_url = t.task.urls
-        else:
-             homework_url = ""
-        if ct.exists():
-            response["data"].append({
-                "tid": ut.task.tid,
-                "title": ut.task.title,
-                "course_name": ut.task.course_name,
-                "content": ut.task.content,
-                "platform": ut.task.platform,
-                "category": ut.task.category,
-                "urls": homework_url,
-                "ddl_time": ut.task.ddl_time,
-                "notification_time": ut.notification_time,
-                "notification_alert": ut.notification_alert,
-                "create_time": ut.task.create_time,
-                "isAdmin:": ut.isAdmin,
-                "is_finished": ut.is_finished
-            })
-        # else:
-            
-    # print(response['data']) 
+    try:
+            usertask = UserTask.objects.filter(user__uid=uid, is_deleted=False) #从该用户的所有task中筛选出和cid建立联系的task
+            for ut in usertask:
+                ct=CourseTask.objects.filter(course__cid=cid,task__tid=ut.task.tid)
+                if ut.task.urls:
+                     if "submissionId=" in ut.task.urls:
+                         homework_url = ut.task.urls+"sakai_action=doView_grade"
+                     elif "assignmentReference=" in ut.task.urls:
+                         homework_url = ut.task.urls+"sakai_action=doView_submission"
+                     else:
+                         homework_url = ut.task.urls
+                else:
+                     homework_url = ""
+                if ct.exists():
+                    response["data"].append({
+                        "tid": ut.task.tid,
+                        "title": ut.task.title,
+                        "course_name": ut.task.course_name,
+                        "content": ut.task.content,
+                        "platform": ut.task.platform,
+                        "category": ut.task.category,
+                        "urls": homework_url,
+                        "ddl_time": ut.task.ddl_time,
+                        "notification_time": ut.notification_time,
+                        "notification_alert": ut.notification_alert,
+                        "create_time": ut.task.create_time,
+                        "isAdmin:": ut.isAdmin,
+                        "is_finished": ut.is_finished
+                    })
+    except:
+        traceback.print_exc()
     return JsonResponse(response, json_dumps_params={'ensure_ascii':False}, charset='utf_8_sig')
     
 def appoint_course_admin(request, cid, uid): #授予普通用户某门课程的管理权
@@ -722,7 +720,7 @@ def show_course_resources(request, uid, cid):
             # print(resources)
             for cr in courseresources:
                 if cr.resource.user:
-                    sharer = cr.resource.user.uid
+                    sharer = cr.resource.user.name
                 else:
                     sharer = ''
                 response['data'].append({
-- 
Gitee