From 2be95ac159c5a75d3ce4fef45323aebc1f08a2bd Mon Sep 17 00:00:00 2001
From: tnicolas1 <thibault.nicolas@ac-clermont.fr>
Date: Tue, 22 Oct 2024 12:20:42 +0200
Subject: [PATCH] =?UTF-8?q?Afficher=20l'=C3=A9tat=20de=20la=20payment=5Fre?=
 =?UTF-8?q?quest=20dans=20la=20page=20de=20d=C3=A9tail=20de=20l'=C3=A9l?=
 =?UTF-8?q?=C3=A8ve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/classes/_pfmps_payments_table.html.haml | 8 --------
 app/views/classes/_students_table.html.haml       | 4 +++-
 app/views/pfmps/_pfmp_payments_table.html.haml    | 7 +++++++
 app/views/pfmps/_pfmp_student_table.html.haml     | 4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 app/views/classes/_pfmps_payments_table.html.haml
 create mode 100644 app/views/pfmps/_pfmp_payments_table.html.haml

diff --git a/app/views/classes/_pfmps_payments_table.html.haml b/app/views/classes/_pfmps_payments_table.html.haml
deleted file mode 100644
index 23803fe28..000000000
--- a/app/views/classes/_pfmps_payments_table.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-- schooling.pfmps.each do |pfmp|
-  .fr-grid-row
-    .fr-col-md-7
-      = dsfr_link_to pfmp.listing_to_s, school_year_class_schooling_pfmp_path(selected_school_year, @classe, schooling, pfmp), title: pfmp.full_dates
-    .fr-col-md-5
-      -if pfmp.latest_payment_request.present?
-        = pfmp.latest_payment_request.status_badge
-= dsfr_link_to "Ajouter une PFMP individuelle", new_school_year_class_schooling_pfmp_path(selected_school_year, @classe, schooling)
diff --git a/app/views/classes/_students_table.html.haml b/app/views/classes/_students_table.html.haml
index 5ba891050..4407c7869 100644
--- a/app/views/classes/_students_table.html.haml
+++ b/app/views/classes/_students_table.html.haml
@@ -47,4 +47,6 @@
               %p= dsfr_badge(status: :error) { "Non saisies" }
               = dsfr_link_to "Saisir les coordonnées bancaires", new_student_rib_path(student)
           %td
-            = render partial: "pfmps_payments_table", locals: { schooling: schooling }
+            - schooling.pfmps.each do |pfmp|
+              = render partial: "pfmps/pfmp_payments_table", locals: { pfmp: pfmp }
+            = dsfr_link_to "Ajouter une PFMP individuelle", new_school_year_class_schooling_pfmp_path(selected_school_year, @classe, schooling)
diff --git a/app/views/pfmps/_pfmp_payments_table.html.haml b/app/views/pfmps/_pfmp_payments_table.html.haml
new file mode 100644
index 000000000..d1a8c5178
--- /dev/null
+++ b/app/views/pfmps/_pfmp_payments_table.html.haml
@@ -0,0 +1,7 @@
+- schooling = pfmp.schooling
+.fr-grid-row
+  .fr-col-md-7
+    = dsfr_link_to pfmp.listing_to_s, school_year_class_schooling_pfmp_path(selected_school_year, schooling.classe, schooling, pfmp), title: pfmp.full_dates
+  .fr-col-md-5
+    -if pfmp.latest_payment_request.present?
+      = pfmp.latest_payment_request.status_badge
diff --git a/app/views/pfmps/_pfmp_student_table.html.haml b/app/views/pfmps/_pfmp_student_table.html.haml
index c72eb5cfe..77a65d3b3 100644
--- a/app/views/pfmps/_pfmp_student_table.html.haml
+++ b/app/views/pfmps/_pfmp_student_table.html.haml
@@ -14,13 +14,13 @@
         %table
           %caption Liste des PFMPs de l'élève
           %thead
-            %th{scope: "col"} PFMP
+            %th{scope: "col"} PFMP et Paiements
             %th{scope: "col"} Nombre de jours
             %th{scope: "col"} Montant
           %tbody
             - pfmps.each do |pfmp|
               %tr
-                %td= link_to_if(classe.establishment.eql?(current_establishment), pfmp.listing_to_s.html_safe, school_year_class_schooling_pfmp_path(classe.school_year, classe, schooling, pfmp), title: "Voir la PFMP #{pfmp.full_dates}")
+                %td= render partial: "pfmps/pfmp_payments_table", locals: { pfmp: pfmp }
                 %td= pfmp.day_count
                 %td
                   %strong= number_to_currency(pfmp.amount)