Merge branch 'mnymkr-edit-program'

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

accounts/forms.py

@@ -337,6 +337,20 @@ class ProfileUpdateForm(UserChangeForm):
         ]
 
 
+class ProgramUpdateForm(UserChangeForm):
+    program = forms.ModelChoiceField(
+        queryset=Program.objects.all(),
+        widget=forms.Select(
+            attrs={"class": "browser-default custom-select form-control"}
+        ),
+        label="Program",
+    )
+
+    class Meta:
+        model = Student
+        fields = ["program"]
+
+
 class EmailValidationOnForgotPassword(PasswordResetForm):
     def clean_email(self):
         email = self.cleaned_data["email"]

accounts/urls.py

@@ -22,11 +22,12 @@ from .views import (
     student_add_view,
     edit_student,
     delete_student,
+    edit_student_program,
     ParentAdd,
     validate_username,
     register,
     render_lecturer_pdf_list,  # new
-    render_student_pdf_list #new
+    render_student_pdf_list,  # new
 )
 
 # from .forms import EmailValidationOnForgotPassword
@@ -47,12 +48,21 @@ urlpatterns = [
     path("student/add/", student_add_view, name="add_student"),
     path("student/<int:pk>/edit/", edit_student, name="student_edit"),
     path("students/<int:pk>/delete/", delete_student, name="student_delete"),
+    path(
+        "edit_student_program/<int:pk>/",
+        edit_student_program,
+        name="student_program_edit",
+    ),
     path("parents/add/", ParentAdd.as_view(), name="add_parent"),
     path("ajax/validate-username/", validate_username, name="validate_username"),
     path("register/", register, name="register"),
     # paths to pdf
-    path("create_lecturers_pdf_list/", render_lecturer_pdf_list, name="lecturer_list_pdf"), #new
+    path(
-    path("create_students_pdf_list/", render_student_pdf_list, name="student_list_pdf"), #new
+        "create_lecturers_pdf_list/", render_lecturer_pdf_list, name="lecturer_list_pdf"
+    ),  # new
+    path(
+        "create_students_pdf_list/", render_student_pdf_list, name="student_list_pdf"
+    ),  # new
     # path('add-student/', StudentAddView.as_view(), name='add_student'),
     # path('programs/course/delete/<int:pk>/', course_delete, name='delete_course'),
     # Setting urls

accounts/views.py

@@ -12,7 +12,13 @@ from core.models import Session, Semester
 from course.models import Course
 from result.models import TakenCourse
 from .decorators import admin_required
-from .forms import StaffAddForm, StudentAddForm, ProfileUpdateForm, ParentAddForm
+from .forms import (
+    StaffAddForm,
+    StudentAddForm,
+    ProfileUpdateForm,
+    ParentAddForm,
+    ProgramUpdateForm,
+)
 from .models import User, Student, Parent
 from .filters import LecturerFilter, StudentFilter
 
@@ -20,7 +26,10 @@ from .filters import LecturerFilter, StudentFilter
 from django.http import HttpResponse
 from django.template.loader import get_template  # to get template which render as pdf
 from xhtml2pdf import pisa
-from django.template.loader import render_to_string #to render a template into a string
+from django.template.loader import (
+    render_to_string,
+)  # to render a template into a string
+
 
 def validate_username(request):
     username = request.GET.get("username", None)
@@ -96,19 +105,17 @@ def profile(request):
             },
         )
 
+
 # function that generate pdf by taking Django template and its context,
 def render_to_pdf(template_name, context):
     """Renders a given template to PDF format."""
-    response = HttpResponse(content_type='application/pdf')
+    response = HttpResponse(content_type="application/pdf")
-    response['Content-Disposition'] = 'filename="profile.pdf"'  # Set default filename
+    response["Content-Disposition"] = 'filename="profile.pdf"'  # Set default filename
 
     template = render_to_string(template_name, context)
-    pdf = pisa.CreatePDF(
+    pdf = pisa.CreatePDF(template, dest=response)
-        template,
-        dest=response
-    )
     if pdf.err:
-        return HttpResponse('We had some problems generating the PDF')
+        return HttpResponse("We had some problems generating the PDF")
 
     return response
 
@@ -131,7 +138,7 @@ def profile_single(request, id):
     pass the context dictionary built for the specific user type 
     (lecturer, student, or superuser) to the render_to_pdf function.
     """
-    if request.GET.get('download_pdf'):
+    if request.GET.get("download_pdf"):
         if user.is_lecturer:
             courses = Course.objects.filter(allocated_course__lecturer__pk=id).filter(
                 semester=current_semester
@@ -342,23 +349,23 @@ class LecturerFilterView(FilterView):
 # lecturers list pdf
 def render_lecturer_pdf_list(request):
     lecturers = User.objects.filter(is_lecturer=True)
-    template_path = 'pdf/lecturer_list.html'
+    template_path = "pdf/lecturer_list.html"
-    context = {'lecturers':lecturers}
+    context = {"lecturers": lecturers}
-    response = HttpResponse(content_type='application/pdf') # convert the response to pdf
+    response = HttpResponse(
-    response['Content-Disposition'] = 'filename="lecturers_list.pdf"'
+        content_type="application/pdf"
+    )  # convert the response to pdf
+    response["Content-Disposition"] = 'filename="lecturers_list.pdf"'
     # find the template and render it.
     template = get_template(template_path)
     html = template.render(context)
     # create a pdf
-    pisa_status = pisa.CreatePDF(
+    pisa_status = pisa.CreatePDF(html, dest=response)
-       html, dest=response)
     # if error then show some funny view
     if pisa_status.err:
-       return HttpResponse('We had some errors <pre>' + html + '</pre>')
+        return HttpResponse("We had some errors <pre>" + html + "</pre>")
     return response
 
 
-    
 # @login_required
 # @lecturer_required
 # def delete_staff(request, pk):
@@ -452,19 +459,20 @@ class StudentListView(FilterView):
 # student list pdf
 def render_student_pdf_list(request):
     students = Student.objects.all()
-    template_path = 'pdf/student_list.html'
+    template_path = "pdf/student_list.html"
-    context = {'students':students}
+    context = {"students": students}
-    response = HttpResponse(content_type='application/pdf') # convert the response to pdf
+    response = HttpResponse(
-    response['Content-Disposition'] = 'filename="students_list.pdf"'
+        content_type="application/pdf"
+    )  # convert the response to pdf
+    response["Content-Disposition"] = 'filename="students_list.pdf"'
     # find the template and render it.
     template = get_template(template_path)
     html = template.render(context)
     # create a pdf
-    pisa_status = pisa.CreatePDF(
+    pisa_status = pisa.CreatePDF(html, dest=response)
-       html, dest=response)
     # if error then show some funny view
     if pisa_status.err:
-       return HttpResponse('We had some errors <pre>' + html + '</pre>')
+        return HttpResponse("We had some errors <pre>" + html + "</pre>")
     return response
 
 
@@ -478,6 +486,33 @@ def delete_student(request, pk):
     return redirect("student_list")
 
 
+@login_required
+@admin_required
+def edit_student_program(request, pk):
+
+    instance = get_object_or_404(Student, student_id=pk)
+    user = get_object_or_404(User, pk=pk)
+    if request.method == "POST":
+        form = ProgramUpdateForm(request.POST, request.FILES, instance=instance)
+        full_name = user.get_full_name
+        if form.is_valid():
+            form.save()
+            messages.success(request, message=full_name + " program has been updated.")
+            url = (
+                "/accounts/profile/" + user.id.__str__() + "/detail/"
+            )  # Botched job, must optimize
+            return redirect(to=url)
+        else:
+            messages.error(request, "Please correct the error(s) below.")
+    else:
+        form = ProgramUpdateForm(instance=instance)
+    return render(
+        request,
+        "accounts/edit_student_program.html",
+        context={"title": "Edit-program", "form": form, "student": instance},
+    )
+
+
 # ########################################################
 
 

config/settings.py

@@ -199,6 +199,7 @@ EMAIL_USE_TLS = config("EMAIL_USE_TLS", default=True, cast=bool)
 EMAIL_HOST_USER = config("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = config("EMAIL_HOST_PASSWORD")
 EMAIL_FROM_ADDRESS = config("EMAIL_FROM_ADDRESS")
+EMAIL_USE_SSL = False
 
 # crispy config
 CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"

templates/accounts/edit_student_program.html

@@ -0,0 +1,36 @@
+{% extends 'base.html' %}
+{% block title %}{{ title }} | Learning management system{% endblock title %}
+{% load crispy_forms_tags %}
+{% load static %}
+
+{% block content %}
+
+<nav style="--bs-breadcrumb-divider: '>';" aria-label="breadcrumb">
+    <ol class="breadcrumb">
+      <li class="breadcrumb-item"><a href="/">Home</a></li>
+      <li class="breadcrumb-item"><a href="{% url 'student_list' %}">Students</a></li>
+      <li class="breadcrumb-item active" aria-current="page">Update</li>
+    </ol>
+</nav>
+
+<h4 class="fw-bold mb-3"><i class="fas fa-cog me-2"></i>Student Program Update Form</h4>
+
+{% include 'snippets/messages.html' %}
+
+<form action="" method="POST" enctype="multipart/form-data">{% csrf_token %}
+    <div class="row mb-3">
+        <div class="col-md-6">
+            <div class="card">
+                <p class="form-title">Program</p>
+
+                <div class="card-body">
+                    <p>Change <a href="{{ student.student.get_absolute_url }}">{{ student.student.get_full_name }}'s</a> program</p>
+                    <hr>
+                    {{ form.program|as_crispy_field }}
+                </div>
+            </div>
+        </div>
+    </div>
+    <input class="btn btn-primary" type="submit" value="Save">
+</form>
+{% endblock content %}

templates/accounts/email/new_lecturer_account_confirmation.html

@@ -261,15 +261,15 @@
           <h1 class="mb-5">🚀 Confirm your account</h1>
           <h4>Dear <b>{{ user.get_full_name }}</b>,</h4>
           <p>
-            A new lecturer account with ID of <b>{user.username}</b> has been
+            A new lecturer account with ID of <b>{{ user.username }}</b> has been
             created for you. <br />
             You're receiving this e-mail because the Dj-LMS admin has given your
             e-mail address to register an account on djlms.com. <br />
           </p>
           <h5>Login credentials for your DJ LMS account:</h5>
           <ul>
-            <li>ID: {user.username}</li>
+            <li>ID: {{ user.username }}</li>
-            <li>Your password: {password}</li>
+            <li>Your password: {{ password }}</li>
           </ul>
           <p>To secure your account be sure to change your password.</p>
           <p>

templates/accounts/email/new_student_account_confirmation.html

@@ -268,8 +268,8 @@
           </p>
           <h5>Login credentials for your DJ LMS account:</h5>
           <ul>
-            <li>ID: {user.username}</li>
+            <li>ID: {{ user.username }}</li>
-            <li>Your password: {password}</li>
+            <li>Your password: {{ password }}</li>
           </ul>
           <p>To secure your account be sure to change your password.</p>
           <p>

templates/accounts/profile.html

@@ -32,9 +32,9 @@
                 </ul>
             </div>
             <hr>
-            <a class="mb-2" href="{% url 'edit_profile' %}"><i class="fas fa-user-edit"></i>
+            <a class="mb-2" href="{% url 'edit_profile' %}"><i class="fas fa-user-edit unstyled"></i>
                 <span class="mobile-hide">Edit Profile</span></a>
-            <a href="{% url 'change_password' %}"><i class="fas fa-lock"></i><span class="mobile-hide">
+            <a href="{% url 'change_password' %}"><i class="fas fa-lock unstyled"></i><span class="mobile-hide">
                     Change password</span></a>
         </div>
     </div>

templates/accounts/profile_single.html

@@ -33,15 +33,18 @@
             </div>
             <hr>
             {% if request.user.is_superuser %}
-            <div class="btn-flex">
+            <div class="d-flex flex-column">
                 {% if user.is_student %}
-                <a class="edit-btn" href="{% url 'student_edit' pk=user.id %}">
+                <a href="{% url 'student_edit' pk=user.id %}">
-                    <i class="fas fa-user-edit"></i><span class="mobile-hide">Edit Profile</span>
+                    <i class="fas fa-user-edit unstyled"></i><span class="mobile-hide">Edit Profile</span>
+                </a>
+                <a href="{% url 'student_program_edit' user.id %}">
+                    <i class="fas fa-pen-to-square unstyled"></i><span class="mobile-hide">Change Program</span>
                 </a>
                 {% endif %}
                 {% if user.is_lecturer %}
-                <a class="edit-btn" href="{% url 'staff_edit' pk=user.id %}">
+                <a href="{% url 'staff_edit' pk=user.id %}">
-                    <i class="fas fa-user-edit"></i><span class="mobile-hide">Edit Profile</span>
+                    <i class="fas fa-user-edit unstyled"></i><span class="mobile-hide">Edit Profile</span>
                 </a>
                 {% endif %}
             </div>
@@ -93,6 +96,7 @@
                 <div class="dashboard-description">
                     <p><strong>School: </strong>Hawas Preparatory School</p>
                     <p><strong>Level: </strong>{{ level.level }}</p>
+                    <p><strong>Program: </strong>{{ student.program }}</p>
                 </div>
                 {% endif %}