- {{ profile.username }}
- {{ profile.email }}
- {% if profile.is_superuser %}Administrator{% endif %}
+ {{ profile.username }}
+ {{ profile.email }}
+ {% if profile.is_superuser %}Administrator{% endif %}
- {# user related departments table #}
-
- {% for department, profile_department_data in profile_departments_data.items %}
-
- {# department name #}
- | {{ department.name }} |
- {# relation information #}
-
-
- {# user managing the department #}
- {% if profile_department_data|dict_get:"is_manager" %}
-
- | Responsable de Département |
- / |
-
+ {# user related departments table #}
+
+ {% for department, profile_department_data in profile_departments_data.items %}
+
+ {# department name #}
+ | {{ department.name }} |
+ {# relation information #}
+
+
+ {# user managing the department #}
+ {% if profile_department_data|dict_get:"is_manager" %}
+
+ | Responsable de Département |
+ / |
+
+ {% endif %}
+ {# user managing units #}
+ {% with managing_units=profile_department_data|dict_get:"managing_units" %}
+ {% if managing_units|length > 0 %}
+
+ | Responsable d'UE |
+
+ {% for managing_unit in managing_units %}
+
+ {{ managing_unit.name }}
+
+ {% if not forloop.last %}
{% endif %}
+ {% endfor %}
+ |
+
{% endif %}
- {# user managing units #}
- {% with managing_units=profile_department_data|dict_get:"managing_units" %}
- {% if managing_units|length > 0 %}
-
- | Responsable d'UE |
-
- {% for managing_unit in managing_units %}
- {{ managing_unit.name }}
- {% if not forloop.last %}
{% endif %}
- {% endfor %}
- |
-
- {% endif %}
- {% endwith %}
- {# user teaching units #}
- {% with teaching_units=profile_department_data|dict_get:"teaching_units" %}
- {% if teaching_units|length > 0 %}
-
- | Enseignant |
-
- {% for teaching_unit in teaching_units %}
- {{ teaching_unit.name }}
- {% if not forloop.last %}
{% endif %}
- {% endfor %}
- |
-
- {% endif %}
- {% endwith %}
- {# user studying groups #}
- {% with student_groups=profile_department_data|dict_get:"student_groups" %}
- {% if student_groups|length > 0 %}
-
- | Groupe Étudiant |
-
- {% for student_group in student_groups %}
- {{ student_group.name }}
- {% if not forloop.last %}
{% endif %}
- {% endfor %}
- |
-
- {% endif %}
- {% endwith %}
-
- |
-
- {% endfor %}
-
-
+ {% endwith %}
+ {# user teaching units #}
+ {% with teaching_units=profile_department_data|dict_get:"teaching_units" %}
+ {% if teaching_units|length > 0 %}
+
+ | Enseignant |
+
+ {% for teaching_unit in teaching_units %}
+
+ {{ teaching_unit.name }}
+
+ {% if not forloop.last %}
{% endif %}
+ {% endfor %}
+ |
+
+ {% endif %}
+ {% endwith %}
+ {# user studying groups #}
+ {% with student_groups=profile_department_data|dict_get:"student_groups" %}
+ {% if student_groups|length > 0 %}
+
+ | Groupe Étudiant |
+
+ {% for student_group in student_groups %}
+ {{ student_group.name }}
+ {% if not forloop.last %}
{% endif %}
+ {% endfor %}
+ |
+
+ {% endif %}
+ {% endwith %}
+
+ |
+
+ {% endfor %}
+
{% endblock %}
diff --git a/Palto/Palto/templates/Palto/teaching_session.html b/Palto/Palto/templates/Palto/teaching_session.html
index c71e13d..e61df75 100644
--- a/Palto/Palto/templates/Palto/teaching_session.html
+++ b/Palto/Palto/templates/Palto/teaching_session.html
@@ -18,7 +18,7 @@
| Unité d'Enseignement |
- {{ session.unit }} |
+ {{ session.unit }} |
| Enseignant |
@@ -51,9 +51,9 @@
{% endwith %}
- {% with absence=session_student_data|dict_get:"attendance" %}
+ {% with absence=session_student_data|dict_get:"absence" %}
{% if absence != None %}
- ...
+ Détails
{% endif %}
{% endwith %}
|
diff --git a/Palto/Palto/templates/Palto/teaching_session_list.html b/Palto/Palto/templates/Palto/teaching_session_list.html
index 6cbf08c..538d830 100644
--- a/Palto/Palto/templates/Palto/teaching_session_list.html
+++ b/Palto/Palto/templates/Palto/teaching_session_list.html
@@ -17,7 +17,7 @@
{% for session in sessions %}
| {{ session.short_id }} |
- {{ session.unit.name }} |
+ {{ session.unit.name }} |
{{ session.start }}
{{ session.end }} |
{{ session.teacher }} |
{{ session.attendances.all|length }} / {{ session.group.students.all|length }} |
diff --git a/Palto/Palto/templates/Palto/teaching_unit.html b/Palto/Palto/templates/Palto/teaching_unit.html
new file mode 100644
index 0000000..bb8f173
--- /dev/null
+++ b/Palto/Palto/templates/Palto/teaching_unit.html
@@ -0,0 +1,60 @@
+{% extends "Palto/base.html" %}
+{% load dict_tags %}
+
+{% block body %}
+ {# unit's information #}
+
+
+ | Identifiant |
+ {{ unit.id }} |
+
+
+ | Nom |
+ {{ unit.name }} |
+
+
+ | Département |
+ {{ unit.department.name }} |
+
+
+ | Mail |
+ {% if unit.email != None %}{{ unit.email }}{% else %} / {% endif %} |
+
+
+ | Sessions |
+ {{ unit.sessions.all|length }} |
+
+
+
+ {# unit's managers #}
+
+
+
+ | Responsables |
+
+
+
+ {% for manager in unit.managers.all %}
+
+ | {{ manager }} |
+
+ {% endfor %}
+
+
+
+ {# unit's teachers #}
+
+
+
+ | Enseignants |
+
+
+
+ {% for teacher in unit.teachers.all %}
+
+ | {{ teacher }} |
+
+ {% endfor %}
+
+
+{% endblock %}
diff --git a/Palto/Palto/urls.py b/Palto/Palto/urls.py
index 357120f..e848bbf 100644
--- a/Palto/Palto/urls.py
+++ b/Palto/Palto/urls.py
@@ -18,6 +18,15 @@ urlpatterns = [
path("logout/", views.logout_view, name="logout"),
path("profile/", views.profile_view, name="my_profile"),
path("profile//", views.profile_view, name="profile"),
+
+ # Units
+ path("teaching_units//", views.teaching_unit_view, name="teaching_unit"),
+
+ # Sessions
path("teaching_sessions/", views.teaching_session_list_view, name="teaching_session_list"),
path("teaching_sessions//", views.teaching_session_view, name="teaching_session"),
+
+ # Absences
+ path("absences//", views.absence_view, name="absence"),
+ # TODO: new absence
]
diff --git a/Palto/Palto/views.py b/Palto/Palto/views.py
index ead12c6..f7886f5 100644
--- a/Palto/Palto/views.py
+++ b/Palto/Palto/views.py
@@ -71,6 +71,10 @@ def profile_view(request: WSGIRequest, profile_id: uuid.UUID = None):
# get the corresponding user from its id.
profile = get_object_or_404(models.User, id=profile_id)
+ # check if the user is allowed to see this specific object
+ if profile not in models.User.all_visible_by_user(request.user):
+ return HttpResponseForbidden()
+
# prepare the data and the "complex" query for the template
profile_departments_data = {
department: {
@@ -115,10 +119,30 @@ def teaching_session_list_view(request: WSGIRequest):
)
+@login_required
+def teaching_unit_view(request: WSGIRequest, unit_id: uuid.UUID):
+ unit = get_object_or_404(models.TeachingUnit, id=unit_id)
+
+ # check if the user is allowed to see this specific object
+ if unit not in models.TeachingUnit.all_visible_by_user(request.user):
+ # TODO: syntaxic sugar session.visible_by_user(request.user)
+ return HttpResponseForbidden()
+
+ # render the page
+ return render(
+ request,
+ "Palto/teaching_unit.html",
+ context=dict(
+ unit=unit,
+ )
+ )
+
+
@login_required
def teaching_session_view(request: WSGIRequest, session_id: uuid.UUID):
session = get_object_or_404(models.TeachingSession, id=session_id)
+ # check if the user is allowed to see this specific object
if session not in models.TeachingSession.all_visible_by_user(request.user):
# TODO: syntaxic sugar session.visible_by_user(request.user)
return HttpResponseForbidden()
@@ -134,8 +158,8 @@ def teaching_session_view(request: WSGIRequest, session_id: uuid.UUID):
"absence": get_object_or_none(
models.Absence.objects,
student=student,
- start__gte=session.start, end__lte=session.end
- ),
+ start__lte=session.start, end__gte=session.end
+ ), # TODO: property ?
}
for student in session.group.students.all()
@@ -150,3 +174,22 @@ def teaching_session_view(request: WSGIRequest, session_id: uuid.UUID):
session_students_data=session_students_data,
)
)
+
+
+@login_required
+def absence_view(request: WSGIRequest, absence_id: uuid.UUID):
+ absence = get_object_or_404(models.Absence, id=absence_id)
+
+ # check if the user is allowed to see this specific object
+ if absence not in models.Absence.all_visible_by_user(request.user):
+ # TODO: syntaxic sugar session.visible_by_user(request.user)
+ return HttpResponseForbidden()
+
+ # render the page
+ return render(
+ request,
+ "Palto/absence.html",
+ context=dict(
+ absence=absence,
+ )
+ )