updated models

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

-# Generated by Django 2.2.7 on 2020-10-24 11:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('quiz', '0003_auto_20201024_0927'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='questions',
-            name='quizCode',
-            field=models.CharField(default='Code', max_length=100),
-        ),
-        migrations.AlterField(
-            model_name='quiz',
-            name='quizCode',
-            field=models.CharField(default='Code', max_length=100),
-        ),
-    ]

quiz/migrations/0005_remove_quiz_starttime.py

-# Generated by Django 2.2.7 on 2020-10-24 12:12
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('quiz', '0004_auto_20201024_1150'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='quiz',
-            name='startTime',
-        ),
-    ]

quiz/models.py

@@ -4,11 +4,9 @@ from django.db import models
 from django.db import models
 class quiz(models.Model):
     quizId=models.AutoField(default=0, primary_key=True) #primary key
-<<<<<<< HEAD
+
     #startTime=models.DateTimeField(auto_now_add=True,default=datetime.datetime.now) 
-=======
-    startTime=models.DateTimeField() 
->>>>>>> f01dab74b5bad6e54fc228f10ec2a1c44428b8da
+    #startTime=models.DateTimeField() 
     length=models.FloatField(max_length=10)
     quizCode=models.CharField(max_length=100,default='Code') ##quiz Code set by instructor
     quizDone=models.BooleanField(default=False)