diff --git a/app_new/interventions/templates/index.html b/app_new/interventions/templates/index.html index 09e533e..68c49a2 100644 --- a/app_new/interventions/templates/index.html +++ b/app_new/interventions/templates/index.html @@ -131,7 +131,14 @@
#{{ interv.id }} — {{ interv.title[:80] }}{% if interv.title|length > 80 %}…{% endif %}
- {% if interv.equipment %}{{ interv.equipment.name[:40] }}{% if interv.equipment.name|length > 40 %}…{% endif %}{% elif interv.room %}{{ interv.room.name }}{% else %}Localisation générale{% endif %} + + {% if interv.equipment %} + {{ interv.equipment.name[:40] }}{% if interv.equipment.name|length > 40 %}…{% endif %} + {% elif interv.room %} + {{ interv.room.name }} + {% else %} + Localisation non renseignée + {% endif %} {% if interv.assigned_to %} · {{ interv.assigned_to.full_name }} {% endif %} diff --git a/app_new/interventions/templates/planning.html b/app_new/interventions/templates/planning.html index e498eeb..36e6894 100644 --- a/app_new/interventions/templates/planning.html +++ b/app_new/interventions/templates/planning.html @@ -29,7 +29,7 @@ {{ intervention.scheduled_date if intervention.scheduled_date else '-' }} {{ intervention.title }} - {{ intervention.equipment.name if intervention.equipment else '-' }} + {{ intervention.equipment.name if intervention.equipment else ('Salle : ' ~ intervention.room.name if intervention.room else 'Localisation non renseignée') }} {{ intervention.priority }} {{ intervention.status }} @@ -43,4 +43,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app_new/templates/interventions/index.html b/app_new/templates/interventions/index.html index 39d32cc..fcd595e 100644 --- a/app_new/templates/interventions/index.html +++ b/app_new/templates/interventions/index.html @@ -129,7 +129,14 @@
#{{ interv.id }} — {{ interv.title[:80] }}{% if interv.title|length > 80 %}…{% endif %}
- {{ interv.equipment.name[:40] }}{% if interv.equipment.name|length > 40 %}…{% endif %} + + {% if interv.equipment %} + {{ interv.equipment.name[:40] }}{% if interv.equipment.name|length > 40 %}…{% endif %} + {% elif interv.room %} + {{ interv.room.name }} + {% else %} + Localisation non renseignée + {% endif %} {% if interv.assigned_to %} · {{ interv.assigned_to.full_name }} {% endif %} diff --git a/app_new/templates/interventions/planning.html b/app_new/templates/interventions/planning.html index e1bdc90..8ed8165 100644 --- a/app_new/templates/interventions/planning.html +++ b/app_new/templates/interventions/planning.html @@ -71,7 +71,7 @@
#{{ interv.id }} — {{ interv.title[:60] }}{% if interv.title|length > 60 %}…{% endif %} - {{ interv.equipment.name[:30] }} + {{ interv.equipment.name[:30] if interv.equipment else ('Salle : ' ~ interv.room.name if interv.room else 'Localisation non renseignée') }} {% if interv.frequency_days %} · {{ frequency_labels.get(interv.frequency_days, interv.frequency_days ~ "j") }} {% endif %} @@ -98,7 +98,7 @@
#{{ interv.id }} — {{ interv.title[:60] }}{% if interv.title|length > 60 %}…{% endif %} - {{ interv.equipment.name[:30] }} + {{ interv.equipment.name[:30] if interv.equipment else ('Salle : ' ~ interv.room.name if interv.room else 'Localisation non renseignée') }} {% if interv.frequency_days %} · {{ frequency_labels.get(interv.frequency_days, interv.frequency_days ~ "j") }} {% endif %} @@ -126,7 +126,7 @@
#{{ interv.id }} — {{ interv.title[:60] }}{% if interv.title|length > 60 %}…{% endif %} - {{ interv.equipment.name[:30] }} + {{ interv.equipment.name[:30] if interv.equipment else ('Salle : ' ~ interv.room.name if interv.room else 'Localisation non renseignée') }} {% if interv.frequency_days %} · {{ frequency_labels.get(interv.frequency_days, interv.frequency_days ~ "j") }} {% endif %} @@ -154,7 +154,7 @@
#{{ interv.id }} — {{ interv.title[:60] }}{% if interv.title|length > 60 %}…{% endif %} - {{ interv.equipment.name[:30] }} + {{ interv.equipment.name[:30] if interv.equipment else ('Salle : ' ~ interv.room.name if interv.room else 'Localisation non renseignée') }} {% if interv.frequency_days %} · {{ frequency_labels.get(interv.frequency_days, interv.frequency_days ~ "j") }} {% endif %} @@ -180,4 +180,4 @@
{% endif %}
-{% endblock %} \ No newline at end of file +{% endblock %}