Verwendung von Pointern, um Vermischung der Pakete zu vermeiden

This commit is contained in:
Jason Streifling 2023-10-05 18:27:21 +02:00
parent 1c39b1e471
commit fcb509c9fe
2 changed files with 20 additions and 17 deletions

12
main.go
View File

@ -3,7 +3,7 @@ package main
import ( import (
"log" "log"
"net/http" "net/http"
"streifling.com/jason/sicherheitsunterweisung/db" // "streifling.com/jason/sicherheitsunterweisung/db"
"streifling.com/jason/sicherheitsunterweisung/server" "streifling.com/jason/sicherheitsunterweisung/server"
) )
@ -14,15 +14,15 @@ func main() {
i, j = 1, 1 i, j = 1, 1
mux := http.NewServeMux() mux := http.NewServeMux()
_, err := db.OpenDB("sicherheitsunterweisung") /* _, err := db.OpenDB("sicherheitsunterweisung")
if err != nil { if err != nil {
log.Fatalln(err) 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.DisplayForm(&i))
mux.HandleFunc("/add-participant/", server.AddParticipant(i)) mux.HandleFunc("/add-participant/", server.AddParticipant(&i))
mux.HandleFunc("/submit/", server.SubmitForm(b, i, j)) mux.HandleFunc("/submit/", server.SubmitForm(&b, &i, &j))
log.Fatalln(http.ListenAndServe(":8080", mux)) log.Fatalln(http.ListenAndServe(":8080", mux))
} }

View File

@ -3,6 +3,7 @@ package server
import ( import (
"fmt" "fmt"
"html/template" "html/template"
"log"
"net/http" "net/http"
) )
@ -28,37 +29,39 @@ type Briefing struct {
Participants []Participant Participants []Participant
} }
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")).Execute(w, i) template.Must(template.ParseFiles("templates/index.html")).Execute(w, i)
} }
} }
func AddParticipant(i int64) http.HandlerFunc { func AddParticipant(i *int64) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
i++ *i++
template.Must(template.ParseFiles("templates/index.html", "templates/participant.html")).ExecuteTemplate(w, "participant", i) template.Must(template.ParseFiles("templates/index.html", "templates/participant.html")).ExecuteTemplate(w, "participant", i)
} }
} }
func SubmitForm(b Briefing, i, j int64) http.HandlerFunc { func SubmitForm(b *Briefing, i, j *int64) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
b.Instructor.FirstName = r.PostFormValue("instructor-first") b.FirstName = r.PostFormValue("instructor-first")
b.Instructor.LastName = r.PostFormValue("instructor-last") b.LastName = r.PostFormValue("instructor-last")
b.Date = r.PostFormValue("date") b.Date = r.PostFormValue("date")
b.Time = r.PostFormValue("time") b.Time = r.PostFormValue("time")
b.State = r.PostFormValue("state") b.State = r.PostFormValue("state")
b.Location = r.PostFormValue("location") b.Location = r.PostFormValue("location")
for ; j <= i; j++ { for ; *j <= *i; *j++ {
b.Participants = append(b.Participants, Participant{ b.Participants = append(b.Participants, Participant{
ID: j, ID: *j,
Person: Person{ Person: Person{
FirstName: r.PostFormValue("participant-first-" + fmt.Sprint(j)), FirstName: r.PostFormValue("participant-first-" + fmt.Sprint(*j)),
LastName: r.PostFormValue(("participant-last-" + fmt.Sprint(j))), LastName: r.PostFormValue(("participant-last-" + fmt.Sprint(*j))),
}, },
Company: r.PostFormValue(("participant-company-" + fmt.Sprint(j))), Company: r.PostFormValue(("participant-company-" + fmt.Sprint(*j))),
}) })
} }
log.Println("Received ", *b)
} }
} }