DOSSIER_ELEVE: Add own_classes filter for ProEco export

ISLNamur · Oct 14, 2022 · 5a939b3 · 5a939b3
1 parent 202adbf
commit 5a939b3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/assets/dossier_eleve/askExportModal.vue b/assets/dossier_eleve/askExportModal.vue
@@ -234,9 +234,11 @@ export default {
         },
         exportProEco: function () {
             const export_type = this.tabIndex == 0 && this.$store.state.settings.enable_disciplinary_council ? "council" : "retenue";
-            window.open(
-                `/dossier_eleve/get_proeco_sanction/${export_type}/${this.date_from}/${this.date_to}/`
-            );
+            let url = `/dossier_eleve/get_proeco_sanction/${export_type}/${this.date_from}/${this.date_to}/`;
+            if (export_type === "retenue") {
+                url += `${this.ownClass}/`;
+            }
+            window.open(url);
         }
     },
     mounted: function () {

diff --git a/dossier_eleve/urls.py b/dossier_eleve/urls.py
@@ -50,4 +50,13 @@
 urlpatterns += router.urls
 
 if "proeco" in settings.INSTALLED_APPS:
-    urlpatterns += path('get_proeco_sanction/<export_type>/<date_from>/<date_to>/', views.ExportStudentToProEco.as_view()),
+    urlpatterns += [
+        path(
+            "get_proeco_sanction/<export_type>/<date_from>/<date_to>/<own_classes>/",
+            views.ExportStudentToProEco.as_view()
+        ),
+        path(
+            "get_proeco_sanction/<export_type>/<date_from>/<date_to>/",
+            views.ExportStudentToProEco.as_view()
+        ),
+    ]
diff --git a/dossier_eleve/views.py b/dossier_eleve/views.py
@@ -842,17 +842,28 @@ def post(self, request, format=None):
     from proeco.views import ExportStudentSelectionAPI
 
     class ExportStudentToProEco(ExportStudentSelectionAPI):
-        def _get_student_list(self, request, kwargs):
+        def _get_student_list(self, request, kwargs, own_classes="false"):
             date_from = kwargs["date_from"]
             date_to = kwargs["date_to"]
             export_type = kwargs["export_type"]
+            own_classes = (kwargs["own_classes"] if "own_classes" in kwargs else own_classes) == "true"
 
             sanctions = CasEleve.objects.filter(
                 student__isnull=False,
                 sanction_decision__isnull=False,
                 sanction_faite=False,
             )
 
+            if own_classes:
+                classes = get_classes(
+                    teaching=get_settings().teachings.all(),
+                    check_access=True,
+                    user=self.request.user,
+                    tenure_class_only=False,
+                    educ_by_years=False
+                )
+                sanctions.filter(student__classe__in=list(classes))
+
             if export_type == "council":
                 sanctions = sanctions.filter(
                     datetime_conseil__gte=date_from,