small fix

Author: SamuelVch98

assignment.py

@@ -134,17 +134,17 @@ def publish_assignments():
         db.session.rollback()
         return jsonify({"error": f"Failed to publish assignments: {str(e)}"}), 500
 
-
 def count_course_assignments():
     # Counts the number of times each user has taught each course
-    assignment_counts = db.session.query(
+    current_year = get_current_year()
+    assignment_counts = (db.session.query(
         AssignmentDraft.user_id,
         AssignmentDraft.course_id,
         func.count(AssignmentDraft.course_id).label('count')
-    ).group_by(
+    ).filter(AssignmentDraft.course_year < current_year).group_by(
         AssignmentDraft.user_id,
         AssignmentDraft.course_id
-    ).all()
+    ).distinct().all())
 
     return assignment_counts
 
@@ -154,4 +154,5 @@ def count_course_assignments():
 @check_access_level(Role.ADMIN)
 def get_course_assignments_count():
     results = count_course_assignments()
-    return jsonify(results=[{'user_id': user_id, 'course_id': course_id, 'count': count} for user_id, course_id, count in results])
+    return jsonify(
+        results=[{'user_id': user_id, 'course_id': course_id, 'count': count} for user_id, course_id, count in results])

course.py

@@ -117,7 +117,7 @@ def add_course():
 @check_access_level(Role.ADMIN)
 def courses(year):
     courses = db.session.query(Course).filter_by(year=year).all()
-    return render_template('courses.html', courses=courses, current_year=year)
+    return render_template('courses.html', courses=courses, year=year)
 
 
 @course_bp.route('/search_teachers')

static/scripts/assignment_table.js

@@ -306,9 +306,9 @@ fetch('/assignment/load_data')
                         // Coloration basée sur le nombre d'affectations
                         const count = assignment.count;
                         if (count === 1) {
-                            TD.style.backgroundColor = '#5DADE2';
-                        } else if (count === 2) {
                             TD.style.backgroundColor = '#87CEEB';
+                        } else if (count === 2) {
+                            TD.style.backgroundColor = '#5DADE2';
                         } else if (count >= 3) {
                             TD.style.backgroundColor = '#0A74DA';
                         }

templates/courses.html

@@ -52,7 +52,7 @@ <h4>Courses</h4>
                 <tr class="course-item"
                     data-organizations="{{ course.organizations | map(attribute='id') | join(',') }}">
                     <td>
-                        <a href="{{ url_for("course.course_info", course_id=course.id, year=current_year) }}">
+                        <a href="{{ url_for("course.course_info", course_id=course.id, year=year) }}">
                             {{ course.code }} - {{ course.title }}
                         </a>
                     </td>