Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(stats): reactivation de la collecte automatique des stats #871

Merged
merged 3 commits into from
Jan 6, 2025
Merged

feat(stats): reactivation de la collecte automatique des stats #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81ba749
activate stats tasks in cron table
vincentporte Jan 6, 2025
9da31ff
remove deactivation messages in stats pages
vincentporte Jan 6, 2025
7cab8e6
cleanup ambr
vincentporte Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions clevercloud/cron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[
"*/10 * * * * $ROOT/clevercloud/rebuild_index.sh",
"0 3 * * * $ROOT/clevercloud/run_management_command.sh clearsessions",
"0 6 * * * $ROOT/clevercloud/run_management_command.sh collect_matomo_stats",
"5 6 * * * $ROOT/clevercloud/run_management_command.sh collect_django_stats",
"10 6 1 * * $ROOT/clevercloud/run_management_command.sh collect_matomo_stats --period month",
"15 6 * * 1 $ROOT/clevercloud/run_management_command.sh collect_matomo_forum_stats",
"*/15 7-21 * * * $ROOT/clevercloud/run_management_command.sh send_messages_notifications asap",
"20 6 * * * $ROOT/clevercloud/run_management_command.sh send_messages_notifications day",
"10 6-22 * * * $ROOT/clevercloud/run_management_command.sh add_user_to_list_when_register",
Expand Down
224 changes: 0 additions & 224 deletions lacommunaute/stats/tests/__snapshots__/tests_views.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,6 @@
<main class="s-main" id="main" role="main">


<section class="s-section m-0">
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12"><div id="messages">


<div class="alert alert-warning alert-dismissible fade show mt-3" role="status">
<button aria-label="Fermer" class="btn-close" data-bs-dismiss="alert" type="button"></button>
La collecte des statistiques est desactivée pour le moment.
</div>


</div>
</div>
</div>
</div>
</section>



<div class="container">
Expand Down Expand Up @@ -184,24 +166,6 @@
<main class="s-main" id="main" role="main">


<section class="s-section m-0">
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12"><div id="messages">


<div class="alert alert-warning alert-dismissible fade show mt-3" role="status">
<button aria-label="Fermer" class="btn-close" data-bs-dismiss="alert" type="button"></button>
La collecte des statistiques est desactivée pour le moment.
</div>


</div>
</div>
</div>
</div>
</section>



<div class="container">
Expand Down Expand Up @@ -352,24 +316,6 @@
<main class="s-main" id="main" role="main">


<section class="s-section m-0">
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12"><div id="messages">


<div class="alert alert-warning alert-dismissible fade show mt-3" role="status">
<button aria-label="Fermer" class="btn-close" data-bs-dismiss="alert" type="button"></button>
La collecte des statistiques est desactivée pour le moment.
</div>


</div>
</div>
</div>
</div>
</section>



<div class="container">
Expand Down Expand Up @@ -520,24 +466,6 @@
<main class="s-main" id="main" role="main">


<section class="s-section m-0">
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12"><div id="messages">


<div class="alert alert-warning alert-dismissible fade show mt-3" role="status">
<button aria-label="Fermer" class="btn-close" data-bs-dismiss="alert" type="button"></button>
La collecte des statistiques est desactivée pour le moment.
</div>


</div>
</div>
</div>
</div>
</section>



<div class="container">
Expand Down Expand Up @@ -688,24 +616,6 @@
<main class="s-main" id="main" role="main">


<section class="s-section m-0">
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12"><div id="messages">


<div class="alert alert-warning alert-dismissible fade show mt-3" role="status">
<button aria-label="Fermer" class="btn-close" data-bs-dismiss="alert" type="button"></button>
La collecte des statistiques est desactivée pour le moment.
</div>


</div>
</div>
</div>
</div>
</section>



<div class="container">
Expand Down Expand Up @@ -856,24 +766,6 @@
<main class="s-main" id="main" role="main">


<section class="s-section m-0">
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12"><div id="messages">


<div class="alert alert-warning alert-dismissible fade show mt-3" role="status">
<button aria-label="Fermer" class="btn-close" data-bs-dismiss="alert" type="button"></button>
La collecte des statistiques est desactivée pour le moment.
</div>


</div>
</div>
</div>
</div>
</section>



<div class="container">
Expand Down Expand Up @@ -1024,24 +916,6 @@
<main class="s-main" id="main" role="main">


<section class="s-section m-0">
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12"><div id="messages">


<div class="alert alert-warning alert-dismissible fade show mt-3" role="status">
<button aria-label="Fermer" class="btn-close" data-bs-dismiss="alert" type="button"></button>
La collecte des statistiques est desactivée pour le moment.
</div>


</div>
</div>
</div>
</div>
</section>



<div class="container">
Expand Down Expand Up @@ -1187,104 +1061,6 @@
</main>
'''
# ---
# name: TestForumStatWeekArchiveView.test_header_and_breadcrumb[breadcrumb]
'''
<nav aria-label="Fil d'ariane" class="c-breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item">Retourner vers</li>
<li class="breadcrumb-item">
<a href="/statistiques/">Statistiques</a>
</li>
</ol>
</nav>
'''
# ---
# name: TestForumStatWeekArchiveView.test_header_and_breadcrumb[title-01]
'''
<section class="s-title-01 mt-lg-5">
<div class="s-title-01__container container">
<div class="s-title-01__row row">
<div class="s-title-01__col col-12">
<h1 class="s-title-01__title h1">
Statistiques de la semaine du 20 mai 2024 au 26 mai 2024
</h1>
</div>
</div>
</div>
</section>
'''
# ---
# name: TestForumStatWeekArchiveView.test_most_rated_forums[most_rated_forums]
'''
<div class="s-section__row row" id="most_rated">
<div class="s-section__col col-12">
<div class="c-box mb-3 mb-md-5">
<h2>
Les 1 fiches pratiques les plus notées pendant la semaine du 20 mai 2024 au 26 mai 2024
</h2>
<table class="table">
<thead>
<tr>
<th scope="col">Fiche Pratique</th>
<th scope="col">Nombres de notations de la semaine</th>
<th scope="col">Notation moyenne totale</th>
</tr>
</thead>
<tbody>

<tr>
<th scope="row">Forum A</th>
<td>2</td>
<td>3,00</td>
</tr>

</tbody>
</table>
</div>
</div>
</div>
'''
# ---
# name: TestForumStatWeekArchiveView.test_most_viewed_forums[most_viewed_forums]
'''
<div class="s-section__row row" id="most_viewed">
<div class="s-section__col col-12">
<div class="c-box mb-3 mb-md-5">
<h2>
Les 2 fiches pratiques les plus lues pendant la semaine du 20 mai 2024 au 26 mai 2024
</h2>
<table class="table">
<thead>
<tr>
<th scope="col">Fiche Pratique</th>
<th scope="col">Visiteurs uniques</th>
<th scope="col">Visiteurs uniques entrants</th>
<th scope="col">Temps de lecture total</th>
</tr>
</thead>
<tbody>

<tr>
<th scope="row">Forum B</th>
<td>17</td>
<td>5</td>
<td>1978 secondes</td>
</tr>

<tr>
<th scope="row">Forum A</th>
<td>10</td>
<td>8</td>
<td>1000 secondes</td>
</tr>

</tbody>
</table>
</div>
</div>
</div>
'''
# ---
# name: TestMonthlyVisitorsView.test_navigation[breadcrumb]
'''
<nav aria-label="Fil d'ariane" class="c-breadcrumb">
Expand Down
7 changes: 0 additions & 7 deletions lacommunaute/stats/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import logging

from dateutil.relativedelta import relativedelta
from django.contrib import messages
from django.db.models import Avg, CharField, Count, OuterRef, Subquery, Sum
from django.db.models.functions import Cast
from django.shortcuts import render
Expand Down Expand Up @@ -80,8 +79,6 @@ def get_context_data(self, **kwargs):
context["dsp_count"] = self.get_dsp_count()
context = {**context, **self.get_funnel_data()}

messages.warning(self.request, "La collecte des statistiques est desactivée pour le moment.")

return context


Expand All @@ -103,8 +100,6 @@ def get_context_data(self, **kwargs):
context["stats"] = self.get_detailled_stats()
context["box_title"] = self.box_title

messages.warning(self.request, "La collecte des statistiques est desactivée pour le moment.")

return context


Expand Down Expand Up @@ -162,8 +157,6 @@ def get(self, request, *args, **kwargs):
)
objects = objects.order_by("-" + sort_key)

messages.warning(self.request, "La collecte des statistiques est desactivée pour le moment.")

return render(
request,
"stats/documents.html",
Expand Down
Loading