Versuch, den Teilnehmer als Argument an Upload zu übergeben

go.mod

@@ -4,6 +4,7 @@ go 1.21.1
 
 require (
 	github.com/go-sql-driver/mysql v1.7.1
+	github.com/google/uuid v1.3.1
 	golang.org/x/term v0.13.0
 )
 

go.sum

@@ -1,5 +1,7 @@
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=

main.go

@@ -6,21 +6,12 @@ import (
 
 	"streifling.com/jason/sicherheitsunterweisung/packages/db"
 	"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() {
 	var i, j int64
-
 	i, j = 1, 1
 	mux := http.NewServeMux()
-	cb := make(chan *types.Briefing)
 
 	db, err := db.Open("sicherheitsunterweisung")
 	if err != nil {
@@ -28,11 +19,11 @@ func main() {
 	}
 
 	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static/"))))
-	mux.HandleFunc("/", server.DisplayForm(&i))
+	mux.HandleFunc("/", server.DisplayTable(db))
+	mux.HandleFunc("/search/", server.DisplayResults(db))
+	mux.HandleFunc("/new-briefing/", server.DisplayForm(&i))
 	mux.HandleFunc("/add-participant/", server.AddParticipant(&i))
-	mux.HandleFunc("/submit/", server.SubmitForm(cb, &i, &j))
-
-	go writeBriefing(cb, db)
+	mux.HandleFunc("/submit/", server.SubmitForm(db, &i, &j))
 
 	log.Fatalln(http.ListenAndServe(":8080", mux))
 }

packages/db/db.go

@@ -37,6 +37,12 @@ func getCredentials() (string, string, error) {
 	return strings.TrimSpace(user), strings.TrimSpace(pass), nil
 }
 
+func reverseOrder(bs *[]types.Briefing) {
+	for i, j := 0, len(*bs)-1; i < j; i, j = i+1, j-1 {
+		(*bs)[i], (*bs)[j] = (*bs)[j], (*bs)[i]
+	}
+}
+
 func Open(dbName string) (*DB, error) {
 	var err error
 	db := new(DB)
@@ -63,18 +69,18 @@ func Open(dbName string) (*DB, error) {
 func (db *DB) WriteBriefing(b *types.Briefing) error {
 	for i := 0; i < len(b.Participants); i++ {
 		result, err := db.Exec("INSERT INTO "+db.Name+" (instructor_first,"+
-			"instructor_last, date, time, state, location, participant_first,"+
-			"participant_last, company) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+			" instructor_last, date, time, state, location, participant_first,"+
+			" participant_last, company) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
 			b.FirstName, b.LastName, b.Date, b.Time, b.State, b.Location,
 			b.Participants[i].FirstName, b.Participants[i].LastName,
 			b.Participants[i].Company)
 		if err != nil {
 			return fmt.Errorf("*DB.WriteBriefing: db.Exec(\"INSERT INTO"+
-				"\"+db.Name+\" (instructor_first, instructor_last, date, time, state,"+
-				"location, participant_first, participant_last, company) VALUES (?, ?,"+
-				"?, ?, ?, ?, ?, ?, ?)\", b.FirstName, b.LastName, b.Date, b.Time,"+
-				"b.State, b.Location, b.Participants[i].FirstName,"+
-				"b.Participants[i].LastName, b.Participants[i].Company): %v\n", err)
+				" \"+db.Name+\" (instructor_first, instructor_last, date, time, state,"+
+				" location, participant_first, participant_last, company) VALUES (?, ?,"+
+				" ?, ?, ?, ?, ?, ?, ?)\", b.FirstName, b.LastName, b.Date, b.Time,"+
+				" b.State, b.Location, b.Participants[i].FirstName,"+
+				" b.Participants[i].LastName, b.Participants[i].Company): %v\n", err)
 		}
 
 		_, err = result.LastInsertId()
@@ -86,6 +92,32 @@ func (db *DB) WriteBriefing(b *types.Briefing) error {
 	return nil
 }
 
+func (db *DB) ReadAll() (*[]types.Briefing, error) {
+	bs := make([]types.Briefing, 0)
+
+	rows, err := db.Query("SELECT *" + " FROM " + db.Name)
+	if err != nil {
+		return nil, fmt.Errorf("*DB.ReadAll: db.Query(\"SELECT * FROM \"+db.Name): %v\n", err)
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		b := new(types.Briefing)
+		p := new(types.Participant)
+
+		if err := rows.Scan(&p.ID, &b.FirstName, &b.LastName, &b.Date, &b.Time,
+			&b.State, &b.Location, &p.FirstName, &p.LastName, &p.Company); err != nil {
+			return nil, fmt.Errorf("*DB.ReadAll: db.Query(): %v\n", err)
+		}
+
+		b.Participants = append(b.Participants, *p)
+		bs = append(bs, *b)
+	}
+
+	reverseOrder(&bs)
+	return &bs, nil
+}
+
 func (db *DB) ReadByName(name string) (*[]types.Briefing, error) {
 	bs := make([]types.Briefing, 0)
 
@@ -120,5 +152,6 @@ func (db *DB) ReadByName(name string) (*[]types.Briefing, error) {
 		bs = append(bs, *b)
 	}
 
+	reverseOrder(&bs)
 	return &bs, nil
 }

packages/server/server.go

@@ -2,26 +2,52 @@ package server
 
 import (
 	"fmt"
+	"github.com/google/uuid"
 	"html/template"
+	"io"
 	"log"
 	"net/http"
+	"os"
+	"streifling.com/jason/sicherheitsunterweisung/packages/db"
 	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
+func DisplayTable(db *db.DB) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		bs, err := db.ReadAll()
+		if err != nil {
+			_ = fmt.Errorf("DisplayTable: %v\n", err)
+			return
+		}
+		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)
+			return
+		}
+		template.Must(template.ParseFiles("templates/table.html")).ExecuteTemplate(w, "rows", bs)
+	}
+}
+
 func DisplayForm(i *int64) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		template.Must(template.ParseFiles("templates/index.html")).Execute(w, i)
+		template.Must(template.ParseFiles("templates/form.html")).ExecuteTemplate(w, "content", i)
 	}
 }
 
 func AddParticipant(i *int64) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		*i++
-		template.Must(template.ParseFiles("templates/index.html", "templates/participant.html")).ExecuteTemplate(w, "participant", i)
+		template.Must(template.ParseFiles("templates/form.html")).ExecuteTemplate(w, "participant", i)
 	}
 }
 
-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) {
 		b := new(types.Briefing)
 
@@ -44,6 +70,37 @@ func SubmitForm(ch chan<- *types.Briefing, i, j *int64) http.HandlerFunc {
 		}
 
 		log.Println(b)
-		ch <- b
+		db.WriteBriefing(b)
+		bs, err := db.ReadAll()
+		if err != nil {
+			_ = fmt.Errorf("SubmitForm: db.ReadAll(): %v\n", err)
+			return
+		}
+		template.Must(template.ParseFiles("templates/index.html", "templates/table.html")).Execute(w, bs)
+	}
+}
+
+func Upload(fn, ln, d, t string) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		r.ParseMultipartForm(10 << 20) // 10 MiB
+
+		tmpFile, _, err := r.FormFile("questionaire")
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		defer tmpFile.Close()
+
+		file, err := os.Create(ln + fn + d + t + uuid.New().String() + ".png")
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		defer file.Close()
+
+		if _, err := io.Copy(file, tmpFile); err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 	}
 }

packages/types/types.go

@@ -1,5 +1,7 @@
 package types
 
+import "os"
+
 type Person struct {
 	FirstName string
 	LastName  string
@@ -10,7 +12,8 @@ type Instructor Person
 type Participant struct {
 	ID int64
 	Person
-	Company string
+	Company      string
+	Questionaire string
 }
 
 type Briefing struct {

templates/form.html

@@ -0,0 +1,58 @@
+{{ define "participant" }}
+<div id="participant-{{ . }}">
+  <label for="participant-first-input-{{ . }}">Vorname</label>
+  <input type="text" name="participant-first-{{ . }}" id="participant-first-input-{{ . }}" />
+
+  <label for="participant-last-input-{{ . }}">Nachname</label>
+  <input type="text" name="participant-last-{{ . }}" id="participant-last-input-{{ . }}" />
+
+  <label for="participant-company-input-{{ . }}">Firma</label>
+  <input type="text" name="participant-company-{{ . }}" id="participant-company-input-{{ . }}" />
+
+  <button type="button" hx-post="/upload/">Fragebogen hochladen</button>
+</div>
+{{ end }}
+
+{{ define "content" }}
+<form>
+  <div id="instructor">
+    <label for="instructor-first-input">Unterweiser Vorname</label>
+    <input type="text" name="instructor-first" id="instructor-first-input" />
+
+    <label for="instructor-last-input">Unterweiser Nachname</label>
+    <input type="text" name="instructor-last" id="instructor-last-input" />
+  </div>
+
+  <div id="date">
+    <label for="date-input">Datum</label>
+    <input type="date" name="date" id="date-input" />
+  </div>
+
+  <div id="time">
+    <label for="time-input">Uhrzeit</label>
+    <input type="time" name="time" id="time-input" />
+  </div>
+
+  <div id="state">
+    <label for="state-input">Stand vom</label>
+    <input type="date" name="state" id="state-input" />
+  </div>
+
+  <div id="location">
+    <label for="location-input">Ort</label>
+    <input type="text" name="location" id="location-input" />
+  </div>
+
+  <div id="participants">
+    <button type="button" hx-post="/add-participant/" hx-target="#participants" hx-swap="beforeend" hx-trigger="click">
+      +
+    </button>
+
+    {{ template "participant" . }}
+  </div>
+
+  <button type="submit" hx-post="/submit/" hx-target="#content" hx-swap="innerHTML">
+    Senden
+  </button>
+</form>
+{{ end }}

templates/index.html

@@ -11,57 +11,9 @@
 <body>
   <h1>Sicherheitsunterweisung</h1>
 
-  <form>
-    <div id="instructor">
-      <label for="instructor-first-input">Unterweiser Vorname</label>
-      <input type="text" name="instructor-first" id="instructor-first-input" />
-
-      <label for="instructor-last-input">Unterweiser Nachname</label>
-      <input type="text" name="instructor-last" id="instructor-last-input" />
-    </div>
-
-    <div id="date">
-      <label for="date-input">Datum</label>
-      <input type="date" name="date" id="date-input" />
-    </div>
-
-    <div id="time">
-      <label for="time-input">Uhrzeit</label>
-      <input type="time" name="time" id="time-input" />
-    </div>
-
-    <div id="state">
-      <label for="state-input">Stand vom</label>
-      <input type="date" name="state" id="state-input" />
-    </div>
-
-    <div id="location">
-      <label for="location-input">Ort</label>
-      <input type="text" name="location" id="location-input" />
-    </div>
-
-    <div id="participants">
-      <button type="button" hx-post="/add-participant/" hx-target="#participants" hx-swap="beforeend"
-        hx-trigger="click">
-        +
-      </button>
-
-      <div id="participant-{{ . }}">
-        <label for="participant-first-input-{{ . }}">Vorname</label>
-        <input type="text" name="participant-first-{{ . }}" id="participant-first-input-{{ . }}" />
-
-        <label for="participant-last-input-{{ . }}">Nachname</label>
-        <input type="text" name="participant-last-{{ . }}" id="participant-last-input-{{ . }}" />
-
-        <label for="participant-company-input-{{ . }}">Firma</label>
-        <input type="text" name="participant-company-{{ . }}" id="participant-company-input-{{ . }}" />
-      </div>
-    </div>
-
-    <button type="submit" hx-post="/submit/">
-      Senden
-    </button>
-  </form>
+  <div id="content">
+    {{ template "content" . }}
+  </div>
 
   <script src="/static/js/htmx.min.js" type="text/javascript"></script>
 </body>

templates/participant.html

@@ -1,12 +0,0 @@
-{{ define "participant" }}
-<div id="participant-{{ . }}">
-  <label for="participant-first-input-{{ . }}">Vorname</label>
-  <input type="text" name="participant-first-{{ . }}" id="participant-first-input-{{ . }}" />
-
-  <label for="participant-last-input-{{ . }}">Nachname</label>
-  <input type="text" name="participant-last-{{ . }}" id="participant-last-input-{{ . }}" />
-
-  <label for="participant-company-input-{{ . }}">Firma</label>
-  <input type="text" name="participant-company-{{ . }}" id="participant-company-input-{{ . }}" />
-</div>
-{{ end }}

templates/table.html

@@ -0,0 +1,49 @@
+{{ define "rows" }}
+{{ range . }}
+<tr>
+  <td>{{ .FirstName }}</td>
+  <td>{{ .LastName }}</td>
+  <td>{{ .Date }}</td>
+  <td>{{ .Time }}</td>
+  <td>{{ .State }}</td>
+  <td>{{ .Location }}</td>
+  {{ range .Participants }}
+  <td>{{ .FirstName }}</td>
+  <td>{{ .LastName }}</td>
+  <td>{{ .Company }}</td>
+  {{ end }}
+</tr>
+{{ end }}
+{{ end }}
+
+{{ define "content" }}
+<form>
+  <label for="search-input">Suche</label>
+  <input type="text" name="search" id="search-input" hx-post="/search/" hx-target="#results" hx-swap="innerHTML"
+    hx-trigger="keyup changed delay:200ms" />
+</form>
+
+<form>
+  <button type="submit" hx-post="/new-briefing/" hx-target="#content" hx-swap="innerHTML">
+    Neue Unterweisung
+  </button>
+</form>
+
+<table>
+  <thead>
+    <tr>
+      <th colspan="2">Unterweiser</th>
+      <th>Datum</th>
+      <th>Uhrzeit</th>
+      <th>Stand</th>
+      <th>Ort</th>
+      <th colspan="2">Teilnehmer</th>
+      <th>Firma</th>
+    </tr>
+  </thead>
+
+  <tbody id="results">
+    {{ template "rows" . }}
+  </tbody>
+</table>
+{{ end }}