diff --git a/lemarche/templates/dashboard/siae_edit_activities.html b/lemarche/templates/dashboard/siae_edit_activities.html index 9afd19100..419826d23 100644 --- a/lemarche/templates/dashboard/siae_edit_activities.html +++ b/lemarche/templates/dashboard/siae_edit_activities.html @@ -17,7 +17,7 @@

Ajoutez vos secteurs d'activité et recevez des opportunités commerciales c
{% for activity in siae.activities.all %}
- {% include "dashboard/_siae_activity_card.html" with activity=activity %} + {% include "siaes/_siae_activity_card.html" with activity=activity %}
{% endfor %}
diff --git a/lemarche/templates/dashboard/siae_edit_activities_create.html b/lemarche/templates/dashboard/siae_edit_activities_create.html index 5767defb7..b72a2bd4a 100644 --- a/lemarche/templates/dashboard/siae_edit_activities_create.html +++ b/lemarche/templates/dashboard/siae_edit_activities_create.html @@ -41,7 +41,7 @@

{{ page_title }}

{% if activity %}
- {% include "dashboard/_siae_activity_card.html" with activity=activity hide_actions=True %} + {% include "siaes/_siae_activity_card.html" with activity=activity hide_actions=True %}
{% endif %} diff --git a/lemarche/templates/dashboard/_siae_activity_card.html b/lemarche/templates/siaes/_siae_activity_card.html similarity index 57% rename from lemarche/templates/dashboard/_siae_activity_card.html rename to lemarche/templates/siaes/_siae_activity_card.html index 816a7e714..fd435d12a 100644 --- a/lemarche/templates/dashboard/_siae_activity_card.html +++ b/lemarche/templates/siaes/_siae_activity_card.html @@ -1,24 +1,9 @@ -{% load static siae_sectors_display %} +{% load siae_sectors_display %}
-

{{ activity.sector_group }}

- -
    - {% siae_sectors_display activity display_max=6 output_format='li' %} -
- -

- - Type(s) de prestation : - {{ activity.presta_type_display }} -

-

- - Intervient sur : {{ siae.geo_range_pretty_title }} - {{ siae.geo_range_pretty_display }} -

+ {% include "siaes/_siae_activity_content.html" with activity=activity with_collapse=with_collapse %}
{% if not hide_actions %} diff --git a/lemarche/templates/siaes/_siae_activity_content.html b/lemarche/templates/siaes/_siae_activity_content.html new file mode 100644 index 000000000..9581f8daf --- /dev/null +++ b/lemarche/templates/siaes/_siae_activity_content.html @@ -0,0 +1,28 @@ +{% load siae_sectors_display %} + +

+ {% if with_collapse %} + + {% else %} + {{ activity.sector_group }} + {% endif %} +

+ +
+
    + {% siae_sectors_display activity display_max=6 output_format='li' %} +
+ +

+ + Type(s) de prestation : + {{ activity.presta_type_display }} +

+

+ + Intervient sur : {{ siae.geo_range_pretty_title }} + {{ siae.geo_range_pretty_display }} +

+
diff --git a/lemarche/templates/siaes/detail.html b/lemarche/templates/siaes/detail.html index a09f9c1f7..c59551495 100644 --- a/lemarche/templates/siaes/detail.html +++ b/lemarche/templates/siaes/detail.html @@ -91,11 +91,18 @@

Présentation du prestataire

Secteurs d'activité

- - {% if not siae.sector_count %} -

Non renseigné

+ {% if user.is_authenticated and user.is_admin %} + {% for activity in siae.activities.all %} + {% include "siaes/_siae_activity_content.html" with activity=activity with_collapse=True %} + {% endfor %} + {% else %} + {% if not siae.sector_count %} +

Non renseigné

+ {% else %} + + {% endif %} {% endif %}
@@ -122,7 +129,7 @@

Références clients

{% endfor %} -
+