Merge pull request #37 from WebCorvus/feat/app-rebuild-user-info-display

Feat/app rebuild user info display

Author: JVPinheiroReis

api/students/views.py

@@ -3,6 +3,8 @@
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
+from django.utils import timezone
+
 from users.permissions import IsProfessor, IsStaff
 from utils.pdfgen import pdfgen
 from utils.reports import (
@@ -77,11 +79,17 @@ def download_grades_pdf(self, request, pk=None):
         student = self.get_object()
         subjects = get_subject_names()
         data = {}
+        current_year = timezone.now().year
+        all_grades = Grade.objects.filter(student=student, year=current_year)
+
         for subject in subjects:
-            data[subject] = Grade.objects.filter(
-                student=student,
-                subject__full_name=subject,
-            )
+            # Initialize with None for each bimester
+            bimester_grades = [None, None, None, None]
+            for grade in all_grades.filter(subject__full_name=subject):
+                bimester_num = int(grade.bimester[0])  # Extract the numeric part (e.g., "1B" -> 1)
+                if 1 <= bimester_num <= 4:
+                    bimester_grades[bimester_num - 1] = grade.value
+            data[subject] = bimester_grades
         return pdfgen(
             "grades.html",
             {"student": student, "data": data},
@@ -91,7 +99,10 @@ def download_grades_pdf(self, request, pk=None):
     @action(detail=True, methods=["get"], url_path="download-presence")
     def download_presence_pdf(self, request, pk=None):
         student = self.get_object()
-        presence_records = Presence.objects.filter(student=student)
+        current_year = timezone.now().year
+        presence_records = Presence.objects.filter(
+            student=student, date__year=current_year
+        ).order_by('date')
         return pdfgen(
             "presence.html",
             {"student": student, "data": presence_records},
@@ -108,10 +119,9 @@ def academic_report(self, request, pk=None):
     @action(detail=True, methods=["get"], url_path="download-academic-report")
     def download_academic_report(self, request, pk=None):
         """Download comprehensive academic report PDF"""
-        from django.utils import timezone as tz
-
+        current_year = timezone.now().year
         student = self.get_object()
-        report = generate_student_academic_report(student)
+        report = generate_student_academic_report(student, year=current_year)
 
         context = {
             "student": student,
@@ -356,11 +366,10 @@ def financial_report(self, request):
     @action(detail=False, methods=["get"], url_path="download-financial-report")
     def download_financial_report(self, request):
         """Download financial report PDF"""
-        from django.utils import timezone as tz
-
+        current_year = timezone.now().year
         student_id = request.query_params.get("student_id")
         student = Student.objects.get(id=student_id) if student_id else None
-        report = generate_financial_report(student)
+        report = generate_financial_report(student, year=current_year)
 
         context = {
             "student": student,

api/templates/grades.html

@@ -51,15 +51,9 @@ <h1>Boletim de {{ student.full_name }}</h1>
                 {% for subject, grades in data.items %}
                 <tr>
                     <th>{{ subject }}</th>
-                    {% if grades %} {% for grade in grades %}
-                    <td>{{ grade.value|default_if_none:"-" }}</td>
-
-                    {% endfor %} {% else %}
-                    <td>-</td>
-                    <td>-</td>
-                    <td>-</td>
-                    <td>-</td>
-                    {% endif %}
+                    {% for grade_value in grades %}
+                    <td>{{ grade_value|default_if_none:"-" }}</td>
+                    {% endfor %}
                 </tr>
                 {% endfor %}
             </table>

api/users/serializers.py

@@ -40,7 +40,7 @@ class UserProfileSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = get_user_model()
-        fields = ["id", "email", "name", "role", "profile_details"]
+        fields = ["id", "email", "name", "role", "is_staff", "is_superuser", "profile_details"]
 
     def get_profile_details(self, obj):
         profile = obj.profile

api/utils/reports.py

@@ -19,17 +19,19 @@
 )
 
 
-def generate_student_academic_report(student):
+def generate_student_academic_report(student, year=None):
     """Generate comprehensive academic report for a single student"""
+    if year is None:
+        year = timezone.now().year
 
     # Get all grades by subject and bimester
     grades_by_subject = {}
     all_subjects = Subject.objects.all()
 
     for subject in all_subjects:
-        grades = Grade.objects.filter(student=student, subject=subject).order_by(
-            "bimester"
-        )
+        grades = Grade.objects.filter(
+            student=student, subject=subject, year=year
+        ).order_by("bimester")
         bimester_grades = {"1B": None, "2B": None, "3B": None, "4B": None}
 
         for grade in grades:
@@ -45,20 +47,28 @@ def generate_student_academic_report(student):
         }
 
     # Get attendance statistics
-    total_days = Presence.objects.filter(student=student).count()
-    absences = Presence.objects.filter(student=student, presence=False).count()
-    presences = Presence.objects.filter(student=student, presence=True).count()
+    total_days = Presence.objects.filter(student=student, date__year=year).count()
+    absences = Presence.objects.filter(
+        student=student, presence=False, date__year=year
+    ).count()
+    presences = Presence.objects.filter(
+        student=student, presence=True, date__year=year
+    ).count()
     absence_rate = (absences / total_days * 100) if total_days > 0 else 0
 
     # Get disciplinary records
-    warnings_count = Warning.objects.filter(student=student).count()
-    suspensions_count = Suspension.objects.filter(student=student).count()
+    warnings_count = Warning.objects.filter(student=student, date__year=year).count()
+    suspensions_count = Suspension.objects.filter(
+        student=student, start_date__year=year
+    ).count()
 
     # Get recent warnings and suspensions
-    recent_warnings = Warning.objects.filter(student=student).order_by("-date")[:5]
-    recent_suspensions = Suspension.objects.filter(student=student).order_by(
-        "-start_date"
+    recent_warnings = Warning.objects.filter(student=student, date__year=year).order_by(
+        "-date"
     )[:5]
+    recent_suspensions = Suspension.objects.filter(
+        student=student, start_date__year=year
+    ).order_by("-start_date")[:5]
 
     return {
         "student_id": student.id,
@@ -174,13 +184,19 @@ def generate_group_performance_report(group):
     }
 
 
-def generate_financial_report(student=None):
+def generate_financial_report(student=None, year=None):
     """Generate financial report for tuition payments"""
+    if year is None:
+        year = timezone.now().year
 
     if student:
-        tuitions = Tuition.objects.filter(student=student).order_by("-reference_month")
+        tuitions = Tuition.objects.filter(
+            student=student, reference_month__year=year
+        ).order_by("-reference_month")
     else:
-        tuitions = Tuition.objects.all().order_by("-reference_month")
+        tuitions = Tuition.objects.filter(reference_month__year=year).order_by(
+            "-reference_month"
+        )
 
     # Summary statistics
     total_pending = tuitions.filter(status="PENDING").count()

app/next.config.js

@@ -1,6 +1,9 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
     output: "standalone",
+    images: {
+        unoptimized: process.env.NODE_ENV === "development",
+    },
 };
 
 module.exports = nextConfig;