main.go

@@ -6,12 +6,21 @@ 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 {
@@ -19,11 +28,11 @@ func main() {
 	}
 
 	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static/"))))
-	mux.HandleFunc("/", server.DisplayTable(db))
+	mux.HandleFunc("/", server.DisplayForm(&i))
-	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("/submit/", server.SubmitForm(cb, &i, &j))
+
+	go writeBriefing(cb, db)
 
 	log.Fatalln(http.ListenAndServe(":8080", mux))
 }

packages/db/db.go

@@ -86,31 +86,6 @@ 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)
-	}
-
-	return &bs, nil
-}
-
 func (db *DB) ReadByName(name string) (*[]types.Briefing, error) {
 	bs := make([]types.Briefing, 0)
 

packages/server/server.go

@@ -5,45 +5,23 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-
-	"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)
-		}
-		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 {
 	return func(w http.ResponseWriter, r *http.Request) {
-		template.Must(template.ParseFiles("templates/form.html")).ExecuteTemplate(w, "content", i)
+		template.Must(template.ParseFiles("templates/index.html")).Execute(w, i)
 	}
 }
 
 func AddParticipant(i *int64) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		*i++
-		template.Must(template.ParseFiles("templates/form.html")).ExecuteTemplate(w, "participant", i)
+		template.Must(template.ParseFiles("templates/index.html", "templates/participant.html")).ExecuteTemplate(w, "participant", i)
 	}
 }
 
-func SubmitForm(db *db.DB, i, j *int64) http.HandlerFunc {
+func SubmitForm(ch chan<- *types.Briefing, i, j *int64) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		b := new(types.Briefing)
 
@@ -66,11 +44,6 @@ func SubmitForm(db *db.DB, i, j *int64) http.HandlerFunc {
 		}
 
 		log.Println(b)
-		db.WriteBriefing(b)
+		ch <- 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)
 	}
 }

templates/form.html

@@ -1,56 +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 }}
-
-{{ 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,10 +11,58 @@
 <body>
   <h1>Sicherheitsunterweisung</h1>
 
-  <div id="content">
+  <form>
-    {{ template "content" . }}
+    <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>
+
   <script src="/static/js/htmx.min.js" type="text/javascript"></script>
 </body>
 

templates/participant.html

@@ -0,0 +1,12 @@
+{{ 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

@@ -1,51 +0,0 @@
-{{ 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" />
-  <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>
-
-<table>
-  <thead>
-    <tr>
-      <th colspan="2">Name Unterweiser</th>
-      <th>Datum</th>
-      <th>Uhrzeit</th>
-      <th>Stand</th>
-      <th>Ort</th>
-      <th colspan="2">Name Teilnehmer</th>
-      <th>Firma</th>
-    </tr>
-  </thead>
-
-  <tbody id="results">
-    {{ template "rows" . }}
-  </tbody>
-</table>
-{{ end }}