Compare commits
2 Commits
7c73ac7749
...
190cded4e5
| Author | SHA1 | Date | |
|---|---|---|---|
| 190cded4e5 | |||
| 4ecdd40613 |
203
main.go
203
main.go
@@ -140,9 +140,12 @@ type Abteilung struct {
|
||||
}
|
||||
|
||||
type Monatsstatistik struct {
|
||||
Monat string // z. B. "07.2025"
|
||||
Summe float64 // bezahlte
|
||||
SummeOffen float64 // noch nicht bezahlt
|
||||
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{
|
||||
@@ -437,11 +440,14 @@ func main() {
|
||||
if _, ok := monatsMap[monatKey]; !ok {
|
||||
monatsMap[monatKey] = &Monatsstatistik{Monat: monatKey}
|
||||
}
|
||||
monatsMap[monatKey].Eintraege = append(monatsMap[monatKey].Eintraege, e)
|
||||
if e.Bezahlt {
|
||||
monatsMap[monatKey].Summe += e.Abgabe
|
||||
} 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
|
||||
@@ -628,7 +634,7 @@ const htmlTemplate = `
|
||||
<div class="col">
|
||||
<label class="form-label">Prozentwert</label>
|
||||
<select name="prozentwert" class="form-select">
|
||||
<option value="30">30%</option>
|
||||
<option value="30">30% (Standard)</option>
|
||||
<option value="10">10%</option>
|
||||
<option value="15">15%</option>
|
||||
<option value="20">20%</option>
|
||||
@@ -684,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>
|
||||
|
||||
@@ -802,6 +724,8 @@ const htmlTemplate = `
|
||||
<th>Monat</th>
|
||||
<th>Abgaben verteilt</th>
|
||||
<th>Abgaben offen</th>
|
||||
<th>Statistik</th>
|
||||
<th>Aktionen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -810,6 +734,107 @@ 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
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="9" class="p-0 border-0">
|
||||
<div class="collapse" id="monat-{{.Monat}}">
|
||||
<div class="bg-light p-3 border-top">
|
||||
<strong>Interne Infos (Details):</strong>
|
||||
<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 .Eintraege}}
|
||||
<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-danger">✗ 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>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
|
||||
Reference in New Issue
Block a user