Production- und Test-Umgebung implementiert. Monatsstatistik an Pos.2 verschoben.
All checks were successful
release-tag / release-image (push) Successful in 2m13s
All checks were successful
release-tag / release-image (push) Successful in 2m13s
This commit is contained in:
64
main.go
64
main.go
@@ -33,7 +33,8 @@ func Enabled(k string, def bool) bool {
|
||||
var (
|
||||
username = GetENV("KT_USERNAME", "root")
|
||||
password = GetENV("KT_PASSWORD", "root")
|
||||
membername = GetENV("KT_MEMBER", "guest")
|
||||
membername = GetENV("KT_MEMBER", "demo")
|
||||
productive = Enabled("KT_PRODUCTIVE", false)
|
||||
)
|
||||
|
||||
type Entry struct {
|
||||
@@ -107,7 +108,16 @@ func isAuthenticated(r *http.Request) bool {
|
||||
}
|
||||
|
||||
func main() {
|
||||
db, err := sql.Open("sqlite", "/data/data.db")
|
||||
var (
|
||||
db *sql.DB
|
||||
err error
|
||||
)
|
||||
if productive {
|
||||
db, err = sql.Open("sqlite", "/data/data.db")
|
||||
} else {
|
||||
db, err = sql.Open("sqlite", "./data.db")
|
||||
}
|
||||
//
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
@@ -115,7 +125,11 @@ func main() {
|
||||
|
||||
createTable(db)
|
||||
|
||||
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("/data/static"))))
|
||||
if productive {
|
||||
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("/data/static"))))
|
||||
} else {
|
||||
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("./static"))))
|
||||
}
|
||||
|
||||
http.HandleFunc("/login", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == http.MethodPost {
|
||||
@@ -453,6 +467,28 @@ const htmlTemplate = `
|
||||
</form>
|
||||
{{end}}
|
||||
|
||||
<h4 class="mt-4">Monatliche Übersicht</h4>
|
||||
<table class="table table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Monat</th>
|
||||
<th>Abgaben verteilt</th>
|
||||
<th>Abgaben offen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{range .Monatsstatistik}}
|
||||
<tr>
|
||||
<td>{{.Monat}}</td>
|
||||
<td>{{formatNumber .Summe}} UEC</td>
|
||||
<td>{{formatNumber .SummeOffen}} UEC</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<hr />
|
||||
|
||||
<h2 class="mb-3">Gespeicherte Einträge</h2>
|
||||
<table class="table table-striped table-bordered">
|
||||
<thead>
|
||||
@@ -507,28 +543,6 @@ const htmlTemplate = `
|
||||
|
||||
<hr />
|
||||
|
||||
<h4 class="mt-4">Monatliche Übersicht</h4>
|
||||
<table class="table table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Monat</th>
|
||||
<th>Abgaben verteilt</th>
|
||||
<th>Abgaben offen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{range .Monatsstatistik}}
|
||||
<tr>
|
||||
<td>{{.Monat}}</td>
|
||||
<td>{{formatNumber .Summe}} UEC</td>
|
||||
<td>{{formatNumber .SummeOffen}} UEC</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<hr />
|
||||
|
||||
<div class="alert alert-info">
|
||||
<strong>Die tatsächlichen Werte können abweichen.</strong> Die dargestellten Werte sind meine Vorstellung einer sinnvollen Verteilung.<br>
|
||||
Die Summe wird an die Orga-Leitung entrichtet. Die entgültige Entscheidung über die Verteilung obliegt der Orga-Leitung.
|
||||
|
Reference in New Issue
Block a user