Größtenteils unwichtiger Kram

.gitignore

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

create_tables.sql

@@ -1,9 +1,12 @@
 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,
@@ -68,7 +71,7 @@ VALUES
   ( 'Georg', 'aus dem Jungel', '123458' );
 
 INSERT INTO briefings (
-  date, time, location, as_of, instructor_id
+  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' );
@@ -84,7 +87,8 @@ INSERT INTO questions (
 ) 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 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
@@ -92,6 +96,8 @@ INSERT INTO given_answers (
   ( '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', '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,33 +1,44 @@
 package main
 
 import (
+	"fmt"
 	"html/template"
 	"log"
 	"net/http"
 
-	"streifling.com/jason/sicherheitsunterweisung/packages/data"
+	"streifling.com/jason/sicherheitsunterweisung/packages/db"
 	"streifling.com/jason/sicherheitsunterweisung/packages/server"
+	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
-func main() {
+func handleSessions(mux *http.ServeMux, db *db.DB, ss []*types.Session, cs <-chan *types.Session) {
-	logins := make([]string, 0)
+	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))
+	}
+}
 
-	db, err := data.OpenDB("sicherheitsunterweisung")
+func main() {
+	db, err := db.Open("sicherheitsunterweisung")
 	if err != nil {
 		log.Fatalln(err)
 	}
 
+	sessions := make([]*types.Session, 0)
+	sessionChan := make(chan *types.Session)
+
 	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("/search/", server.DisplaySearchResults(db))
-	mux.HandleFunc("/new-briefing/", server.DisplayInstructorForm())
-	mux.HandleFunc("/add-participant/", server.AddParticipant(&logins))
-	mux.HandleFunc("/submit-form/", server.SubmitBriefingForm(db, &logins))
 	mux.HandleFunc("/internal-login/", server.DisplayTable(db))
-	mux.HandleFunc("/external-login/", server.DisplayParticipantForm(&logins))
+	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/data/questionaires.go

@@ -1,42 +0,0 @@
-package data
-
-import "streifling.com/jason/sicherheitsunterweisung/packages/types"
-
-func InitQuestions() []types.Question {
-	Q := make([]types.Question, 0)
-
-	Q = append(Q, types.Question{
-		Text: "Wie viel ist 1+1?",
-		Answers: []types.Answer{
-			{ID: 0, Text: "1"},
-			{ID: 1, Text: "2"},
-			{ID: 2, Text: "3"},
-			{ID: 3, Text: "4"},
-		},
-		Correct: 1,
-	})
-
-	Q = append(Q, types.Question{
-		Text: "Wie viel ist 2+2?",
-		Answers: []types.Answer{
-			{ID: 0, Text: "1"},
-			{ID: 1, Text: "2"},
-			{ID: 2, Text: "3"},
-			{ID: 3, Text: "4"},
-		},
-		Correct: 3,
-	})
-
-	Q = append(Q, types.Question{
-		Text: "Wie viel ist 1+2?",
-		Answers: []types.Answer{
-			{ID: 0, Text: "1"},
-			{ID: 1, Text: "2"},
-			{ID: 2, Text: "3"},
-			{ID: 3, Text: "4"},
-		},
-		Correct: 2,
-	})
-
-	return Q
-}

packages/db/db.go

@@ -1,4 +1,4 @@
-package data
+package db
 
 import (
 	"bufio"
@@ -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 {
@@ -60,7 +59,7 @@ func getCredentials() (string, string, error) {
 	return user, pass, nil
 }
 
-func OpenDB(dbName string) (*DB, error) {
+func Open(dbName string) (*DB, error) {
 	var err error
 	db := new(DB)
 
@@ -155,7 +154,7 @@ func (db *DB) WriteAllDataOfBriefing(b *types.Briefing, sp *[]*types.Participant
 	return nil
 }
 
-func (db *DB) GetAllOverviewTableData() (*[]*types.OverviewTableData, error) {
+func (db *DB) GetAllOverviewTableData() ([]*types.OverviewTableData, error) {
 	rows, err := db.Query(`
   SELECT
     i.first_name,
@@ -173,8 +172,12 @@ func (db *DB) GetAllOverviewTableData() (*[]*types.OverviewTableData, error) {
       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
@@ -207,7 +210,7 @@ func (db *DB) GetAllOverviewTableData() (*[]*types.OverviewTableData, error) {
 		data = append(data, otd)
 	}
 
-	return &data, nil
+	return data, nil
 }
 
 func (db *DB) GetOverviewTableDataByName(n string) (*[]*types.OverviewTableData, error) {
@@ -231,6 +234,7 @@ func (db *DB) GetOverviewTableDataByName(n string) (*[]*types.OverviewTableData,
     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

packages/server/server.go

@@ -9,18 +9,12 @@ import (
 	"strconv"
 	"time"
 
-	"streifling.com/jason/sicherheitsunterweisung/packages/data"
+	"github.com/google/uuid"
+	"streifling.com/jason/sicherheitsunterweisung/packages/db"
 	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
-// type questionData struct {
+func DisplayTable(db *db.DB) http.HandlerFunc {
-// 	ID int64
-// 	Q  types.Question
-// 	I  int
-// 	J  int
-// }
-
-func DisplayTable(db *data.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		bs, err := db.GetAllOverviewTableData()
 		if err != nil {
@@ -30,7 +24,7 @@ func DisplayTable(db *data.DB) http.HandlerFunc {
 	}
 }
 
-func DisplaySearchResults(db *data.DB) http.HandlerFunc {
+func DisplaySearchResults(db *db.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		bs, err := db.GetOverviewTableDataByName(r.PostFormValue("search"))
 		if err != nil {
@@ -40,9 +34,13 @@ func DisplaySearchResults(db *data.DB) http.HandlerFunc {
 	}
 }
 
-func DisplayInstructorForm() http.HandlerFunc {
+func DisplayInstructorForm(cs chan<- *types.Session) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		template.Must(template.ParseFiles("templates/briefing.html")).ExecuteTemplate(w, "content", nil)
+		session := new(types.Session)
+		session.ID = uuid.New()
+		cs <- session
+
+		template.Must(template.ParseFiles("templates/briefing.html")).ExecuteTemplate(w, "content", session.ID)
 	}
 }
 
@@ -56,21 +54,21 @@ func generateUUID() (string, error) {
 	return hex.EncodeToString(bs), nil
 }
 
-func AddParticipant(sl *[]string) http.HandlerFunc {
+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)
 		}
 
-		(*sl) = append(*sl, login)
+		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(db *data.DB, sl *[]string) http.HandlerFunc {
+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)
@@ -87,17 +85,20 @@ func SubmitBriefingForm(db *data.DB, sl *[]string) http.HandlerFunc {
 		// 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, logins *[]string) bool {
+func loginIsCorrect(l string, ss []*types.Session) bool {
-	for i, v := range *logins {
+	for _, session := range ss {
+		for i, v := range session.Logins {
 			if l == v {
-			(*logins) = append((*logins)[:i], (*logins)[i+1:]...)
+				session.Logins = append(session.Logins[:i], session.Logins[i+1:]...)
 				return true
 			}
 		}
+	}
 	return false
 }
 
@@ -113,15 +114,23 @@ func newParticipant(l string) (*types.Participant, error) {
 	return p, nil
 }
 
-func DisplayParticipantForm(sl *[]string) http.HandlerFunc {
+func DisplayParticipantForm(ss []*types.Session) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if loginIsCorrect(r.PostFormValue("login"), sl) {
+		type data struct {
-			uuid, err := generateUUID()
+			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", uuid)
+			template.Must(template.ParseFiles("templates/participant.html")).ExecuteTemplate(w, "content", data)
 		} else {
 			template.Must(template.ParseFiles("templates/login.html")).ExecuteTemplate(w, "content", nil)
 		}

packages/types/types.go

@@ -1,5 +1,7 @@
 package types
 
+import "github.com/google/uuid"
+
 type Person struct {
 	ID        int64
 	FirstName string
@@ -54,3 +56,12 @@ type OverviewTableData struct {
 	ParticipantLastName  string
 	ParticipantCompany   string
 }
+
+type Session struct {
+	ID             uuid.UUID
+	InstructorID   int64
+	BriefingID     int64
+	Logins         []string
+	ParticipantIDs []int64
+	QuestionIDs    []int64
+}

templates/table.html

@@ -1,17 +1,16 @@
 {{ define "rows" }}
 {{ range . }}
 <tr>
-  <td>{{ .FirstName }}</td>
+  <td>{{ .InstructorFirstName }}</td>
-  <td>{{ .LastName }}</td>
+  <td>{{ .InstructorLastName }}</td>
-  <td>{{ .Date }}</td>
+  <td>{{ .BriefingDate }}</td>
-  <td>{{ .Time }}</td>
+  <td>{{ .BriefingTime }}</td>
-  <td>{{ .State }}</td>
+  <td>{{ .BriefingLocation }}</td>
-  <td>{{ .Location }}</td>
+  <td>{{ .BriefingDocumentName }}</td>
-  {{ range .Participants }}
+  <td>{{ .BriefingAsOf }}</td>
-  <td>{{ .FirstName }}</td>
+  <td>{{ .ParticipantFirstName }}</td>
-  <td>{{ .LastName }}</td>
+  <td>{{ .ParticipantLastName }}</td>
-  <td>{{ .Company }}</td>
+  <td>{{ .ParticipantCompany }}</td>
-  {{ end }}
 </tr>
 {{ end }}
 {{ end }}
@@ -35,8 +34,9 @@
       <th colspan="2">Unterweiser</th>
       <th>Datum</th>
       <th>Uhrzeit</th>
-      <th>Stand</th>
       <th>Ort</th>
+      <th>Dokument</th>
+      <th>Stand</th>
       <th colspan="2">Teilnehmer</th>
       <th>Firma</th>
     </tr>

tmp/build-errors.log

@@ -1 +0,0 @@
-exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1