diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index 3b43a58..09f0d2e 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -424,6 +424,13 @@ class DuplicatedEvents(models.Model): super().save(*args, **kwargs) + def get_import_messages(self): + msgs = [] + for e in self.get_duplicated(): + for m in e.message_set.filter(message_type__in=[Message.TYPE.IMPORT_PROCESS, Message.TYPE.UPDATE_PROCESS]).order_by("date"): + msgs.append(m) + return msgs + class ReferenceLocation(models.Model): @@ -762,6 +769,9 @@ class Event(models.Model): super().__init__(*args, **kwargs) self.processing_user = None + def get_import_messages(self): + return self.message_set.filter(message_type__in=[Message.TYPE.IMPORT_PROCESS, Message.TYPE.UPDATE_PROCESS]).order_by("date") + def get_consolidated_end_day(self, intuitive=True): if intuitive: end_day = self.get_consolidated_end_day(False) diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index d867255..b589711 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -1161,6 +1161,9 @@ article>article { .entete-badge { grid-template-columns: 2.5em repeat(auto-fit, minmax(0%, 1fr)); + .full-columns { + grid-column: 1 / 3; + } .badge-large { @extend .badge-circle; font-size: 140%; diff --git a/src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html b/src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html index ae92183..4af02a1 100644 --- a/src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html @@ -17,9 +17,24 @@ {% if e.local_version %}version modifiée localement{% endif %} - + {% with e.get_import_messages as messages %} + {% if messages|length > 0 %} +
+

Journaux des modifications d'import

+ +
+ {% endif %} + {% endwith %} + {% endfor %} + {% for e in object.get_items_comparison %}

{% event_field_verbose_name e.key %}

{% if e.similar %} diff --git a/src/agenda_culturel/templates/agenda_culturel/duplicate-inc.html b/src/agenda_culturel/templates/agenda_culturel/duplicate-inc.html index 0005343..022cf60 100644 --- a/src/agenda_culturel/templates/agenda_culturel/duplicate-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/duplicate-inc.html @@ -4,15 +4,29 @@
-
+

{% if duplicate.representative %}Duplication{% else %}Possible duplication{% endif %} -  : {{ events|length }} événements le {{ events.0.start_day }} +  : {{ events|length }} événements le {{ events.0.start_day }}

+

Versions

+ {% with duplicate.get_import_messages as messages %} + {% if messages|length > 0 %} +

Messages d'import et de mise à jour

+ + {% endif %} + {% endwith %} {% if perms.agenda_culturel.change_duplicatedevents %}