jmtrivial/agenda_culturel
4
4
Fork 0
Code Issues 72 Pull Requests 1 Projects 1 Releases Wiki Activity

On affiche les messages de mise à jour dans les dupliqués

Browse Source
This commit is contained in:
Jean-Marie Favreau 2025-01-26 12:28:51 +01:00
parent 27933f2454
commit e825c01a20
4 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/agenda_culturel/models.py
View File

@ -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)

3
src/agenda_culturel/static/style.scss
View File

@ -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%;

17
src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html
View File

@ -17,9 +17,24 @@
{% if e.local_version %}<strong>version modifiée localement</strong>{% endif %}
</li>
</ul>
</div>
{% with e.get_import_messages as messages %}
{% if messages|length > 0 %}
<div class="full-columns">
<h3>Journaux des modifications d'import</h3>
<ul>
{% for m in messages %}
<li>
{{ m.date }}, {% if m.message_type %}{{ m.get_message_type_display }}{% endif %}&nbsp;: <a href="{% url 'message' m.pk %}">{{ m.subject }}</a>&nbsp;: <em>{{ m.message }}</em>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endwith %}
</div>
{% endfor %}
</div>
{% for e in object.get_items_comparison %}
<h3>{% event_field_verbose_name e.key %}</h3>
{% if e.similar %}

22
src/agenda_culturel/templates/agenda_culturel/duplicate-inc.html
View File

@ -4,15 +4,29 @@
<article>
<header><a href="{% url 'view_duplicate' duplicate.pk %}">
<header><h2><a href="{% url 'view_duplicate' duplicate.pk %}">
{% if duplicate.representative %}Duplication{% else %}Possible duplication{% endif %}
&nbsp;:</a> {{ events|length }} événements le {{ events.0.start_day }}
&nbsp;:</a> {{ events|length }} événements le {{ events.0.start_day }}</h2>
</header>
<h3>Versions</h3>
<ul>
{% for e in events %}
<li>{{ e.start_day }}{% if e.start_time %} à {{ e.start_time }}{% endif %}&nbsp;: {{ e|picto_status }} <a href="{{ e.get_absolute_url }}">{{ e.title }}</a> créé le {{ e.created_date }}</li>
{% for e in events %}
<li>{{ e.start_day }}{% if e.start_time %} à {{ e.start_time }}{% endif %}&nbsp;: {{ e|picto_status }} <a href="{{ e.get_absolute_url }}">{{ e.title }}</a>{% if e.modified_date %} dernière modification le {{ e.modified_date }}{% else %}créé le {{ e.created_date }}{% endif %}</li>
{% endfor %}
</ul>
{% with duplicate.get_import_messages as messages %}
{% if messages|length > 0 %}
<h3>Messages d'import et de mise à jour</h3>
<ul>
{% for m in messages %}
<li>
{{ m.date }}, {% if m.message_type %}{{ m.get_message_type_display }}{% endif %}&nbsp;: <a href="{% url 'message' m.pk %}">{{ m.subject }}</a>
pour événement <a href="{{ obj.related_event.get_absolute_url }}">{{ m.related_event.pk }}</a>&nbsp;: <em>{{ m.message }}</em>
</li>
{% endfor %}
</ul>
{% endif %}
{% endwith %}
{% if perms.agenda_culturel.change_duplicatedevents %}
<footer class="infos-and-buttons">
<div class="infos"></div>