Compare commits
No commits in common. "1822fc20cb56d76146b833c5efdee122eaab3e0f" and "04bb218ac72ac3cb34e0d9e967f030d3c570108a" have entirely different histories.
1822fc20cb
...
04bb218ac7
24
analytics.py
24
analytics.py
@ -141,34 +141,22 @@ def return_file_access():
|
||||
return []
|
||||
|
||||
def songs_dashboard():
|
||||
if 'songs_dashboard_timeframe' not in session:
|
||||
session['songs_dashboard_timeframe'] = "30"
|
||||
timeframe_param = request.args.get("timeframe", session['songs_dashboard_timeframe'])
|
||||
session['songs_dashboard_timeframe'] = timeframe_param
|
||||
|
||||
if 'songs_dashboard_category' not in session:
|
||||
session['songs_dashboard_category'] = "Gemeinsamer Gesang"
|
||||
category = request.args.get("category", session['songs_dashboard_category'])
|
||||
session['songs_dashboard_category'] = category
|
||||
|
||||
if 'songs_dashboard_site' not in session:
|
||||
session['songs_dashboard_site'] = "Speyer"
|
||||
site = request.args.get("site", session['songs_dashboard_site'])
|
||||
session['songs_dashboard_site'] = site
|
||||
days_param = request.args.get("days", "30")
|
||||
site = str(request.args.get("site", "Speyer"))
|
||||
|
||||
# Determine cutoff_date based on the days parameter
|
||||
if timeframe_param == "all":
|
||||
if days_param == "all":
|
||||
cutoff_date = None # No date filtering when analyzing all time
|
||||
timeframe = "all" # Pass the string to the template if needed
|
||||
else:
|
||||
timeframe = int(timeframe_param)
|
||||
timeframe = int(days_param)
|
||||
now = datetime.now()
|
||||
cutoff_date = now - timedelta(days=timeframe)
|
||||
|
||||
cursor = search_db.cursor()
|
||||
# Query rows with category "Gemeinsamer Gesang"
|
||||
query = "SELECT titel, performance_date FROM files WHERE category = ? and site = ?"
|
||||
cursor.execute(query, (category, site))
|
||||
cursor.execute(query, ('Gemeinsamer Gesang', site))
|
||||
rows = cursor.fetchall()
|
||||
|
||||
# Group and count performances per titel (only if performance_date is within the timeframe,
|
||||
@ -189,7 +177,7 @@ def songs_dashboard():
|
||||
performance_data = [(count, titel) for titel, count in performance_counts.items()]
|
||||
performance_data.sort(reverse=True, key=lambda x: x[0])
|
||||
|
||||
return render_template('songs_dashboard.html', timeframe=timeframe_param, performance_data=performance_data, site=site, category=category)
|
||||
return render_template('songs_dashboard.html', timeframe=timeframe, performance_data=performance_data, site=site)
|
||||
|
||||
@require_secret
|
||||
def connections():
|
||||
|
||||
@ -128,19 +128,6 @@ def updatefileindex():
|
||||
# Prepend the foldername so it becomes part of the stored relative path.
|
||||
relative_path = os.path.join(foldername, rel_part).replace(os.sep, '/')
|
||||
filetype = os.path.splitext(entry.name)[1].lower()
|
||||
|
||||
# Retrieve the hit count for this file.
|
||||
hit_count = get_hit_count(relative_path)
|
||||
|
||||
category, titel, name, performance_date, site = None, None, None, None, None
|
||||
|
||||
# Determine the site
|
||||
if foldername == 'Gottesdienste Speyer':
|
||||
site = 'Speyer'
|
||||
elif foldername == 'Gottesdienste Schwegenheim':
|
||||
site = 'Schwegenheim'
|
||||
|
||||
if filetype == '.mp3':
|
||||
transcript = None
|
||||
|
||||
# Check for a corresponding transcript file in a sibling "Transkription" folder.
|
||||
@ -155,19 +142,22 @@ def updatefileindex():
|
||||
except Exception:
|
||||
transcript = None
|
||||
|
||||
# Retrieve the hit count for this file.
|
||||
hit_count = get_hit_count(relative_path)
|
||||
|
||||
category, titel, name, performance_date, site = None, None, None, None, None
|
||||
|
||||
if filetype == '.mp3':
|
||||
# Determine the site
|
||||
if foldername == 'Gottesdienste Speyer':
|
||||
site = 'Speyer'
|
||||
elif foldername == 'Gottesdienste Schwegenheim':
|
||||
site = 'Schwegenheim'
|
||||
|
||||
# extract category and titel from filename
|
||||
filename_ext = os.path.splitext(entry.name)[0]
|
||||
left_side, right_side = filename_ext.split('-', 1) if '-' in filename_ext else (filename_ext, None)
|
||||
try:
|
||||
int(left_side.strip())
|
||||
# first part is only a number
|
||||
previous_right_side = right_side
|
||||
left_side, right_side = previous_right_side.split('-', 1) if '-' in previous_right_side else (previous_right_side, None)
|
||||
except:
|
||||
# first part not a number
|
||||
continue
|
||||
|
||||
if 'predig' in left_side.lower():
|
||||
if 'predigt' in left_side.lower():
|
||||
category = 'Predigt'
|
||||
elif 'wort' in left_side.lower() or 'einladung' in left_side.lower():
|
||||
category = 'Vorwort'
|
||||
|
||||
@ -67,11 +67,18 @@
|
||||
<a class="navbar-brand" href="#">Downloads der letzten 10 Minuten</a>
|
||||
<div class="navbar-collapse" id="navbarNav">
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<li class="nav-item"><a href="{{ url_for('index') }}" class="nav-link">App</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('mylinks') }}" class="nav-link">Meine Links</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('connections') }}" class="nav-link">Verbindungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung-Downloads</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('songs_dashboard') }}" class="nav-link">Auswertung-Wiederholungen</a></li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ url_for('index') }}" class="nav-link">App</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ url_for('mylinks') }}" class="nav-link">Meine Links</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ url_for('connections') }}" class="nav-link">Verbindungen</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -31,8 +31,7 @@
|
||||
<li class="nav-item"><a href="{{ url_for('index') }}" class="nav-link">App</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('mylinks') }}" class="nav-link">Meine Links</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('connections') }}" class="nav-link">Verbindungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung-Downloads</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('songs_dashboard') }}" class="nav-link">Auswertung-Wiederholungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@ -273,8 +272,8 @@
|
||||
</div>
|
||||
|
||||
<!-- Scripts -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
||||
<script>
|
||||
// Data passed from the backend as JSON
|
||||
let distinctDeviceData = {{ distinct_device_data|tojson }};
|
||||
|
||||
@ -33,8 +33,7 @@
|
||||
<li class="nav-item"><a href="{{ url_for('index') }}" class="nav-link">App</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('mylinks') }}" class="nav-link">Meine Links</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('connections') }}" class="nav-link">Verbindungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung-Downloads</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('songs_dashboard') }}" class="nav-link">Auswertung-Wiederholungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,163 +1,32 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Dashboard - Verbindungsanalyse</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<style>
|
||||
html, body {
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.container-fluid {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
.card {
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- Navigation Bar -->
|
||||
<nav class="navbar navbar-expand-lg navbar-dark bg-secondary mb-3">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" href="#">Dashboard - Analyse Wiederholungen</a>
|
||||
<div class="navbar-collapse" id="navbarNav">
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<li class="nav-item"><a href="{{ url_for('index') }}" class="nav-link">App</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('mylinks') }}" class="nav-link">Meine Links</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('connections') }}" class="nav-link">Verbindungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung-Downloads</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('songs_dashboard') }}" class="nav-link">Auswertung-Wiederholungen</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
<title>Gemeinsamer Gesang</title>
|
||||
<!-- Bootstrap CSS -->
|
||||
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
|
||||
</head>
|
||||
<body>
|
||||
<div class="container mt-4">
|
||||
<h1>Dashboard: Gemeinsamer Gesang</h1>
|
||||
|
||||
<!-- Main Container -->
|
||||
<div class="container-fluid px-4">
|
||||
<!-- Dropdown Controls -->
|
||||
<div class="mb-4 d-flex flex-wrap gap-2">
|
||||
|
||||
<!-- Site Dropdown -->
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-secondary dropdown-toggle"
|
||||
type="button" id="siteDropdown" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{% if session['songs_dashboard_site'] == 'Speyer' %}
|
||||
Speyer
|
||||
{% elif session['songs_dashboard_site'] == 'Schwegenheim' %}
|
||||
Schwegenheim
|
||||
{% else %}
|
||||
Select Site
|
||||
{% endif %}
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="siteDropdown">
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_site'] == 'Speyer' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', site='Speyer') }}">
|
||||
Speyer
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_site'] == 'Schwegenheim' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', site='Schwegenheim') }}">
|
||||
Schwegenheim
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- Timeframe Dropdown -->
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-secondary dropdown-toggle"
|
||||
type="button" id="timeframeDropdown" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{% if session['songs_dashboard_timeframe'] == '7' %}
|
||||
Last 7 Days
|
||||
{% elif session['songs_dashboard_timeframe'] == '30' %}
|
||||
Last 30 Days
|
||||
{% elif session['songs_dashboard_timeframe'] == '90' %}
|
||||
Last 90 Days
|
||||
{% elif session['songs_dashboard_timeframe'] == '365' %}
|
||||
Last 365 Days
|
||||
{% elif session['songs_dashboard_timeframe'] == 'all' %}
|
||||
All Data
|
||||
{% else %}
|
||||
Select Timeframe
|
||||
{% endif %}
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="timeframeDropdown">
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_timeframe'] == '7' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', timeframe='7') }}">
|
||||
Last 7 Days
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_timeframe'] == '30' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', timeframe='30') }}">
|
||||
Last 30 Days
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_timeframe'] == '90' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', timeframe='90') }}">
|
||||
Last 90 Days
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_timeframe'] == '365' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', timeframe='365') }}">
|
||||
Last 365 Days
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_timeframe'] == 'all' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', timeframe='all') }}">
|
||||
All Data
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- category Dropdown -->
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-secondary dropdown-toggle" type="button" id="categoryDropdown" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{% if session['songs_dashboard_category'] == 'Gemeinsamer Gesang' %}
|
||||
Gemeinsamer Gesang
|
||||
{% elif session['songs_dashboard_category'] == 'Chor' %}
|
||||
Chor
|
||||
{% elif session['songs_dashboard_category'] == 'Gruppenlied' %}
|
||||
Gruppenlied
|
||||
{% else %}
|
||||
Select Category
|
||||
{% endif %}
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="categoryDropdown">
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_category'] == 'Gemeinsamer Gesang' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', category='Gemeinsamer Gesang') }}">
|
||||
Gemeinsamer Gesang
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_category'] == 'Chor' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', category='Chor') }}">
|
||||
Chor
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item {% if session['songs_dashboard_category'] == 'Gruppenlied' %}active{% endif %}"
|
||||
href="{{ url_for('songs_dashboard', category='Gruppenlied') }}">
|
||||
Gruppenlied
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- Timeframe selection form -->
|
||||
<form method="get" action="{{ url_for('songs_dashboard') }}" class="mb-3" onsubmit="this.submit();">
|
||||
<div class="form-group">
|
||||
<label for="siteSelect">Gemeindehaus</label>
|
||||
<select class="form-control" id="siteSelect" name="site" onchange="this.form.submit();">
|
||||
<option value="Speyer" {% if site == "Speyer" %}selected{% endif %}>Speyer</option>
|
||||
<option value="Schwegenheim" {% if site == "Schwegenheim" %}selected{% endif %}>Schwegenheim</option>
|
||||
</select>
|
||||
<label for="timeframeSelect">Zeitrahmen (in Tage)</label>
|
||||
<select class="form-control" id="timeframeSelect" name="days" onchange="this.form.submit();">
|
||||
<option value="7" {% if timeframe == 7 %}selected{% endif %}>letzte 7 Tage</option>
|
||||
<option value="30" {% if timeframe == 30 %}selected{% endif %}>letzte 30 Tage</option>
|
||||
<option value="365" {% if timeframe == 365 %}selected{% endif %}>letzte 365 Tage</option>
|
||||
<option value="all" {% if timeframe == "all" %}selected{% endif %}>Alle Jahre</option>
|
||||
</select>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<!-- Table Output -->
|
||||
<table class="table table-bordered">
|
||||
@ -176,7 +45,6 @@
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user