Commit 7b302b5a authored by Samarth Joshi's avatar Samarth Joshi

Fixed timer bug and adding new quizid everytime (previouly quizid was 0 everytime)

parent 1b948e42
No preview for this file type
# Generated by Django 3.1.2 on 2020-11-06 13:01
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('quiz', '0005_auto_20201106_0534'),
]
operations = [
migrations.AlterField(
model_name='quiz',
name='quizInstructor',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
# Generated by Django 3.1.2 on 2020-11-06 13:31
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('quiz', '0006_auto_20201106_1301'),
]
operations = [
migrations.AlterField(
model_name='quiz',
name='startTime',
field=models.TimeField(),
),
]
......@@ -3,16 +3,16 @@ from django.contrib.auth.models import User
import datetime
class quiz(models.Model):
quizId=models.AutoField(default=0, primary_key=True) #primary key
quizId=models.AutoField(primary_key=True) #primary key
#startTime=models.DateTimeField(auto_now_add=True,default=datetime.datetime.now)
startTime=models.TimeField(auto_now=True)
startTime=models.TimeField()
date=models.DateField(default=datetime.date.today)
length=models.FloatField(max_length=10)
quizCode=models.CharField(max_length=100,default='Code') ##quiz Code set by instructor
quizDone=models.BooleanField(default=False)
quizInfo=models.CharField(max_length=100,default="No Info Available")
quizInstructor=models.CharField(max_length=100,default="No Name")
quizInstructor=models.ForeignKey(to=User, on_delete=models.CASCADE)
@property
def end_datetime( self ):
......
......@@ -90,7 +90,10 @@
if (distance < 0) {
clearInterval(x);
document.getElementById("timer").innerHTML = "EXPIRED";
submit_form(1);
console.log(endtime);
console.log(distance);
console.log(now);
//submit_form(1);
}
}, 1000);
</script>
......
......@@ -105,7 +105,7 @@ def upload_file(request):
uploaded=False
temp1='test'
q= quiz(length=request.POST.get('length'),quizCode=request.POST.get('quizCode'),quizInfo=request.POST.get('quizInfo'),date=request.POST.get('date'),
quizInstructor=request.POST.get('quizInstructor'),startTime =request.POST.get('startTime'),quizDone=False)
quizInstructor=request.user,startTime =request.POST.get('startTime'),quizDone=False)
q.save()
form = UploadFileForm(request.POST, request.FILES)
if request.method == 'POST' and form.is_valid():
......@@ -223,14 +223,14 @@ def add_quiz(request):
i+=1
print(request.user)
q= quiz(length=length,quizCode=quizCode,quizInfo='',date=date,
quizInstructor=str(request.user),startTime =startTime,quizDone=False)
quizInstructor=request.user,startTime =startTime,quizDone=False)
q.save()
while(i<len(vals)):
row=(vals[i],vals[i+1],vals[i+2],vals[i+3],vals[i+4],vals[i+5],vals[i+6],vals[i+7],vals[i+8])
q1=Questions(question=row[0],option1=row[1],option2=row[2],option3=row[3],option4=row[4],
answer=row[7],marks=int(row[5]),negative=float(row[6]),explainations=row[7],quizCode=quizCode,quizId=q)#hardcoded quizid
answer=row[7],marks=int(row[5]),negative=float(row[6]),explainations=row[7],quizCode=quizCode,quizId=q)
q1.save()
i=i+9
return HttpResponse('sucess')#(request,'success')
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment