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

Amélioration rendu

Browse Source
This commit is contained in:
Jean-Marie Favreau 2024-11-11 23:35:22 +01:00
parent 743b393366
commit 936f6c1b6b
6 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/agenda_culturel/templates/agenda_culturel/administration.html
View File

@ -20,12 +20,14 @@
<article>
<header>
<div class="slide-buttons">
<a href="{% url 'activite' %}" role="button">Voir l'historique {% picto_from_name "chevron-right" %}</a>
</div>
<h2>Activité des derniers jours</h2>
</header>
{% include "agenda_culturel/recent-activity-inc.html" with modifications=daily_modifications %}
<h3>Résumé des activités</h3>
{% include "agenda_culturel/recent-activity-inc.html" with modifications=daily_modifications next=1 %}
<h3>Derniers imports</h3>
{% include "agenda_culturel/batch-imports-inc.html" with objects=batch_imports next=1 %}
<p>Détail des imports récurrents&nbsp;:
{% include "agenda_culturel/rimports-info-inc.html" with all=1 %}</p>

28
src/agenda_culturel/templates/agenda_culturel/batch-imports-inc.html
View File

@ -16,13 +16,19 @@
</tr>
</thead>
<tbody>
{% for obj in paginator_filter %}
{% for obj in objects %}
<tr>
<td>{{ obj.id }}</td>
<td>{{ obj.created_date }}</td>
<td>{% if obj.recurrentImport %}<a href="{{ obj.recurrentImport.get_absolute_url }}">{{ obj.recurrentImport.name }}</a>{% else %}
{% if obj.url_source %}
<a href="{{ obj.url_source }}"><em>url</em></a>
<a href="{{ obj.url_source }}">
{% if "facebook" in obj.url_source %}
<em>lien facebook</em>
{% else %}
<em>url</em>
{% endif %}
</a>
{% endif %}
{% endif %} </td>
<td><span{% if obj.status == "failed" %} data-tooltip="{{ obj.error_message }}"{% endif %}>{{ obj.status }}</span></td>
@ -33,10 +39,18 @@
<td>{% if obj.status == "success" %}{{ obj.nb_removed }}{% endif %}</td>
</tr>
{% endfor %}
{% if next %}
<tr>
<td><a href="{% url 'imports' %}">...</a></td>
<td><a href="{% url 'imports' %}">...</a></td>
<td><a href="{% url 'imports' %}">...</a></td>
<td><a href="{% url 'imports' %}">...</a></td>
<td><a href="{% url 'imports' %}"></a></td>
<td><a href="{% url 'imports' %}">...</a></td>
<td><a href="{% url 'imports' %}">...</a></td>
<td><a href="{% url 'imports' %}">...</a></td>
<td><a href="{% url 'imports' %}">...</a></td>
</tr>
{% endif %}
</tbody>
</table>
<footer>
<span>
{% include 'agenda_culturel/paginator.html' %}
</span>
</footer>

8
src/agenda_culturel/templates/agenda_culturel/imports.html
View File

@ -23,7 +23,13 @@
<h1>Importations par lot</h1>
</header>
{% include "agenda_culturel/batch-imports-inc.html" with paginator_filter=paginator_filter %}
{% include "agenda_culturel/batch-imports-inc.html" with objects=paginator_filter %}
<footer>
<span>
{% include 'agenda_culturel/paginator.html' %}
</span>
</footer>
</article>
{% include "agenda_culturel/side-nav.html" with current="imports" %}

7
src/agenda_culturel/templates/agenda_culturel/page-rimport.html
View File

@ -52,8 +52,13 @@
</header>
{% include "agenda_culturel/batch-imports-inc.html" with paginator_filter=paginator_filter %}
{% include "agenda_culturel/batch-imports-inc.html" with objects=paginator_filter %}
<footer>
<span>
{% include 'agenda_culturel/paginator.html' %}
</span>
</footer>
</article>

9
src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html
View File

@ -21,6 +21,15 @@
<td>{{ m.nb_local_copies }}</td>
</tr>
{% endfor %}
{% if next %}
<tr>
<td><a href="{% url 'activite' %}">...</a></td>
<td><a href="{% url 'activite' %}">...</a></td>
<td><a href="{% url 'activite' %}">...</a></td>
<td><a href="{% url 'activite' %}">...</a></td>
<td><a href="{% url 'activite' %}">...</a></td>
</tr>
{% endif %}
</tbody>
</table>
{% endif %}

13
src/agenda_culturel/views.py
View File

@ -1044,7 +1044,10 @@ def administration(request):
daily_modifications = Event.get_count_modifications([(d, 1) for d in days])
# get last created events
events = queryset=Event.objects.all().order_by("-created_date")[:10]
events = Event.objects.all().order_by("-created_date")[:5]
# get last batch imports
batch_imports = BatchImportation.objects.all().order_by("-created_date")[:5]
# get info about batch information
newest = BatchImportation.objects.filter(recurrentImport=OuterRef("pk")).order_by(
@ -1068,8 +1071,10 @@ def administration(request):
return render(
request,
"agenda_culturel/administration.html",
{"daily_modifications": daily_modifications, "events": events, "nb_failed": nb_failed, "nb_canceled": nb_canceled,
"nb_running": nb_running, "nb_all": nb_all},
{"daily_modifications": daily_modifications,
"events": events, "batch_imports": batch_imports,
"nb_failed": nb_failed, "nb_canceled": nb_canceled,
"nb_running": nb_running, "nb_all": nb_all},
)
@ -1309,7 +1314,7 @@ def event_search_full(request):
@login_required(login_url="/accounts/login/")
@permission_required("agenda_culturel.view_batchimportation")
def imports(request):
paginator = Paginator(BatchImportation.objects.all().order_by("-created_date"), 10)
paginator = Paginator(BatchImportation.objects.all().order_by("-created_date"), 30)
page = request.GET.get("page")
try: