Merge conflicts

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/migrations/0004_auto_20201024_1020.py

-# Generated by Django 3.1.2 on 2020-10-24 10:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('quiz', '0003_auto_20201024_0927'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='quiz',
-            name='startTime',
-            field=models.DateTimeField(),
-        ),
-    ]

quiz/models.py

@@ -3,9 +3,11 @@ from django.contrib.auth.models import User
 
 class quiz(models.Model):
     quizId=models.AutoField(default=0, primary_key=True) #primary key
-    startTime=models.DateTimeField() 
+
+    #startTime=models.DateTimeField(auto_now_add=True,default=datetime.datetime.now) 
+    #startTime=models.DateTimeField() 
     length=models.FloatField(max_length=10)
-    quizCode=models.CharField(max_length=100) ##quiz Code set by instructor
+    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")
@@ -25,6 +27,7 @@ class Questions(models.Model):
     negative = models.FloatField(max_length=10,default=0)
     explainations=models.TextField(max_length=1000,default='No Explaination Given')
     questionId=models.AutoField(primary_key=True,)
+    quizCode =models.CharField(max_length=100,default='Code')
     quizId=models.ForeignKey(quiz,to_field='quizId',on_delete=models.CASCADE)#unique quiz identification
     
     def __str__(self):

quiz/views.py

@@ -8,6 +8,8 @@ from django.http import HttpResponseRedirect
 from .models import submission
 from .models import cribs
 from . newQuiz import readCSV
+from .models import quiz
+from django.db.models import Max
 import csv
 #for login
 from django.contrib.auth.models import User
@@ -115,9 +117,11 @@ def student(request):
 def upload_file(request):
     uploaded=False
     temp1='test'
+    q= quiz(length=90,quizCode='abcd',quizDone=False)
+    q.save()
     form = UploadFileForm(request.POST, request.FILES)
     if request.method == 'POST' and form.is_valid():
-        handle_uploaded_file(request.FILES['file'])
+        handle_uploaded_file(request.FILES['file'],q)
         uploaded=True
         return HttpResponse('success')
         
@@ -126,7 +130,7 @@ def upload_file(request):
     
     
 
-def handle_uploaded_file(f):
+def handle_uploaded_file(f,q1):
     with open('name.csv', 'wb+') as destination:
         for chunk in f.chunks():
             destination.write(chunk)
@@ -134,7 +138,11 @@ def handle_uploaded_file(f):
     rows=readCSV(destination)
     for row in rows:
         
+<<<<<<< HEAD
         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])#hardcoded quizid
+=======
+        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=q1)#hardcoded quizid
+>>>>>>> 09a4b5410797d85c84844bbbd0ec6370a35f5a16
         q.save()