Merge branch 'feat/it18229912' into 'develop'

Feat/it18229912

See merge request !41

Presently/presently/users/templates/users/emotionvideo.html

@@ -29,14 +29,9 @@
         {% endfor %}
     </div>
     <hr/>
-
-    <div class="heading-text heading-line text-center mt-5">
-        <h4>Usage of Body Gestures</h4>
-    </div>
-
-    <h4 class="py-5">Waiting...</h4>
         
     <div class="d-flex justify-content-center mb-5">
+        <a class="btn btn-primary" href="{% url 'handgestures' %}" type="submit">Usage of hand gestures</a>
         <a class="btn btn-outline" href="{% url 'overallfeedback' %}" type="submit">View Summary Detail</a>
     </div> 
 </div>

Presently/presently/users/templates/users/handgestures.html

+{% extends 'users/base.html' %}
+{% load static %}
+{% block content %}
+
+<div class="container">
+    <nav aria-label="breadcrumb mt-4">
+        <ol class="breadcrumb">
+          <li class="breadcrumb-item"><a href="{% url 'home' %}">Home</a></li>
+          <li class="breadcrumb-item"><a href="{% url 'feedback' %}">Dashboard</a></li>
+          <li class="breadcrumb-item active" aria-current="page">Emotion-predictions(Video)</li>
+        </ol>
+    </nav>
+    
+    <div class="heading-text heading-line text-center mt-5">
+        <h4>Usage of Hand Gestures</h4>
+    </div>
+
+    <div class="d-flex">
+        <div class="col-5">
+            <div id="modalVideo" style="max-width: 700px; min-height:380px">
+                <div class="p-t-30 text-center">
+                    {% for x in all %}
+                    <h2 class="mb-3">Video Review</h2>
+                    <div class="video-wrap m-b-20">
+                        <video id="video-js" class="video-js" controls loop preload="false"
+                            poster="">
+                            <source src="{{x.video.url}}" type="video/mp4" />
+                            <source src="{{x.video.url}}" type="video/webm" />
+                        </video>
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+        </div> 
+        <div class="col-7 px-3"> 
+            <div class="p-t-30 d-flex justify-content-center">
+                <div class="d-flex mb-3">
+                    <h3 class="m-b-0">Awaiting...</h3> 
+                </div>        
+            </div>
+        </div>
+    </div>   
+        
+    <div class="d-flex justify-content-center mb-5">
+        <a class="btn btn-primary" href="{% url 'emotionvideo' %}" type="submit">Usage of face emotions</a>
+        <a class="btn btn-outline" href="{% url 'overallfeedback' %}" type="submit">View Summary Detail</a>
+    </div> 
+</div>
+
+{% endblock content %}

Presently/presently/users/urls.py

@@ -16,6 +16,7 @@ urlpatterns = [
     path('feedback/emotion/audio', views.emotionaudio, name='emotionaudio'),
     path('feedback/emotion/audio/warnings', views.warningemotionsaudio, name='warningemotionaudio'),
     path('feedback/emotion/video', views.emotionvideo, name='emotionvideo'),
+    path('feedback/emotion/video/hand-gestures', views.handgestures, name='handgestures'),
     path('feedback/emotion/audio/prosody', views.emotionaudioprosody, name='emotionaudioprosody'),
     path('login/', auth_view.LoginView.as_view(template_name='users/login.html'), name="login"),
     path('logout/', auth_view.LogoutView.as_view(template_name='users/logout.html'), name="logout"),

Presently/presently/users/views.py

@@ -64,7 +64,12 @@ def feedback(request):
 def emotionaudio(request):
     all_video=Video.objects.all()
 
-    return render(request, 'users/emotionaudio.html',{"all":all_video})  
+    return render(request, 'users/emotionaudio.html',{"all":all_video}) 
+
+def handgestures(request):
+    all_video=Video.objects.all()
+
+    return render(request, 'users/handgestures.html',{"all":all_video})     
 
 def emotionvideo(request):
     emotion= emotiondetectionvideo.emo