diff --git a/onlinecourse/admin.py b/onlinecourse/admin.py index ffd8a631..ccfc1673 100644 --- a/onlinecourse/admin.py +++ b/onlinecourse/admin.py @@ -1,15 +1,20 @@ 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 +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. class CourseAdmin(admin.ModelAdmin): inlines = [LessonInline] @@ -21,10 +26,16 @@ class CourseAdmin(admin.ModelAdmin): class LessonAdmin(admin.ModelAdmin): list_display = ['title'] +class QuestionAdmin(admin.ModelAdmin): + inlines = [ChoiceInline] + list_display = ['question_text'] -# Register Question and Choice models here +# 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/migrations/0001_initial.py b/onlinecourse/migrations/0001_initial.py new file mode 100644 index 00000000..e1efbffd --- /dev/null +++ b/onlinecourse/migrations/0001_initial.py @@ -0,0 +1,78 @@ +# Generated by Django 4.2.4 on 2025-05-12 23:33 + +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/migrations/0002_choice_submission_question_choice_question.py b/onlinecourse/migrations/0002_choice_submission_question_choice_question.py new file mode 100644 index 00000000..c365a26b --- /dev/null +++ b/onlinecourse/migrations/0002_choice_submission_question_choice_question.py @@ -0,0 +1,44 @@ +# Generated by Django 4.2.4 on 2025-05-13 00:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('onlinecourse', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Choice', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('choice_text', models.TextField()), + ('is_correct', models.BooleanField(default=False)), + ], + ), + migrations.CreateModel( + name='Submission', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('choices', models.ManyToManyField(to='onlinecourse.choice')), + ('enrollment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='onlinecourse.enrollment')), + ], + ), + migrations.CreateModel( + name='Question', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('question_text', models.TextField()), + ('grade_point', models.IntegerField()), + ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='onlinecourse.course')), + ], + ), + migrations.AddField( + model_name='choice', + name='question', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='onlinecourse.question'), + ), + ] diff --git a/onlinecourse/models.py b/onlinecourse/models.py index f6fbcbb5..70b6dbbf 100644 --- a/onlinecourse/models.py +++ b/onlinecourse/models.py @@ -94,10 +94,45 @@ class Enrollment(models.Model): mode = models.CharField(max_length=5, choices=COURSE_MODES, default=AUDIT) rating = models.FloatField(default=5.0) +# Create a Question Model with: +# Used to persist questions for a course +# Has a Many-To-One relationship with the course +# Has question text +# Has a grade point for each question +class Question(models.Model): + course = models.ForeignKey(Course, on_delete=models.CASCADE) + question_text = models.TextField() + grade_point = models.IntegerField() + + def __str__(self): + return "Question: " + self.question_text + + # A sample model method to calculate if learner get 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 + +# Create a Choice Model with: +# Used to persist choice content for a question +# Has a Many-To-One relationship with the Question model +# Has choice text +# Has a boolean field to indicate if the choice is correct +class Choice(models.Model): + question = models.ForeignKey(Question, on_delete=models.CASCADE) + choice_text = models.TextField() + is_correct = models.BooleanField(default=False) + + def __str__(self): + return self.choice_text # 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) +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..fdb986d1 100644 --- a/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html +++ b/onlinecourse/templates/onlinecourse/course_detail_bootstrap.html @@ -18,22 +18,31 @@
    {% if user.is_authenticated %} -
  • - {{ user.first_name }}({{ user.username }}) - Logout -
    • - {% else %} -
  • -
    - {% csrf_token %} -
    - - - - Sign Up +
    + +
    + + {% for question in course.question_set.all %} +
    +
    +
    {{ question.question_text }}
    +
    + {% csrf_token %} +
    + {% for choice in question.choice_set.all %} +
    + +
    + {% endfor %} +
    + {% endfor %} + -
    • + {% endif %}
@@ -54,3 +63,4 @@

{{ course.name }}

+ diff --git a/onlinecourse/templates/onlinecourse/exam_result_bootstrap.html b/onlinecourse/templates/onlinecourse/exam_result_bootstrap.html index 264728f5..5a738dc8 100644 --- a/onlinecourse/templates/onlinecourse/exam_result_bootstrap.html +++ b/onlinecourse/templates/onlinecourse/exam_result_bootstrap.html @@ -38,18 +38,34 @@
{% 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.question_text }}
+
+ {% for choice in question.choice_set.all %} +
+ {% if choice.is_correct and choice in choices %} +
Correct answer: {{ choice.choice_text }}
+ {% else %}{% if choice.is_correct and not choice in choices %} +
Not selected: {{ choice.choice_text }}
+ {% else %}{% if not choice.is_correct and choice in choices %} +
Wrong answer: {{ choice.choice_text }}
+ {% else %} +
{{ choice.choice_text }}
+ {% endif %}{% endif %}{% endif %} +
+ {% endfor %} +
+ {% endfor %}
\ No newline at end of file diff --git a/onlinecourse/urls.py b/onlinecourse/urls.py index 2960e104..fa15fbee 100644 --- a/onlinecourse/urls.py +++ b/onlinecourse/urls.py @@ -18,7 +18,7 @@ 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..67611705 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,16 +103,17 @@ 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): - - +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 def extract_answers(request): submitted_anwsers = [] @@ -124,13 +125,27 @@ 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): +# Create an exam result view to check if learner passed exam and show their question results and result for each question, +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 + questions = course.question_set.all() # Assuming course has related questions + + for question in questions: + correct_choices = question.choice_set.filter(is_correct=True) # Get all correct choices for the question + selected_choices = choices.filter(question=question) # Get the user's selected choices for the question + + # Check if the selected choices are the same as the correct choices + if set(correct_choices) == set(selected_choices): + total_score += question.grade_point # Add the question's grade only if all correct answers are selected + context['course'] = course + context['grade'] = total_score + context['choices'] = choices + return render(request, 'onlinecourse/exam_result_bootstrap.html', context) diff --git a/requirements.txt b/requirements.txt index 79caae61..b7ad3c60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -Django==4.2.3 -Pillow==10.0.0 +Django==4.2.4 +Pillow==10.4.0 jinja2==3.0 gunicorn==20.1.0 contextvars typing-extensions==4.2.0 -aiohttp==3.8.3 +aiohttp==3.9.3 click==8.0.4 wheel==0.41.1 -multidict==4.5 +multidict==4.5 \ No newline at end of file diff --git a/static/media/course_images/question.png b/static/media/course_images/question.png new file mode 100644 index 00000000..7726870a Binary files /dev/null and b/static/media/course_images/question.png differ