From 3257c9c8f11767144f6748180792760f0b64a4b8 Mon Sep 17 00:00:00 2001
From: root <root@CT113.local>
Date: Thu, 20 Aug 2026 21:26:06 +0000
Subject: [PATCH] =?UTF-8?q?Permettre=20des=20horaires=20diff=C3=A9rents=20?=
 =?UTF-8?q?selon=20l'ann=C3=A9e=20scolaire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_new/core/models/planning.py                  |  1 +
 .../templates/planning/time_tracking.html        |  1 +
 app_new/planning/time_tracking.py                | 14 ++++++++++----
 .../fa1b2c3d4e5f_add_schedule_academic_year.py   | 16 ++++++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 migrations/versions/fa1b2c3d4e5f_add_schedule_academic_year.py

diff --git a/app_new/core/models/planning.py b/app_new/core/models/planning.py
index 7bf0f04..e608ec2 100644
--- a/app_new/core/models/planning.py
+++ b/app_new/core/models/planning.py
@@ -11,6 +11,7 @@ class WorkSchedule(db.Model):
     
     id = db.Column(db.Integer, primary_key=True)
     user_id = db.Column(db.Integer, db.ForeignKey("users.id"))
+    academic_year = db.Column(db.Integer, nullable=True, index=True)
     
     day_of_week = db.Column(db.Integer)
     start_time = db.Column(db.Time)
diff --git a/app_new/planning/templates/planning/time_tracking.html b/app_new/planning/templates/planning/time_tracking.html
index 07a7fdc..0a8beb2 100644
--- a/app_new/planning/templates/planning/time_tracking.html
+++ b/app_new/planning/templates/planning/time_tracking.html
@@ -52,6 +52,7 @@
   <div class="card"><div class="card-header"><strong>Historique {{ year }}</strong></div><div class="table-responsive"><table class="table table-sm mb-0"><thead><tr><th>Date</th><th>Type</th><th>Prévu</th><th>Réalisé</th><th>Écart</th><th>Note</th></tr></thead><tbody>{% for entry in entries[:50] %}<tr><td>{{ entry.work_date.strftime('%d/%m/%Y') }}</td><td>{{ entry.entry_type }}</td><td>{{ entry.planned_minutes }} min</td><td>{{ entry.actual_minutes }} min</td><td class="{% if entry.variance_minutes < 0 %}text-danger{% elif entry.variance_minutes > 0 %}text-success{% endif %}">{{ '+' if entry.variance_minutes > 0 else '' }}{{ entry.variance_minutes }} min</td><td>{{ entry.note or '—' }}</td></tr>{% else %}<tr><td colspan="6" class="text-muted">Aucune saisie.</td></tr>{% endfor %}</tbody></table></div></div>
 </div>
 <script>
+document.querySelectorAll('form[action*="assign_time_template"]').forEach(function (form) { var input = document.createElement('input'); input.type = 'hidden'; input.name = 'year'; input.value = '{{ year }}'; form.appendChild(input); });
 document.addEventListener('DOMContentLoaded', function () {
   document.querySelectorAll('input[name="work_dates"][checked]').forEach(function (input) {
     input.disabled = true;
diff --git a/app_new/planning/time_tracking.py b/app_new/planning/time_tracking.py
index ce9e3cd..dc987be 100644
--- a/app_new/planning/time_tracking.py
+++ b/app_new/planning/time_tracking.py
@@ -70,7 +70,12 @@ def time_tracking():
         db.session.add(config)
         db.session.commit()
     templates = WorkScheduleTemplate.query.filter_by(user_id=current_user.id, is_active=True).order_by(WorkScheduleTemplate.id).all()
-    assignments = {item.day_of_week: item for item in WorkSchedule.query.filter_by(user_id=current_user.id, is_active=True).all()}
+    all_assignments = WorkSchedule.query.filter_by(user_id=current_user.id, is_active=True).all()
+    assignments = {item.day_of_week: item for item in all_assignments if item.academic_year == year}
+    # Compatibilité avec les affectations créées avant le suivi par année.
+    for item in all_assignments:
+        if item.academic_year is None and item.day_of_week not in assignments:
+            assignments[item.day_of_week] = item
     closures = CollegeClosure.query.filter(
         CollegeClosure.end_date >= period_start, CollegeClosure.start_date <= period_end
     ).order_by(CollegeClosure.start_date).all()
@@ -265,22 +270,23 @@ def edit_time_template(id):
 @login_required
 def assign_time_template():
     day = request.form.get("day_of_week", type=int)
+    year = request.form.get("year", _current_year(), type=int)
     template_id = request.form.get("template_id", type=int)
-    assignment = WorkSchedule.query.filter_by(user_id=current_user.id, day_of_week=day).first()
+    assignment = WorkSchedule.query.filter_by(user_id=current_user.id, day_of_week=day, academic_year=year).first()
     if not template_id:
         if assignment:
             db.session.delete(assignment)
     else:
         template = WorkScheduleTemplate.query.filter_by(id=template_id, user_id=current_user.id, is_active=True).first_or_404()
         if not assignment:
-            assignment = WorkSchedule(user_id=current_user.id, day_of_week=day)
+            assignment = WorkSchedule(user_id=current_user.id, day_of_week=day, academic_year=year)
             db.session.add(assignment)
         assignment.template_id = template.id
         assignment.start_time, assignment.end_time = template.start_time, template.end_time
         assignment.lunch_start, assignment.lunch_end = template.lunch_start, template.lunch_end
         assignment.is_active = True
     db.session.commit()
-    return _redirect()
+    return _redirect(year)
 
 
 @planning_bp.route("/time/entry", methods=["POST"])
diff --git a/migrations/versions/fa1b2c3d4e5f_add_schedule_academic_year.py b/migrations/versions/fa1b2c3d4e5f_add_schedule_academic_year.py
new file mode 100644
index 0000000..29f9f58
--- /dev/null
+++ b/migrations/versions/fa1b2c3d4e5f_add_schedule_academic_year.py
@@ -0,0 +1,16 @@
+"""Associe les horaires affectés à une année scolaire."""
+from alembic import op
+import sqlalchemy as sa
+
+revision = "fa1b2c3d4e5f"
+down_revision = "f9c3d4e5f6a7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("work_schedules", sa.Column("academic_year", sa.Integer(), nullable=True))
+
+
+def downgrade():
+    op.drop_column("work_schedules", "academic_year")