From 6bf236ff15c611bf0b9982878eec884381e57e9a Mon Sep 17 00:00:00 2001
From: prashantmitts <prashantmitts@yahoo.com>
Date: Sun, 6 Aug 2017 21:07:12 +0530
Subject: [PATCH 1/3] video db added with video playing video playing issue
 pesists

---
 mooc/models.py                 |  6 ++++--
 mooc/templates/mooc/topic.html |  8 ++++++++
 mooc/views.py                  | 21 ++++++++++++++-------
 mooc_chatbot/settings.py       |  2 ++
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/mooc/models.py b/mooc/models.py
index 23248f2..6058f9f 100644
--- a/mooc/models.py
+++ b/mooc/models.py
@@ -1,7 +1,9 @@
 from django.db import models
 
 # Create your models here.
+
+
 class Topic(models.Model):
     content = models.CharField(max_length=10000)
-    title = models.CharField(max_length=40, default='Title')    
-
+    title = models.CharField(max_length=40, default='Title')
+    video_dir = models.FileField(upload_to='videos/', default="video")
diff --git a/mooc/templates/mooc/topic.html b/mooc/templates/mooc/topic.html
index 8ffa702..5e67f89 100644
--- a/mooc/templates/mooc/topic.html
+++ b/mooc/templates/mooc/topic.html
@@ -1,5 +1,7 @@
 {% extends 'mooc/_base.html' %}
 {% block styles %}
+{% load staticfiles %}
+
 <style type="text/css">
 	#chatbox {
 		width: 380px;
@@ -29,6 +31,12 @@ <h2>{{topic.title}}</h2>
 <div id="chatbox">
 	{% include 'bot/chatbox.html' %}
 </div>
+
+<video width="320" height="240" controls>
+<source src="{{ STATIC_URL }}""videos/video.mp4" type="video/mp4">
+</video>
+
+
 {% endblock content %}
 {% block script %}
 {% include 'bot/scripts.html' %}
diff --git a/mooc/views.py b/mooc/views.py
index f2cdb41..4df44a3 100644
--- a/mooc/views.py
+++ b/mooc/views.py
@@ -1,21 +1,28 @@
 from django.shortcuts import render
 from mooc.models import Topic
+from mooc_chatbot.settings import MEDIA_ROOT
+
 # Create your views here.
+
+
 def home(request):
     print('home')
     return render(request, 'mooc/home.html')
 
+
 def search(request):
     print('search')
     if request.GET and request.GET.get('query'):
-        search_results = Topic.objects.filter(title__icontains=request.GET.get('query'))
+        search_results = Topic.objects.filter(
+            title__icontains=request.GET.get('query'))
     return render(request, 'mooc/search_results.html', context={'results': search_results})
 
+
 def topic(request):
-    topic_id=request.GET.get('id')
+    topic_id = request.GET.get('id')
     topic = Topic.objects.filter(id=topic_id).first()
-    # if topic:
-    #     topic_content = topic.content
-    # else:
-    #     topic_content =None    
-    return render(request, 'mooc/topic.html',context={'topic_id':topic_id, 'topic': topic})
\ No newline at end of file
+    if topic:
+        topic_content = topic.content
+    else:
+        topic_content =None
+    return render(request, 'mooc/topic.html', context={'topic_id': topic_id, 'topic': topic, 'content': topic_content, 'video': MEDIA_ROOT+"/"+str(topic.video_dir)})
diff --git a/mooc_chatbot/settings.py b/mooc_chatbot/settings.py
index e5c9ce6..e28e329 100644
--- a/mooc_chatbot/settings.py
+++ b/mooc_chatbot/settings.py
@@ -14,6 +14,8 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+MEDIA_ROOT = os.path.join(BASE_DIR,'uploads')
+MEDIA_URL = '/uploads/'
 
 
 # Quick-start development settings - unsuitable for production

From 9aeece059444ce437fccb2454b6142538bba61b9 Mon Sep 17 00:00:00 2001
From: prashantmitts <prashantmitts@yahoo.com>
Date: Mon, 7 Aug 2017 00:32:42 +0530
Subject: [PATCH 2/3] video is functional error lied in static directory

---
 mooc/models.py                 | 2 +-
 mooc/templates/mooc/topic.html | 5 ++---
 mooc/urls.py                   | 3 ++-
 mooc/views.py                  | 4 ++--
 mooc_chatbot/settings.py       | 5 ++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/mooc/models.py b/mooc/models.py
index 6058f9f..50b8de9 100644
--- a/mooc/models.py
+++ b/mooc/models.py
@@ -6,4 +6,4 @@
 class Topic(models.Model):
     content = models.CharField(max_length=10000)
     title = models.CharField(max_length=40, default='Title')
-    video_dir = models.FileField(upload_to='videos/', default="video")
+    video = models.FileField(upload_to='videos/', default="video")
diff --git a/mooc/templates/mooc/topic.html b/mooc/templates/mooc/topic.html
index 5e67f89..2b7b134 100644
--- a/mooc/templates/mooc/topic.html
+++ b/mooc/templates/mooc/topic.html
@@ -32,11 +32,10 @@ <h2>{{topic.title}}</h2>
 	{% include 'bot/chatbox.html' %}
 </div>
 
-<video width="320" height="240" controls>
-<source src="{{ STATIC_URL }}""videos/video.mp4" type="video/mp4">
+<video width="320" height="240" controls autoplay>
+<source src="{% static video %}" type="video/mp4">
 </video>
 
-
 {% endblock content %}
 {% block script %}
 {% include 'bot/scripts.html' %}
diff --git a/mooc/urls.py b/mooc/urls.py
index 66d4ce7..a62feeb 100644
--- a/mooc/urls.py
+++ b/mooc/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls import url
 from mooc.views import *
-
+from mooc_chatbot import settings
+from django.conf.urls.static import static
 
 urlpatterns = [
     url(r'^$', home, name='home'),
diff --git a/mooc/views.py b/mooc/views.py
index 4df44a3..ca06955 100644
--- a/mooc/views.py
+++ b/mooc/views.py
@@ -1,6 +1,5 @@
 from django.shortcuts import render
 from mooc.models import Topic
-from mooc_chatbot.settings import MEDIA_ROOT
 
 # Create your views here.
 
@@ -25,4 +24,5 @@ def topic(request):
         topic_content = topic.content
     else:
         topic_content =None
-    return render(request, 'mooc/topic.html', context={'topic_id': topic_id, 'topic': topic, 'content': topic_content, 'video': MEDIA_ROOT+"/"+str(topic.video_dir)})
+    video_d = str(topic.video)
+    return render(request, 'mooc/topic.html', context={'topic_id': topic_id, 'topic': topic, 'content': topic_content, 'video': video_d})
diff --git a/mooc_chatbot/settings.py b/mooc_chatbot/settings.py
index e28e329..fb3d383 100644
--- a/mooc_chatbot/settings.py
+++ b/mooc_chatbot/settings.py
@@ -14,9 +14,8 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-MEDIA_ROOT = os.path.join(BASE_DIR,'uploads')
-MEDIA_URL = '/uploads/'
-
+STATICFILES_DIRS = (os.path.join(BASE_DIR, "uploads/"), )
+print(STATICFILES_DIRS)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/

From 599d26cb685e47b0d0c0075fb7246599a1ba3f28 Mon Sep 17 00:00:00 2001
From: Krittam <krittam@gmail.com>
Date: Mon, 7 Aug 2017 00:43:45 +0530
Subject: [PATCH 3/3] test commit video

---
 .gitignore                                    |   1 +
 mooc/migrations/0003_topic_video.py           |  20 ++++++++++++++++++
 .../__pycache__/settings.cpython-35.pyc       | Bin 2844 -> 2898 bytes
 mooc_chatbot/__pycache__/urls.cpython-35.pyc  | Bin 1034 -> 1034 bytes
 mooc_chatbot/settings.py                      |   1 -
 5 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 mooc/migrations/0003_topic_video.py

diff --git a/.gitignore b/.gitignore
index b66db70..6be2033 100755
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,4 @@ config.json
 .idea/
 .DS_Store
 
+uploads
diff --git a/mooc/migrations/0003_topic_video.py b/mooc/migrations/0003_topic_video.py
new file mode 100644
index 0000000..f029c40
--- /dev/null
+++ b/mooc/migrations/0003_topic_video.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2017-08-06 18:09
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mooc', '0002_topic_title'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='topic',
+            name='video',
+            field=models.FileField(default='video', upload_to='videos/'),
+        ),
+    ]
diff --git a/mooc_chatbot/__pycache__/settings.cpython-35.pyc b/mooc_chatbot/__pycache__/settings.cpython-35.pyc
index 182bbf6fabd5e163d57cac4a50e151d50c25f30d..b822649a6e8add3c2d5df1524e54f5ad1e3e1a53 100644
GIT binary patch
delta 513
zcmY+BJx>%-7)H;`F1tJ9?us7_;1}YGxQO643M5KElTB!Ji3yj&Z1TWlCI*azdJ79G
z3p0g{zrlvY($?P6*53FBNO&&^iB4v2PVT&U?s;auBtMf@(rCo5v;FmtP58|}SKauT
zJ-c5&wVw7j1M-l(%4P+X_z<!c;A*Ihi_icrCIxp2*+3Q9E8CBe?bJ~NHAy3!@o6-O
z&Y-jC96FDNNUJ!TNpMXxj7HF?57Y%8uKq=I30+24&=|T(S|$s~%B1FDiQ_m6y@p!o
zI-1}=;~U;Mv)hL4;0ZM8*~85fXrI882g`TncME5V(|vRs&7fJI;!N32GR-^aF1m*n
zyoXPGh#rxZJiDP|iG<uH=g@sG;jGzX+$eg2J1*y}n|(j4XR9@w$63jcZhNu!Ab@x!
z?;ZRI=7OlU_wMaZPrI`RhvDCWV66C4n;$OcJK6TH!S349T4(u1XZ3ma%}VE0x0sCb
f;&b%9(zbv2zFlm@FYDWem9So#3Pvi$w|MIa=-pk(

delta 429
zcmYk2J5C!>6o$VUznF<_2-pq~;s6F>ATLJ=Ay9-ZAZT(*^uuT@L?l=M1)@rU&`4CQ
zfrbU7Pnm)Zq>aQDaxM~5u5_-x;@tmne|N4sy-uT%-rbyk+ik)h{yTN&EuWLC%ih<P
zN>~k*u@N$`1XV77Or2&4mZByaMPukG8b=eTMOMR}pf*-V9rO%MhPRpuI+{k$(F}Tl
zy67cYnLHvdlSNnq&0;P)hvrcaEwCRkj2VuyUqy?Y#pI_xzU{^fXen@jSC7ztgyjHk
zV4iOU^N6eHHF|^IlE;`Qb|+8y4!uVMv=MRy!H?(@c`2~99zwJk`sNz?FbFBkn|;P6
z(K_}}&b*wPc|X6s;up+Y#_TL_-rhx9(d}&Mz7lndv1FszOY%y2_&q-=ekDJvegE;}
UesPg*r-zQ!xL#VR6@Sx%f6+}$cK`qY

diff --git a/mooc_chatbot/__pycache__/urls.cpython-35.pyc b/mooc_chatbot/__pycache__/urls.cpython-35.pyc
index 7d70da0ad3ca59f7a30288695f4ebbc3292aede8..af148fbb109a267f82080f0414f202d03fb6dd82 100644
GIT binary patch
delta 16
XcmeC;=;B}(<K^X2&uHJs&ddS;9IyjB

delta 16
XcmeC;=;B}(<K^YLwyt#}J2MLaBNGHJ

diff --git a/mooc_chatbot/settings.py b/mooc_chatbot/settings.py
index fb3d383..add337d 100644
--- a/mooc_chatbot/settings.py
+++ b/mooc_chatbot/settings.py
@@ -15,7 +15,6 @@
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 STATICFILES_DIRS = (os.path.join(BASE_DIR, "uploads/"), )
-print(STATICFILES_DIRS)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/