jason/sicherheitsunterweisung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Grundlegenden Funktionsumfang geschaffen, dafür einiges umstrukturiert

Browse Source
This commit is contained in:
Jason Streifling 2023-10-08 10:36:16 +02:00
parent 15675d5e6c
commit 324a1c54d6
5 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main.go
View File

@ -6,39 +6,24 @@ import (
"streifling.com/jason/sicherheitsunterweisung/packages/db" "streifling.com/jason/sicherheitsunterweisung/packages/db"
"streifling.com/jason/sicherheitsunterweisung/packages/server" "streifling.com/jason/sicherheitsunterweisung/packages/server"
"streifling.com/jason/sicherheitsunterweisung/packages/types"
) )
func writeBriefing(ch chan *types.Briefing, db *db.DB) {
for b := range ch {
db.WriteBriefing(b)
}
}
func main() { func main() {
var i, j int64 var i, j int64
i, j = 1, 1 i, j = 1, 1
mux := http.NewServeMux() mux := http.NewServeMux()
cb := make(chan *types.Briefing)
db, err := db.Open("sicherheitsunterweisung") db, err := db.Open("sicherheitsunterweisung")
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
bs, err := db.ReadAll()
if err != nil {
log.Fatalln(err)
}
mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static/")))) mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static/"))))
// mux.HandleFunc("/", server.DisplayForm(&i)) mux.HandleFunc("/", server.DisplayTable(db))
mux.HandleFunc("/", server.DisplayTable(bs)) mux.HandleFunc("/submit/", server.SubmitForm(db, &i, &j))
mux.HandleFunc("/search/", server.DisplayResults(db))
mux.HandleFunc("/new-briefing/", server.DisplayForm(&i))
mux.HandleFunc("/add-participant/", server.AddParticipant(&i)) mux.HandleFunc("/add-participant/", server.AddParticipant(&i))
mux.HandleFunc("/submit/", server.SubmitForm(cb, &i, &j))
go writeBriefing(cb, db)
log.Fatalln(http.ListenAndServe(":8080", mux)) log.Fatalln(http.ListenAndServe(":8080", mux))
} }

29
packages/server/server.go
View File

@ -5,18 +5,34 @@ import (
"html/template" "html/template"
"log" "log"
"net/http" "net/http"
"streifling.com/jason/sicherheitsunterweisung/packages/db"
"streifling.com/jason/sicherheitsunterweisung/packages/types" "streifling.com/jason/sicherheitsunterweisung/packages/types"
) )
func DisplayTable(bs *[]types.Briefing) http.HandlerFunc { func DisplayTable(db *db.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
bs, err := db.ReadAll()
if err != nil {
_ = fmt.Errorf("DisplayTable: %v\n", err)
}
template.Must(template.ParseFiles("templates/index.html", "templates/table.html")).Execute(w, bs) template.Must(template.ParseFiles("templates/index.html", "templates/table.html")).Execute(w, bs)
} }
} }
func DisplayResults(db *db.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
bs, err := db.ReadByName(r.PostFormValue("search"))
if err != nil {
_ = fmt.Errorf("DisplayResults: db.ReadByName(r.PostFormValue()): %v\n", err)
}
template.Must(template.ParseFiles("templates/table.html")).ExecuteTemplate(w, "rows", bs)
}
}
func DisplayForm(i *int64) http.HandlerFunc { func DisplayForm(i *int64) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
template.Must(template.ParseFiles("templates/index.html", "templates/form.html")).Execute(w, i) template.Must(template.ParseFiles("templates/form.html")).ExecuteTemplate(w, "content", i)
} }
} }
@ -27,7 +43,7 @@ func AddParticipant(i *int64) http.HandlerFunc {
} }
} }
func SubmitForm(ch chan<- *types.Briefing, i, j *int64) http.HandlerFunc { func SubmitForm(db *db.DB, i, j *int64) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
b := new(types.Briefing) b := new(types.Briefing)
@ -50,6 +66,11 @@ func SubmitForm(ch chan<- *types.Briefing, i, j *int64) http.HandlerFunc {
} }
log.Println(b) log.Println(b)
ch <- b db.WriteBriefing(b)
bs, err := db.ReadAll()
if err != nil {
_ = fmt.Errorf("SubmitForm: db.ReadAll(): %v\n", err)
}
template.Must(template.ParseFiles("templates/index.html", "templates/table.html")).Execute(w, bs)
} }
} }

4
templates/form.html
View File

@ -49,6 +49,8 @@
{{ template "participant" . }} {{ template "participant" . }}
</div> </div>
<button type="submit" hx-post="/submit/">Senden</button> <button type="submit" hx-post="/submit/" hx-target="#content" hx-swap="innerHTML">
Senden
</button>
</form> </form>
{{ end }} {{ end }}

2
templates/index.html
View File

@ -11,7 +11,9 @@
<body> <body>
<h1>Sicherheitsunterweisung</h1> <h1>Sicherheitsunterweisung</h1>
<div id="content">
{{ template "content" . }} {{ template "content" . }}
</div>
<script src="/static/js/htmx.min.js" type="text/javascript"></script> <script src="/static/js/htmx.min.js" type="text/javascript"></script>
</body> </body>

22
templates/table.html
View File

@ -1,4 +1,5 @@
{{ define "row" }} {{ define "rows" }}
{{ range . }}
<tr> <tr>
<td>{{ .FirstName }}</td> <td>{{ .FirstName }}</td>
<td>{{ .LastName }}</td> <td>{{ .LastName }}</td>
@ -13,15 +14,25 @@
{{ end }} {{ end }}
</tr> </tr>
{{ end }} {{ end }}
{{ end }}
{{ define "content" }} {{ define "content" }}
<form> <form>
<label for="search-input">Suche</label> <label for="search-input">Suche</label>
<input type="text" name="search" id="search-input" /> <input type="text" name="search" id="search-input" />
<button type="submit" hx-post="" hx-target="" hx-swap="">Suchen</button> <button type="submit" hx-post="/search/" hx-target="#results" hx-swap="innerHTML">
Suchen
</button>
</form>
<form>
<button type="submit" hx-post="/new-briefing/" hx-target="#content" hx-swap="innerHTML">
Neue Unterweisung
</button>
</form> </form>
<table> <table>
<thead>
<tr> <tr>
<th colspan="2">Name Unterweiser</th> <th colspan="2">Name Unterweiser</th>
<th>Datum</th> <th>Datum</th>
@ -31,9 +42,10 @@
<th colspan="2">Name Teilnehmer</th> <th colspan="2">Name Teilnehmer</th>
<th>Firma</th> <th>Firma</th>
</tr> </tr>
</thead>
{{ range . }} <tbody id="results">
{{ template "row" . }} {{ template "rows" . }}
{{ end }} </tbody>
</table> </table>
{{ end }} {{ end }}