Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stats: Improve summaries when range is selected

Browse Source 
Fixes #446
This commit is contained in:
rubenwardy
2023-06-15 08:45:28 +01:00
parent 81651aee97
commit 2596253535
5 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/templates/macros/stats.html
View File

@@ -2,7 +2,7 @@
<script src="/static/libs/chart.min.js"></script>
<script src="/static/libs/chartjs-adapter-date-fns.bundle.min.js"></script>
<script src="/static/libs/chartjs-plugin-annotation.min.js"></script>
<script src="/static/package_charts.js?v=10"></script>
<script src="/static/package_charts.js?v=11"></script>
{% endmacro %}
@@ -44,14 +44,28 @@
{% endmacro %}
{% macro render_package_stats(source, downloads) %}
{% macro render_package_stats(source, downloads, is_range) %}
<div class="d-none">
<span id="downloads-7days">
{{ _("Downloads, past 7 days") }}
</span>
<span id="downloads-30days">
{{ _("Downloads, past 30 days") }}
</span>
<span id="downloads-range">
{{ _("Downloads from $1 to $2") }}
</span>
<span id="downloads-per-day">
{{ _("$1 per day") }}
</span>
</div>
<noscript>
<p class="alert alert-danger">
{{ _("JavaScript is required to display charts and statistics") }}
</p>
</noscript>
<div class="row mb-5">
<div class="col-md-4">
<div class="row mb-5" id="stats-summaries">
<div class="col-md-4" id="lifetime-downloads">
<div class="card h-100">
<div class="card-body align-items-center text-center">
<div class="mt-0 mb-3">
@@ -64,40 +78,6 @@
</div>
</div>
</div>
<div class="col-md-4">
<div class="card h-100">
<div class="card-body align-items-center text-center">
<div class="mt-0 mb-3">
<i class="fas fa-download mr-1"></i>
{{ _("Downloads, past 7 days") }}
</div>
<div class="my-0 h4">
<span id='downloads_total7d'></span>
<small class="text-muted ml-2">
({{ _("%(downloads)s per day", downloads=("<span id='downloads_avg7d'></span>" | safe)) }})
</small>
</div>
</div>
</div>
</div>
<div class="col-md-4" id="downloads30">
<div class="card h-100">
<div class="card-body align-items-center text-center">
<div class="mt-0 mb-3">
<i class="fas fa-download mr-1"></i>
{{ _("Downloads, past 30 days") }}
</div>
<div class="my-0 h4">
<span id='downloads_total30d'></span>
<small class="text-muted ml-2">
({{ _("%(downloads)s per day", downloads=("<span id='downloads_avg30d'></span>" | safe)) }})
</small>
</div>
</div>
</div>
</div>
</div>
<div id="loading">{{ _("Loading...") }}</div>
@@ -106,7 +86,7 @@
{{ _("No data") }}
</div>
<div id="stats-root" data-source="{{ source }}" style="display: none;">
<div id="stats-root" data-source="{{ source }}" data-is-range="{{ is_range and 'true' or 'false' }}" style="display: none;">
<section id="downloads-by-package" class="d-none">
<h3>{{ _("Downloads by Package") }}</h3>
<p class="text-muted">

2
app/templates/packages/stats.html
View File

@@ -21,5 +21,5 @@
{{ render_package_selector(package.author, package=package) }}
</div>
<h2 class="mt-0">{{ _("Statistics") }}</h2>
{{ render_package_stats(package.getURL('api.package_stats', start=start, end=end), package.downloads) }}
{{ render_package_stats(package.getURL('api.package_stats', start=start, end=end), package.downloads, start or end) }}
{% endblock %}

2
app/templates/users/stats.html
View File

@@ -17,5 +17,5 @@
{{ render_package_selector(user, package=None) }}
</div>
<h2 class="mt-0">{{ self.title() }}</h2>
{{ render_package_stats(url_for("api.user_stats", username=user.username, start=start, end=end), downloads) }}
{{ render_package_stats(url_for("api.user_stats", username=user.username, start=start, end=end), downloads, start or end) }}
{% endblock %}