db changes and lecturer video

MonitorLecturerApp/api.py

@@ -4,23 +4,67 @@ from rest_framework.response import Response
 from LectureSummarizingApp.models import LectureAudioSummary
 from LectureSummarizingApp.serializer import LectureAudioSummarySerializer
 from . logic import classroom_activity, text_analysis as ta
-from .models import LecturerVideo, LecturerAudioText
-from .serializers import LecturerVideoSerializer, LecturerAudioTextSerializer
+from .models import LecturerVideo, LecturerAudioText, LecturerVideoMetaData, LectureRecordedVideo
+from .serializers import *
 
 import datetime
 
 
+
+##### LECTURER ACTIVITY SECTION #####
 class ActivityRecognitionAPI(APIView):
 
     def get(self, request):
         video_name = request.query_params.get('video_name')
+
+        # retrieve the lecturer video details with the video name
+        lec_video = LectureRecordedVideo.objects.filter(lecture_video_name=video_name)
+        lec_video_ser = LectureRecordedVideoSerializer(lec_video, many=True)
+        lec_video_data = lec_video_ser.data
         percentages = classroom_activity.activity_recognition(video_name)
+
+        # saving to the db
+        LecturerVideoMetaData(
+            lecturer_video_id_id=lec_video_data[0]['id'],
+            seated_count=percentages["sitting_perct"],
+            standing_count=percentages["standing_perct"],
+            walking_count=percentages["walking_perct"]
+        ).save()
+
         return Response({"response": percentages})
 
     def post(self, request):
         pass
 
 
+# this method will retrieve the lecturer video meta data results
+class GetLectureVideoResultsAPI(APIView):
+
+    def get(self, request):
+        video_id = request.query_params.get('video_id')
+        int_video_id = int(video_id)
+
+        # retrieve from the db
+        video_meta_data = LecturerVideoMetaData.objects.filter(lecturer_video_id_id=int_video_id)
+        video_meta_data_ser = LecturerVideoMetaDataSerializer(video_meta_data, many=True)
+        video_meta_data_processed = video_meta_data_ser.data
+        percentages = {}
+
+        for meta_data in video_meta_data_processed:
+            percentages["sitting_perct"] = meta_data["seated_count"]
+            percentages["standing_perct"] = meta_data["standing_count"]
+            percentages["walking_perct"] = meta_data["walking_count"]
+
+
+
+        return Response({
+            "response": percentages
+        })
+
+
+##### END OF LECTURER ACTIVITY SECTION #####
+
+
 # class ActivityRecognitionAPI(APIView):
 #
 #     def get(self, request):
@@ -39,11 +83,17 @@ class GetLectureAudioAnalysis(APIView):
         lec_audio_id = request.query_params.get("audio_id")
         int_audio_id = int(lec_audio_id)
 
+        print('audio id: ', int_audio_id)
+
+        # all_lec_audio_summary
+
         lec_audio_summary = LectureAudioSummary.objects.filter(lecture_audio_id=int_audio_id)
         lec_audio_summary_serializer = LectureAudioSummarySerializer(lec_audio_summary, many=True)
         audio_summary_data = lec_audio_summary_serializer.data
         lec_audio_summary_id = 0
 
+        print('lec audio summary: ', len(audio_summary_data))
+
         for audio in audio_summary_data:
             lec_audio_summary_id = audio['id']
 
@@ -52,6 +102,7 @@ class GetLectureAudioAnalysis(APIView):
         lec_audio_text_serializer = LecturerAudioTextSerializer(lec_audio_text, many=True)
         lec_audio_text_data = lec_audio_text_serializer.data
 
+        print('lec audio text data: ', len(lec_audio_text_data))
 
         audio_text = []
 
@@ -157,3 +208,5 @@ class LecturerAudioSummaryPeriodAPI(APIView):
             "labels": labels,
             "isRecordFound": isRecordFound
         })
+
+

MonitorLecturerApp/models.py

@@ -29,7 +29,21 @@ class LecturerVideo(models.Model):
         return self.name
 
 
+class LectureRecordedVideo (models.Model):
+    lecture_video_id = models.CharField(max_length=10)
+    lecturer_date = models.DateField()
+    lecture_video_name = models.CharField(max_length=50)
+    lecture_video_length = models.DurationField()
+    lecturer = models.ForeignKey(Lecturer, on_delete=models.CASCADE, default=0)
+    subject = models.ForeignKey(Subject, on_delete=models.CASCADE, default=0)
+
+    def __str__(self):
+        return self.lecture_video_id
+
+
+
 class LecturerVideoMetaData(models.Model):
+    lecturer_video_id = models.ForeignKey(LectureRecordedVideo, on_delete=models.CASCADE, default=0)
     fps = models.IntegerField()
     frame_count = models.IntegerField()
     seated_count = models.IntegerField()
@@ -73,13 +87,3 @@ class LecturerAudioText (models.Model):
     def __str__(self):
         return self.lecturer_audio_text_id
 
-class LectureRecordedVideo (models.Model):
-    lecture_video_id = models.CharField(max_length=10)
-    lecturer_date = models.DateField()
-    lecture_video_name = models.CharField(max_length=50)
-    lecture_video_length = models.DurationField()
-    lecturer = models.ForeignKey(Lecturer, on_delete=models.CASCADE, default=0)
-    subject = models.ForeignKey(Subject, on_delete=models.CASCADE, default=0)
-
-    def __str__(self):
-        return self.lecture_video_id
\ No newline at end of file

MonitorLecturerApp/serializers.py

@@ -18,6 +18,9 @@ class LecturerVideoSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 class LecturerVideoMetaDataSerializer(serializers.ModelSerializer):
+
+    lecturer_video_id = LectureRecordedVideo()
+
     class Meta:
         model = LecturerVideoMetaData
         fields = '__all__'

MonitorLecturerApp/templates/MonitorLecturerApp/index.html

@@ -40,28 +40,53 @@
 
     $(document).ready(function () {
         $('.calc').click(function () {
-            let video_name = $(this).attr('id');
+            let video_name = $(this).attr('data-name');
 
-            $('#loader').attr('hidden', false);
+            $('#no_content_message').attr('hidden', true);
+
+            $('#video_loader').attr('hidden', false);
 
             // alert('hello');
 
-            $('#no_content_message').attr('hidden', true);
+
 
             //fetching data from the API
             fetch('http://127.0.0.1:8000/lecturer/activities/?video_name=' + video_name)
                 .then((res) => res.json())
                 .then((out) => assignPerct(out.response))
-                .catch((error) => alert('error ' + error))
+                .catch((error) => alert('error ' + error));
+
+
+
+        });
+
+
+        //this function will handle the lecturer video results button
+        $('.results').click(function () {
+            let video_id = $(this).attr('data-id');
+
+
+            $('#no_content_message').attr('hidden', true);
+
+            $('#video_loader').attr('hidden', false);
+
+            //fetch the results
+            fetch('http://127.0.0.1:8000/lecturer/get-lecturer-video-results/?video_id=' + video_id)
+            .then((res) => res.json())
+            .then((out) => assignPerct(out.response))
+            .catch((err) => alert('error: ' + err))
+
         });
 
 
+
         //to assign percentage values
         function assignPerct(percentages) {
             $('#no_content_message').attr('hidden', true);
             $('#progress_bars').attr('hidden', false);
             $('#loader').attr('hidden', true);
 
+
             {#let sitting = Math.round(percentages.sitting_perct);#}
             let sitting = Math.round(percentages.sitting_perct);
             let standing = Math.round(percentages.standing_perct);
@@ -75,9 +100,10 @@
             $('#standing_span').text(standing + '%');
             $('#walking_span').text(walking + '%');
 
-
+            $('#video_loader').hide();
         }
 
+
 /*
         //this is for the temporay button (delete later)
         $('#temp_btn').click(function () {
@@ -443,8 +469,8 @@
                             <!-- Card Header - Dropdown -->
                             <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
                                 <h6 class="m-0 font-weight-bold text-primary">Video List</h6>
-{#                                <button type="button" class="btn btn-outline-primary" id="video_graph">Statistics#}
-{#                                </button>#}
+                                <button type="button" class="btn btn-outline-primary" id="video_graph">Statistics
+                                </button>
 
                             </div>
                             <!-- Card Body -->
@@ -463,11 +489,21 @@
                                             <tr>
                                                 <td>{{ video.name }}</td>
                                                 <td>{{ video.duration }}</td>
+                                                {% if video.isAvailable %}
+                                                    <td class="btn_class">
+                                                        <button type="button" class="btn btn-primary results"
+                                                                data-name='{{ video.name }}'
+                                                                data-id="{{ video.video_id }}">Results
+                                                        </button>
+                                                    </td>
+                                                {% else %}
                                                     <td class="btn_class">
                                                     <button type="button" class="btn btn-success calc"
-                                                            id='{{ video.name }}'>Calculate
+                                                            data-name='{{ video.name }}'>Calculate
                                                     </button>
                                                 </td>
+                                                {% endif %}
+
                                             </tr>
                                         {% endfor %}
                                         </tbody>
@@ -498,7 +534,6 @@
 
                             <!--loader -->
                             <div class="text-center" id="audio_loader" hidden>
-{#                                <img src="{% static 'FirstApp/images/ajax-loader.gif' %}" alt="">#}
 
                                 <img src="{% static 'FirstApp/images/ajax-loader.gif' %}" alt="">
 
@@ -515,22 +550,15 @@
                                     <!-- table body-->
                                     <tbody>
                                     <tr>
-                                        <td>No of Total words</td>
+                                        <td>No of Total words: </td>
                                         <td id="num_of_words"></td>
                                     </tr>
                                     <tr>
-                                        <td>No fo word to be expected</td>
+                                        <td>No of word expected: </td>
                                         <td> 3600 - 4800</td>
                                     </tr>
 
-                                    {#                                        <tr>#}
-                                    {#                                            <td>No of extraneous words</td>#}
-                                    {#                                            <td id="lexical_count"></td>#}
-                                    {#                                        </tr>#}
-                                    {#                                        <tr>#}
-                                    {#                                            <td>No of Non-lexical words</td>#}
-                                    {#                                            <td id="non_lexical_count"></td>#}
-                                    {#                                        </tr>#}
+
                                     </tbody>
                                 </table>
                                 <!--button -->
@@ -676,11 +704,11 @@
                 <table class="table table-borderless">
                     <tbody>
                     <tr>
-                        <td>No. of extraneous words</td>
+                        <td>No. of extraneous words: </td>
                         <td id="lexical_count"></td>
                     </tr>
                     <tr>
-                        <td>No. of non-lexical words</td>
+                        <td>No. of non-lexical words: </td>
                         <td id="non_lexical_count"></td>
                     </tr>
                     </tbody>

MonitorLecturerApp/urls.py

@@ -24,9 +24,16 @@ urlpatterns = [
     path('lecture-video', views.lecVideo),
     # path('Video', views.hello)
 
+    ##### LECTURER ACTIVITY SECTION #####
     # API to retrieve activity recognition
     url(r'^activities/$', api.ActivityRecognitionAPI.as_view()),
 
+    # API to retrieve lecturer video meta data results
+    url(r'^get-lecturer-video-results/$', api.GetLectureVideoResultsAPI.as_view()),
+
+    ##### END OF LECTURER ACTIVITY SECTION #####
+
+
     # API to retrieve audio analysis
     url(r'^get-audio-analysis/$', api.GetLectureAudioAnalysis.as_view()),
 

MonitorLecturerApp/views.py

@@ -8,8 +8,8 @@ from rest_framework.response import Response
 from LectureSummarizingApp.models import LectureAudio
 from LectureSummarizingApp.serializer import LectureAudioSerializer
 from . import views
-from .models import RegisterTeacher, LecturerVideo
-from . serializers import RegisterTeacherSerializer
+from .models import *
+from . serializers import *
 
 import cv2
 import os
@@ -70,8 +70,14 @@ def hello(request):
     # the list needs to be sorted by the date
     lec_list.sort(key=lambda date: dt.strptime(str(date['date']), "%Y-%m-%d"), reverse=True)
 
+    # retrieve exsiting lecture recorded videos
+    lec_recorded_video = LectureRecordedVideo.objects.all()
+    lec_recorded_video_ser = LectureRecordedVideoSerializer(lec_recorded_video, many=True)
+    lec_recorded_video_data = lec_recorded_video_ser.data
+
     for videoPath in videoPaths:
         video = LecturerVideo()
+        video = {}
         cap = cv2.VideoCapture(videoPath)
         fps = cap.get(cv2.CAP_PROP_FPS)  # OpenCV2 version 2 used "CV_CAP_PROP_FPS"
         frame_count = int(cap.get(cv2.CAP_PROP_FRAME_COUNT))
@@ -80,11 +86,21 @@ def hello(request):
         videoName = os.path.basename(videoPath)
         # videoName = videos.append(os.path.basename(videoPath))
         durationObj = datetime.timedelta(seconds=duration)
-        video.path = videoPath
-        video.name = videoName
-        video.duration = str(durationObj)
+        video['path'] = videoPath
+        video['name'] = videoName
+        video['duration'] = str(durationObj)
+        video['video_id'] = None
+
+        # checking whether this video already exists
+        for recorded_lecture in lec_recorded_video_data:
+
+            if videoName == recorded_lecture['lecture_video_name']:
+                video['isAvailable'] = True
+                video['video_id'] = recorded_lecture['id']
+
+
         videos.append(video)
-        print('Video Name: ', video.name)
+        print('Video Name: ', video['name'])
     context = {'object': obj, 'Videos': videos, 'durations': durations, 'template_name': 'MonitorLecturerApp/template.html', 'lec_list': lec_list}
     return render(request, 'MonitorLecturerApp/index.html', context)