added models

quiz/admin.py

@@ -4,6 +4,8 @@ from django.contrib import admin
 from .models import Questions
 from .models import submission
 from .models import cribs
+from .models import quiz
 admin.site.register(Questions)
 admin.site.register(submission)
 admin.site.register(cribs)
+admin.site.register(quiz)

quiz/migrations/0002_auto_20201024_0840.py

+# Generated by Django 2.2.7 on 2020-10-24 08:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quiz', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quiz',
+            name='quizInfo',
+            field=models.CharField(default='No Info Available', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='quiz',
+            name='quizInstructor',
+            field=models.CharField(default='No Name', max_length=100),
+        ),
+    ]

quiz/migrations/0003_auto_20201024_0927.py

+# Generated by Django 2.2.7 on 2020-10-24 09:27
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quiz', '0002_auto_20201024_0840'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cribs',
+            name='quiz',
+        ),
+        migrations.RemoveField(
+            model_name='questions',
+            name='quiz',
+        ),
+        migrations.AlterField(
+            model_name='cribs',
+            name='quizId',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz'),
+        ),
+        migrations.AlterField(
+            model_name='questions',
+            name='quizId',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz'),
+        ),
+        migrations.AlterField(
+            model_name='submission',
+            name='quizId',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz'),
+        ),
+    ]

quiz/models.py

@@ -6,8 +6,10 @@ class quiz(models.Model):
     quizId=models.AutoField(default=0, primary_key=True) #primary key
     startTime=models.DateTimeField(auto_now_add=True) 
     length=models.FloatField(max_length=10)
-    quizCode=models.CharField(max_length=100) #quizId for questions table
+    quizCode=models.CharField(max_length=100) ##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")
 
 class Questions(models.Model):
     question = models.TextField()
@@ -20,23 +22,18 @@ class Questions(models.Model):
     marks =models.IntegerField(default=1)
     negative = models.FloatField(max_length=10,default=0)
     explainations=models.TextField(max_length=1000,default='No Explaination Given')
-    quizId = models.CharField(max_length=100,default=10)
     questionId=models.AutoField(primary_key=True,)
-    quiz=models.ForeignKey(quiz,to_field='quizId',on_delete=models.CASCADE)
+    quizId=models.ForeignKey(quiz,to_field='quizId',on_delete=models.CASCADE)#unique quiz identification
 
 class submission(models.Model):
     
     questionId=models.ForeignKey(Questions,to_field='questionId',on_delete=models.CASCADE)
     option=models.CharField(max_length=100)
     studentId=models.CharField(max_length=100)
-    quizId=models.CharField(max_length=100)
+    quizId=models.ForeignKey(quiz,to_field='quizId',on_delete=models.CASCADE)#unique quiz identification
 
 class cribs(models.Model):
     studentId=models.CharField(max_length=100)
     cribs=models.CharField(max_length=1000)
-    quizId=models.CharField(max_length=100)
-    quiz=models.ForeignKey(quiz,to_field='quizId',on_delete=models.CASCADE,default=0)
-    questionId=models.ForeignKey(Questions,to_field='questionId',on_delete=models.CASCADE)
-
-
-
+    quizId=models.ForeignKey(quiz,to_field='quizId',on_delete=models.CASCADE)
+    questionId=models.ForeignKey(Questions,to_field='questionId',on_delete=models.CASCADE)
\ No newline at end of file

quiz/views.py

@@ -120,7 +120,7 @@ def handle_uploaded_file(f):
     rows=readCSV(destination)
     for row in rows:
         
-        q=Questions(question=row[0],option1=row[1],option2=row[2],option3=row[3],option4=row[4],answer=row[5],type=row[6],marks=int(row[7]),negative=float(row[8]),explainations=row[9],quizId=row[10])
+        q=Questions(question=row[0],option1=row[1],option2=row[2],option3=row[3],option4=row[4],answer=row[5],type=row[6],marks=int(row[7]),negative=float(row[8]),explainations=row[9],quizCode=row[10],quizId='0')#hardcoded quizid
         q.save()