diff --git a/studenteval/templates/studenteval/cl_student_eval_detail.html b/studenteval/templates/studenteval/cl_student_eval_detail.html
index e17b90f..006f968 100644
--- a/studenteval/templates/studenteval/cl_student_eval_detail.html
+++ b/studenteval/templates/studenteval/cl_student_eval_detail.html
@@ -2,7 +2,7 @@
{% block url_nav %}
- Voir toutes les évaluations
+ Voir toutes les évaluations
Imprimer liste PDF
diff --git a/studenteval/templates/studenteval/cl_student_eval_list.html b/studenteval/templates/studenteval/cl_student_eval_list.html
index fbe8e9d..3b6b1eb 100644
--- a/studenteval/templates/studenteval/cl_student_eval_list.html
+++ b/studenteval/templates/studenteval/cl_student_eval_list.html
@@ -4,7 +4,7 @@
{% block url_nav %}
- Imprimer liste PDF
+ Imprimer liste PDF
{% endblock %}
{% block cl_content %}
diff --git a/studenteval/urls.py b/studenteval/urls.py
index 7c70eac..5ca477c 100644
--- a/studenteval/urls.py
+++ b/studenteval/urls.py
@@ -9,8 +9,8 @@ app_name = "studenteval"
urlpatterns = [
path('show_pdf//', views.student_eval_detail.as_view(), name='student_eval_detail'),
- path('show_pdf_all//', views.student_eval_list.as_view(), name='student_eval_list'),
- path('export_pdf_all//', views.export_pdf_all, name='export_pdf_all'),
+ path('show_pdf_all//', views.student_eval_list.as_view(), name='student_eval_list'),
+ path('export_pdf_all//', views.export_pdf_all, name='export_pdf_all'),
path('export_pdf//', views.export_pdf, name='export_pdf'),
#path('peremptions', views.view_peremptions, name='view_peremptions'),
diff --git a/studenteval/views.py b/studenteval/views.py
index ad34c64..a3d763c 100644
--- a/studenteval/views.py
+++ b/studenteval/views.py
@@ -48,8 +48,9 @@ class student_eval_list(LoginRequiredMixin,ListView):
def get_queryset(self):
- nStudent_id = self.kwargs['Student']
- return cl_Student_eval.objects.filter(Student=nStudent_id)
+ print(self.kwargs)
+ object = cl_Student_eval.objects.get(pk= self.kwargs['pk'])
+ return cl_Student_eval.objects.filter(Student=object.Student)
@@ -78,12 +79,12 @@ class student_eval_list(LoginRequiredMixin,ListView):
object.get_all_evals_for_student()
object.get_mirror_eval(object.a_evals)
context['my_objects'].append(object)
- context["student_id"] = object.Student.id
+ context["uuid"] = object.uuid
return context
-def export_pdf_all(request,student_id):
+def export_pdf_all(request,pk):
'''
if not "dtDate__range__gte" in request.GET.keys():
start = datetime.today().replace(day=1,hour=0, minute=0)
@@ -95,7 +96,7 @@ def export_pdf_all(request,student_id):
end = request.GET['dtDate__range__lte']
'''
template_name = "studenteval/all_pdf_template.html"
- records = cl_Student_eval.objects.filter(Student=student_id)
+ records = cl_Student_eval.objects.filter(Student=cl_Student_eval.objects.get(pk=pk).Student)
objects=[]
for record in records:
record.get_all_evals_for_student()