Commit f1a5828b authored by Roshan Rabinarayan's avatar Roshan Rabinarayan

changes submissions to insert explainations

parent 792936b5
......@@ -43,6 +43,6 @@ urlpatterns = [
path('heartbeat/',a.heartbeat),
path('getbeat/',a.getbeat),
path('logs/',a.view_logs),
path('logout/', auth_views.LogoutView.as_view(), name='logout')
path('logout/', auth_views.LogoutView.as_view(), name='logout'),
]+ static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
No preview for this file type
# Generated by Django 3.1.2 on 2020-11-13 09:34
import datetime
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Questions',
fields=[
('question', models.TextField()),
('option1', models.CharField(max_length=100)),
('option2', models.CharField(max_length=100)),
('option3', models.CharField(max_length=100)),
('option4', models.CharField(max_length=100)),
('answer', models.CharField(max_length=100)),
('type', models.CharField(default=1, max_length=10)),
('marks', models.IntegerField(default=1)),
('negative', models.FloatField(default=0, max_length=10)),
('explainations', models.TextField(default='No Explaination Given', max_length=1000)),
('questionId', models.AutoField(primary_key=True, serialize=False)),
('quizCode', models.CharField(default='Code', max_length=100)),
],
options={
'db_table': 'Questions',
},
),
migrations.CreateModel(
name='quiz',
fields=[
('quizId', models.AutoField(primary_key=True, serialize=False)),
('startTime', models.TimeField()),
('date', models.DateField(default=datetime.date.today)),
('length', models.FloatField(max_length=10)),
('quizCode', models.CharField(default='Code', max_length=100)),
('quizDone', models.BooleanField(default=False)),
('quizInfo', models.CharField(default='No Info Available', max_length=100)),
('quizInstructor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='submission',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('option', models.CharField(max_length=100)),
('questionId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.questions')),
('quizId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz')),
('studentId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='result',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('marks', models.IntegerField(default=0, max_length=10)),
('quizId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz')),
('studentId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.AddField(
model_name='questions',
name='quizId',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz'),
),
migrations.CreateModel(
name='Permission',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('role', models.CharField(default='S', max_length=1)),
('userId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='cribs',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('cribs', models.CharField(max_length=1000)),
('questionId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.questions')),
('quizId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz')),
('studentId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
options={
'db_table': 'cribs',
},
),
]
# Generated by Django 3.1.2 on 2020-11-13 10:47
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('quiz', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='cribs',
name='studentId',
field=models.CharField(max_length=100),
),
]
# Generated by Django 3.1.2 on 2020-11-13 10:48
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', '0002_auto_20201113_1047'),
]
operations = [
migrations.AlterField(
model_name='cribs',
name='studentId',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
# Generated by Django 3.1.2 on 2020-11-14 15:53
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', '0003_auto_20201113_1048'),
]
operations = [
migrations.CreateModel(
name='log',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('text', models.CharField(max_length=1000)),
('studentId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
# Generated by Django 3.1.2 on 2020-11-14 16:04
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('quiz', '0004_log'),
]
operations = [
migrations.RemoveField(
model_name='log',
name='studentId',
),
migrations.AddField(
model_name='log',
name='quizId',
field=models.ForeignKey(default='', on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz'),
),
]
# Generated by Django 3.1.2 on 2020-11-14 16:33
import datetime
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_20201114_1604'),
]
operations = [
migrations.RemoveField(
model_name='log',
name='text',
),
migrations.AddField(
model_name='log',
name='fullscreen',
field=models.CharField(default='', max_length=20),
),
migrations.AddField(
model_name='log',
name='logtime',
field=models.DateTimeField(default=datetime.datetime(2020, 11, 14, 16, 33, 30, 839180)),
),
migrations.AddField(
model_name='log',
name='questions',
field=models.CharField(default='', max_length=20),
),
migrations.AddField(
model_name='log',
name='studentId',
field=models.ForeignKey(default='', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
# Generated by Django 3.1.2 on 2020-11-14 16:35
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('quiz', '0006_auto_20201114_1633'),
]
operations = [
migrations.AlterField(
model_name='log',
name='logtime',
field=models.DateTimeField(default=django.utils.timezone.now),
),
]
# Generated by Django 3.1.2 on 2020-11-14 16:36
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('quiz', '0007_auto_20201114_1635'),
]
operations = [
migrations.AlterField(
model_name='result',
name='marks',
field=models.IntegerField(default=0),
),
]
# Generated by Django 3.1.2 on 2020-11-14 16:45
import datetime
from django.db import migrations, models
from django.utils.timezone import utc
class Migration(migrations.Migration):
dependencies = [
('quiz', '0008_auto_20201114_1636'),
]
operations = [
migrations.AlterField(
model_name='log',
name='logtime',
field=models.DateTimeField(default=datetime.datetime(2020, 11, 14, 16, 45, 56, 786475, tzinfo=utc)),
),
]
# Generated by Django 3.1.2 on 2020-11-14 16:46
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('quiz', '0009_auto_20201114_1645'),
]
operations = [
migrations.AlterField(
model_name='log',
name='logtime',
field=models.DateTimeField(default=django.utils.timezone.now),
),
]
......@@ -233,7 +233,7 @@ def sign_up(request):
if request.method == "POST":
if form.is_valid():
user = form.save()
login(request.user)
login(request,user)
return render(request,'student.html')
context['form']=form
return render(request,'registration/signup.html',context)
......@@ -291,7 +291,8 @@ def add_quiz(request):
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=q.quizCode,quizId=q)
answer=row[7],marks=int(row[5]),negative=float(row[6]),explainations=row[8],quizCode=q.quizCode,quizId=q)
print(row)
q1.save()
i=i+9
return render(request,'professor.html',{'quiz_upload':True})#(request,'success')
......
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