From 0b1598daf6a2bd5678ef9b173a98c27ad87c451d Mon Sep 17 00:00:00 2001 From: jacksavino Date: Thu, 12 Oct 2023 01:41:21 -0400 Subject: [PATCH 1/2] Adding files from lab env --- onlinecourse/admin.py | 21 +++++++---- onlinecourse/models.py | 35 +++++++++++++++---- .../onlinecourse/course_detail_bootstrap.html | 30 ++++++++++++++++ 3 files changed, 74 insertions(+), 12 deletions(-) diff --git a/onlinecourse/admin.py b/onlinecourse/admin.py index ffd8a631..3d26bfd6 100644 --- a/onlinecourse/admin.py +++ b/onlinecourse/admin.py @@ -1,30 +1,39 @@ from django.contrib import admin -# Import any new Models here -from .models import Course, Lesson, Instructor, Learner +from .models import Course, Lesson, Instructor, Learner, Question, Choice, Submission -# Register QuestionInline and ChoiceInline classes here +# Inline classes +class ChoiceInline(admin.StackedInline): + model = Choice + extra = 2 +class QuestionInline(admin.StackedInline): + model = Question + extra = 2 class LessonInline(admin.StackedInline): model = Lesson extra = 5 -# Register your models here. +# Register models class CourseAdmin(admin.ModelAdmin): inlines = [LessonInline] list_display = ('name', 'pub_date') list_filter = ['pub_date'] search_fields = ['name', 'description'] - class LessonAdmin(admin.ModelAdmin): list_display = ['title'] +class QuestionAdmin(admin.ModelAdmin): + inlines = [ChoiceInline] + list_display = ['content'] -# Register Question and Choice models here admin.site.register(Course, CourseAdmin) admin.site.register(Lesson, LessonAdmin) admin.site.register(Instructor) admin.site.register(Learner) +admin.site.register(Question, QuestionAdmin) +admin.site.register(Choice) +admin.site.register(Submission) diff --git a/onlinecourse/models.py b/onlinecourse/models.py index f6fbcbb5..c8bfd57e 100644 --- a/onlinecourse/models.py +++ b/onlinecourse/models.py @@ -95,9 +95,32 @@ class Enrollment(models.Model): rating = models.FloatField(default=5.0) -# One enrollment could have multiple submission -# One submission could have multiple choices -# One choice could belong to multiple submissions -#class Submission(models.Model): -# enrollment = models.ForeignKey(Enrollment, on_delete=models.CASCADE) -# choices = models.ManyToManyField(Choice) +# Question model +class Question(models.Model): + course = models.ForeignKey(Course, on_delete=models.CASCADE) + content = models.CharField(max_length=200) + grade = models.IntegerField(default=50) + + def __str__(self): + return "Question: " + self.content + + # Method to calculate if the learner gets the score of the question + def is_get_score(self, selected_ids): + all_answers = self.choice_set.filter(is_correct=True).count() + selected_correct = self.choice_set.filter(is_correct=True, id__in=selected_ids).count() + if all_answers == selected_correct: + return True + else: + return False + +# Choice model +class Choice(models.Model): + question = models.ForeignKey(Question, on_delete=models.CASCADE) + content = models.CharField(max_length=200) + is_correct = models.BooleanField(default=False) + + +# Submission model +class Submission(models.Model): + enrollment = models.ForeignKey(Enrollment, on_delete=models.CASCADE) + choices = models.ManyToManyField(Choice) diff --git a/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html b/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html index fb48e939..bf936209 100644 --- a/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html +++ b/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html @@ -51,6 +51,36 @@

{{ course.name }}

{% endfor %} + {% if user.is_authenticated %} +
+ + +
+
+
+
+ {% for question in course.question_set.all %} + + {% endfor %} +
+
+
+
{{ question.content }}
+ {% csrf_token %} +
+ +
+
+ {% for choice in question.choice_set.all %} +
+ +
+ {% endfor %} + {% endif %} From d269d8aa80388db93308c62e71e50c42cfb1b0c0 Mon Sep 17 00:00:00 2001 From: jacksavino Date: Thu, 12 Oct 2023 02:07:11 -0400 Subject: [PATCH 2/2] Adding updated files from lab env --- onlinecourse/migrations/0001_initial.py | 78 +++++++++++++++++++ .../onlinecourse/course_detail_bootstrap.html | 37 ++++----- .../onlinecourse/exam_result_bootstrap.html | 22 ++++++ onlinecourse/urls.py | 2 + onlinecourse/views.py | 42 ++++++---- 5 files changed, 145 insertions(+), 36 deletions(-) create mode 100644 onlinecourse/migrations/0001_initial.py diff --git a/onlinecourse/migrations/0001_initial.py b/onlinecourse/migrations/0001_initial.py new file mode 100644 index 00000000..48845fba --- /dev/null +++ b/onlinecourse/migrations/0001_initial.py @@ -0,0 +1,78 @@ +# Generated by Django 4.2.3 on 2023-10-12 05:05 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Course', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(default='online course', max_length=30)), + ('image', models.ImageField(upload_to='course_images/')), + ('description', models.CharField(max_length=1000)), + ('pub_date', models.DateField(null=True)), + ('total_enrollment', models.IntegerField(default=0)), + ], + ), + migrations.CreateModel( + name='Lesson', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(default='title', max_length=200)), + ('order', models.IntegerField(default=0)), + ('content', models.TextField()), + ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='onlinecourse.course')), + ], + ), + migrations.CreateModel( + name='Learner', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('occupation', models.CharField(choices=[('student', 'Student'), ('developer', 'Developer'), ('data_scientist', 'Data Scientist'), ('dba', 'Database Admin')], default='student', max_length=20)), + ('social_link', models.URLField()), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Instructor', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('full_time', models.BooleanField(default=True)), + ('total_learners', models.IntegerField()), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Enrollment', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('date_enrolled', models.DateField(default=django.utils.timezone.now)), + ('mode', models.CharField(choices=[('audit', 'Audit'), ('honor', 'Honor'), ('BETA', 'BETA')], default='audit', max_length=5)), + ('rating', models.FloatField(default=5.0)), + ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='onlinecourse.course')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.AddField( + model_name='course', + name='instructors', + field=models.ManyToManyField(to='onlinecourse.instructor'), + ), + migrations.AddField( + model_name='course', + name='users', + field=models.ManyToManyField(through='onlinecourse.Enrollment', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html b/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html index bf936209..37edadbc 100644 --- a/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html +++ b/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html @@ -53,33 +53,30 @@

{{ course.name }}

{% if user.is_authenticated %}
- -
-
{% for question in course.question_set.all %} - +
+
+
{{ question.content }}
+
+ {% csrf_token %} +
+ {% for choice in question.choice_set.all %} +
+ +
+ {% endfor %} +
+
{% endfor %} +
-
-
{{ question.content }}
- {% csrf_token %} -
- -
-
- {% for choice in question.choice_set.all %} -
- -
- {% endfor %} {% endif %} diff --git a/onlinecourse/templates/onlinecourse/exam_result_bootstrap.html b/onlinecourse/templates/onlinecourse/exam_result_bootstrap.html index 264728f5..d1b23715 100644 --- a/onlinecourse/templates/onlinecourse/exam_result_bootstrap.html +++ b/onlinecourse/templates/onlinecourse/exam_result_bootstrap.html @@ -39,16 +39,38 @@ {% if grade > 80 %}
+ Congratulations, {{ user.first_name }}! You have passed the exam and completed the course with score {{ grade }}/100
{% else %}
+ Failed Sorry, {{ user.first_name }}! You have failed the exam with score {{ grade }}/100
Re-test {% endif %}
Exam results
+ {% for question in course.question_set.all %} +
+
{{ question.content }}
+
+ {% for choice in question.choice_set.all %} +
+ {% if choice.is_correct and choice in choices %} +
Correct answer: {{ choice.content }}
+ {% else %}{% if choice.is_correct and not choice in choices %} +
Not selected: {{ choice.content }}
+ {% else %}{% if not choice.is_correct and choice in choices %} +
Wrong answer: {{ choice.content }}
+ {% else %} +
{{ choice.content }}
+ {% endif %}{% endif %}{% endif %} +
+ {% endfor %} +
+
+ {% endfor %}
diff --git a/onlinecourse/urls.py b/onlinecourse/urls.py index 2960e104..48304e75 100644 --- a/onlinecourse/urls.py +++ b/onlinecourse/urls.py @@ -18,7 +18,9 @@ path('/enroll/', views.enroll, name='enroll'), # Create a route for submit view + path('/submit/', views.submit, name="submit"), # Create a route for show_exam_result view + path('course//submission//result/', views.show_exam_result, name="exam_result"), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/onlinecourse/views.py b/onlinecourse/views.py index 53eb02f0..ff4c8bdb 100644 --- a/onlinecourse/views.py +++ b/onlinecourse/views.py @@ -1,7 +1,7 @@ from django.shortcuts import render from django.http import HttpResponseRedirect # Import any new Models here -from .models import Course, Enrollment +from .models import Course, Enrollment, Question, Choice, Submission from django.contrib.auth.models import User from django.shortcuts import get_object_or_404, render, redirect from django.urls import reverse @@ -103,14 +103,16 @@ def enroll(request, course_id): return HttpResponseRedirect(reverse(viewname='onlinecourse:course_details', args=(course.id,))) -# Create a submit view to create an exam submission record for a course enrollment, -# you may implement it based on following logic: - # Get user and course object, then get the associated enrollment object created when the user enrolled the course - # Create a submission object referring to the enrollment - # Collect the selected choices from exam form - # Add each selected choice object to the submission object - # Redirect to show_exam_result with the submission id -#def submit(request, course_id): +# Submit view +def submit(request, course_id): + course = get_object_or_404(Course, pk=course_id) + user = request.user + enrollment = Enrollment.objects.get(user=user, course=course) + submission = Submission.objects.create(enrollment=enrollment) + choices = extract_answers(request) + submission.choices.set(choices) + submission_id = submission.id + return HttpResponseRedirect(reverse(viewname='onlinecourse:exam_result', args=(course_id, submission_id,))) # An example method to collect the selected choices from the exam form from the request object @@ -124,13 +126,21 @@ def extract_answers(request): return submitted_anwsers -# Create an exam result view to check if learner passed exam and show their question results and result for each question, -# you may implement it based on the following logic: - # Get course and submission based on their ids - # Get the selected choice ids from the submission record - # For each selected choice, check if it is a correct answer or not - # Calculate the total score -#def show_exam_result(request, course_id, submission_id): +# Evaluation view +def show_exam_result(request, course_id, submission_id): + context = {} + course = get_object_or_404(Course, pk=course_id) + submission = Submission.objects.get(id=submission_id) + choices = submission.choices.all() + total_score = 0 + for choice in choices: + if choice.is_correct: + total_score += choice.question.grade + context['course'] = course + context['grade'] = total_score + context['choices'] = choices + + return render(request, 'onlinecourse/exam_result_bootstrap.html', context)