Größtenteils unwichtiger Kram

.air.toml

@@ -0,0 +1,44 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  args_bin = []
+  bin = "./tmp/main"
+  cmd = "go build -o ./tmp/main ."
+  delay = 0
+  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  exclude_file = []
+  exclude_regex = ["_test.go"]
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = ""
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  include_file = []
+  kill_delay = "0s"
+  log = "build-errors.log"
+  poll = false
+  poll_interval = 0
+  rerun = false
+  rerun_delay = 500
+  send_interrupt = false
+  stop_on_error = false
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  main_only = false
+  time = false
+
+[misc]
+  clean_on_exit = false
+
+[screen]
+  clear_on_rebuild = false
+  keep_scroll = true

.gitignore

@@ -1 +1,2 @@
-create_tables.sql
+tmp
+test.sql

create_tables.sql

@@ -0,0 +1,103 @@
+USE sicherheitsunterweisung;
+
+SET FOREIGN_KEY_CHECKS = 0;
+DROP TABLE IF EXISTS instructors;
+DROP TABLE IF EXISTS briefings;
+DROP TABLE IF EXISTS participants;
+DROP TABLE IF EXISTS questions;
+DROP TABLE IF EXISTS given_answers;
+SET FOREIGN_KEY_CHECKS = 1;
+
+CREATE TABLE instructors (
+  id           INT         NOT NULL AUTO_INCREMENT,
+  first_name   VARCHAR(32) NOT NULL,
+  last_name    VARCHAR(32) NOT NULL,
+  personnel_id INT         NOT NULL,
+
+  PRIMARY KEY(id)
+);
+
+CREATE TABLE briefings (
+  id            INT         NOT NULL AUTO_INCREMENT,
+  date          DATE        NOT NULL,
+  time          TIME        NOT NULL,
+  location      VARCHAR(32) NOT NULL,
+  document_name VARCHAR(16) NOT NULL,
+  as_of         DATE        NOT NULL,
+  instructor_id INT         NOT NULL,
+
+  PRIMARY KEY(id),
+  FOREIGN KEY(instructor_id) REFERENCES instructors(id)
+);
+
+CREATE TABLE participants (
+  id         INT         NOT NULL AUTO_INCREMENT,
+  first_name VARCHAR(32) NOT NULL,
+  last_name  VARCHAR(32) NOT NULL,
+  company    VARCHAR(32) NOT NULL,
+
+  PRIMARY KEY(id)
+);
+
+CREATE TABLE questions (
+  id             INT          NOT NULL AUTO_INCREMENT,
+  question       VARCHAR(256) NOT NULL,
+  answer_1       VARCHAR(64)  NOT NULL,
+  answer_2       VARCHAR(64)  NOT NULL,
+  answer_3       VARCHAR(64)  NOT NULL,
+  answer_4       VARCHAR(64)  NOT NULL,
+  correct_answer INT          NOT NULL,
+
+  PRIMARY KEY(id)
+);
+
+CREATE TABLE given_answers (
+  briefing_id    INT NOT NULL,
+  participant_id INT NOT NULL,
+  question_id    INT NOT NULL,
+  given_answer   INT NOT NULL,
+
+  PRIMARY KEY(briefing_id, participant_id, question_id),
+  FOREIGN KEY(briefing_id)    REFERENCES briefings(id),
+  FOREIGN KEY(participant_id) REFERENCES participants(id),
+  FOREIGN KEY(question_id)    REFERENCES questions(id)
+);
+
+INSERT INTO instructors
+  (first_name, last_name, personnel_id)
+VALUES
+  ( 'Jason', 'Streifling',     '123456' ),
+  ( 'Tim',   'Taler',          '123457' ),
+  ( 'Georg', 'aus dem Jungel', '123458' );
+
+INSERT INTO briefings (
+  date, time, location, document_name, as_of, instructor_id
+) VALUES
+  ( '2023-10-16', '17:00:00', 'Werk Langenhagen', 'ICS-2021-LGH', '2021-02-01', '1' ),
+  ( '2023-10-16', '17:05:00', 'Werk Langenhagen', 'ICS-2021-LGH', '2021-02-01', '2' );
+
+INSERT INTO participants (
+  first_name, last_name, company
+) VALUES
+  ( 'Peter', 'Enis',  'Körber'     ),
+  ( 'Dürüm', 'Döner', 'MP Technic' );
+
+INSERT INTO questions (
+  question, answer_1, answer_2, answer_3, answer_4, correct_answer
+) VALUES
+  ( 'Was ist 1+1?', '1', '2', '3', '4', '2' ),
+  ( 'Was ist 1+2?', '1', '2', '3', '4', '3' ),
+  ( 'Was ist 2+2?', '1', '2', '3', '4', '4' ),
+  ( 'Was ist 0+1?', '1', '2', '3', '4', '1' );
+
+INSERT INTO given_answers (
+  briefing_id, participant_id, question_id, given_answer
+) VALUES
+  ( '1', '1', '1', '2' ),
+  ( '1', '1', '2', '3' ),
+  ( '1', '1', '3', '3' ),
+  ( '1', '1', '4', '1' ),
+  ( '2', '2', '1', '2' ),
+  ( '2', '2', '2', '3' ),
+  ( '2', '2', '3', '4' ),
+  ( '2', '2', '4', '1' );

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

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"fmt"
+	"html/template"
 	"log"
 	"net/http"
 
@@ -9,30 +11,34 @@ import (
 	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
-func writeBriefing(ch chan *types.Briefing, db *db.DB) {
-	for b := range ch {
-		db.WriteBriefing(b)
+func handleSessions(mux *http.ServeMux, db *db.DB, ss []*types.Session, cs <-chan *types.Session) {
+	for session := range cs {
+		ss = append(ss, session)
+		mux.HandleFunc("/add-participant-"+fmt.Sprint(session.ID)+"/", server.AddParticipant(session))
+		mux.HandleFunc("/submit-form-"+fmt.Sprint(session.ID)+"/", server.SubmitBriefingForm(session, db))
 	}
 }
 
 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 {
 		log.Fatalln(err)
 	}
 
-	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static/"))))
-	mux.HandleFunc("/", server.DisplayForm(&i))
-	mux.HandleFunc("/add-participant/", server.AddParticipant(&i))
-	mux.HandleFunc("/submit/", server.SubmitForm(cb, &i, &j))
+	sessions := make([]*types.Session, 0)
+	sessionChan := make(chan *types.Session)
 
-	go writeBriefing(cb, db)
+	mux := http.NewServeMux()
+	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static/"))))
+	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		template.Must(template.ParseFiles("templates/index.html", "templates/login.html")).Execute(w, nil)
+	})
+	mux.HandleFunc("/internal-login/", server.DisplayTable(db))
+	mux.HandleFunc("/external-login/", server.DisplayParticipantForm(sessions))
+	mux.HandleFunc("/search/", server.DisplaySearchResults(db))
+	mux.HandleFunc("/new-briefing/", server.DisplayInstructorForm(sessionChan))
+
+	go handleSessions(mux, db, sessions, sessionChan)
 
 	log.Fatalln(http.ListenAndServe(":8080", mux))
 }

packages/db/db.go

@@ -8,10 +8,9 @@ import (
 	"strings"
 	"syscall"
 
-	"streifling.com/jason/sicherheitsunterweisung/packages/types"
-
 	"github.com/go-sql-driver/mysql"
 	"golang.org/x/term"
+	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
 type DB struct {
@@ -19,22 +18,45 @@ type DB struct {
 	Name string
 }
 
+func getUsername() (string, error) {
+	user := os.Getenv("DB_USER")
+	if user == "" {
+		var err error
+		fmt.Printf("DB Benutzer: ")
+		user, err = bufio.NewReader(os.Stdin).ReadString('\n')
+		if err != nil {
+			return "", fmt.Errorf("getUsername: bufio.NewReader(os.Stdin).ReadString('\n'): %v", err)
+		}
+	}
+	return strings.TrimSpace(user), nil
+}
+
+func getPassword() (string, error) {
+	pass := os.Getenv("DB_PASS")
+	if pass == "" {
+		fmt.Printf("DB Passwort: ")
+		bytePass, err := term.ReadPassword(int(syscall.Stdin))
+		if err != nil {
+			return "", fmt.Errorf("getCredentials: term.ReadPassword(int(syscall.Stdin)): %v", err)
+		}
+		fmt.Println()
+		pass = strings.TrimSpace(string(bytePass))
+	}
+	return pass, nil
+}
+
 func getCredentials() (string, string, error) {
-	fmt.Printf("DB Benutzer: ")
-	user, err := bufio.NewReader(os.Stdin).ReadString('\n')
+	user, err := getUsername()
 	if err != nil {
-		return "", "", fmt.Errorf("getCredentials: bufio.NewReader(os.Stdin).ReadString('\n'): %v", err)
+		return "", "", fmt.Errorf("getCredentials: getUsername(): %v", err)
 	}
 
-	fmt.Printf("DB Passwort: ")
-	bytePass, err := term.ReadPassword(int(syscall.Stdin))
+	pass, err := getPassword()
 	if err != nil {
-		return "", "", fmt.Errorf("getCredentials: term.ReadPassword(int(syscall.Stdin)): %v", err)
+		return "", "", fmt.Errorf("getCredentials: getPassword(): %v", err)
 	}
-	fmt.Println()
-	pass := string(bytePass)
 
-	return strings.TrimSpace(user), strings.TrimSpace(pass), nil
+	return user, pass, nil
 }
 
 func Open(dbName string) (*DB, error) {
@@ -61,64 +83,231 @@ 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 (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-			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)
-		}
+	result, err := db.Exec(`
+  INSERT INTO briefings
+  	(date, time, location, document_name, as_of, instructor_id)
+  VALUES
+  	(?, ?, ?, ?, ?, ?)
+  `, b.Date, b.Time, b.Location, b.DocumentName, b.AsOf, b.InstructorID)
+	if err != nil {
+		return fmt.Errorf("*DB.writeBriefing: db.Exec(): %v\n", err)
+	}
 
-		_, err = result.LastInsertId()
-		if err != nil {
-			return fmt.Errorf("*DB.WriteBriefing: result.LastInsertId(): %v\n", err)
+	b.ID, err = result.LastInsertId()
+	if err != nil {
+		return fmt.Errorf("*DB.writeBriefing: result.LastInsertId(): %v\n", err)
+	}
+
+	return nil
+}
+
+func (db *DB) WriteParticipant(p *types.Participant) error {
+	result, err := db.Exec(`
+  INSERT INTO participants
+  	(first_name, last_name, company)
+  VALUES
+  	(?, ?, ?)
+  `, p.FirstName, p.LastName, p.Company)
+	if err != nil {
+		return fmt.Errorf("*DB.writeParticipants: db.Exec(): %v\n", err)
+	}
+
+	p.ID, err = result.LastInsertId()
+	if err != nil {
+		return fmt.Errorf("*DB.writeParticipants: result.LastInsertId(): %v\n", err)
+	}
+
+	return nil
+}
+
+func (db *DB) WriteGivenAnswer(b *types.Briefing, p *types.Participant, q *types.Question, g *types.GivenAnswer) error {
+	_, err := db.Exec(`
+  INSERT INTO given_answers
+  	(briefing_id, participant_id, question_id, given_answer)
+  VALUES
+  	(?, ?, ?, ?)
+  `, b.ID, p.ID, q.ID, g)
+	if err != nil {
+		return fmt.Errorf("*DB.writeGivenAnswers: db.Exec(): %v\n", err)
+	}
+
+	return nil
+}
+
+func (db *DB) WriteAllDataOfBriefing(b *types.Briefing, sp *[]*types.Participant, sq *[]*types.Question, sg *[]*types.GivenAnswer) error {
+	if err := db.WriteBriefing(b); err != nil {
+		return fmt.Errorf("*DB.WriteAllDataOfBriefing: db.writeBriefing(): %v\n", err)
+	}
+
+	for _, p := range *sp {
+		if err := db.WriteParticipant(p); err != nil {
+			return fmt.Errorf("*DB.WriteAllDataOfBriefing: db.writeParticipants(): %v\n", err)
+		}
+	}
+
+	for _, p := range *sp {
+		for i, q := range *sq {
+			db.WriteGivenAnswer(b, p, q, (*sg)[i])
 		}
 	}
 
 	return nil
 }
 
-func (db *DB) ReadByName(name string) (*[]types.Briefing, error) {
-	bs := make([]types.Briefing, 0)
-
-	rows, err := db.Query("SELECT *"+
-		" FROM "+db.Name+
-		" WHERE instructor_first LIKE ?"+
-		" OR instructor_last LIKE ?"+
-		" OR participant_first LIKE ?"+
-		" OR participant_last LIKE ?",
-		"%"+name+"%", "%"+name+"%", "%"+name+"%", "%"+name+"%")
+func (db *DB) GetAllOverviewTableData() ([]*types.OverviewTableData, error) {
+	rows, err := db.Query(`
+  SELECT
+    i.first_name,
+    i.last_name,
+    b.date,
+    b.time,
+    b.location,
+    b.document_name,
+    b.as_of,
+    p.first_name,
+    p.last_name,
+    p.company
+  FROM given_answers AS g
+    INNER JOIN briefings AS b
+      ON b.id = g.briefing_id
+    INNER JOIN participants AS p
+      ON p.id = g.participant_id
+    INNER JOIN questions AS q
+      ON q.id = g.question_id
+    INNER JOIN instructors AS i
+      ON i.id = b.instructor_id
+  WHERE
+    q.id = 1
+  ORDER BY
+    b.id DESC,
+    p.id
+  `)
 	if err != nil {
-		return nil, fmt.Errorf("*DB.ReadByName: db.Query(\"SELECT *"+
-			" FROM \"+db.Name+"+
-			" WHERE instructor_first LIKE ?"+
-			" OR instructor_last LIKE ?"+
-			" OR participant_first LIKE ?"+
-			" OR participant_last LIKE ?\"): %v\n", err)
+		return nil, fmt.Errorf("*DB.ReadAllBriefings: db.Query(): %v\n", err)
 	}
 	defer rows.Close()
 
+	data := make([]*types.OverviewTableData, 0)
 	for rows.Next() {
-		b := new(types.Briefing)
-		p := new(types.Participant)
+		otd := new(types.OverviewTableData)
 
-		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.ReadByName: rows.Scan(&p.ID, &b.FirstName,"+
-				" &b.LastName, &b.Date, &b.Time, &b.State, &b.Location, &p.FirstName,"+
-				" &p.LastName, &p.Company): %v\n", err)
+		err := rows.Scan(
+			&otd.InstructorFirstName,
+			&otd.InstructorLastName,
+			&otd.BriefingDate,
+			&otd.BriefingTime,
+			&otd.BriefingLocation,
+			&otd.BriefingDocumentName,
+			&otd.BriefingAsOf,
+			&otd.ParticipantFirstName,
+			&otd.ParticipantLastName,
+			&otd.ParticipantCompany,
+		)
+		if err != nil {
+			return nil, fmt.Errorf("*DB.ReadAllBriefings: rows.Scan(): %v\n", err)
 		}
-		b.Participants = append(b.Participants, *p)
-		bs = append(bs, *b)
+
+		data = append(data, otd)
 	}
 
-	return &bs, nil
+	return data, nil
+}
+
+func (db *DB) GetOverviewTableDataByName(n string) (*[]*types.OverviewTableData, error) {
+	rows, err := db.Query(`
+  SELECT
+    i.first_name,
+    i.last_name,
+    b.date,
+    b.time,
+    b.location,
+    b.document_name,
+    b.as_of,
+    p.first_name,
+    p.last_name,
+    p.company
+  FROM given_answers AS g
+    INNER JOIN briefings AS b
+      ON b.id = g.briefing_id
+    INNER JOIN participants AS p
+      ON p.id = g.participant_id
+    INNER JOIN instructors AS i
+      ON i.id = b.instructor_id
+  WHERE
+    q.id = 1 AND
+    i.first_name LIKE ? OR
+    i.last_name LIKE ? OR
+    p.first_name LIKE ? OR
+    p.last_name LIKE ?
+  ORDER BY
+    b.id DESC,
+    p.id
+  `, "%"+n+"%", "%"+n+"%", "%"+n+"%", "%"+n+"%")
+	if err != nil {
+		return nil, fmt.Errorf("*DB.GetOverviewTableDataByName: db.Query(): %v\n", err)
+	}
+	defer rows.Close()
+
+	data := make([]*types.OverviewTableData, 0)
+	for rows.Next() {
+		otd := new(types.OverviewTableData)
+
+		err := rows.Scan(
+			&otd.InstructorFirstName,
+			&otd.InstructorLastName,
+			&otd.BriefingDate,
+			&otd.BriefingTime,
+			&otd.BriefingLocation,
+			&otd.BriefingDocumentName,
+			&otd.BriefingAsOf,
+			&otd.ParticipantFirstName,
+			&otd.ParticipantLastName,
+			&otd.ParticipantCompany,
+		)
+		if err != nil {
+			return nil, fmt.Errorf("*DB.ReadAllBriefings: rows.Scan(): %v\n", err)
+		}
+
+		data = append(data, otd)
+	}
+
+	return &data, nil
+}
+
+func (db *DB) GetLastID(table string) (int, error) {
+	var id int
+
+	row := db.QueryRow(`
+  SELECT id
+  FROM ?
+  ORDER BY id DESC
+    LIMIT 0, 1
+  `, table)
+
+	if err := row.Scan(&id); err != nil {
+		return -1, fmt.Errorf("*DB.GetLastID: row.Scan(): %v\n", err)
+	}
+
+	return id, nil
+}
+
+func (db *DB) GetInstructors() (*[]*types.Instructor, error) {
+	rows, err := db.Query(`
+  SELECT *
+  FROM instructors
+  `)
+	if err != nil {
+		return nil, fmt.Errorf("*DB.GetInstructors: db.Query(): %v\n", err)
+	}
+
+	instructors := make([]*types.Instructor, 0)
+	for rows.Next() {
+		instructor := new(types.Instructor)
+		if err = rows.Scan(instructor); err != nil {
+			return nil, fmt.Errorf("*DB.GetInstructors: rows.Scan(): %v\n", err)
+		}
+		instructors = append(instructors, instructor)
+	}
+
+	return &instructors, nil
 }

packages/server/server.go

@@ -1,49 +1,202 @@
 package server
 
 import (
+	"crypto/rand"
+	"encoding/hex"
 	"fmt"
 	"html/template"
-	"log"
 	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/google/uuid"
+	"streifling.com/jason/sicherheitsunterweisung/packages/db"
 	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
-func DisplayForm(i *int64) http.HandlerFunc {
+func DisplayTable(db *db.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		template.Must(template.ParseFiles("templates/index.html")).Execute(w, i)
+		bs, err := db.GetAllOverviewTableData()
+		if err != nil {
+			http.Error(w, "DisplayTable: *DB.GetAllOverviewTableData(): "+fmt.Sprint(err), http.StatusInternalServerError)
+		}
+		template.Must(template.ParseFiles("templates/table.html")).ExecuteTemplate(w, "content", bs)
 	}
 }
 
-func AddParticipant(i *int64) http.HandlerFunc {
+func DisplaySearchResults(db *db.DB) 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)
+		bs, err := db.GetOverviewTableDataByName(r.PostFormValue("search"))
+		if err != nil {
+			http.Error(w, "DisplayResults: db.ReadByName(r.PostFormValue()): "+fmt.Sprint(err), http.StatusInternalServerError)
+		}
+		template.Must(template.ParseFiles("templates/table.html")).ExecuteTemplate(w, "rows", bs)
 	}
 }
 
-func SubmitForm(ch chan<- *types.Briefing, i, j *int64) http.HandlerFunc {
+func DisplayInstructorForm(cs chan<- *types.Session) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		b := new(types.Briefing)
+		session := new(types.Session)
+		session.ID = uuid.New()
+		cs <- session
 
-		b.FirstName = r.PostFormValue("instructor-first")
-		b.LastName = r.PostFormValue("instructor-last")
-		b.Date = r.PostFormValue("date")
-		b.Time = r.PostFormValue("time")
-		b.State = r.PostFormValue("state")
-		b.Location = r.PostFormValue("location")
+		template.Must(template.ParseFiles("templates/briefing.html")).ExecuteTemplate(w, "content", session.ID)
+	}
+}
 
-		for ; *j <= *i; *j++ {
-			b.Participants = append(b.Participants, types.Participant{
-				ID: *j,
-				Person: types.Person{
-					FirstName: r.PostFormValue("participant-first-" + fmt.Sprint(*j)),
-					LastName:  r.PostFormValue(("participant-last-" + fmt.Sprint(*j))),
-				},
-				Company: r.PostFormValue(("participant-company-" + fmt.Sprint(*j))),
-			})
+func generateUUID() (string, error) {
+	bs := make([]byte, 4)
+
+	if _, err := rand.Read(bs); err != nil {
+		return "", fmt.Errorf("GenerateUUID: rand.Read(bs): %v\n", err)
+	}
+
+	return hex.EncodeToString(bs), nil
+}
+
+func AddParticipant(s *types.Session) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		login, err := generateUUID()
+		if err != nil {
+			http.Error(w, "AddParticipant: generateUUID(): "+fmt.Sprint(err), http.StatusInternalServerError)
 		}
 
-		log.Println(b)
-		ch <- b
+		s.Logins = append(s.Logins, login)
+		template.Must(template.ParseFiles("templates/briefing.html")).ExecuteTemplate(w, "new", login)
 	}
 }
+
+// TODO: Hier weiter machen, irgendwie die b.ID herausgeben,
+// am besten hier auch die p.IDs rausgeben, damit diese später verknüpft werden können
+func SubmitBriefingForm(s *types.Session, db *db.DB) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		now := time.Now()
+		briefing := new(types.Briefing)
+
+		// TODO: Dropdownmenü
+		// instructorFirstName := r.PostFormValue("instructor-first")
+		// instructorLastName := r.PostFormValue("instructor-last")
+
+		briefing.Date = now.Format("2006-01-02")
+		briefing.Time = now.Format("15:04:05")
+		briefing.Location = r.PostFormValue("location")
+		briefing.DocumentName = r.PostFormValue("document") // TODO: in HTML einfügen
+		briefing.AsOf = r.PostFormValue("state")            // TODO: Umbenennen
+		// briefing.InstructorID = r.PostFormValue("instructor-id") // TODO: aus Dropdown holen
+
+		db.WriteBriefing(briefing)
+		s.BriefingID = briefing.ID
+	}
+}
+
+// TODO: Make it only serve one purpose
+func loginIsCorrect(l string, ss []*types.Session) bool {
+	for _, session := range ss {
+		for i, v := range session.Logins {
+			if l == v {
+				session.Logins = append(session.Logins[:i], session.Logins[i+1:]...)
+				return true
+			}
+		}
+	}
+	return false
+}
+
+func newParticipant(l string) (*types.Participant, error) {
+	var err error
+	p := new(types.Participant)
+
+	p.ID, err = strconv.ParseInt(l, 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("newParticipant: strconv.Atoi(idString): %v\n", err)
+	}
+
+	return p, nil
+}
+
+func DisplayParticipantForm(ss []*types.Session) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		type data struct {
+			SessionID uuid.UUID
+			UUID      string
+		}
+
+		if loginIsCorrect(r.PostFormValue("login"), ss) {
+			data := new(data)
+			var err error
+
+			data.UUID, err = generateUUID()
+			if err != nil {
+				http.Error(w, "DisplayParticipantForm: generateUUID(): "+fmt.Sprint(err), http.StatusInternalServerError)
+			}
+
+			template.Must(template.ParseFiles("templates/participant.html")).ExecuteTemplate(w, "content", data)
+		} else {
+			template.Must(template.ParseFiles("templates/login.html")).ExecuteTemplate(w, "content", nil)
+		}
+	}
+}
+
+// func readAnswer(r *http.Request, p *types.Participant, i int) error {
+// 	v, err := strconv.Atoi(r.PostFormValue("answer"))
+// 	if err != nil {
+// 		return fmt.Errorf("readAnswer: strconv.Atoi(): %v\n", err)
+// 	}
+//
+// 	p.Questions[i].Chosen = v
+//
+// 	return nil
+// }
+//
+// func DisplayQuestion(i int, p *types.Participant) http.HandlerFunc {
+// 	return func(w http.ResponseWriter, r *http.Request) {
+// 		if i == 0 {
+// 			p.FirstName = r.PostFormValue("participant-first-" + fmt.Sprintf("%d", p.ID))
+// 			p.LastName = r.PostFormValue("participant-last-" + fmt.Sprintf("%d", p.ID))
+// 			p.Company = r.PostFormValue("participant-company-" + fmt.Sprintf("%d", p.ID))
+// 		} else {
+// 			if err := readAnswer(r, p, i-1); err != nil {
+// 				http.Error(w, "DisplayQuestion: readAnswer(r, p, i): "+fmt.Sprint(err), http.StatusInternalServerError)
+// 			}
+// 		}
+//
+// 		data := new(questionData)
+// 		data.ID = p.ID
+// 		data.Q = p.Questions[i]
+// 		data.I = i
+// 		data.J = i + 1
+//
+// 		template.Must(template.ParseFiles("templates/question.html")).ExecuteTemplate(w, "content", data)
+// 	}
+// }
+//
+// func DisplayTestResults(b *types.Briefing, p *types.Participant) http.HandlerFunc {
+// 	return func(w http.ResponseWriter, r *http.Request) {
+// 		numQuestions := len(p.Questions)
+// 		wrongAnswers := make([]int, 0)
+// 		fmt.Println(wrongAnswers)
+//
+// 		if err := readAnswer(r, p, numQuestions-1); err != nil {
+// 			http.Error(w, "DisplayTestResults: readAnswer(r, p, i): "+fmt.Sprint(err), http.StatusInternalServerError)
+// 		}
+//
+// 		for i, q := range p.Questions {
+// 			if q.Chosen != q.Correct {
+// 				wrongAnswers = append(wrongAnswers, i)
+// 			}
+// 		}
+//
+// 		if wrongAnswers == nil {
+// 			b.Participants = append(b.Participants, p)
+// 		} else {
+// 			data := new(questionData)
+// 			data.ID = p.ID
+// 			data.Q = p.Questions[0]
+// 			data.I = 0
+// 			data.J = data.I + 1
+// 			template.Must(template.ParseFiles("templates/question.html")).ExecuteTemplate(w, "content", data)
+// 		}
+//
+// 		template.Must(template.ParseFiles("templates/results.html")).ExecuteTemplate(w, "content", nil)
+// 	}
+// }

packages/types/types.go

@@ -1,6 +1,9 @@
 package types
 
+import "github.com/google/uuid"
+
 type Person struct {
+	ID        int64
 	FirstName string
 	LastName  string
 }
@@ -8,16 +11,57 @@ type Person struct {
 type Instructor Person
 
 type Participant struct {
-	ID int64
 	Person
 	Company string
 }
 
 type Briefing struct {
-	Instructor
+	ID           int64
 	Date         string
 	Time         string
-	State        string
 	Location     string
-	Participants []Participant
+	DocumentName string
+	AsOf         string
+	InstructorID int64
+}
+
+type Answer struct {
+	ID   int64
+	Text string
+}
+
+type Question struct {
+	ID      int64
+	Text    string
+	Answers []Answer
+	Correct int
+}
+
+type GivenAnswer struct {
+	BriefingID    int64
+	ParticipantID int64
+	QuestionID    int64
+	GivenAnswer   int
+}
+
+type OverviewTableData struct {
+	InstructorFirstName  string
+	InstructorLastName   string
+	BriefingDate         string
+	BriefingTime         string
+	BriefingLocation     string
+	BriefingDocumentName string
+	BriefingAsOf         string
+	ParticipantFirstName string
+	ParticipantLastName  string
+	ParticipantCompany   string
+}
+
+type Session struct {
+	ID             uuid.UUID
+	InstructorID   int64
+	BriefingID     int64
+	Logins         []string
+	ParticipantIDs []int64
+	QuestionIDs    []int64
 }

templates/briefing.html

@@ -0,0 +1,38 @@
+{{ define "add-button" }}
+<button type="button" hx-post="/add-participant/" hx-target="this" hx-swap="outerHTML">
+  Neuer Teilnehmer
+</button>
+{{ end }}
+
+{{ define "new" }}
+<span>{{ . }}</span>
+{{ template "add-button" . }}
+{{ 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="location">
+    <label for="location-input">Ort</label>
+    <input type="text" name="location" id="location-input" />
+  </div>
+
+  <div id="state">
+    <label for="state-input">Stand vom</label>
+    <input type="date" name="state" id="state-input" />
+  </div>
+
+  {{ template "add-button" . }}
+
+  <button type="submit" hx-post="/submit-form/" hx-target="#content" hx-swap="innerHTML">
+    OK
+  </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/login.html

@@ -0,0 +1,16 @@
+{{ define "content" }}
+<h2>Login</h2>
+
+<form>
+  <label for="login-input">Code</label>
+  <input type="text" name="login" id="login-input" />
+
+  <button type="submit" hx-post="/external-login/" hx-target="#content">
+    Anmelden
+  </button>
+
+  <button type="submit" hx-post="/internal-login/" hx-target="#content">
+    Intern
+  </button>
+</form>
+{{ end }}

templates/participant.html

@@ -1,5 +1,5 @@
-{{ define "participant" }}
-<div id="participant-{{ . }}">
+{{ define "content" }}
+<form id="participant-{{ . }}">
   <label for="participant-first-input-{{ . }}">Vorname</label>
   <input type="text" name="participant-first-{{ . }}" id="participant-first-input-{{ . }}" />
 
@@ -8,5 +8,9 @@
 
   <label for="participant-company-input-{{ . }}">Firma</label>
   <input type="text" name="participant-company-{{ . }}" id="participant-company-input-{{ . }}" />
-</div>
+
+  <button type="button" hx-post="/display-question-{{ . }}-0/" hx-target="#content">
+    Fertig
+  </button>
+</form>
 {{ end }}

templates/question.html

@@ -0,0 +1,21 @@
+{{ define "answers" }}
+{{ range .Q.Answers }}
+<div>
+  <input type="radio" name="answer" id="answer-{{ .ID }}" value="{{ .ID }}" />
+  <label for="answer-{{ .ID }}">{{ .Text }}</label>
+</div>
+{{ end }}
+{{ end }}
+
+{{ define "content" }}
+<h2>Frage {{ .I }}</h2>
+<p>{{ .Q.Text }}</p>
+
+<form>
+  {{ template "answers" . }}
+
+  <button type="submit" hx-post="/display-question-{{ .ID }}-{{ .J }}/" hx-target="#content" hx-swap="innerHTML">
+    Weiter
+  </button>
+</form>
+{{ end }}

templates/results.html

@@ -0,0 +1,11 @@
+{{ define "passed" }}
+{{ end }}
+
+{{ define "failed" }}
+{{ end }}
+
+{{ define "content" }}
+{{ q := range .Participant.Questions }}
+<p>{{ . }}{{ q.Text }}</p>
+{{ end }}
+{{ end }}

templates/table.html

@@ -0,0 +1,49 @@
+{{ define "rows" }}
+{{ range . }}
+<tr>
+  <td>{{ .InstructorFirstName }}</td>
+  <td>{{ .InstructorLastName }}</td>
+  <td>{{ .BriefingDate }}</td>
+  <td>{{ .BriefingTime }}</td>
+  <td>{{ .BriefingLocation }}</td>
+  <td>{{ .BriefingDocumentName }}</td>
+  <td>{{ .BriefingAsOf }}</td>
+  <td>{{ .ParticipantFirstName }}</td>
+  <td>{{ .ParticipantLastName }}</td>
+  <td>{{ .ParticipantCompany }}</td>
+</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>Ort</th>
+      <th>Dokument</th>
+      <th>Stand</th>
+      <th colspan="2">Teilnehmer</th>
+      <th>Firma</th>
+    </tr>
+  </thead>
+
+  <tbody id="results">
+    {{ template "rows" . }}
+  </tbody>
+</table>
+{{ end }}