diff --git a/accounts/migrations/0016_alter_user_managers.py b/accounts/migrations/0016_alter_user_managers.py new file mode 100644 index 0000000..fe47888 --- /dev/null +++ b/accounts/migrations/0016_alter_user_managers.py @@ -0,0 +1,20 @@ +# Generated by Django 4.0.8 on 2023-12-30 19:04 + +import accounts.models +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounts', '0015_alter_user_managers'), + ] + + operations = [ + migrations.AlterModelManagers( + name='user', + managers=[ + ('objects', accounts.models.CustomUserManager()), + ], + ), + ] diff --git a/quiz/migrations/0003_rename_essay_question_essayquestion.py b/quiz/migrations/0003_rename_essay_question_essayquestion.py new file mode 100644 index 0000000..d6648d5 --- /dev/null +++ b/quiz/migrations/0003_rename_essay_question_essayquestion.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0.8 on 2023-12-30 19:04 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('quiz', '0002_alter_choice_id_alter_progress_id_alter_question_id_and_more'), + ] + + operations = [ + migrations.RenameModel( + old_name='Essay_Question', + new_name='EssayQuestion', + ), + ] diff --git a/quiz/views.py b/quiz/views.py index 194acf7..cd757ca 100644 --- a/quiz/views.py +++ b/quiz/views.py @@ -180,9 +180,6 @@ class QuizUserProgressView(TemplateView): return context -from result.models import TakenCourse - - @method_decorator([login_required, lecturer_required], name="dispatch") class QuizMarkingList(QuizMarkerMixin, SittingFilterTitleMixin, ListView): model = Sitting diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html index c73757a..970bfd4 100644 --- a/templates/accounts/profile.html +++ b/templates/accounts/profile.html @@ -73,7 +73,7 @@ {% endfor %} {% else %} -
No courses!
+
No courses!
{% endif %} {% endif %} diff --git a/templates/accounts/profile_single.html b/templates/accounts/profile_single.html index 95f03a0..316001b 100644 --- a/templates/accounts/profile_single.html +++ b/templates/accounts/profile_single.html @@ -65,7 +65,7 @@ {% endfor %} {% else %} -
No courses!
+
No courses!
{% endif %} {% endif %} diff --git a/templates/accounts/student_list.html b/templates/accounts/student_list.html index 60d0697..b22f9a4 100644 --- a/templates/accounts/student_list.html +++ b/templates/accounts/student_list.html @@ -88,7 +88,7 @@ - No Student. + No Student. {% if request.user.is_superuser %} diff --git a/templates/course/course_add.html b/templates/course/course_add.html index ecf999b..1bf00b2 100644 --- a/templates/course/course_add.html +++ b/templates/course/course_add.html @@ -8,8 +8,8 @@ Programs Add & Update Course
Course Add & Update Form
-
- +
+
{% if messages %} {% for message in messages %} {% if message.tags == 'error' %} diff --git a/templates/course/course_registration.html b/templates/course/course_registration.html index 5048861..931f03c 100644 --- a/templates/course/course_registration.html +++ b/templates/course/course_registration.html @@ -7,7 +7,7 @@ {% block content %}
Home Course Registration
-

Course Add & Drop

+

Course Add & Drop

{% if messages %} {% for message in messages %} @@ -90,7 +90,7 @@ - No Course. + No Course. @@ -153,7 +153,7 @@ - No Course. + No Course. @@ -259,7 +259,7 @@ - No Course. + No Course. diff --git a/templates/course/course_single.html b/templates/course/course_single.html index 050b053..43057a4 100644 --- a/templates/course/course_single.html +++ b/templates/course/course_single.html @@ -16,16 +16,16 @@
{% if request.user.is_superuser or request.user.is_lecturer %} - + Upload new file - + Upload new video {% endif %}
@@ -33,7 +33,7 @@
{{ course }}
-

{{ course.summary }}

+

{{ course.summary }}

{% if request.user.is_superuser %}
@@ -112,7 +112,7 @@ - No video Uploaded. + No video Uploaded. {% if request.user.is_superuser or request.user.is_lecturer %} @@ -190,7 +190,7 @@ - No File Uploaded. + No File Uploaded. {% if request.user.is_superuser or request.user.is_lecturer %} diff --git a/templates/course/program_list.html b/templates/course/program_list.html index af80cac..e257b89 100644 --- a/templates/course/program_list.html +++ b/templates/course/program_list.html @@ -113,6 +113,26 @@ {% endif %} + {% empty %} + + + + + + No program. + {% if request.user.is_superuser %} + + + Add program now. + + {% endif %} + + + + + + + {% endfor %} diff --git a/templates/course/program_single.html b/templates/course/program_single.html index 747ad76..d2f3d2d 100644 --- a/templates/course/program_single.html +++ b/templates/course/program_single.html @@ -19,7 +19,7 @@ {% if program %}
{{ program.title }}
{% if program.summary %} -

{{ program.summary }}

+

{{ program.summary }}

{% endif %} {% endif %} @@ -103,6 +103,21 @@ {% endif %} + {% empty %} + + + + No course for this progrm. + {% if request.user.is_superuser %} + + + Add one now. + + {% endif %} + + + + {% endfor %} diff --git a/templates/quiz/sitting_list.html b/templates/quiz/sitting_list.html index bc8658d..4c54102 100644 --- a/templates/quiz/sitting_list.html +++ b/templates/quiz/sitting_list.html @@ -53,7 +53,7 @@ {% else %} -

{% trans "There are no matching results for your search..." %}.

+

{% trans "No completed exams for you" %}.

{% endif %}
{% endblock %} diff --git a/templates/result/add_score.html b/templates/result/add_score.html index c6b5432..c15152b 100644 --- a/templates/result/add_score.html +++ b/templates/result/add_score.html @@ -30,7 +30,7 @@ {{ current_semester }} Semester - {{ current_session }}


-
No course selected.
+
No course selected.
diff --git a/templates/result/add_score_for.html b/templates/result/add_score_for.html index 0c037dc..69f0145 100644 --- a/templates/result/add_score_for.html +++ b/templates/result/add_score_for.html @@ -15,7 +15,7 @@ {% for course in courses %} {{ course.title }} {% empty %} - + {% endfor %} @@ -131,7 +131,7 @@ - No Student. + No Student.