From 2a879de7e2e434d6ad0d1f02ea93071115698e00 Mon Sep 17 00:00:00 2001 From: Zaki Benaissa Date: Sat, 6 Jan 2024 15:19:55 +0100 Subject: [PATCH] Change 'Department' occurences to 'Program' --- accounts/filters.py | 8 ++++---- accounts/forms.py | 6 +++--- .../0018_rename_department_student_program.py | 18 ++++++++++++++++++ accounts/models.py | 4 ++-- course/views.py | 6 +++--- result/views.py | 14 +++++++++----- templates/accounts/add_student.html | 4 ++-- templates/accounts/profile_single.html | 2 +- templates/accounts/student_list.html | 4 ++-- templates/course/user_course_list.html | 6 +++--- templates/registration/register.html | 4 ++-- 11 files changed, 49 insertions(+), 27 deletions(-) create mode 100644 accounts/migrations/0018_rename_department_student_program.py diff --git a/accounts/filters.py b/accounts/filters.py index 6c54d34..3960888 100644 --- a/accounts/filters.py +++ b/accounts/filters.py @@ -36,7 +36,7 @@ class StudentFilter(django_filters.FilterSet): student__username = django_filters.CharFilter(lookup_expr="exact", label="") student__name = django_filters.CharFilter(method="filter_by_name", label="") student__email = django_filters.CharFilter(lookup_expr="icontains", label="") - department__title = django_filters.CharFilter(lookup_expr="icontains", label="") + program__title = django_filters.CharFilter(lookup_expr="icontains", label="") class Meta: model = Student @@ -44,7 +44,7 @@ class StudentFilter(django_filters.FilterSet): "student__username", "student__name", "student__email", - "department__title", + "program__title", ] def __init__(self, *args, **kwargs): @@ -60,8 +60,8 @@ class StudentFilter(django_filters.FilterSet): self.filters["student__email"].field.widget.attrs.update( {"class": "au-input", "placeholder": "Email"} ) - self.filters["department__title"].field.widget.attrs.update( - {"class": "au-input", "placeholder": "Department"} + self.filters["program__title"].field.widget.attrs.update( + {"class": "au-input", "placeholder": "Program"} ) def filter_by_name(self, queryset, name, value): diff --git a/accounts/forms.py b/accounts/forms.py index c54b18a..5780e0d 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -176,12 +176,12 @@ class StudentAddForm(UserCreationForm): ), ) - department = forms.ModelChoiceField( + program = forms.ModelChoiceField( queryset=Program.objects.all(), widget=forms.Select( attrs={"class": "browser-default custom-select form-control"} ), - label="Department", + label="Program", ) email = forms.EmailField( @@ -237,7 +237,7 @@ class StudentAddForm(UserCreationForm): student = Student.objects.create( student=user, level=self.cleaned_data.get("level"), - department=self.cleaned_data.get("department"), + program=self.cleaned_data.get("program"), ) student.save() return user diff --git a/accounts/migrations/0018_rename_department_student_program.py b/accounts/migrations/0018_rename_department_student_program.py new file mode 100644 index 0000000..d6451ed --- /dev/null +++ b/accounts/migrations/0018_rename_department_student_program.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0.8 on 2024-01-06 13:41 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounts', '0017_alter_departmenthead_options_alter_parent_options_and_more'), + ] + + operations = [ + migrations.RenameField( + model_name='student', + old_name='department', + new_name='program', + ), + ] diff --git a/accounts/models.py b/accounts/models.py index 5196b87..1baa3fd 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -128,7 +128,7 @@ class StudentManager(models.Manager): def search(self, query=None): qs = self.get_queryset() if query is not None: - or_lookup = Q(level__icontains=query) | Q(department__icontains=query) + or_lookup = Q(level__icontains=query) | Q(program__icontains=query) qs = qs.filter( or_lookup ).distinct() # distinct() is often necessary with Q lookups @@ -139,7 +139,7 @@ class Student(models.Model): student = models.OneToOneField(User, on_delete=models.CASCADE) # id_number = models.CharField(max_length=20, unique=True, blank=True) level = models.CharField(max_length=25, choices=LEVEL, null=True) - department = models.ForeignKey(Program, on_delete=models.CASCADE, null=True) + program = models.ForeignKey(Program, on_delete=models.CASCADE, null=True) objects = StudentManager() diff --git a/course/views.py b/course/views.py index 2bce8e0..1eb4aaa 100644 --- a/course/views.py +++ b/course/views.py @@ -468,7 +468,7 @@ def course_registration(request): courses = ( Course.objects.filter( - program__pk=student.department.id, + program__pk=student.program.id, level=student.level, semester=current_semester, ) @@ -476,7 +476,7 @@ def course_registration(request): .order_by("year") ) all_courses = Course.objects.filter( - level=student.level, program__pk=student.department.id + level=student.level, program__pk=student.program.id ) no_course_is_registered = False # Check if no course is registered @@ -550,7 +550,7 @@ def user_course_list(request): student__student__id=student.student.id ) courses = Course.objects.filter(level=student.level).filter( - program__pk=student.department.id + program__pk=student.program.id ) return render( diff --git a/result/views.py b/result/views.py index 8ff5109..6e7fa6b 100644 --- a/result/views.py +++ b/result/views.py @@ -115,10 +115,10 @@ def add_score_for(request, id): student = TakenCourse.objects.get(id=ids[s]) # print(student) # print(student.student) - # print(student.student.department.id) + # print(student.student.program.id) courses = ( Course.objects.filter(level=student.student.level) - .filter(program__pk=student.student.department.id) + .filter(program__pk=student.student.program.id) .filter(semester=current_semester) ) # all courses of a specific level in current semester total_credit_in_semester = 0 @@ -474,7 +474,7 @@ def course_registration_form(request): normal.fontName = "Helvetica" normal.fontSize = 12 normal.leading = 18 - title = "EZOD UNIVERSITY OF TECHNOLOGY, ADAMA" + title = "EZOD UNIVERSITY OF TECHNOLOGY, ADAMA" # TODO: Make this dynamic title = Paragraph(title.upper(), normal) Story.append(title) style = getSampleStyleSheet() @@ -484,7 +484,9 @@ def course_registration_form(request): school.fontName = "Helvetica" school.fontSize = 10 school.leading = 18 - school_title = "SCHOOL OF ELECTRICAL ENGINEERING & COMPUTING" + school_title = ( + "SCHOOL OF ELECTRICAL ENGINEERING & COMPUTING" # TODO: Make this dynamic + ) school_title = Paragraph(school_title.upper(), school) Story.append(school_title) @@ -495,7 +497,9 @@ def course_registration_form(request): department.fontName = "Helvetica" department.fontSize = 9 department.leading = 18 - department_title = "DEPARTMENT OF COMPUTER SCIENCE & ENGINEERING" + department_title = ( + "DEPARTMENT OF COMPUTER SCIENCE & ENGINEERING" # TODO: Make this dynamic + ) department_title = Paragraph(department_title, department) Story.append(department_title) Story.append(Spacer(1, 0.3 * inch)) diff --git a/templates/accounts/add_student.html b/templates/accounts/add_student.html index 44a4766..8645ea2 100644 --- a/templates/accounts/add_student.html +++ b/templates/accounts/add_student.html @@ -92,8 +92,8 @@

Others

- {{ form.department.label }}{{ form.department }} - {{ form.department.errors }} + {{ form.program.label }}{{ form.program }} + {{ form.program.errors }}
{{ form.level.label }}{{ form.level }} diff --git a/templates/accounts/profile_single.html b/templates/accounts/profile_single.html index 316001b..6a45eaa 100644 --- a/templates/accounts/profile_single.html +++ b/templates/accounts/profile_single.html @@ -80,7 +80,7 @@

Applicant Info

School: {{ student.get_student_school }}

-

Department: {{ student.department }}

+

Program: {{ student.program }}

Level: {{ student.level }}

{% endif %} diff --git a/templates/accounts/student_list.html b/templates/accounts/student_list.html index 6f18517..43386df 100644 --- a/templates/accounts/student_list.html +++ b/templates/accounts/student_list.html @@ -54,7 +54,7 @@ ID No. Full Name Email - Department + Program {% if request.user.is_superuser %} Action {% endif %} @@ -67,7 +67,7 @@ {{ student.student.username }} {{ student.student.get_full_name }} {{ student.student.email }} - {{ student.department }} + {{ student.program }} {% if request.user.is_superuser %} diff --git a/templates/course/user_course_list.html b/templates/course/user_course_list.html index 770dbbb..0bf3065 100644 --- a/templates/course/user_course_list.html +++ b/templates/course/user_course_list.html @@ -7,10 +7,10 @@
Home My Courses
{% if request.user.is_student %} -
{{ student.department.title }}
+
{{ student.program.title }}
- {% if student.department.summary %} -

{{ student.department.summary }}

+ {% if student.program.summary %} +

{{ student.program.summary }}

{% endif %} {% endif %} diff --git a/templates/registration/register.html b/templates/registration/register.html index 0e64b73..b8e605f 100644 --- a/templates/registration/register.html +++ b/templates/registration/register.html @@ -58,8 +58,8 @@ {{ form.level }}
- - {{ form.department }} + + {{ form.program }}