Compare commits
24 Commits
i18n
...
95ed606796
Author | SHA1 | Date | |
---|---|---|---|
95ed606796 | |||
52eac7530a | |||
2f6138b1d6 | |||
f5a39e80b4 | |||
f9f73e24c9 | |||
d697928241 | |||
f998f7fff8 | |||
1a5aa003a2 | |||
eecc2b8b73 | |||
0b13a408cd | |||
c4a65bba48 | |||
e4b37d9261 | |||
45cc02b4b0 | |||
05766d9a97 | |||
e5fbc14a34 | |||
9e025bd4c7 | |||
f4ffd14624 | |||
4740288c45 | |||
512898b34b | |||
872d0f9e23 | |||
28fda213ba | |||
bdf4e134e4 | |||
601f993ccb | |||
8fdf764a7b |
34
README.md
34
README.md
@@ -60,6 +60,7 @@ Die Webanwendung erreicht hervorragende Performance-Werte in allen Kategorien (P
|
|||||||
- Datum plus/minus X Wochen/Monate
|
- Datum plus/minus X Wochen/Monate
|
||||||
- Kalenderwoche zu Datum
|
- Kalenderwoche zu Datum
|
||||||
- Start-/Enddatum einer Kalenderwoche eines Jahres
|
- Start-/Enddatum einer Kalenderwoche eines Jahres
|
||||||
|
- Integrierter Taschenrechner mit History und Sprachausgabe
|
||||||
- Mehrsprachige Unterstützung (Deutsch/Englisch) mit automatischer Browser-Spracherkennung
|
- Mehrsprachige Unterstützung (Deutsch/Englisch) mit automatischer Browser-Spracherkennung
|
||||||
- Sprachausgabe für alle Ergebnisse (barrierefrei)
|
- Sprachausgabe für alle Ergebnisse (barrierefrei)
|
||||||
- Statistik-Dashboard mit Passwortschutz unter `/stats`
|
- Statistik-Dashboard mit Passwortschutz unter `/stats`
|
||||||
@@ -69,6 +70,7 @@ Die Webanwendung erreicht hervorragende Performance-Werte in allen Kategorien (P
|
|||||||
Die Werktagsberechnung kann optional bundeslandspezifische Feiertage berücksichtigen. Dazu wird die kostenlose API von [feiertage-api.de](https://feiertage-api.de) verwendet.
|
Die Werktagsberechnung kann optional bundeslandspezifische Feiertage berücksichtigen. Dazu wird die kostenlose API von [feiertage-api.de](https://feiertage-api.de) verwendet.
|
||||||
|
|
||||||
**Verfügbare Bundesländer:**
|
**Verfügbare Bundesländer:**
|
||||||
|
|
||||||
- Baden-Württemberg (BW)
|
- Baden-Württemberg (BW)
|
||||||
- Bayern (BY)
|
- Bayern (BY)
|
||||||
- Berlin (BE)
|
- Berlin (BE)
|
||||||
@@ -93,24 +95,29 @@ Die Feiertage werden automatisch für den gewählten Zeitraum abgerufen und bei
|
|||||||
Die Anwendung unterstützt Deutsch und Englisch mit folgenden Features:
|
Die Anwendung unterstützt Deutsch und Englisch mit folgenden Features:
|
||||||
|
|
||||||
### Automatische Spracherkennung:
|
### Automatische Spracherkennung:
|
||||||
|
|
||||||
- *Browser-Sprache*: Automatische Erkennung der Browser-Einstellung
|
- *Browser-Sprache*: Automatische Erkennung der Browser-Einstellung
|
||||||
- *URL-Parameter*: Sprachauswahl über `?lang=de` oder `?lang=en`
|
- *URL-Parameter*: Sprachauswahl über `?lang=de` oder `?lang=en`
|
||||||
- *localStorage*: Persistente Sprachauswahl im Browser
|
- *localStorage*: Persistente Sprachauswahl im Browser
|
||||||
- *Fallback*: Deutsch als Standardsprache
|
- *Fallback*: Deutsch als Standardsprache
|
||||||
|
|
||||||
### *Datenschutzfreundliche Implementierung:*
|
### *Datenschutzfreundliche Implementierung:*
|
||||||
|
|
||||||
- *Keine Cookies*: Sprachauswahl ohne Cookies
|
- *Keine Cookies*: Sprachauswahl ohne Cookies
|
||||||
- *URL-Parameter*: Transparente Sprachauswahl in der URL
|
- *URL-Parameter*: Transparente Sprachauswahl in der URL
|
||||||
- *localStorage*: Lokale Speicherung im Browser
|
- *localStorage*: Lokale Speicherung im Browser
|
||||||
- *Teilbare URLs*: URLs mit Sprachauswahl können geteilt werden
|
- *Teilbare URLs*: URLs mit Sprachauswahl können geteilt werden
|
||||||
|
|
||||||
### *Barrierefreiheit:*
|
### *Barrierefreiheit:*
|
||||||
|
|
||||||
- *Screenreader*: Vollständige Unterstützung
|
- *Screenreader*: Vollständige Unterstützung
|
||||||
- *Tastatur-Navigation*: Vollständig bedienbar
|
- *Tastatur-Navigation*: Vollständig bedienbar
|
||||||
- *ARIA-Attribute*: Korrekte Beschriftungen
|
- *ARIA-Attribute*: Korrekte Beschriftungen
|
||||||
- *Semantische HTML*: Korrekte Struktur
|
- *Semantische HTML*: Korrekte Struktur
|
||||||
|
- *Taschenrechner*: Vollständig barrierefrei mit Tastatur-Bedienung und Sprachausgabe
|
||||||
|
|
||||||
### *Technische Details:*
|
### *Technische Details:*
|
||||||
|
|
||||||
- *Flask-Babel*: Professionelle i18n-Implementierung
|
- *Flask-Babel*: Professionelle i18n-Implementierung
|
||||||
- *Gettext*: Standard für Übersetzungen
|
- *Gettext*: Standard für Übersetzungen
|
||||||
- *Responsive Design*: Angepasst für alle Geräte
|
- *Responsive Design*: Angepasst für alle Geräte
|
||||||
@@ -200,8 +207,11 @@ docker-compose up --build
|
|||||||
## REST API
|
## REST API
|
||||||
|
|
||||||
Alle Datumsfunktionen stehen auch als REST-API zur Verfügung. Die API akzeptiert und liefert JSON.
|
Alle Datumsfunktionen stehen auch als REST-API zur Verfügung. Die API akzeptiert und liefert JSON.
|
||||||
|
|
||||||
**Basis-URL:** `http://localhost:5000/api/`
|
**Basis-URL:** `http://localhost:5000/api/`
|
||||||
|
|
||||||
|
**Swagger Dokumentation:** [https://date.elpatron.me/api-docs](https://date.elpatron.me/api-docs)
|
||||||
|
|
||||||
**Hinweis:** Die Nutzung der REST API wird im Statistik-Dashboard ausgewertet und als Diagramm angezeigt.
|
**Hinweis:** Die Nutzung der REST API wird im Statistik-Dashboard ausgewertet und als Diagramm angezeigt.
|
||||||
|
|
||||||
### Endpunkte und Beispiele
|
### Endpunkte und Beispiele
|
||||||
@@ -334,6 +344,7 @@ curl -X POST http://localhost:5000/api/plusminus \
|
|||||||
```
|
```
|
||||||
|
|
||||||
**Hinweis:**
|
**Hinweis:**
|
||||||
|
|
||||||
- `"einheit"`: `"tage"`, `"wochen"` oder `"monate"`
|
- `"einheit"`: `"tage"`, `"wochen"` oder `"monate"`
|
||||||
- `"richtung"`: `"add"` (plus) oder `"sub"` (minus)
|
- `"richtung"`: `"add"` (plus) oder `"sub"` (minus)
|
||||||
- `"werktage"`: `true` für Werktage, sonst `false` (nur bei `"tage"` unterstützt)
|
- `"werktage"`: `true` für Werktage, sonst `false` (nur bei `"tage"` unterstützt)
|
||||||
@@ -395,6 +406,7 @@ Elpatrons Datumsrechner ist als PWA installierbar (z.B. auf Android/iOS-Homescre
|
|||||||
- Manifest und Service Worker sind integriert
|
- Manifest und Service Worker sind integriert
|
||||||
- App-Icon und Theme-Color für Homescreen
|
- App-Icon und Theme-Color für Homescreen
|
||||||
- Installation über Browser-Menü ("Zum Startbildschirm hinzufügen")
|
- Installation über Browser-Menü ("Zum Startbildschirm hinzufügen")
|
||||||
|
- Taschenrechner funktioniert vollständig clientseitig (offline verfügbar)
|
||||||
|
|
||||||
## Monitoring & Healthcheck
|
## Monitoring & Healthcheck
|
||||||
|
|
||||||
@@ -407,9 +419,7 @@ Die App bietet einen Monitoring-Endpunkt unter `/monitor`, der Statusinformation
|
|||||||
|
|
||||||
Beispiel-Aufruf:
|
Beispiel-Aufruf:
|
||||||
|
|
||||||
```
|
`GET https://date.elpatron.me/monitor`
|
||||||
GET https://date.elpatron.me/monitor
|
|
||||||
```
|
|
||||||
|
|
||||||
Antwort:
|
Antwort:
|
||||||
|
|
||||||
@@ -448,7 +458,7 @@ Finde mal eine Datumsrechner- Webapp, die nicht völlig Werbe- und Tracking vers
|
|||||||
|
|
||||||
### Vibe Coding
|
### Vibe Coding
|
||||||
|
|
||||||
Dieses Projekt wurde zu nahezu 100% mit Unterstützung künsticher Intelligenz (*[Vibe Coding](https://de.wikipedia.org/wiki/Vibe_Coding)*) erstellt. Das Grundgerüst war nach ca. 45 Minuten fertig gestellt, insgesamt hat die Entwicklung des Projekts ca. 4 Stunden Zeit beansprucht.
|
Dieses Projekt wurde zu nahezu 100% mit Unterstützung künsticher Intelligenz (*[Vibe Coding](https://de.wikipedia.org/wiki/Vibe_Coding)*) erstellt. Das Grundgerüst war nach ca. 45 Minuten fertig gestellt, insgesamt hat die Entwicklung des Projekts ca. 12 Stunden Zeit beansprucht.
|
||||||
|
|
||||||
### Statistik-Erfassung, Logging
|
### Statistik-Erfassung, Logging
|
||||||
|
|
||||||
@@ -465,6 +475,7 @@ Es werden keine IP-Adressen oder sonstigen persönlichen Daten gespeichert, ledi
|
|||||||
- *Farbkontraste:* Hohe Kontraste für Texte, Buttons und Ergebnisboxen, geprüft nach WCAG-Richtlinien.
|
- *Farbkontraste:* Hohe Kontraste für Texte, Buttons und Ergebnisboxen, geprüft nach WCAG-Richtlinien.
|
||||||
- *Status- und Fehlermeldungen:* Ergebnisse und Fehler werden mit `aria-live` für Screenreader zugänglich gemacht.
|
- *Status- und Fehlermeldungen:* Ergebnisse und Fehler werden mit `aria-live` für Screenreader zugänglich gemacht.
|
||||||
- *Sprachausgabe:* Alle Ergebnisse können über 🔊-Buttons vorgelesen werden (Web Speech API, deutsche Sprache).
|
- *Sprachausgabe:* Alle Ergebnisse können über 🔊-Buttons vorgelesen werden (Web Speech API, deutsche Sprache).
|
||||||
|
- *Taschenrechner:* Vollständig barrierefrei mit Tastatur-Bedienung, Sprachausgabe und History-Funktion.
|
||||||
- *Mobile Optimierung:* Zusätzliche Meta-Tags für bessere Bedienbarkeit auf mobilen Geräten und Unterstützung von Screenreadern.
|
- *Mobile Optimierung:* Zusätzliche Meta-Tags für bessere Bedienbarkeit auf mobilen Geräten und Unterstützung von Screenreadern.
|
||||||
- *SEO:* Das Thema Barrierefreiheit ist in den Meta-Tags für Suchmaschinen sichtbar.
|
- *SEO:* Das Thema Barrierefreiheit ist in den Meta-Tags für Suchmaschinen sichtbar.
|
||||||
|
|
||||||
@@ -472,22 +483,23 @@ Damit ist die App für Menschen mit unterschiedlichen Einschränkungen (z.B. Seh
|
|||||||
|
|
||||||
### Code Statistik
|
### Code Statistik
|
||||||
|
|
||||||
cloc|github.com/AlDanial/cloc v 2.06 T=0.08 s (269.8 files/s, 57268.4 lines/s)
|
cloc|github.com/AlDanial/cloc v 2.06 T=0.23 s (109.5 files/s, 30735.0 lines/s)
|
||||||
--- | ---
|
--- | ---
|
||||||
|
|
||||||
Language|files|blank|comment|code
|
Language|files|blank|comment|code
|
||||||
:-------|-------:|-------:|-------:|-------:
|
:-------|-------:|-------:|-------:|-------:
|
||||||
HTML|8|36|6|1998
|
HTML|8|159|8|2805
|
||||||
Python|2|53|57|614
|
Python|2|66|74|739
|
||||||
JavaScript|2|95|87|571
|
JavaScript|2|95|88|580
|
||||||
Markdown|2|139|0|360
|
PO File|2|260|266|544
|
||||||
|
Markdown|3|184|0|498
|
||||||
JSON|3|0|0|243
|
JSON|3|0|0|243
|
||||||
CSS|1|186|3|188
|
CSS|1|186|3|188
|
||||||
SVG|2|0|0|14
|
SVG|2|0|0|14
|
||||||
Dockerfile|1|5|6|8
|
Dockerfile|1|5|6|8
|
||||||
DOS Batch|1|0|0|1
|
DOS Batch|1|0|0|1
|
||||||
--------|--------|--------|--------|--------
|
--------|--------|--------|--------|--------
|
||||||
SUM:|22|514|159|3997
|
SUM:|25|955|445|5620
|
||||||
|
|
||||||
## Lizenz
|
## Lizenz
|
||||||
|
|
||||||
@@ -496,4 +508,4 @@ Dieses Projekt steht unter der [MIT-Lizenz](LICENSE).
|
|||||||
---
|
---
|
||||||
(c) 2025 [Markus Busche](https://digitalcourage.social/@elpatron)
|
(c) 2025 [Markus Busche](https://digitalcourage.social/@elpatron)
|
||||||
|
|
||||||
**Version 1.4.0** - Mehrsprachige Unterstützung hinzugefügt
|
**Version 1.4.12** - Integrierter Taschenrechner mit History und Sprachausgabe hinzugefügt
|
||||||
|
129
app.py
129
app.py
@@ -1,4 +1,4 @@
|
|||||||
from flask import Flask, render_template, request, redirect, url_for, session, abort, jsonify, g
|
from flask import Flask, render_template, request, redirect, url_for, session, abort, jsonify, g, make_response
|
||||||
from flask_babel import Babel, gettext, ngettext, get_locale
|
from flask_babel import Babel, gettext, ngettext, get_locale
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
import numpy as np
|
import numpy as np
|
||||||
@@ -20,7 +20,23 @@ app.config['BABEL_TRANSLATION_DIRECTORIES'] = 'translations'
|
|||||||
babel = Babel()
|
babel = Babel()
|
||||||
|
|
||||||
# Version der App
|
# Version der App
|
||||||
APP_VERSION = "1.4.0"
|
APP_VERSION = "1.4.13"
|
||||||
|
|
||||||
|
def add_cache_headers(response):
|
||||||
|
"""Fügt Cache-Control-Header hinzu, die den Back-Forward-Cache ermöglichen"""
|
||||||
|
# Cache-Control für statische Inhalte und API-Endpunkte
|
||||||
|
if request.path.startswith('/static/') or request.path.startswith('/api/'):
|
||||||
|
response.headers['Cache-Control'] = 'public, max-age=3600, s-maxage=3600'
|
||||||
|
else:
|
||||||
|
# Für HTML-Seiten: kurze Cache-Zeit, aber Back-Forward-Cache erlauben
|
||||||
|
response.headers['Cache-Control'] = 'public, max-age=60, s-maxage=300'
|
||||||
|
|
||||||
|
# Wichtig: Keine Vary-Header für User-Agent oder andere dynamische Werte
|
||||||
|
# Dies verhindert den Back-Forward-Cache
|
||||||
|
if 'Vary' in response.headers:
|
||||||
|
del response.headers['Vary']
|
||||||
|
|
||||||
|
return response
|
||||||
|
|
||||||
# HTML-Template wird jetzt aus templates/index.html geladen
|
# HTML-Template wird jetzt aus templates/index.html geladen
|
||||||
|
|
||||||
@@ -229,34 +245,72 @@ def index():
|
|||||||
plusminus_result = f"Datum {d.strftime('%d.%m.%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} Monate: {result.strftime('%d.%m.%Y')}"
|
plusminus_result = f"Datum {d.strftime('%d.%m.%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} Monate: {result.strftime('%d.%m.%Y')}"
|
||||||
except Exception:
|
except Exception:
|
||||||
plusminus_result = gettext('Ungültige Eingabe')
|
plusminus_result = gettext('Ungültige Eingabe')
|
||||||
return render_template('index.html', tage=tage, werktage=werktage, wochentag=wochentag, plusminus_result=plusminus_result, kw_berechnen=kw_berechnen, kw_datum=kw_datum, active_idx=active_idx
|
response = make_response(render_template('index.html', tage=tage, werktage=werktage, wochentag=wochentag, plusminus_result=plusminus_result, kw_berechnen=kw_berechnen, kw_datum=kw_datum, active_idx=active_idx
|
||||||
, feiertage_anzahl=feiertage_anzahl, wochenendtage_anzahl=wochenendtage_anzahl, app_version=APP_VERSION, get_locale=get_locale
|
, feiertage_anzahl=feiertage_anzahl, wochenendtage_anzahl=wochenendtage_anzahl, app_version=APP_VERSION, get_locale=get_locale
|
||||||
)
|
))
|
||||||
|
return add_cache_headers(response)
|
||||||
|
|
||||||
|
|
||||||
def parse_log_stats(log_path):
|
def parse_log_stats(log_path):
|
||||||
pageviews = 0
|
pageviews = 0
|
||||||
func_counts = {}
|
func_counts = {}
|
||||||
|
func_counts_hourly = {}
|
||||||
impressions_per_day = {}
|
impressions_per_day = {}
|
||||||
|
impressions_per_hour = {}
|
||||||
api_counts = {}
|
api_counts = {}
|
||||||
|
api_counts_hourly = {}
|
||||||
if os.path.exists(log_path):
|
if os.path.exists(log_path):
|
||||||
with open(log_path, encoding='utf-8') as f:
|
with open(log_path, encoding='utf-8') as f:
|
||||||
for line in f:
|
for line in f:
|
||||||
if 'PAGEVIEW' in line:
|
if 'PAGEVIEW' in line:
|
||||||
pageviews += 1
|
pageviews += 1
|
||||||
try:
|
try:
|
||||||
date = line[:10]
|
# Parse timestamp (format: YYYY-MM-DDTHH:MM:SS)
|
||||||
|
timestamp = line[:19] # First 19 chars for YYYY-MM-DDTHH:MM:SS
|
||||||
|
date = timestamp[:10] # YYYY-MM-DD
|
||||||
|
hour = timestamp[11:13] # HH
|
||||||
|
|
||||||
if len(date) == 10 and date[4] == '-' and date[7] == '-':
|
if len(date) == 10 and date[4] == '-' and date[7] == '-':
|
||||||
impressions_per_day[date] = impressions_per_day.get(date, 0) + 1
|
impressions_per_day[date] = impressions_per_day.get(date, 0) + 1
|
||||||
|
|
||||||
|
if len(hour) == 2 and hour.isdigit():
|
||||||
|
hour_key = f"{date} {hour}:00"
|
||||||
|
impressions_per_hour[hour_key] = impressions_per_hour.get(hour_key, 0) + 1
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
elif 'FUNC:' in line:
|
elif 'FUNC:' in line:
|
||||||
func = line.split('FUNC:')[1].strip()
|
func = line.split('FUNC:')[1].strip()
|
||||||
func_counts[func] = func_counts.get(func, 0) + 1
|
func_counts[func] = func_counts.get(func, 0) + 1
|
||||||
|
|
||||||
|
# Stündliche Funktionsaufrufe
|
||||||
|
try:
|
||||||
|
timestamp = line[:19]
|
||||||
|
date = timestamp[:10]
|
||||||
|
hour = timestamp[11:13]
|
||||||
|
if len(hour) == 2 and hour.isdigit():
|
||||||
|
hour_key = f"{date} {hour}:00"
|
||||||
|
if hour_key not in func_counts_hourly:
|
||||||
|
func_counts_hourly[hour_key] = {}
|
||||||
|
func_counts_hourly[hour_key][func] = func_counts_hourly[hour_key].get(func, 0) + 1
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
elif 'FUNC_API:' in line:
|
elif 'FUNC_API:' in line:
|
||||||
api = line.split('FUNC_API:')[1].strip()
|
api = line.split('FUNC_API:')[1].strip()
|
||||||
api_counts[api] = api_counts.get(api, 0) + 1
|
api_counts[api] = api_counts.get(api, 0) + 1
|
||||||
return pageviews, func_counts, impressions_per_day, api_counts
|
|
||||||
|
# Stündliche API-Aufrufe
|
||||||
|
try:
|
||||||
|
timestamp = line[:19]
|
||||||
|
date = timestamp[:10]
|
||||||
|
hour = timestamp[11:13]
|
||||||
|
if len(hour) == 2 and hour.isdigit():
|
||||||
|
hour_key = f"{date} {hour}:00"
|
||||||
|
if hour_key not in api_counts_hourly:
|
||||||
|
api_counts_hourly[hour_key] = {}
|
||||||
|
api_counts_hourly[hour_key][api] = api_counts_hourly[hour_key].get(api, 0) + 1
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return pageviews, func_counts, func_counts_hourly, impressions_per_day, impressions_per_hour, api_counts, api_counts_hourly
|
||||||
|
|
||||||
@app.route('/stats', methods=['GET', 'POST'])
|
@app.route('/stats', methods=['GET', 'POST'])
|
||||||
def stats():
|
def stats():
|
||||||
@@ -267,11 +321,14 @@ def stats():
|
|||||||
session['stats_auth'] = True
|
session['stats_auth'] = True
|
||||||
return redirect(url_for('stats'))
|
return redirect(url_for('stats'))
|
||||||
else:
|
else:
|
||||||
return render_template('stats_login.html', error='Falsches Passwort!')
|
response = make_response(render_template('stats_login.html', error='Falsches Passwort!'))
|
||||||
return render_template('stats_login.html', error=None)
|
return add_cache_headers(response)
|
||||||
|
response = make_response(render_template('stats_login.html', error=None))
|
||||||
|
return add_cache_headers(response)
|
||||||
log_path = os.path.join('log', 'pageviews.log')
|
log_path = os.path.join('log', 'pageviews.log')
|
||||||
pageviews, func_counts, impressions_per_day, api_counts = parse_log_stats(log_path)
|
pageviews, func_counts, func_counts_hourly, impressions_per_day, impressions_per_hour, api_counts, api_counts_hourly = parse_log_stats(log_path)
|
||||||
return render_template('stats_dashboard.html', pageviews=pageviews, func_counts=func_counts, impressions_per_day=impressions_per_day, api_counts=api_counts)
|
response = make_response(render_template('stats_dashboard.html', pageviews=pageviews, func_counts=func_counts, func_counts_hourly=func_counts_hourly, impressions_per_day=impressions_per_day, impressions_per_hour=impressions_per_hour, api_counts=api_counts, api_counts_hourly=api_counts_hourly))
|
||||||
|
return add_cache_headers(response)
|
||||||
|
|
||||||
# --- REST API ---
|
# --- REST API ---
|
||||||
def log_api_usage(api_name):
|
def log_api_usage(api_name):
|
||||||
@@ -305,7 +362,8 @@ def api_tage_werktage():
|
|||||||
tage = int(np.busday_count(d1.date(), (d2 + timedelta(days=1)).date(), holidays=holidays))
|
tage = int(np.busday_count(d1.date(), (d2 + timedelta(days=1)).date(), holidays=holidays))
|
||||||
else:
|
else:
|
||||||
tage = abs((d2 - d1).days)
|
tage = abs((d2 - d1).days)
|
||||||
return jsonify({'result': tage})
|
response = jsonify({'result': tage})
|
||||||
|
return add_cache_headers(response)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return jsonify({'error': 'Ungültige Eingabe', 'details': str(e)}), 400
|
return jsonify({'error': 'Ungültige Eingabe', 'details': str(e)}), 400
|
||||||
|
|
||||||
@@ -318,7 +376,8 @@ def api_wochentag():
|
|||||||
d = datetime.strptime(datum, '%Y-%m-%d')
|
d = datetime.strptime(datum, '%Y-%m-%d')
|
||||||
wochentage = get_wochentage()
|
wochentage = get_wochentage()
|
||||||
wochentag = wochentage[d.weekday()]
|
wochentag = wochentage[d.weekday()]
|
||||||
return jsonify({'result': wochentag})
|
response = jsonify({'result': wochentag})
|
||||||
|
return add_cache_headers(response)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return jsonify({'error': 'Ungültige Eingabe', 'details': str(e)}), 400
|
return jsonify({'error': 'Ungültige Eingabe', 'details': str(e)}), 400
|
||||||
|
|
||||||
@@ -335,7 +394,8 @@ def api_kw_berechnen():
|
|||||||
kw_berechnen = f"Week {kw} ({d.year})"
|
kw_berechnen = f"Week {kw} ({d.year})"
|
||||||
else:
|
else:
|
||||||
kw_berechnen = f"KW {kw} ({d.year})"
|
kw_berechnen = f"KW {kw} ({d.year})"
|
||||||
return jsonify({'result': kw_berechnen, 'kw': kw, 'jahr': d.year})
|
response = jsonify({'result': kw_berechnen, 'kw': kw, 'jahr': d.year})
|
||||||
|
return add_cache_headers(response)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return jsonify({'error': 'Ungültige Eingabe', 'details': str(e)}), 400
|
return jsonify({'error': 'Ungültige Eingabe', 'details': str(e)}), 400
|
||||||
|
|
||||||
@@ -355,7 +415,8 @@ def api_kw_datum():
|
|||||||
kw_datum = f"{start.strftime('%m/%d/%Y')} to {end.strftime('%m/%d/%Y')}"
|
kw_datum = f"{start.strftime('%m/%d/%Y')} to {end.strftime('%m/%d/%Y')}"
|
||||||
else:
|
else:
|
||||||
kw_datum = f"{start.strftime('%d.%m.%Y')} bis {end.strftime('%d.%m.%Y')}"
|
kw_datum = f"{start.strftime('%d.%m.%Y')} bis {end.strftime('%d.%m.%Y')}"
|
||||||
return jsonify({'result': kw_datum, 'start': start.strftime('%Y-%m-%d'), 'end': end.strftime('%Y-%m-%d')})
|
response = jsonify({'result': kw_datum, 'start': start.strftime('%Y-%m-%d'), 'end': end.strftime('%Y-%m-%d')})
|
||||||
|
return add_cache_headers(response)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return jsonify({'error': 'Ungültige Eingabe', 'details': str(e)}), 400
|
return jsonify({'error': 'Ungültige Eingabe', 'details': str(e)}), 400
|
||||||
|
|
||||||
@@ -378,34 +439,26 @@ def api_plusminus():
|
|||||||
if is_werktage:
|
if is_werktage:
|
||||||
result = np.busday_offset(d.date(), anzahl_int, roll='forward')
|
result = np.busday_offset(d.date(), anzahl_int, roll='forward')
|
||||||
result_dt = datetime.strptime(str(result), '%Y-%m-%d')
|
result_dt = datetime.strptime(str(result), '%Y-%m-%d')
|
||||||
if locale == 'en':
|
response = jsonify({'result': result_dt.strftime('%Y-%m-%d')})
|
||||||
plusminus_result = f"Date {d.strftime('%m/%d/%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} workdays: {result_dt.strftime('%m/%d/%Y')}"
|
return add_cache_headers(response)
|
||||||
else:
|
|
||||||
plusminus_result = f"Datum {d.strftime('%d.%m.%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} Werktage: {result_dt.strftime('%d.%m.%Y')}"
|
|
||||||
else:
|
else:
|
||||||
result = d + timedelta(days=anzahl_int)
|
result = d + timedelta(days=anzahl_int)
|
||||||
if locale == 'en':
|
response = jsonify({'result': result.strftime('%Y-%m-%d')})
|
||||||
plusminus_result = f"Date {d.strftime('%m/%d/%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} days: {result.strftime('%m/%d/%Y')}"
|
return add_cache_headers(response)
|
||||||
else:
|
|
||||||
plusminus_result = f"Datum {d.strftime('%d.%m.%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} Tage: {result.strftime('%d.%m.%Y')}"
|
|
||||||
elif einheit == 'wochen':
|
elif einheit == 'wochen':
|
||||||
if is_werktage:
|
if is_werktage:
|
||||||
return jsonify({'error': 'Nicht unterstützt: Werktage + Wochen.'}), 400
|
return jsonify({'error': 'Nicht unterstützt: Werktage + Wochen.'}), 400
|
||||||
else:
|
else:
|
||||||
result = d + timedelta(weeks=anzahl_int)
|
result = d + timedelta(weeks=anzahl_int)
|
||||||
if locale == 'en':
|
response = jsonify({'result': result.strftime('%Y-%m-%d')})
|
||||||
plusminus_result = f"Date {d.strftime('%m/%d/%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} weeks: {result.strftime('%m/%d/%Y')}"
|
return add_cache_headers(response)
|
||||||
else:
|
|
||||||
plusminus_result = f"Datum {d.strftime('%d.%m.%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} Wochen: {result.strftime('%d.%m.%Y')}"
|
|
||||||
elif einheit == 'monate':
|
elif einheit == 'monate':
|
||||||
if is_werktage:
|
if is_werktage:
|
||||||
return jsonify({'error': 'Nicht unterstützt: Werktage + Monate.'}), 400
|
return jsonify({'error': 'Nicht unterstützt: Werktage + Monate.'}), 400
|
||||||
else:
|
else:
|
||||||
result = d + relativedelta(months=anzahl_int)
|
result = d + relativedelta(months=anzahl_int)
|
||||||
if locale == 'en':
|
response = jsonify({'result': result.strftime('%Y-%m-%d')})
|
||||||
plusminus_result = f"Date {d.strftime('%m/%d/%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} months: {result.strftime('%m/%d/%Y')}"
|
return add_cache_headers(response)
|
||||||
else:
|
|
||||||
plusminus_result = f"Datum {d.strftime('%d.%m.%Y')} {'plus' if anzahl_int>=0 else 'minus'} {abs(anzahl_int)} Monate: {result.strftime('%d.%m.%Y')}"
|
|
||||||
else:
|
else:
|
||||||
return jsonify({'error': 'Ungültige Einheit'}), 400
|
return jsonify({'error': 'Ungültige Einheit'}), 400
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -414,8 +467,14 @@ def api_plusminus():
|
|||||||
@app.route('/api/stats', methods=['GET'])
|
@app.route('/api/stats', methods=['GET'])
|
||||||
def api_stats():
|
def api_stats():
|
||||||
log_path = os.path.join('log', 'pageviews.log')
|
log_path = os.path.join('log', 'pageviews.log')
|
||||||
pageviews, func_counts, impressions_per_day, api_counts = parse_log_stats(log_path)
|
pageviews, func_counts, func_counts_hourly, impressions_per_day, impressions_per_hour, api_counts, api_counts_hourly = parse_log_stats(log_path)
|
||||||
return render_template('stats_dashboard.html', pageviews=pageviews, func_counts=func_counts, impressions_per_day=impressions_per_day, api_counts=api_counts)
|
response = jsonify({
|
||||||
|
"pageviews": pageviews,
|
||||||
|
"func_counts": func_counts,
|
||||||
|
"impressions_per_day": impressions_per_day,
|
||||||
|
"api_counts": api_counts
|
||||||
|
})
|
||||||
|
return add_cache_headers(response)
|
||||||
|
|
||||||
@app.route('/api/monitor', methods=['GET'])
|
@app.route('/api/monitor', methods=['GET'])
|
||||||
def api_monitor():
|
def api_monitor():
|
||||||
@@ -427,17 +486,19 @@ def api_monitor():
|
|||||||
if 'PAGEVIEW' in line:
|
if 'PAGEVIEW' in line:
|
||||||
pageviews += 1
|
pageviews += 1
|
||||||
uptime = int(time.time() - app_start_time)
|
uptime = int(time.time() - app_start_time)
|
||||||
return jsonify({
|
response = jsonify({
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
"message": "App running",
|
"message": "App running",
|
||||||
"time": datetime.now().isoformat(),
|
"time": datetime.now().isoformat(),
|
||||||
"uptime_seconds": uptime,
|
"uptime_seconds": uptime,
|
||||||
"pageviews_last_7_days": pageviews
|
"pageviews_last_7_days": pageviews
|
||||||
})
|
})
|
||||||
|
return add_cache_headers(response)
|
||||||
|
|
||||||
@app.route('/api-docs')
|
@app.route('/api-docs')
|
||||||
def api_docs():
|
def api_docs():
|
||||||
return render_template('swagger.html')
|
response = make_response(render_template('swagger.html'))
|
||||||
|
return add_cache_headers(response)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
@@ -1,5 +0,0 @@
|
|||||||
# Netscape HTTP Cookie File
|
|
||||||
# https://curl.se/docs/http-cookies.html
|
|
||||||
# This file was generated by libcurl! Edit at your own risk.
|
|
||||||
|
|
||||||
#HttpOnly_localhost FALSE / FALSE 0 session eyJsYW5ndWFnZSI6ImVuIn0.aIzL2Q.DZtPH-UmM3muNC8RZypEbL29jCg
|
|
File diff suppressed because one or more lines are too long
@@ -1,15 +1,25 @@
|
|||||||
const CACHE_NAME = 'datumsrechner-cache-v1';
|
const CACHE_NAME = 'datumsrechner-cache-v1';
|
||||||
const urlsToCache = [
|
const urlsToCache = [
|
||||||
'/',
|
'/',
|
||||||
'/static/style.css',
|
|
||||||
'/static/favicon.ico',
|
'/static/favicon.ico',
|
||||||
'/static/favicon.png',
|
'/static/favicon.png',
|
||||||
|
'/static/favicon.svg',
|
||||||
'/static/logo.svg',
|
'/static/logo.svg',
|
||||||
|
'/static/manifest.json',
|
||||||
];
|
];
|
||||||
self.addEventListener('install', event => {
|
self.addEventListener('install', event => {
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
caches.open(CACHE_NAME)
|
caches.open(CACHE_NAME)
|
||||||
.then(cache => cache.addAll(urlsToCache))
|
.then(cache => {
|
||||||
|
// Füge nur existierende Dateien zum Cache hinzu
|
||||||
|
return Promise.allSettled(
|
||||||
|
urlsToCache.map(url =>
|
||||||
|
cache.add(url).catch(err => {
|
||||||
|
console.log('Failed to cache:', url, err);
|
||||||
|
})
|
||||||
|
)
|
||||||
|
);
|
||||||
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
self.addEventListener('fetch', event => {
|
self.addEventListener('fetch', event => {
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
.v{
|
{
|
||||||
"openapi": "3.0.3",
|
"openapi": "3.0.3",
|
||||||
"info": {
|
"info": {
|
||||||
"title": "Elpatrons Datumsrechner API",
|
"title": "Elpatrons Datumsrechner API",
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -19,6 +19,32 @@
|
|||||||
.stats-label { color: #64748b; }
|
.stats-label { color: #64748b; }
|
||||||
.stats-value { font-size: 1.5em; font-weight: bold; }
|
.stats-value { font-size: 1.5em; font-weight: bold; }
|
||||||
.chart-container { margin: 2em 0; }
|
.chart-container { margin: 2em 0; }
|
||||||
|
.toggle-container {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
margin-bottom: 1.5em;
|
||||||
|
gap: 0.5em;
|
||||||
|
}
|
||||||
|
.toggle-btn {
|
||||||
|
padding: 0.5em 1em;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
background: #f9fafb;
|
||||||
|
color: #6b7280;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.2s;
|
||||||
|
}
|
||||||
|
.toggle-btn.active {
|
||||||
|
background: #2563eb;
|
||||||
|
color: white;
|
||||||
|
border-color: #2563eb;
|
||||||
|
}
|
||||||
|
.toggle-btn:hover {
|
||||||
|
background: #e5e7eb;
|
||||||
|
}
|
||||||
|
.toggle-btn.active:hover {
|
||||||
|
background: #1d4ed8;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -28,6 +54,12 @@
|
|||||||
<div class="stats-label">Gesamt-Pageviews (7 Tage):</div>
|
<div class="stats-label">Gesamt-Pageviews (7 Tage):</div>
|
||||||
<div class="stats-value">{{ pageviews }}</div>
|
<div class="stats-value">{{ pageviews }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="toggle-container">
|
||||||
|
<button class="toggle-btn active" data-period="week">Wochenverlauf</button>
|
||||||
|
<button class="toggle-btn" data-period="day">24-Stunden-Verlauf</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="chart-container">
|
<div class="chart-container">
|
||||||
<canvas id="imprChart" width="400" height="180"></canvas>
|
<canvas id="imprChart" width="400" height="180"></canvas>
|
||||||
</div>
|
</div>
|
||||||
@@ -43,75 +75,196 @@
|
|||||||
</div>
|
</div>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
// Impressions pro Tag
|
// Daten für verschiedene Zeiträume
|
||||||
// eslint-disable-next-line
|
const weekData = {{ impressions_per_day|tojson }};
|
||||||
const imprData = {{ impressions_per_day|tojson }};
|
const dayData = {{ impressions_per_hour|tojson }};
|
||||||
const imprLabels = Object.keys(imprData);
|
const weekFuncData = {{ func_counts|tojson }};
|
||||||
const imprCounts = Object.values(imprData);
|
const dayFuncData = {{ func_counts_hourly|tojson }};
|
||||||
new Chart(document.getElementById('imprChart').getContext('2d'), {
|
const weekApiData = {{ api_counts|tojson }};
|
||||||
type: 'line',
|
const dayApiData = {{ api_counts_hourly|tojson }};
|
||||||
data: {
|
|
||||||
labels: imprLabels,
|
let currentPeriod = 'week';
|
||||||
datasets: [{
|
let currentImprChart = null;
|
||||||
label: 'Impressions/Tag',
|
let currentFuncChart = null;
|
||||||
data: imprCounts,
|
let currentApiChart = null;
|
||||||
borderColor: '#059669',
|
|
||||||
backgroundColor: 'rgba(5,150,105,0.1)',
|
// Toggle-Buttons Event Listener
|
||||||
tension: 0.2,
|
document.querySelectorAll('.toggle-btn').forEach(btn => {
|
||||||
fill: true
|
btn.addEventListener('click', function() {
|
||||||
}]
|
// Aktiven Button aktualisieren
|
||||||
},
|
document.querySelectorAll('.toggle-btn').forEach(b => b.classList.remove('active'));
|
||||||
options: {
|
this.classList.add('active');
|
||||||
plugins: { legend: { display: true } },
|
|
||||||
scales: {
|
// Zeitraum wechseln
|
||||||
y: { beginAtZero: true, ticks: { stepSize: 1 } }
|
currentPeriod = this.dataset.period;
|
||||||
}
|
updateAllCharts();
|
||||||
}
|
});
|
||||||
});
|
});
|
||||||
// Funktionsaufrufe
|
|
||||||
// eslint-disable-next-line
|
function updateImpressionsChart() {
|
||||||
const funcCounts = {{ func_counts|tojson }};
|
const ctx = document.getElementById('imprChart').getContext('2d');
|
||||||
const labels = Object.keys(funcCounts);
|
|
||||||
const data = Object.values(funcCounts);
|
// Bestehenden Chart zerstören
|
||||||
new Chart(document.getElementById('funcChart').getContext('2d'), {
|
if (currentImprChart) {
|
||||||
type: 'bar',
|
currentImprChart.destroy();
|
||||||
data: {
|
|
||||||
labels: labels,
|
|
||||||
datasets: [{
|
|
||||||
label: 'Funktionsaufrufe',
|
|
||||||
data: data,
|
|
||||||
backgroundColor: '#2563eb',
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
options: {
|
|
||||||
plugins: { legend: { display: false } },
|
|
||||||
scales: {
|
|
||||||
y: { beginAtZero: true, ticks: { stepSize: 1 } }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
|
||||||
// API-Nutzung
|
let data, labels, counts;
|
||||||
// eslint-disable-next-line
|
|
||||||
const apiCounts = {{ api_counts|tojson }};
|
if (currentPeriod === 'week') {
|
||||||
if (Object.keys(apiCounts).length > 0 && document.getElementById('apiChart')) {
|
data = weekData;
|
||||||
new Chart(document.getElementById('apiChart').getContext('2d'), {
|
labels = Object.keys(data);
|
||||||
type: 'bar',
|
counts = Object.values(data);
|
||||||
|
} else {
|
||||||
|
data = dayData;
|
||||||
|
labels = Object.keys(data);
|
||||||
|
counts = Object.values(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
currentImprChart = new Chart(ctx, {
|
||||||
|
type: 'line',
|
||||||
data: {
|
data: {
|
||||||
labels: Object.keys(apiCounts),
|
labels: labels,
|
||||||
datasets: [{
|
datasets: [{
|
||||||
label: 'API-Aufrufe nach Endpunkt',
|
label: currentPeriod === 'week' ? 'Impressions/Tag' : 'Impressions/Stunde',
|
||||||
data: Object.values(apiCounts),
|
data: counts,
|
||||||
backgroundColor: '#f59e42',
|
borderColor: '#059669',
|
||||||
|
backgroundColor: 'rgba(5,150,105,0.1)',
|
||||||
|
tension: 0.2,
|
||||||
|
fill: true
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
options: {
|
options: {
|
||||||
plugins: { legend: { display: false } },
|
plugins: {
|
||||||
|
legend: { display: true },
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: currentPeriod === 'week' ? 'Wochenverlauf' : '24-Stunden-Verlauf'
|
||||||
|
}
|
||||||
|
},
|
||||||
scales: {
|
scales: {
|
||||||
y: { beginAtZero: true, ticks: { stepSize: 1 } }
|
y: { beginAtZero: true, ticks: { stepSize: 1 } }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateFunctionChart() {
|
||||||
|
const ctx = document.getElementById('funcChart').getContext('2d');
|
||||||
|
|
||||||
|
// Bestehenden Chart zerstören
|
||||||
|
if (currentFuncChart) {
|
||||||
|
currentFuncChart.destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
let data, labels, counts;
|
||||||
|
|
||||||
|
if (currentPeriod === 'week') {
|
||||||
|
data = weekFuncData;
|
||||||
|
labels = Object.keys(data);
|
||||||
|
counts = Object.values(data);
|
||||||
|
} else {
|
||||||
|
// Für stündliche Daten: Summe aller Stunden für jede Funktion
|
||||||
|
const aggregatedData = {};
|
||||||
|
Object.values(dayFuncData).forEach(hourData => {
|
||||||
|
Object.keys(hourData).forEach(func => {
|
||||||
|
aggregatedData[func] = (aggregatedData[func] || 0) + hourData[func];
|
||||||
|
});
|
||||||
|
});
|
||||||
|
data = aggregatedData;
|
||||||
|
labels = Object.keys(data);
|
||||||
|
counts = Object.values(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
currentFuncChart = new Chart(ctx, {
|
||||||
|
type: 'bar',
|
||||||
|
data: {
|
||||||
|
labels: labels,
|
||||||
|
datasets: [{
|
||||||
|
label: 'Funktionsaufrufe',
|
||||||
|
data: counts,
|
||||||
|
backgroundColor: '#2563eb',
|
||||||
|
}]
|
||||||
|
},
|
||||||
|
options: {
|
||||||
|
plugins: {
|
||||||
|
legend: { display: false },
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: currentPeriod === 'week' ? 'Funktionsaufrufe (Woche)' : 'Funktionsaufrufe (24h)'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
scales: {
|
||||||
|
y: { beginAtZero: true, ticks: { stepSize: 1 } }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateApiChart() {
|
||||||
|
const apiChartElement = document.getElementById('apiChart');
|
||||||
|
if (!apiChartElement) return;
|
||||||
|
|
||||||
|
const ctx = apiChartElement.getContext('2d');
|
||||||
|
|
||||||
|
// Bestehenden Chart zerstören
|
||||||
|
if (currentApiChart) {
|
||||||
|
currentApiChart.destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
let data, labels, counts;
|
||||||
|
|
||||||
|
if (currentPeriod === 'week') {
|
||||||
|
data = weekApiData;
|
||||||
|
} else {
|
||||||
|
// Für stündliche Daten: Summe aller Stunden für jede API
|
||||||
|
const aggregatedData = {};
|
||||||
|
Object.values(dayApiData).forEach(hourData => {
|
||||||
|
Object.keys(hourData).forEach(api => {
|
||||||
|
aggregatedData[api] = (aggregatedData[api] || 0) + hourData[api];
|
||||||
|
});
|
||||||
|
});
|
||||||
|
data = aggregatedData;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Object.keys(data).length === 0) return;
|
||||||
|
|
||||||
|
labels = Object.keys(data);
|
||||||
|
counts = Object.values(data);
|
||||||
|
|
||||||
|
currentApiChart = new Chart(ctx, {
|
||||||
|
type: 'bar',
|
||||||
|
data: {
|
||||||
|
labels: labels,
|
||||||
|
datasets: [{
|
||||||
|
label: 'API-Aufrufe nach Endpunkt',
|
||||||
|
data: counts,
|
||||||
|
backgroundColor: '#f59e42',
|
||||||
|
}]
|
||||||
|
},
|
||||||
|
options: {
|
||||||
|
plugins: {
|
||||||
|
legend: { display: false },
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: currentPeriod === 'week' ? 'API-Nutzung (Woche)' : 'API-Nutzung (24h)'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
scales: {
|
||||||
|
y: { beginAtZero: true, ticks: { stepSize: 1 } }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateAllCharts() {
|
||||||
|
updateImpressionsChart();
|
||||||
|
updateFunctionChart();
|
||||||
|
updateApiChart();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initial Charts erstellen
|
||||||
|
updateAllCharts();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
@@ -221,10 +221,11 @@ def test_api_plusminus(client):
|
|||||||
def test_api_stats(client):
|
def test_api_stats(client):
|
||||||
resp = client.get('/api/stats')
|
resp = client.get('/api/stats')
|
||||||
assert resp.status_code == 200
|
assert resp.status_code == 200
|
||||||
# Die Route gibt HTML zurück, nicht JSON
|
data = resp.get_json()
|
||||||
html = resp.data.decode('utf-8')
|
assert "pageviews" in data
|
||||||
# Prüfe auf typische HTML-Elemente des Dashboards
|
assert "func_counts" in data
|
||||||
assert 'Statistik-Dashboard' in html or 'Dashboard' in html
|
assert "impressions_per_day" in data
|
||||||
|
assert "api_counts" in data
|
||||||
|
|
||||||
def test_api_monitor(client):
|
def test_api_monitor(client):
|
||||||
resp = client.get('/api/monitor')
|
resp = client.get('/api/monitor')
|
||||||
|
Binary file not shown.
@@ -480,4 +480,108 @@ msgstr "Select German"
|
|||||||
|
|
||||||
#: templates/index.html:131
|
#: templates/index.html:131
|
||||||
msgid "English auswählen"
|
msgid "English auswählen"
|
||||||
msgstr "Select English"
|
msgstr "Select English"
|
||||||
|
|
||||||
|
#: templates/index.html:132
|
||||||
|
msgid "Taschenrechner"
|
||||||
|
msgstr "Calculator"
|
||||||
|
|
||||||
|
#: templates/index.html:133
|
||||||
|
msgid "Taschenrechner öffnen"
|
||||||
|
msgstr "Open calculator"
|
||||||
|
|
||||||
|
#: templates/index.html:134
|
||||||
|
msgid "Taschenrechner schließen"
|
||||||
|
msgstr "Close calculator"
|
||||||
|
|
||||||
|
#: templates/index.html:135
|
||||||
|
msgid "Verwenden Sie die Tab-Taste um durch die Tasten zu navigieren. Tastatur-Kurzbefehle: Zahlen 0-9, Punkt oder Komma für Dezimal, Plus (+) oder P für Addition, Minus (-) oder M für Subtraktion, Stern (*) oder X für Multiplikation, Schrägstrich (/) oder D für Division, Enter oder Leertaste für Gleich, C für Löschen, Backspace für letzte Ziffer löschen."
|
||||||
|
msgstr "Use the Tab key to navigate through the buttons. Keyboard shortcuts: Numbers 0-9, period or comma for decimal, Plus (+) or P for addition, Minus (-) or M for subtraction, Asterisk (*) or X for multiplication, Slash (/) or D for division, Enter or Space for equals, C for clear, Backspace for delete last digit."
|
||||||
|
|
||||||
|
#: templates/index.html:136
|
||||||
|
msgid "Taschenrechner Anzeige"
|
||||||
|
msgstr "Calculator display"
|
||||||
|
|
||||||
|
#: templates/index.html:137
|
||||||
|
msgid "Berechnungsverlauf"
|
||||||
|
msgstr "Calculation history"
|
||||||
|
|
||||||
|
#: templates/index.html:138
|
||||||
|
msgid "Löschen (Taste: C)"
|
||||||
|
msgstr "Clear (key: C)"
|
||||||
|
|
||||||
|
#: templates/index.html:139
|
||||||
|
msgid "Letzte Ziffer löschen (Taste: Backspace)"
|
||||||
|
msgstr "Delete last digit (key: Backspace)"
|
||||||
|
|
||||||
|
#: templates/index.html:140
|
||||||
|
msgid "Dividieren (Taste: / oder D)"
|
||||||
|
msgstr "Divide (key: / or D)"
|
||||||
|
|
||||||
|
#: templates/index.html:141
|
||||||
|
msgid "Multiplizieren (Taste: * oder X)"
|
||||||
|
msgstr "Multiply (key: * or X)"
|
||||||
|
|
||||||
|
#: templates/index.html:142
|
||||||
|
msgid "Sieben"
|
||||||
|
msgstr "Seven"
|
||||||
|
|
||||||
|
#: templates/index.html:143
|
||||||
|
msgid "Acht"
|
||||||
|
msgstr "Eight"
|
||||||
|
|
||||||
|
#: templates/index.html:144
|
||||||
|
msgid "Neun"
|
||||||
|
msgstr "Nine"
|
||||||
|
|
||||||
|
#: templates/index.html:145
|
||||||
|
msgid "Subtrahieren (Taste: - oder M)"
|
||||||
|
msgstr "Subtract (key: - or M)"
|
||||||
|
|
||||||
|
#: templates/index.html:146
|
||||||
|
msgid "Vier"
|
||||||
|
msgstr "Four"
|
||||||
|
|
||||||
|
#: templates/index.html:147
|
||||||
|
msgid "Fünf"
|
||||||
|
msgstr "Five"
|
||||||
|
|
||||||
|
#: templates/index.html:148
|
||||||
|
msgid "Sechs"
|
||||||
|
msgstr "Six"
|
||||||
|
|
||||||
|
#: templates/index.html:149
|
||||||
|
msgid "Addieren (Taste: + oder P)"
|
||||||
|
msgstr "Add (key: + or P)"
|
||||||
|
|
||||||
|
#: templates/index.html:150
|
||||||
|
msgid "Eins"
|
||||||
|
msgstr "One"
|
||||||
|
|
||||||
|
#: templates/index.html:151
|
||||||
|
msgid "Zwei"
|
||||||
|
msgstr "Two"
|
||||||
|
|
||||||
|
#: templates/index.html:152
|
||||||
|
msgid "Drei"
|
||||||
|
msgstr "Three"
|
||||||
|
|
||||||
|
#: templates/index.html:153
|
||||||
|
msgid "Gleich (Taste: Enter oder Leertaste)"
|
||||||
|
msgstr "Equals (key: Enter or Space)"
|
||||||
|
|
||||||
|
#: templates/index.html:154
|
||||||
|
msgid "Null"
|
||||||
|
msgstr "Zero"
|
||||||
|
|
||||||
|
#: templates/index.html:155
|
||||||
|
msgid "Komma (Taste: . oder ,)"
|
||||||
|
msgstr "Decimal (key: . or ,)"
|
||||||
|
|
||||||
|
#: templates/index.html:156
|
||||||
|
msgid "Fehler"
|
||||||
|
msgstr "Error"
|
||||||
|
|
||||||
|
#: templates/index.html:157
|
||||||
|
msgid "Berechnung"
|
||||||
|
msgstr "Calculation"
|
||||||
|
Reference in New Issue
Block a user