From 190cded4e5b54d05e5ba934abb77eedc1e31b037 Mon Sep 17 00:00:00 2001
From: jbergner <jbergner@send.nrw>
Date: Mon, 28 Jul 2025 23:24:30 +0200
Subject: [PATCH] Kompakte Ansicht finalisiert

---
 data.db | Bin 12288 -> 12288 bytes
 main.go | 107 +++++++++-----------------------------------------------
 2 files changed, 17 insertions(+), 90 deletions(-)

diff --git a/data.db b/data.db
index cb9db8abbf1851ba7bfa41708bfc948ba0b54fd6..5335d8a27f67d8019b06ce2bd4fc89ade7779f38 100644
GIT binary patch
delta 112
zcmZojXh@hK&6qk-#+fm7W5N=C9v0rq4E%n4EBV-YFK-qQILvEj#KOzK!otYTVay8z
zjEr;U7%~0&&>-g+<rcIoEiK*1z{phBz+BhJLcz$;%Fx2f)KsKVo|zA%iHT#gpqv{c
NBj@G_`Q-wPEC5_A8aV&}

delta 63
zcmZojXh@hK&6qS%#+fl`W5N=C9%epv27W)jm3-{{e47OX4)acIFyU&HXXayIVPRzA
T+$<>P#>mLAIYNH903$O1|7;E(

diff --git a/main.go b/main.go
index 147923f..bae657c 100644
--- a/main.go
+++ b/main.go
@@ -140,10 +140,12 @@ type Abteilung struct {
 }
 
 type Monatsstatistik struct {
-	Monat      string  // z. B. "07.2025"
-	Summe      float64 // bezahlte
-	SummeOffen float64 // noch nicht bezahlt
-	Eintraege  []Entry
+	Monat        string  // z. B. "07.2025"
+	Summe        float64 // bezahlte
+	SummeOffen   float64 // noch nicht bezahlt
+	Prozent      float64
+	ProzentOffen float64
+	Eintraege    []Entry
 }
 
 var tmpl = template.Must(template.New("form").Funcs(template.FuncMap{
@@ -444,6 +446,8 @@ func main() {
 			} else {
 				monatsMap[monatKey].SummeOffen += e.Abgabe
 			}
+			monatsMap[monatKey].Prozent = monatsMap[monatKey].Summe / (monatsMap[monatKey].Summe + monatsMap[monatKey].SummeOffen) * 100
+			monatsMap[monatKey].ProzentOffen = monatsMap[monatKey].SummeOffen / (monatsMap[monatKey].Summe + monatsMap[monatKey].SummeOffen) * 100
 		}
 
 		var monatsStat []Monatsstatistik
@@ -686,92 +690,8 @@ const htmlTemplate = `
 			</div>
 			<button type="submit" class="btn btn-primary">Berechnen & Speichern</button>
 		</form>
-		{{end}}
-
-
-		<h2 class="mb-3">Gespeicherte Einträge</h2>
-		<table class="table table-striped table-bordered">
-			<thead>
-				<tr>
-					<th>#</th>
-					<th>Datum</th>
-					<th>UEC Anfang</th>
-					<th>UEC Ende</th>
-					<th>UEC Profit</th>
-					<th>Prozent</th>
-					<th>UEC Abgabe</th>
-					<th>Status</th>
-					{{if .LoggedIn}}<th>Aktion</th>{{else}}<th>Erweitert</th>{{end}}
-				</tr>
-			</thead>
-			<tbody id="eintragsTabelle">
-				{{range .Entries}}
-				<tr>
-					<td>{{.ID}}</td>
-					<td>{{formatDate .CreatedAt}}</td>
-					<td>{{formatNumber .Anfangsbestand}}</td>
-					<td>{{formatNumber .Endbestand}}</td>
-					<td>{{formatNumber .Gesamtwert}}</td>
-					<td>{{formatNumber .Prozentwert}}%</td>
-					<td>{{formatNumber .Abgabe}}</td>
-					<td>
-						{{if .Bezahlt}}
-							{{if $.LoggedIn}}
-							<a href="/unmarkaspaid?id={{.ID}}" class="btn btn-sm btn-outline-danger">✗ stornieren</a>
-							{{else}}
-							<span class="badge bg-success">✓ Erledigt</span>
-							{{end}}
-						{{else}}
-							{{if $.LoggedIn}}
-							<a href="/markaspaid?id={{.ID}}" class="btn btn-sm btn-outline-success">✓ abgeben</a>
-							{{else}}
-							<span class="badge bg-secondary">✗ Offen</span>
-							{{end}}
-						{{end}}
-					</td>
-					<td>
-						<button class="btn btn-sm btn-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#details-{{.ID}}" aria-expanded="false" aria-controls="details-{{.ID}}">
-							Details
-						</button>
-						{{if $.LoggedIn}}
-						<a href="/delete?id={{.ID}}" class="btn btn-sm btn-danger" onclick="return confirm('Eintrag wirklich löschen?')">Löschen</a>
-						{{end}}
-					</td>
-				</tr>
-				<tr>
-					<td colspan="9" class="p-0 border-0">
-						<div class="collapse" id="details-{{.ID}}">
-							<div class="bg-light p-3 border-top">
-								<strong>Interne Infos (Details):</strong>
-								<table class="table table-sm table-bordered mb-0">
-									<thead>
-										<tr>
-											<th>Startort</th>
-											<th>Zielort</th>
-											<th>Schiff</th>
-											<th>Ware</th>
-											<th>Zeit (min)</th>
-										</tr>
-									</thead>
-									<tbody>
-										<tr>
-											<td>{{.Startort}}</td>
-											<td>{{.Zielort}}</td>
-											<td>{{.Schiff}}</td>
-											<td>{{.Ware}}</td>
-											<td>{{formatNumber .Zeitaufwand}}</td>
-										</tr>
-									</tbody>
-								</table>
-							</div>
-						</div>
-					</td>
-				</tr>
-				{{end}}
-			</tbody>
-		</table>
-
 		<hr />
+		{{end}}
 
 		<h2 class="mb-3">Auswertungen</h2>
 
@@ -804,6 +724,7 @@ const htmlTemplate = `
 							<th>Monat</th>
 							<th>Abgaben verteilt</th>
 							<th>Abgaben offen</th>
+							<th>Statistik</th>
 							<th>Aktionen</th>
 						</tr>
 					</thead>
@@ -813,6 +734,12 @@ const htmlTemplate = `
 							<td>{{.Monat}}</td>
 							<td>{{formatNumber .Summe}} UEC</td>
 							<td>{{formatNumber .SummeOffen}} UEC</td>
+							<td>
+								<div class="progress">
+									<div class="progress-bar progress-bar-striped bg-success" role="progressbar" style="width: {{.Prozent}}%" aria-valuenow="{{.Prozent}}" aria-valuemin="0" aria-valuemax="100"></div>
+									<div class="progress-bar progress-bar-striped bg-danger" role="progressbar" style="width: {{.ProzentOffen}}%" aria-valuenow="{{.ProzentOffen}}" aria-valuemin="0" aria-valuemax="100"></div>
+								</div>
+							</td>
 							<td>
 								<button class="btn btn-sm btn-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#monat-{{.Monat}}" aria-expanded="false" aria-controls="monat-{{.Monat}}">
 									Details
@@ -860,7 +787,7 @@ const htmlTemplate = `
 															{{if $.LoggedIn}}
 															<a href="/markaspaid?id={{.ID}}" class="btn btn-sm btn-outline-success">✓ abgeben</a>
 															{{else}}
-															<span class="badge bg-secondary">✗ Offen</span>
+															<span class="badge bg-danger">✗ Offen</span>
 															{{end}}
 														{{end}}
 													</td>