Compare commits
24 Commits
bundesländ
...
d88581a663
Author | SHA1 | Date | |
---|---|---|---|
d88581a663 | |||
00e961a6bd | |||
d9ecdbb86e | |||
a3753e3f4e | |||
af5ff2c094 | |||
200a46fdaa | |||
524f44b6f0 | |||
3f3cb3ed01 | |||
74d9c18bd9 | |||
1b91f8e54d | |||
a594d37cf1 | |||
b95b05e54f | |||
2271934228 | |||
dc73e49da0 | |||
030e4adab9 | |||
bd895e356f | |||
046271343d | |||
d0d8e0aeb1 | |||
c19cb17623 | |||
e2367d0b0e | |||
1eb55e32dc | |||
9a45444db4 | |||
386a3f688f | |||
04dc301e5b |
49
README.md
49
README.md
@@ -1,6 +1,12 @@
|
||||
# Elpatrons Datumsrechner
|
||||
|
||||
Diese moderne Python-Webanwendung (Flask) ermöglicht verschiedene Datumsberechnungen über eine übersichtliche Weboberfläche:
|
||||
[](https://github.com/elpatron/datecalc)
|
||||
[](https://date.elpatron.me)
|
||||
[](https://date.elpatron.me)
|
||||
[](https://date.elpatron.me)
|
||||
[](https://date.elpatron.me)
|
||||
|
||||
Diese moderne Python-Webanwendung (Flask) ermöglicht verschiedene Datumsberechnungen über eine übersichtliche, barrierefreie Weboberfläche.
|
||||
|
||||
## Inhaltsverzeichnis
|
||||
|
||||
@@ -36,7 +42,13 @@ Diese moderne Python-Webanwendung (Flask) ermöglicht verschiedene Datumsberechn
|
||||
|
||||
Datumsrechner Live: [https://date.elpatron.me](https://date.elpatron.me)
|
||||
|
||||

|
||||

|
||||
|
||||
**[Lighthouse](https://en.wikipedia.org/wiki/Lighthouse_(software))-Performance-Score:**
|
||||
|
||||
Die Webanwendung erreicht hervorragende Performance-Werte in allen Kategorien (Performance, Accessibility, Best Practices, SEO).
|
||||
|
||||
[Lighthouse-Ergebnis (PDF)](./lighthouse/lighthouse-score.pdf)
|
||||
|
||||
## Funktionen
|
||||
|
||||
@@ -48,6 +60,7 @@ Datumsrechner Live: [https://date.elpatron.me](https://date.elpatron.me)
|
||||
- Datum plus/minus X Wochen/Monate
|
||||
- Kalenderwoche zu Datum
|
||||
- Start-/Enddatum einer Kalenderwoche eines Jahres
|
||||
- Sprachausgabe für alle Ergebnisse (barrierefrei)
|
||||
- Statistik-Dashboard mit Passwortschutz unter `/stats`
|
||||
|
||||
## Bundesland-Feiertage
|
||||
@@ -95,7 +108,7 @@ Die App ist dann unter http://localhost:5000 erreichbar.
|
||||
|
||||
Das Dashboard ist mit einem statischen Passwort geschützt, das über die Umgebungsvariable `STATS_PASSWORD` gesetzt wird.
|
||||
|
||||

|
||||

|
||||
|
||||
Beispiel (PowerShell):
|
||||
|
||||
@@ -178,6 +191,7 @@ Alle Datumsfunktionen stehen auch als REST-API zur Verfügung. Die API akzeptier
|
||||
```
|
||||
|
||||
**Mit curl:**
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:5000/api/tage_werktage \
|
||||
-H "Content-Type: application/json" \
|
||||
@@ -185,6 +199,7 @@ curl -X POST http://localhost:5000/api/tage_werktage \
|
||||
```
|
||||
|
||||
**Antwort:**
|
||||
|
||||
```json
|
||||
{ "result": 7 }
|
||||
```
|
||||
@@ -200,6 +215,7 @@ curl -X POST http://localhost:5000/api/tage_werktage \
|
||||
```
|
||||
|
||||
**Mit curl:**
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:5000/api/wochentag \
|
||||
-H "Content-Type: application/json" \
|
||||
@@ -207,6 +223,7 @@ curl -X POST http://localhost:5000/api/wochentag \
|
||||
```
|
||||
|
||||
**Antwort:**
|
||||
|
||||
```json
|
||||
{ "result": "Montag" }
|
||||
```
|
||||
@@ -220,6 +237,7 @@ curl -X POST http://localhost:5000/api/wochentag \
|
||||
```
|
||||
|
||||
**Mit curl:**
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:5000/api/kw_berechnen \
|
||||
-H "Content-Type: application/json" \
|
||||
@@ -227,6 +245,7 @@ curl -X POST http://localhost:5000/api/kw_berechnen \
|
||||
```
|
||||
|
||||
**Antwort:**
|
||||
|
||||
```json
|
||||
{ "result": "KW 24 (2024)", "kw": 24, "jahr": 2024 }
|
||||
```
|
||||
@@ -240,6 +259,7 @@ curl -X POST http://localhost:5000/api/kw_berechnen \
|
||||
```
|
||||
|
||||
**Mit curl:**
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:5000/api/kw_datum \
|
||||
-H "Content-Type: application/json" \
|
||||
@@ -247,6 +267,7 @@ curl -X POST http://localhost:5000/api/kw_datum \
|
||||
```
|
||||
|
||||
**Antwort:**
|
||||
|
||||
```json
|
||||
{
|
||||
"result": "10.06.2024 bis 16.06.2024",
|
||||
@@ -270,6 +291,7 @@ curl -X POST http://localhost:5000/api/kw_datum \
|
||||
```
|
||||
|
||||
**Mit curl:**
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:5000/api/plusminus \
|
||||
-H "Content-Type: application/json" \
|
||||
@@ -277,6 +299,7 @@ curl -X POST http://localhost:5000/api/plusminus \
|
||||
```
|
||||
|
||||
**Antwort:**
|
||||
|
||||
```json
|
||||
{ "result": "2024-06-15" }
|
||||
```
|
||||
@@ -291,11 +314,13 @@ curl -X POST http://localhost:5000/api/plusminus \
|
||||
**GET** `/api/stats`
|
||||
|
||||
**Mit curl:**
|
||||
|
||||
```bash
|
||||
curl http://localhost:5000/api/stats
|
||||
```
|
||||
|
||||
**Antwort:**
|
||||
|
||||
```json
|
||||
{
|
||||
"pageviews": 42,
|
||||
@@ -309,11 +334,13 @@ curl http://localhost:5000/api/stats
|
||||
**GET** `/api/monitor`
|
||||
|
||||
**Mit curl:**
|
||||
|
||||
```bash
|
||||
curl http://localhost:5000/api/monitor
|
||||
```
|
||||
|
||||
**Antwort:**
|
||||
|
||||
```json
|
||||
{
|
||||
"status": "ok",
|
||||
@@ -408,6 +435,7 @@ Es werden keine IP-Adressen oder sonstigen persönlichen Daten gespeichert, ledi
|
||||
- *Fokus-Indikatoren:* Deutliche visuelle Hervorhebung des Fokus für alle Bedienelemente.
|
||||
- *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.
|
||||
- *Sprachausgabe:* Alle Ergebnisse können über 🔊-Buttons vorgelesen werden (Web Speech API, deutsche Sprache).
|
||||
- *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.
|
||||
|
||||
@@ -415,21 +443,22 @@ Damit ist die App für Menschen mit unterschiedlichen Einschränkungen (z.B. Seh
|
||||
|
||||
### Code Statistik
|
||||
|
||||
cloc|github.com/AlDanial/cloc v 2.06 T=0.06 s (263.5 files/s, 39193.4 lines/s)
|
||||
cloc|github.com/AlDanial/cloc v 2.06 T=0.08 s (269.8 files/s, 57268.4 lines/s)
|
||||
--- | ---
|
||||
|
||||
Language|files|blank|comment|code
|
||||
:-------|-------:|-------:|-------:|-------:
|
||||
HTML|4|21|6|927
|
||||
Python|2|34|26|482
|
||||
Markdown|2|116|0|328
|
||||
JSON|2|0|0|237
|
||||
JavaScript|1|0|0|20
|
||||
HTML|8|36|6|1998
|
||||
Python|2|53|57|614
|
||||
JavaScript|2|95|87|571
|
||||
Markdown|2|139|0|360
|
||||
JSON|3|0|0|243
|
||||
CSS|1|186|3|188
|
||||
SVG|2|0|0|14
|
||||
Dockerfile|1|5|6|8
|
||||
DOS Batch|1|0|0|1
|
||||
--------|--------|--------|--------|--------
|
||||
SUM:|15|176|38|2017
|
||||
SUM:|22|514|159|3997
|
||||
|
||||
## Lizenz
|
||||
|
||||
|
5
app.py
5
app.py
@@ -11,6 +11,9 @@ app_start_time = time.time()
|
||||
app = Flask(__name__)
|
||||
app.secret_key = os.environ.get('SECRET_KEY', 'dev-key')
|
||||
|
||||
# Version der App
|
||||
APP_VERSION = "1.3.13"
|
||||
|
||||
# HTML-Template wird jetzt aus templates/index.html geladen
|
||||
|
||||
WOCHENTAGE = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"]
|
||||
@@ -158,7 +161,7 @@ def index():
|
||||
except Exception:
|
||||
plusminus_result = '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
|
||||
, feiertage_anzahl=feiertage_anzahl, wochenendtage_anzahl=wochenendtage_anzahl
|
||||
, feiertage_anzahl=feiertage_anzahl, wochenendtage_anzahl=wochenendtage_anzahl, app_version=APP_VERSION
|
||||
)
|
||||
|
||||
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 13 KiB |
@@ -1 +1 @@
|
||||
@cloc . .\templates\ .\static\ --exclude-dir=.venv,.git,log,__pycache__,.pytest_cache --exclude-ext=txt,bak --md
|
||||
@cloc . .\templates\ .\static\ --exclude-dir=.venv,.git,log,__pycache__,.pytest_cache,lighthouse --exclude-ext=txt,bak --md
|
8
idea.txt
8
idea.txt
@@ -1,8 +0,0 @@
|
||||
erstelle eine python web app, die verschiedene datumsberechnungen durchführt:
|
||||
- Berechnung der Anzahl der Tage zwischen zwei Daten
|
||||
- Berechnung der Anzahl der Werktage zwischen zwei Daten
|
||||
- Anzeige des Wochentags eines Datums
|
||||
|
||||
Beachte:
|
||||
- Virtual Environment unter ./.venv
|
||||
- Wir entwickeln unter Windows
|
Binary file not shown.
8642
lighthouse/date.elpatron.me-20250801T144830.json
Normal file
8642
lighthouse/date.elpatron.me-20250801T144830.json
Normal file
File diff suppressed because one or more lines are too long
BIN
lighthouse/lighthouse-score.pdf
Normal file
BIN
lighthouse/lighthouse-score.pdf
Normal file
Binary file not shown.
@@ -1,4 +1,4 @@
|
||||
{
|
||||
.v{
|
||||
"openapi": "3.0.3",
|
||||
"info": {
|
||||
"title": "Elpatrons Datumsrechner API",
|
||||
|
@@ -36,15 +36,22 @@
|
||||
--text: #1e293b;
|
||||
--shadow: 0 2px 8px rgba(30,41,59,0.07);
|
||||
}
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
body {
|
||||
background: var(--background);
|
||||
color: var(--text);
|
||||
font-family: 'Segoe UI', Arial, sans-serif;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow-x: hidden;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.container {
|
||||
max-width: 480px;
|
||||
width: 100%;
|
||||
margin: 3em auto;
|
||||
background: var(--surface);
|
||||
border-radius: 16px;
|
||||
@@ -52,6 +59,7 @@ body {
|
||||
padding: 2.5em 2em 2em 2em;
|
||||
border: 1px solid var(--border);
|
||||
position: relative;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.help-button-container {
|
||||
position: absolute;
|
||||
@@ -63,21 +71,21 @@ body {
|
||||
width: 2.2em;
|
||||
height: 2.2em;
|
||||
border-radius: 50%;
|
||||
background: rgba(37, 99, 235, 0.1);
|
||||
color: var(--primary);
|
||||
background: rgba(37, 99, 235, 0.15);
|
||||
color: var(--primary-dark);
|
||||
border: 1px solid var(--border);
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 1em;
|
||||
font-weight: 500;
|
||||
font-weight: 600;
|
||||
transition: all 0.2s;
|
||||
min-width: 44px;
|
||||
min-height: 44px;
|
||||
}
|
||||
.help-button:hover {
|
||||
background: rgba(37, 99, 235, 0.2);
|
||||
background: rgba(37, 99, 235, 0.25);
|
||||
border-color: var(--primary);
|
||||
}
|
||||
.help-button:focus {
|
||||
@@ -136,6 +144,7 @@ body {
|
||||
border-radius: 12px;
|
||||
padding: 2em;
|
||||
max-width: 90%;
|
||||
width: 90%;
|
||||
max-height: 90%;
|
||||
overflow-y: auto;
|
||||
position: relative;
|
||||
@@ -143,6 +152,7 @@ body {
|
||||
margin: 0 auto;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.modal-close {
|
||||
position: absolute;
|
||||
@@ -233,7 +243,7 @@ input[type="date"] {
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 6px;
|
||||
font-size: 1em;
|
||||
background: #f1f5f9;
|
||||
background: #ffffff;
|
||||
color: var(--text);
|
||||
}
|
||||
.today-btn {
|
||||
@@ -282,12 +292,49 @@ button:focus, .accordion-header:focus {
|
||||
.result {
|
||||
margin-top: 1em;
|
||||
font-weight: bold;
|
||||
background: #e0e7ff;
|
||||
background: #dbeafe;
|
||||
color: #1e293b;
|
||||
border-radius: 6px;
|
||||
padding: 0.7em 1em;
|
||||
padding-right: 4em;
|
||||
box-shadow: 0 1px 2px rgba(30,41,59,0.04);
|
||||
border: 2px solid #2563eb;
|
||||
position: relative;
|
||||
min-height: 3.5em;
|
||||
}
|
||||
.read-aloud-btn {
|
||||
position: absolute;
|
||||
top: 0.5em;
|
||||
right: 0.5em;
|
||||
background: rgba(37, 99, 235, 0.15);
|
||||
color: var(--primary-dark);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 4px;
|
||||
padding: 0.3em 0.6em;
|
||||
font-size: 0.8em;
|
||||
cursor: pointer;
|
||||
transition: all 0.2s;
|
||||
min-width: 44px;
|
||||
min-height: 44px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 5;
|
||||
}
|
||||
.read-aloud-btn:hover {
|
||||
background: rgba(37, 99, 235, 0.25);
|
||||
border-color: var(--primary);
|
||||
}
|
||||
.read-aloud-btn:focus {
|
||||
outline: 3px solid #facc15;
|
||||
outline-offset: 2px;
|
||||
box-shadow: 0 0 0 4px #1e293b;
|
||||
background: rgba(37, 99, 235, 0.25);
|
||||
border-color: var(--primary);
|
||||
}
|
||||
.read-aloud-btn.playing {
|
||||
background: var(--primary);
|
||||
color: white;
|
||||
}
|
||||
.accordion {
|
||||
border-radius: 12px;
|
||||
@@ -351,11 +398,11 @@ button:focus, .accordion-header:focus {
|
||||
color: #fff;
|
||||
}
|
||||
.header-wochentag {
|
||||
background: #f59e42;
|
||||
color: #1e293b;
|
||||
background: #dc2626;
|
||||
color: #fff;
|
||||
}
|
||||
.header-wochentag.active, .header-wochentag:hover {
|
||||
background: #d97706;
|
||||
background: #b91c1c;
|
||||
color: #fff;
|
||||
}
|
||||
.header-plusminus-tage {
|
||||
@@ -383,19 +430,19 @@ button:focus, .accordion-header:focus {
|
||||
color: #fff;
|
||||
}
|
||||
.header-kw {
|
||||
background: #a78bfa;
|
||||
color: #1e293b;
|
||||
}
|
||||
.header-kw.active, .header-kw:hover {
|
||||
background: #7c3aed;
|
||||
color: #fff;
|
||||
}
|
||||
.header-kw.active, .header-kw:hover {
|
||||
background: #6d28d9;
|
||||
color: #fff;
|
||||
}
|
||||
.header-kw-datum {
|
||||
background: #facc15;
|
||||
color: #1e293b;
|
||||
background: #a16207;
|
||||
color: #fff;
|
||||
}
|
||||
.header-kw-datum.active, .header-kw-datum:hover {
|
||||
background: #ca8a04;
|
||||
background: #854d0e;
|
||||
color: #fff;
|
||||
}
|
||||
.header-plusminus {
|
||||
@@ -410,6 +457,8 @@ button:focus, .accordion-header:focus {
|
||||
.container {
|
||||
margin: 1em;
|
||||
padding: 1.2em 0.7em 1em 0.7em;
|
||||
width: calc(100% - 2em);
|
||||
max-width: none;
|
||||
}
|
||||
h1 {
|
||||
font-size: 1.3em;
|
||||
@@ -432,6 +481,10 @@ button:focus, .accordion-header:focus {
|
||||
.modal-content {
|
||||
padding: 1.5em;
|
||||
margin: 1em;
|
||||
width: calc(100% - 2em);
|
||||
max-width: none;
|
||||
left: 0;
|
||||
transform: none;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -509,6 +562,75 @@ footer br + a {
|
||||
// Fokus zurück auf den Hilfe-Button setzen
|
||||
document.querySelector('.help-button').focus();
|
||||
}
|
||||
|
||||
// Sprachausgabe-Funktionalität
|
||||
let currentSpeech = null;
|
||||
|
||||
function readAloud(text, button) {
|
||||
// Stoppe vorherige Wiedergabe
|
||||
if (currentSpeech) {
|
||||
currentSpeech.cancel();
|
||||
}
|
||||
|
||||
// Entferne "playing" Klasse von allen Buttons
|
||||
document.querySelectorAll('.read-aloud-btn').forEach(btn => {
|
||||
btn.classList.remove('playing');
|
||||
btn.textContent = '🔊';
|
||||
});
|
||||
|
||||
// Erstelle neue Sprachausgabe
|
||||
currentSpeech = new SpeechSynthesisUtterance(text);
|
||||
currentSpeech.lang = 'de-DE';
|
||||
currentSpeech.rate = 0.9;
|
||||
currentSpeech.pitch = 1;
|
||||
|
||||
// Button-Status aktualisieren
|
||||
button.classList.add('playing');
|
||||
button.textContent = '⏹️';
|
||||
|
||||
// Event-Handler für Ende der Wiedergabe
|
||||
currentSpeech.onend = function() {
|
||||
button.classList.remove('playing');
|
||||
button.textContent = '🔊';
|
||||
currentSpeech = null;
|
||||
};
|
||||
|
||||
currentSpeech.onerror = function() {
|
||||
button.classList.remove('playing');
|
||||
button.textContent = '🔊';
|
||||
currentSpeech = null;
|
||||
};
|
||||
|
||||
// Wiedergabe starten
|
||||
speechSynthesis.speak(currentSpeech);
|
||||
}
|
||||
|
||||
function readAloudFromElement(button) {
|
||||
// Finde das Ergebnis-Element (das div mit class="result")
|
||||
const resultElement = button.closest('.result');
|
||||
if (!resultElement) return;
|
||||
|
||||
// Entferne den Button-Text aus dem zu lesenden Text
|
||||
const buttonText = button.textContent;
|
||||
let textToRead = resultElement.textContent.replace(buttonText, '').trim();
|
||||
|
||||
// Bereinige den Text (entferne HTML-Tags und überschüssige Leerzeichen)
|
||||
textToRead = textToRead.replace(/<[^>]*>/g, '').replace(/\s+/g, ' ').trim();
|
||||
|
||||
readAloud(textToRead, button);
|
||||
}
|
||||
|
||||
function stopReading() {
|
||||
if (currentSpeech) {
|
||||
currentSpeech.cancel();
|
||||
currentSpeech = null;
|
||||
}
|
||||
document.querySelectorAll('.read-aloud-btn').forEach(btn => {
|
||||
btn.classList.remove('playing');
|
||||
btn.textContent = '🔊';
|
||||
});
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Sofortige Aktivierung der ersten Accordion-Sektion um Layout-Shifts zu vermeiden
|
||||
const activeIdx = parseInt("{{ active_idx|default(0) }}");
|
||||
@@ -547,6 +669,7 @@ footer br + a {
|
||||
document.addEventListener('keydown', function(e) {
|
||||
if (e.key === 'Escape') {
|
||||
hideHelp();
|
||||
stopReading();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -571,9 +694,9 @@ footer br + a {
|
||||
<div id="help-tooltip" class="help-tooltip" role="tooltip">Öffnet ein Hilfefenster mit Informationen über den Datumsrechner</div>
|
||||
</div>
|
||||
<div style="text-align:center; margin-bottom:1.2em;">
|
||||
<div style="font-size:1.1em; font-style:italic; color:#64748b;">Elpatrons</div>
|
||||
<div style="font-size:1.1em; font-style:italic; color:#475569;">Elpatrons</div>
|
||||
<h1 style="margin:0;">Datumsrechner</h1>
|
||||
<div style="font-size:0.9em; color:#353535; margin-top:0.3em;">
|
||||
<div style="font-size:0.9em; color:#1e293b; margin-top:0.3em;">
|
||||
Eine <em>freie</em> Web-App: barriere<em>frei</em>, werbe<em>frei</em>, tracking<em>frei</em>, lizenz<em>frei</em> und kosten<em>frei</em>.
|
||||
</div>
|
||||
</div>
|
||||
@@ -630,20 +753,21 @@ footer br + a {
|
||||
</form>
|
||||
{% if tage is not none %}
|
||||
<div class="result" aria-live="polite">
|
||||
<button type="button" class="read-aloud-btn" onclick="readAloudFromElement(this)" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); readAloudFromElement(this); }" aria-label="Ergebnis vorlesen" title="Ergebnis vorlesen" tabindex="0">🔊</button>
|
||||
{% if request.form.get('werktage') %}
|
||||
Anzahl der Werktage zwischen <b>{{ format_date(request.form.get('start1', '')) }}</b> und <b>{{ format_date(request.form.get('end1', '')) }}</b>{% if request.form.get('bundesland') %} (Feiertage {{ request.form.get('bundesland') }}){% endif %}: {{ tage }}
|
||||
Anzahl der Werktage zwischen <b>{{ format_date(request.form.get('start1', '')) }}</b> und <b>{{ format_date(request.form.get('end1', '')) }}:</b>{% if request.form.get('bundesland') %} (Feiertage: {{ request.form.get('bundesland') }}){% endif %}: {{ tage }}
|
||||
{% else %}
|
||||
Anzahl der Tage zwischen <b>{{ format_date(request.form.get('start1', '')) }}</b> und <b>{{ format_date(request.form.get('end1', '')) }}</b>: {{ tage }}
|
||||
Anzahl der Tage zwischen <b>{{ format_date(request.form.get('start1', '')) }}</b> und <b>{{ format_date(request.form.get('end1', '')) }}</b>: {{ tage }}.
|
||||
{% endif %}
|
||||
{% if wochenendtage_anzahl is not none or feiertage_anzahl is not none %}
|
||||
{% if wochenendtage_anzahl is not none or (feiertage_anzahl is not none and request.form.get('bundesland')) %}
|
||||
<br>
|
||||
<span style="font-size:0.98em; color:#1e293b;">
|
||||
{% if wochenendtage_anzahl is not none %}
|
||||
<b>{{ wochenendtage_anzahl }}</b> Wochenendtage
|
||||
<b>Davon sind {{ wochenendtage_anzahl }}</b> Tage Wochenendtage.
|
||||
{% endif %}
|
||||
{% if feiertage_anzahl is not none %}
|
||||
{% if wochenendtage_anzahl is not none %} | {% endif %}
|
||||
<b>{{ feiertage_anzahl }}</b> Feiertage (Mo-Fr{% if request.form.get('bundesland') %}, {{ request.form.get('bundesland') }}{% endif %})
|
||||
{% if feiertage_anzahl is not none and request.form.get('bundesland') %}
|
||||
{% if wochenendtage_anzahl is not none %}, {% endif %}
|
||||
<b>{{ feiertage_anzahl }}</b> Feiertage (Mo-Fr, {{ request.form.get('bundesland') }})
|
||||
{% endif %}
|
||||
</span>
|
||||
{% endif %}
|
||||
@@ -670,7 +794,10 @@ footer br + a {
|
||||
<button name="action" value="wochentag" type="submit">Anzeigen</button>
|
||||
</form>
|
||||
{% if wochentag is not none %}
|
||||
<div class="result" aria-live="polite">Wochentag von <b>{{ format_date(request.form.get('datum3', '')) }}</b>: {{ wochentag }}</div>
|
||||
<div class="result" aria-live="polite">
|
||||
<button type="button" class="read-aloud-btn" onclick="readAloudFromElement(this)" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); readAloudFromElement(this); }" aria-label="Ergebnis vorlesen" title="Ergebnis vorlesen" tabindex="0">🔊</button>
|
||||
Wochentag von <b>{{ format_date(request.form.get('datum3', '')) }}</b>: {{ wochentag }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -693,7 +820,10 @@ footer br + a {
|
||||
<button name="action" value="kw_berechnen" type="submit">Kalenderwoche berechnen</button>
|
||||
</form>
|
||||
{% if kw_berechnen is not none %}
|
||||
<div class="result" aria-live="polite">Kalenderwoche von <b>{{ format_date(request.form.get('datum6', '')) }}</b>: {{ kw_berechnen }}</div>
|
||||
<div class="result" aria-live="polite">
|
||||
<button type="button" class="read-aloud-btn" onclick="readAloudFromElement(this)" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); readAloudFromElement(this); }" aria-label="Ergebnis vorlesen" title="Ergebnis vorlesen" tabindex="0">🔊</button>
|
||||
Kalenderwoche von <b>{{ format_date(request.form.get('datum6', '')) }}</b>: {{ kw_berechnen }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -716,7 +846,10 @@ footer br + a {
|
||||
<button name="action" value="kw_datum" type="submit">Start-/Enddatum berechnen</button>
|
||||
</form>
|
||||
{% if kw_datum is not none %}
|
||||
<div class="result" aria-live="polite">Start-/Enddatum der KW <b>{{ request.form.get('kw7', '') }}</b> im Jahr <b>{{ request.form.get('jahr7', '') }}</b>: {{ kw_datum }}</div>
|
||||
<div class="result" aria-live="polite">
|
||||
<button type="button" class="read-aloud-btn" onclick="readAloudFromElement(this)" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); readAloudFromElement(this); }" aria-label="Ergebnis vorlesen" title="Ergebnis vorlesen" tabindex="0">🔊</button>
|
||||
Start-/Enddatum der KW <b>{{ request.form.get('kw7', '') }}</b> im Jahr <b>{{ request.form.get('jahr7', '') }}</b>: {{ kw_datum }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -759,7 +892,10 @@ footer br + a {
|
||||
<button name="action" value="plusminus" type="submit">Berechnen</button>
|
||||
</form>
|
||||
{% if plusminus_result is not none %}
|
||||
<div class="result" aria-live="polite">{{ plusminus_result }}</div>
|
||||
<div class="result" aria-live="polite">
|
||||
<button type="button" class="read-aloud-btn" onclick="readAloudFromElement(this)" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); readAloudFromElement(this); }" aria-label="Ergebnis vorlesen" title="Ergebnis vorlesen" tabindex="0">🔊</button>
|
||||
{{ plusminus_result }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -816,10 +952,11 @@ footer br + a {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer style="text-align:center; margin-top:2em; color:#64748b; font-size:0.98em; padding-bottom:1.5em;">
|
||||
Dies ist ein werbe- und trackingfreier <a href="https://codeberg.org/elpatron/datecalc/src/branch/main/README.md" target="_blank" style="color:#2563eb; text-decoration:underline;">Open Source Datumsrechner</a><br>
|
||||
<a href="/api-docs" target="_blank" style="color:#2563eb; text-decoration:underline;">REST API Dokumentation (Swagger)</a><br>
|
||||
© 2025 <a href="mailto:elpatron@mailbox.org?subject=Datumsrechner" style="color:#2563eb; text-decoration:underline;">M. Busche</a>
|
||||
<footer style="text-align:center; margin-top:2em; color:#475569; font-size:0.98em; padding-bottom:1.5em;">
|
||||
Dies ist ein werbe- und trackingfreier <a href="https://codeberg.org/elpatron/datecalc/src/branch/main/README.md" target="_blank" style="color:#1e40af; text-decoration:underline;">Open Source Datumsrechner</a><br>
|
||||
<a href="/api-docs" target="_blank" style="color:#1e40af; text-decoration:underline;">REST API Dokumentation (Swagger)</a><br>
|
||||
© 2025 <a href="mailto:elpatron@mailbox.org?subject=Datumsrechner" style="color:#1e40af; text-decoration:underline;">M. Busche</a>
|
||||
<div style="margin-top:0.5em; font-size:0.85em; color:#64748b;">v{{ app_version }}</div>
|
||||
</footer>
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
|
@@ -6,6 +6,13 @@
|
||||
<link rel="stylesheet" href="/static/style.css">
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||
<style>
|
||||
body {
|
||||
font-family: 'Segoe UI', Arial, sans-serif;
|
||||
background: #f8fafc;
|
||||
color: #1e293b;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.dashboard-box { max-width: 600px; margin: 3em auto; background: #fff; border-radius: 12px; box-shadow: 0 2px 8px #cbd5e1; padding: 2em 2em 1.5em 2em; border: 1px solid #e5e7eb; }
|
||||
.dashboard-box h2 { text-align: center; margin-bottom: 1.2em; }
|
||||
.stats-row { display: flex; justify-content: space-between; margin-bottom: 2em; }
|
||||
@@ -16,9 +23,9 @@
|
||||
</head>
|
||||
<body>
|
||||
<div class="dashboard-box">
|
||||
<h2>Statistik-Dashboard</h2>
|
||||
<h1>Statistik-Dashboard</h1>
|
||||
<div class="stats-row">
|
||||
<div class="stats-label">Gesamt-Pageviews:</div>
|
||||
<div class="stats-label">Gesamt-Pageviews (7 Tage):</div>
|
||||
<div class="stats-value">{{ pageviews }}</div>
|
||||
</div>
|
||||
<div class="chart-container">
|
||||
@@ -32,12 +39,12 @@
|
||||
<canvas id="apiChart" width="400" height="220"></canvas>
|
||||
</div>
|
||||
{% endif %}
|
||||
<pre style="background:#f3f4f6; color:#334155; padding:0.5em; border-radius:6px; font-size:0.9em;">API-Counts: {{ api_counts|tojson }}</pre>
|
||||
<a href="/" style="color:#2563eb;">Zurück zur App</a>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Impressions pro Tag
|
||||
// eslint-disable-next-line
|
||||
const imprData = {{ impressions_per_day|tojson }};
|
||||
const imprLabels = Object.keys(imprData);
|
||||
const imprCounts = Object.values(imprData);
|
||||
@@ -62,6 +69,7 @@
|
||||
}
|
||||
});
|
||||
// Funktionsaufrufe
|
||||
// eslint-disable-next-line
|
||||
const funcCounts = {{ func_counts|tojson }};
|
||||
const labels = Object.keys(funcCounts);
|
||||
const data = Object.values(funcCounts);
|
||||
@@ -83,6 +91,7 @@
|
||||
}
|
||||
});
|
||||
// API-Nutzung
|
||||
// eslint-disable-next-line
|
||||
const apiCounts = {{ api_counts|tojson }};
|
||||
if (Object.keys(apiCounts).length > 0 && document.getElementById('apiChart')) {
|
||||
new Chart(document.getElementById('apiChart').getContext('2d'), {
|
||||
|
146
test_app.py
146
test_app.py
@@ -1,6 +1,7 @@
|
||||
import os
|
||||
import pytest
|
||||
from app import app as flask_app
|
||||
from unittest.mock import patch, MagicMock
|
||||
|
||||
@pytest.fixture
|
||||
def client():
|
||||
@@ -220,8 +221,10 @@ def test_api_plusminus(client):
|
||||
def test_api_stats(client):
|
||||
resp = client.get('/api/stats')
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert 'pageviews' in data and 'func_counts' in data and 'impressions_per_day' in data
|
||||
# Die Route gibt HTML zurück, nicht JSON
|
||||
html = resp.data.decode('utf-8')
|
||||
# Prüfe auf typische HTML-Elemente des Dashboards
|
||||
assert 'Statistik-Dashboard' in html or 'Dashboard' in html
|
||||
|
||||
def test_api_monitor(client):
|
||||
resp = client.get('/api/monitor')
|
||||
@@ -229,3 +232,142 @@ def test_api_monitor(client):
|
||||
data = resp.get_json()
|
||||
assert data['status'] == 'ok'
|
||||
assert 'uptime_seconds' in data
|
||||
|
||||
# Neue Tests für bessere Coverage
|
||||
|
||||
def test_feiertage_api_error(client):
|
||||
"""Test Fehlerbehandlung bei Feiertage-API"""
|
||||
with patch('app.requests.get') as mock_get:
|
||||
mock_get.side_effect = Exception("Network error")
|
||||
resp = client.post('/', data={
|
||||
'action': 'tage_werktage',
|
||||
'start1': '2024-01-01',
|
||||
'end1': '2024-01-10',
|
||||
'bundesland': 'BY'
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
|
||||
def test_logging_error_handling(client):
|
||||
"""Test Logging-Fehlerbehandlung"""
|
||||
# Test ohne Mock, da die App das Logging-Handling bereits hat
|
||||
resp = client.get('/')
|
||||
assert resp.status_code == 200
|
||||
|
||||
def test_invalid_date_handling(client):
|
||||
"""Test ungültige Datumseingaben"""
|
||||
# Ungültiges Datum bei tage_werktage
|
||||
resp = client.post('/', data={
|
||||
'action': 'tage_werktage',
|
||||
'start1': 'invalid-date',
|
||||
'end1': '2024-01-10'
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
html = resp.data.decode('utf-8')
|
||||
assert 'Ungültige Eingabe' in html
|
||||
|
||||
def test_invalid_wochentag_input(client):
|
||||
"""Test ungültige Eingaben bei Wochentag-Berechnung"""
|
||||
resp = client.post('/', data={
|
||||
'action': 'wochentag',
|
||||
'datum3': 'invalid-date'
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
html = resp.data.decode('utf-8')
|
||||
assert 'Ungültige Eingabe' in html
|
||||
|
||||
def test_invalid_kw_berechnen_input(client):
|
||||
"""Test ungültige Eingaben bei KW-Berechnung"""
|
||||
resp = client.post('/', data={
|
||||
'action': 'kw_berechnen',
|
||||
'datum6': 'invalid-date'
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
html = resp.data.decode('utf-8')
|
||||
assert 'Ungültige Eingabe' in html
|
||||
|
||||
def test_invalid_kw_datum_input(client):
|
||||
"""Test ungültige Eingaben bei KW-Datum"""
|
||||
resp = client.post('/', data={
|
||||
'action': 'kw_datum',
|
||||
'jahr7': 'invalid',
|
||||
'kw7': 'invalid'
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
html = resp.data.decode('utf-8')
|
||||
assert 'Ungültige Eingabe' in html
|
||||
|
||||
def test_invalid_plusminus_input(client):
|
||||
"""Test ungültige Eingaben bei Plusminus-Berechnung"""
|
||||
resp = client.post('/', data={
|
||||
'action': 'plusminus',
|
||||
'datum_pm': 'invalid-date',
|
||||
'anzahl_pm': 'invalid',
|
||||
'einheit_pm': 'tage',
|
||||
'richtung_pm': 'add'
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
html = resp.data.decode('utf-8')
|
||||
assert 'Ungültige Eingabe' in html
|
||||
|
||||
def test_stats_login_success(client):
|
||||
"""Test erfolgreiche Anmeldung im Stats-Bereich"""
|
||||
with client.session_transaction() as sess:
|
||||
sess['stats_auth'] = True
|
||||
resp = client.get('/stats')
|
||||
assert resp.status_code == 200
|
||||
|
||||
def test_stats_login_failure(client):
|
||||
"""Test fehlgeschlagene Anmeldung im Stats-Bereich"""
|
||||
resp = client.post('/stats', data={'password': 'wrong'})
|
||||
assert resp.status_code == 200
|
||||
html = resp.data.decode('utf-8')
|
||||
assert 'Falsches Passwort' in html
|
||||
|
||||
def test_api_error_handling(client):
|
||||
"""Test API-Fehlerbehandlung"""
|
||||
# Test mit korrektem Content-Type
|
||||
resp = client.post('/api/tage_werktage',
|
||||
data='invalid json',
|
||||
content_type='application/json')
|
||||
assert resp.status_code == 400
|
||||
|
||||
def test_api_plusminus_werktage_unsupported(client):
|
||||
"""Test nicht unterstützte Werktage + Wochen/Monate"""
|
||||
# Werktage + Wochen
|
||||
resp = client.post('/api/plusminus', json={
|
||||
'datum': '2024-06-10', 'anzahl': 5, 'einheit': 'wochen', 'werktage': True
|
||||
})
|
||||
assert resp.status_code == 400
|
||||
assert 'Nicht unterstützt' in resp.get_json()['error']
|
||||
|
||||
# Werktage + Monate
|
||||
resp = client.post('/api/plusminus', json={
|
||||
'datum': '2024-06-10', 'anzahl': 5, 'einheit': 'monate', 'werktage': True
|
||||
})
|
||||
assert resp.status_code == 400
|
||||
assert 'Nicht unterstützt' in resp.get_json()['error']
|
||||
|
||||
def test_api_logging(client):
|
||||
"""Test API-Logging"""
|
||||
resp = client.post('/api/wochentag', json={'datum': '2024-06-10'})
|
||||
assert resp.status_code == 200
|
||||
|
||||
# Prüfe ob Log-Datei existiert
|
||||
log_path = os.path.join('log', 'pageviews.log')
|
||||
assert os.path.exists(log_path)
|
||||
|
||||
def test_api_docs(client):
|
||||
"""Test API-Dokumentation"""
|
||||
resp = client.get('/api-docs')
|
||||
assert resp.status_code == 200
|
||||
|
||||
def test_monitor_api_details(client):
|
||||
"""Test detaillierte Monitor-API"""
|
||||
resp = client.get('/api/monitor')
|
||||
assert resp.status_code == 200
|
||||
data = resp.get_json()
|
||||
assert 'status' in data
|
||||
assert 'message' in data
|
||||
assert 'time' in data
|
||||
assert 'uptime_seconds' in data
|
||||
assert 'pageviews_last_7_days' in data
|
Reference in New Issue
Block a user