Merge branch 'test'

main/templates/main/faculty_profile.html

@@ -41,4 +41,5 @@ <h4>Dept :<span class="mx-2"></span>{{faculty.department}}</h4>
       </div>
    </div>
 </div>
-{% endblock %}
+
+{% endblock %}

main/templates/main/profile.html

@@ -40,4 +40,6 @@ <h4>Dept :<span class="mx-2"> {{student.department}}</h4>
       </div>
    </div>
 </div>
+
+
 {% endblock %}

quiz/migrations/0001_initial.py

@@ -0,0 +1,59 @@
+# Generated by Django 4.0.4 on 2022-08-21 13:53
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('main', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Question',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('question', models.TextField()),
+                ('marks', models.IntegerField(blank=True, default=0, null=True)),
+                ('option1', models.TextField(default='')),
+                ('option2', models.TextField(default='')),
+                ('option3', models.TextField(default='')),
+                ('option4', models.TextField(default='')),
+                ('answer', models.CharField(choices=[('A', 'A'), ('B', 'B'), ('C', 'C'), ('D', 'D')], default='A', max_length=1)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Quiz',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('start', models.DateTimeField()),
+                ('end', models.DateTimeField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('total_marks', models.IntegerField(default=0)),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.course')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='StudentAnswer',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('answer', models.CharField(blank=True, choices=[('A', 'A'), ('B', 'B'), ('C', 'C'), ('D', 'D')], default='', max_length=1, null=True)),
+                ('marks', models.IntegerField(blank=True, null=True)),
+                ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.question')),
+                ('quiz', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz')),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.student')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='question',
+            name='quiz',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quiz.quiz'),
+        ),
+    ]

quiz/migrations/0002_remove_quiz_total_marks_alter_question_marks.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.0.4 on 2022-08-21 22:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quiz', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='quiz',
+            name='total_marks',
+        ),
+        migrations.AlterField(
+            model_name='question',
+            name='marks',
+            field=models.IntegerField(default=0),
+        ),
+    ]

quiz/migrations/0003_alter_quiz_options_quiz_publish_status.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.0.4 on 2022-08-22 17:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quiz', '0002_remove_quiz_total_marks_alter_question_marks'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='quiz',
+            options={'ordering': ['-created_at'], 'verbose_name_plural': 'Quizzes'},
+        ),
+        migrations.AddField(
+            model_name='quiz',
+            name='publish_status',
+            field=models.BooleanField(blank=True, default=False, null=True),
+        ),
+    ]

quiz/migrations/0004_alter_quiz_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.0.4 on 2022-08-22 18:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quiz', '0003_alter_quiz_options_quiz_publish_status'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='quiz',
+            options={'verbose_name_plural': 'Quizzes'},
+        ),
+    ]

templates/index.html

@@ -62,14 +62,6 @@
       <script src=" {% static 'js/bootstrap.bundle.min.js' %} "></script>
       <script src=" {% static 'js/chart.js' %} "></script>
 
-
-
-      <!-- Tooltips-->
-      <script>
-         var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
-         var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
-             return new bootstrap.Tooltip(tooltipTriggerEl)
-         })
-      </script>     
+
    </body>
 </html>