Committing the graphical implementation of the lecture activity frame...

Committing the graphical implementation of the lecture activity frame groupings in the lecturer Home page.

FirstApp/MongoModels.py

@@ -110,6 +110,36 @@ class LectureVideo(models.Model):
     def __str__(self):
         return self.lecture_video_id
 
+
+
+class Landmarks(models.Model):
+    landmark = models.CharField(max_length=15)
+
+    class Meta:
+        abstract = True
+
+
+# lecture video time landmarks table
+class LectureVideoTimeLandmarks(models.Model):
+    lecture_video_time_landmarks_id = models.CharField(max_length=15)
+    lecture_video_id = models.ForeignKey(LectureVideo, on_delete=models.CASCADE)
+    time_landmarks = models.ArrayField(Landmarks)
+
+    def __str__(self):
+        return self.lecture_video_time_landmarks_id
+
+
+# lecture video frame landmarks table
+class LectureVideoFrameLandmarks(models.Model):
+    lecture_video_frame_landmarks_id = models.CharField(max_length=15)
+    lecture_video_id = models.ForeignKey(LectureVideo, on_delete=models.CASCADE)
+    frame_landmarks = models.ArrayField(Landmarks)
+
+    def __str__(self):
+        return self.lecture_video_frame_landmarks_id
+
+
+
 # ACTIVITY section
 # lecture activity table
 class LectureActivity(models.Model):

FirstApp/api.py

@@ -772,11 +772,63 @@ class GetLectureVideoSummaryTimeLandmarks(APIView):
 
     def get(self, request):
         video_name = request.query_params.get('video_name')
-        time_landmarks = ve.getTimeLandmarks(video_name)
 
-        return Response({
-            "response": time_landmarks
-        })
+        # checking for the existing time landmarks details
+        isExist = LectureVideoTimeLandmarks.objects.filter(lecture_video_id__video_name=video_name).exists()
+
+        if (isExist):
+            time_landmarks = []
+            lec_video_time_landmarks = LectureVideoTimeLandmarks.objects.filter(lecture_video_id__video_name=video_name)
+            lec_video_time_landmarks_ser = LectureVideoTimeLandmarksSerializer(lec_video_time_landmarks, many=True)
+            lec_video_time_landmarks_data = lec_video_time_landmarks_ser.data[0]
+
+            retrieved_landmarks = lec_video_time_landmarks_data["time_landmarks"]
+
+            for landmark in retrieved_landmarks:
+                time_landmarks.append(landmark['landmark'])
+
+            # return the response
+            return Response({
+                "response": time_landmarks
+            })
+
+        # else:
+        #
+        #
+        #     last_lec_video_time_landmarks = LectureVideoTimeLandmarks.objects.order_by('lecture_video_time_landmarks_id').last()
+        #     new_lecture_video_time_landmarks_id = "LVTL00001" if (last_lec_video_time_landmarks is None) else \
+        #         ig.generate_new_id(last_lec_video_time_landmarks.lecture_video_time_landmarks_id)
+        #
+        #
+        #     # retrieve lecture video details
+        #     lec_video = LectureVideo.objects.filter(video_name=video_name)
+        #     lec_video_ser = LectureVideoSerializer(lec_video, many=True)
+        #     lec_video_id = lec_video_ser.data[0]['id']
+        #
+        #
+        #     # save the landmark details in the db
+        #     time_landmarks = ve.getTimeLandmarks(video_name)
+        #
+        #     db_time_landmarks = []
+        #
+        #     # loop through the time landmarks
+        #     for landmark in time_landmarks:
+        #         landmark_obj = Landmarks()
+        #         landmark_obj.landmark = landmark
+        #
+        #         db_time_landmarks.append(landmark_obj)
+        #
+        #
+        #     new_lec_video_time_landmarks = LectureVideoTimeLandmarks()
+        #     new_lec_video_time_landmarks.lecture_video_time_landmarks_id = new_lecture_video_time_landmarks_id
+        #     new_lec_video_time_landmarks.lecture_video_id_id = lec_video_id
+        #     new_lec_video_time_landmarks.time_landmarks = db_time_landmarks
+        #
+        #     new_lec_video_time_landmarks.save()
+        #
+        #     return Response({
+        #         "response": time_landmarks
+        #     })
 
 
 # this API will retrieve lecture activity summary
@@ -786,54 +838,118 @@ class GetLectureActivitySummary(APIView):
         video_name = request.query_params.get('video_name')
 
         # checking the existence of lecture activity frame grouping records in the db
-        lec_activity_frame_groupings = LectureActivityFrameGroupings.objects.filter(lecture_activity_id__lecture_video_id__video_name=video_name).exists()
+        isExist = LectureActivityFrameGroupings.objects.filter(lecture_activity_id__lecture_video_id__video_name=video_name).exists()
 
-        if (lec_activity_frame_groupings):
-
-            return Response({
-                "frame_group_percentages": {}
-            })
-
-        else:
-            frame_landmarks, frame_group_dict = ve.getFrameLandmarks(video_name)
-            frame_group_percentages, activity_labels = ar.activity_frame_groupings(video_name, frame_landmarks, frame_group_dict)
+        if (isExist):
+            # frame_landmarks, frame_group_dict = ve.getFrameLandmarks(video_name)
+            frame_group_percentages = {}
+            frame_landmarks = []
 
+            # retrieve frame landmarks from db
+            lec_video_frame_landmarks = LectureVideoFrameLandmarks.objects.filter(lecture_video_id__video_name=video_name)
+            lec_video_frame_landmarks_ser = LectureVideoFrameLandmarksSerializer(lec_video_frame_landmarks, many=True)
+            lec_video_frame_landmarks_data = lec_video_frame_landmarks_ser.data[0]
 
+            retrieved_frame_landmarks = lec_video_frame_landmarks_data["frame_landmarks"]
 
-            # save the frame group details into db (temp method)
+            for landmark in retrieved_frame_landmarks:
+                frame_landmarks.append(landmark['landmark'])
 
-            last_lec_activity_frame_grouping = LectureActivityFrameGroupings.objects.order_by('lecture_activity_frame_groupings_id').last()
-            new_lecture_activity_frame_grouping_id = "LAFG00001" if (last_lec_activity_frame_grouping is None) else \
-                ig.generate_new_id(last_lec_activity_frame_grouping.lecture_activity_frame_groupings_id)
 
-            # retrieve the lecture activity id
-            lec_activity = LectureActivity.objects.filter(lecture_video_id__video_name=video_name)
-            lec_activity_ser = LectureActivitySerializer(lec_activity, many=True)
-            lec_activity_id = lec_activity_ser.data[0]['id']
+            lec_activity_frame_groupings = LectureActivityFrameGroupings.objects.filter(lecture_activity_id__lecture_video_id__video_name=video_name)
+            lec_activity_frame_groupings_ser = LectureActivityFrameGroupingsSerializer(lec_activity_frame_groupings, many=True)
+            lec_activity_frame_groupings_data = lec_activity_frame_groupings_ser.data[0]
 
-            # create the frame group details
-            frame_group_details = []
+            frame_group_details = lec_activity_frame_groupings_data["frame_group_details"]
 
-            for key in frame_group_percentages.keys():
-                obj = {}
-                obj['frame_group'] = key
-                obj['frame_group_percentages'] = frame_group_percentages[key]
 
-                frame_group_details.append(obj)
+            # create the new dictionary
+            for group in frame_group_details:
+                frame_group_percentages[group['frame_group']] = group['frame_group_percentages']
 
 
-            new_lec_activity_frame_groupings = LectureActivityFrameGroupings()
-            new_lec_activity_frame_groupings.lecture_activity_frame_groupings_id = new_lecture_activity_frame_grouping_id
-            new_lec_activity_frame_groupings.lecture_activity_id_id = lec_activity_id
-            new_lec_activity_frame_groupings.frame_group_details = frame_group_details
-
-            # save
-            new_lec_activity_frame_groupings.save()
 
+            class_labels = ['phone_perct', 'listen_perct', 'note_perct']
 
             return Response({
                 "frame_landmarks": frame_landmarks,
-                "frame_group_dict": frame_group_dict,
                 "frame_group_percentages": frame_group_percentages,
-                "activity_labels": activity_labels
-            })
\ No newline at end of file
+                "activity_labels": class_labels
+            })
+
+        # else:
+        #
+        #     # retrieve the previous lecture video frame landmarks details
+        #     last_lec_video_frame_landmarks = LectureVideoFrameLandmarks.objects.order_by(
+        #         'lecture_video_frame_landmarks_id').last()
+        #     new_lecture_video_frame_landmarks_id = "LVFL00001" if (last_lec_video_frame_landmarks is None) else \
+        #         ig.generate_new_id(last_lec_video_frame_landmarks.lecture_video_frame_landmarks_id)
+        #
+        #
+        #     frame_landmarks, frame_group_dict = ve.getFrameLandmarks(video_name)
+        #     frame_group_percentages, activity_labels = ar.activity_frame_groupings(video_name, frame_landmarks, frame_group_dict)
+        #
+        #
+        #     # retrieve lecture video details
+        #     lec_video = LectureVideo.objects.filter(video_name=video_name)
+        #     lec_video_ser = LectureVideoSerializer(lec_video, many=True)
+        #     lec_video_id = lec_video_ser.data[0]['id']
+        #
+        #
+        #     # save the frame landmarks details into db (temp method)
+        #     db_frame_landmarks = []
+        #
+        #     for landmark in frame_landmarks:
+        #         landmark_obj = Landmarks()
+        #         landmark_obj.landmark = landmark
+        #
+        #         db_frame_landmarks.append(landmark_obj)
+        #
+        #
+        #     new_lec_video_frame_landmarks = LectureVideoFrameLandmarks()
+        #     new_lec_video_frame_landmarks.lecture_video_frame_landmarks_id = new_lecture_video_frame_landmarks_id
+        #     new_lec_video_frame_landmarks.lecture_video_id_id = lec_video_id
+        #     new_lec_video_frame_landmarks.frame_landmarks = db_frame_landmarks
+        #
+        #     new_lec_video_frame_landmarks.save()
+        #
+        #
+        #
+        #     # save the frame group details into db (temp method)
+        #
+        #     last_lec_activity_frame_grouping = LectureActivityFrameGroupings.objects.order_by('lecture_activity_frame_groupings_id').last()
+        #     new_lecture_activity_frame_grouping_id = "LAFG00001" if (last_lec_activity_frame_grouping is None) else \
+        #         ig.generate_new_id(last_lec_activity_frame_grouping.lecture_activity_frame_groupings_id)
+        #
+        #     # retrieve the lecture activity id
+        #     lec_activity = LectureActivity.objects.filter(lecture_video_id__video_name=video_name)
+        #     lec_activity_ser = LectureActivitySerializer(lec_activity, many=True)
+        #     lec_activity_id = lec_activity_ser.data[0]['id']
+        #
+        #     # create the frame group details
+        #     frame_group_details = []
+        #
+        #     for key in frame_group_percentages.keys():
+        #         # create an object of type 'LectureActivityFrameGroupDetails'
+        #         lec_activity_frame_group_details = LectureActivityFrameGroupDetails()
+        #         lec_activity_frame_group_details.frame_group = key
+        #         lec_activity_frame_group_details.frame_group_percentages = frame_group_percentages[key]
+        #
+        #         frame_group_details.append(lec_activity_frame_group_details)
+        #
+        #
+        #     new_lec_activity_frame_groupings = LectureActivityFrameGroupings()
+        #     new_lec_activity_frame_groupings.lecture_activity_frame_groupings_id = new_lecture_activity_frame_grouping_id
+        #     new_lec_activity_frame_groupings.lecture_activity_id_id = lec_activity_id
+        #     new_lec_activity_frame_groupings.frame_group_details = frame_group_details
+        #
+        #     # save
+        #     new_lec_activity_frame_groupings.save()
+        #
+        #
+        #     return Response({
+        #         "frame_landmarks": frame_landmarks,
+        #         "frame_group_percentages": frame_group_percentages,
+        #         "activity_labels": activity_labels
+        #     })
+

FirstApp/logic/activity_recognition.py

@@ -764,7 +764,6 @@ def activity_frame_groupings(video_name, frame_landmarks, frame_group_dict):
     # print('frame group dict: ', frame_group_dict)
     activity_labels = ['phone_perct', 'listen_perct', 'note_perct']
 
-    print('frame group percentages: ', frame_group_dict)
 
     # return the dictionary
     return frame_group_dict, activity_labels
\ No newline at end of file

FirstApp/serializers.py

@@ -201,6 +201,52 @@ class LectureVideoSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 
+# lecture video time landmarks serializer
+class LectureVideoTimeLandmarksSerializer(serializers.ModelSerializer):
+
+    lecture_video_id = LectureVideoSerializer()
+    time_landmarks = serializers.SerializerMethodField()
+
+    def get_time_landmarks(self, obj):
+        return_data = []
+
+        for time_landmark in obj.time_landmarks:
+            landmark_details = {}
+            landmark_details["landmark"] = time_landmark.landmark
+
+            return_data.append(landmark_details)
+
+        return return_data
+
+
+    class Meta:
+        model = LectureVideoTimeLandmarks
+        fields = '__all__'
+
+# lecture video frame landmarks serializer
+class LectureVideoFrameLandmarksSerializer(serializers.ModelSerializer):
+
+    lecture_video_id = LectureVideoSerializer()
+    frame_landmarks = serializers.SerializerMethodField()
+
+    def get_frame_landmarks(self, obj):
+        return_data = []
+
+        for frame_landmark in obj.frame_landmarks:
+            landmark_details = {}
+            landmark_details["landmark"] = frame_landmark.landmark
+
+            return_data.append(landmark_details)
+
+        return return_data
+
+
+    class Meta:
+        model = LectureVideoFrameLandmarks
+        fields = '__all__'
+
+
+
 class LectureActivitySerializer(serializers.ModelSerializer):
 
     lecture_video_id = LectureVideoSerializer()
@@ -213,6 +259,23 @@ class LectureActivitySerializer(serializers.ModelSerializer):
 class LectureActivityFrameGroupingsSerializer(serializers.ModelSerializer):
 
     lecture_activity_id = LectureActivitySerializer()
+    frame_group_details = serializers.SerializerMethodField()
+
+    def get_frame_group_details(self, obj):
+        return_data = []
+
+        for frame_group in obj.frame_group_details:
+            group_details = {}
+            group_details["frame_group_percentages"] = {}
+
+            group_details["frame_group"] = frame_group.frame_group
+            group_details["frame_group_percentages"]["phone_perct"] = frame_group.frame_group_percentages.phone_perct
+            group_details["frame_group_percentages"]["listen_perct"] = frame_group.frame_group_percentages.listen_perct
+            group_details["frame_group_percentages"]["note_perct"] = frame_group.frame_group_percentages.note_perct
+
+            return_data.append(group_details)
+
+        return return_data
 
     class Meta:
         model = LectureActivityFrameGroupings

FirstApp/templates/FirstApp/Home.html

@@ -291,7 +291,7 @@
 
                 lecture_activity_frame_group_percentages = response.frame_group_percentages;
                 let frame_landmarks = response.frame_landmarks;
-                let frame_group_dict = response.frame_group_dict;
+                {#let frame_group_dict = response.frame_group_dict;#}
                 let activity_labels = response.activity_labels;