Redesign DSFR usager-details.html (#1437)

aidants_connect_common/static/scss/main.scss

@@ -146,6 +146,24 @@ p:last-child {
   height: 100%;
 }
 
+.fr-btn.fr-btn--warning {
+  --hover-tint: var(--hover);
+  --idle: transparent;
+  --hover: var(--background-action-high-warning-hover);
+  --active: var(--background-action-high-warning-active);
+  align-items: center;
+  background-color: var(--background-action-high-warning);
+  color: var(--text-inverted-warning);
+
+  &.fr-btn--secondary {
+    --hover: inherit;
+    --active: inherit;
+    background-color: transparent;
+    box-shadow: inset 0 0 0 1px var(--border-action-high-warning);
+    color: var(--text-default-warning);
+  }
+}
+
 @for $i from 0 through 32 {
   @each $gap-type in gap, row-gap, column-gap {
     .fr-grid-row.fr-grid-row--#{$gap-type}-#{$i}v {

aidants_connect_common/templatetags/ac_common.py

@@ -1,4 +1,5 @@
 import re
+from collections.abc import Iterable
 from urllib.parse import quote, urlencode
 
 from django import template
@@ -7,6 +8,7 @@
 from django.template.base import Node, NodeList, Parser, TextNode, Token, token_kwargs
 from django.template.defaultfilters import stringfilter
 from django.templatetags.static import static
+from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from aidants_connect import utils
@@ -218,7 +220,7 @@ def withdict(parser, token):
     For example::
 
         {% withdict name=person.name key=person.key as dict %}
-            {% some_tag_expecting_a_dict doct %}
+            {% some_tag_expecting_a_dict dict %}
         {% endwithdict %}
 
     """
@@ -252,3 +254,27 @@ def render(self, context):
         values = {key: val.resolve(context) for key, val in self.extra_context.items()}
         with context.push(**{self.variable_name: values}):
             return self.nodelist.render(context)
+
+
+@register.filter(is_safe=True)
+def strfmt(args, format_string):
+    """
+    Shortcup to `str.format`.
+
+    Usage:
+
+    ```
+    {{ ctx_variable|strfmt:"The sum of 1 + 2 is {0}" }}
+    ```
+    See: https://docs.python.org/3/library/stdtypes.html#str.format
+    """
+    kwargs = {}
+    if isinstance(args, dict):
+        kwargs.update(args)
+        args = tuple()
+    if isinstance(args, Iterable) and not isinstance(args, str):
+        args = tuple(args)
+    else:
+        args = (str(args),)
+
+    return format_html(format_string, *args, **kwargs)

aidants_connect_web/models/mandat.py

@@ -14,6 +14,7 @@
 from django.db import IntegrityError, models, transaction
 from django.db.models import SET_NULL, Q, QuerySet
 from django.template import defaultfilters, loader
+from django.template.defaultfilters import pluralize
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
@@ -135,6 +136,13 @@ def can_renew(self):
             not self.is_expired or self.objects.renewable().filter(mandat=self).exists()
         )
 
+    @property
+    def remaining_timedelta(self):
+        td = self.expiration_date - timezone.now()
+        if td.days <= 0:
+            return "moins d'un jour"
+        return f"{td.days} jour{pluralize(td.days)}"
+
     @cached_property
     def revocation_date(self) -> Optional[datetime]:
         """

aidants_connect_web/static/css/usager-details.css

@@ -0,0 +1,3 @@
+.active-mandat-revoked-autorisation, #mandats-revoques {
+  color: var(--text-mention-grey);
+}

aidants_connect_web/templates/aidants_connect_web/usager-details.html

@@ -0,0 +1,157 @@
+{% extends 'layouts/main.html' %}
+
+{% load ac_common dsfr_tags static %}
+
+{% block title %}Aidants Connect - {{ usager.get_full_name }}{% endblock %}
+
+{% block extracss %}
+  <link href="{% static 'css/usager-details.css' %}" rel="stylesheet">
+{% endblock extracss %}
+
+{% block content %}
+  <div class="fr-container">
+    <div class="flex fr-mb-8v">
+      <h1 class="fr-m-0">{{ usager.get_full_name }}</h1>
+
+      {% if aidant.can_create_mandats %}
+        <div class="spacer"></div>
+        <a
+          id="add-mandat"
+          class="fr-btn fr-btn--icon-left fr-icon-edit-fill"
+          href="{% url 'new_mandat' %}"
+        >
+          Créer un mandat
+        </a>
+      {% endif %}
+    </div>
+
+    {% if usager.birthdate %}
+      <div class="fr-mb-8v">
+        {% dsfr_tag label=usager.birthdate|date:"d F Y"|strfmt:"Date de naissance : {}" %}
+      </div>
+    {% endif %}
+
+    {% for group, mandats in mandats_grouped.items %}
+      <h2 id="{{ group|slugify }}" class="fr-mt-12v">{{ group }}</h2>
+
+      {% for mandat in mandats %}
+        <section class="fr-p-6v fr-mb-4v fr-bordered {{ group|slugify }}">
+          <div class="flex fr-mb-4v">
+            <h3 class="fr-m-0">Mandat du {{ mandat.creation_date|date:"d F Y" }}</h3>
+            <div class="spacer"></div>
+            <ul class="fr-btns-group fr-btns-group--inline fr-mb-n4v fr-btns-group--icon-left">
+              <li>
+                <a
+                  id="view-mandat-attestation-{{ mandat.pk }}"
+                  class="fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-printer-line"
+                  href="{% url 'mandat_visualisation' mandat_id=mandat.id %}"
+                >
+                  Voir l’attestation
+                </a>
+              </li>
+              {% if mandat.is_active %}
+                <li>
+                  <a
+                    id="renew-mandat-{{ mandat.pk }}"
+                    class="fr-btn fr-btn--icon-left fr-icon-refresh-line"
+                    href="{{ usager.renew_mandate_url }}"
+                  >
+                    Renouveler
+                  </a>
+                </li>
+                <li>
+                  <a
+                    id="cancel-mandat-{{ mandat.pk }}"
+                    class="fr-btn fr-btn--warning fr-btn--icon-left fr-icon-delete-bin-line"
+                    href="{% url 'confirm_mandat_cancelation' mandat_id=mandat.pk %}"
+                  >
+                    Révoquer
+                  </a>
+                </li>
+              {% elif mandat.was_explicitly_revoked %}
+                <a
+                  class="fr-btn fr-btn--icon-left fr-icon-printer-fill fr-btn--sm auth-revocation-attestation"
+                  href="{% url 'mandat_cancellation_attestation' mandat_id=mandat.pk %}"
+                >
+                  Voir la révocation
+                </a>
+              {% endif %}
+            </ul>
+          </div>
+          <div class="fr-mb-4v">
+            {% dsfr_tag label=mandat.get_duree_keyword_display|capfirst %}
+            {% withdict remaining=mandat.remaining_timedelta end_date=mandat.expiration_date|date:"d F Y" as format_data %}
+              {% dsfr_tag label=format_data|strfmt:"<strong>Validité restante : </strong>{remaining} ({end_date})" %}
+            {% endwithdict %}
+            {% if mandat.is_remote %}
+              {% dsfr_tag label="Signé à distance" %}
+            {% else %}
+              {% dsfr_tag label="Signé en présence" %}
+            {% endif %}
+          </div>
+
+          {% if mandat.autorisations.all %}
+            <div class="fr-table">
+              <div class="fr-table__wrapper">
+                <div class="fr-table__container">
+                  <div class="fr-table__content">
+                    <table>
+                      <thead>
+                      <tr>
+                        <th scope="col">Thématique administrative</th>
+                        <th scope="col">Révocation</th>
+                        <th scope="col">Actions</th>
+                      </tr>
+                      </thead>
+                      <tbody>
+                      {% for autorisation in mandat.autorisations.all %}
+                        <tr
+                          id="mandat-{{ mandat.pk }}-autorisation-{{ autorisation.demarche }}"
+                          class="mandat-autorisation-row{% if autorisation.was_separately_revoked %} mandat-revoked-autorisation{% endif %}"
+                          data-row-key="{{ forloop.counter }}"
+                        >
+                          <td>{{ autorisation.get_demarche_display }}</td>
+                          <td>
+                            {% if autorisation.revocation_date %}
+                              {{ autorisation.revocation_date|date:"d F Y" }}
+                            {% else %}
+                              <span class="sr-only">Cette autorisation nʼa pas été révoquée.</span>
+                            {% endif %}
+                          </td>
+                          <td>
+                            {% if aidant.can_create_mandats and not autorisation.revocation_date %}
+                              <a
+                                id="mandat-{{ mandat.pk }}-auth-revocation-{{ autorisation.demarche }}"
+                                href="{% url 'confirm_autorisation_cancelation' usager_id=usager.id autorisation_id=autorisation.id %}"
+                                class="fr-btn fr-btn--warning fr-btn--secondary fr-btn--icon-left fr-btn--sm fr-icon-delete-bin-fill"
+                              >
+                                Révoquer la thématique
+                              </a>
+                            {% elif autorisation.was_separately_revoked %}
+                              <a
+                                id="mandat-{{ mandat.pk }}-auth-revocation-attestation-{{ autorisation.demarche }}"
+                                class="fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-printer-fill fr-btn--sm"
+                                href="{% url 'autorisation_cancelation_attestation' autorisation_id=autorisation.id usager_id=mandat.usager.id %}"
+                              >
+                                Voir la révocation
+                              </a>
+                            {% endif %}
+                          </td>
+                        </tr>
+                      {% endfor %}
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              </div>
+            </div>
+          {% else %}
+            {% dsfr_alert content="Ce mandat nʼa pas d'autorisation connue." type="info" %}
+          {% endif %}
+        </section>
+      {% empty %}
+        {% dsfr_alert content=group|lower|strfmt:"Vous n’avez pas de mandat {} avec cet usager." type="info" %}
+      {% endfor %}
+    {% endfor %}
+  </div>
+{% endblock content %}