diff --git a/.gitignore b/.gitignore
index c052e8f..9c00e0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@ vendor/
# Go workspace file
go.work
+
+#IDE files
+*.geany
diff --git a/controllers/addOfficeHourHandler.go b/controllers/addOfficeHourHandler.go
index 816a874..20c3b8d 100644
--- a/controllers/addOfficeHourHandler.go
+++ b/controllers/addOfficeHourHandler.go
@@ -25,16 +25,17 @@ type maskData struct {
Hour int
Minute int
}
- SelectedCourse int
- SelectedRoom int
- Date models.Date
- Duration int
- Roomname string
- Name string
- Email string
- Info string
- Errors []string
- Config config.Config
+ SelectedCourse int
+ SelectedRoom int
+ Date models.Date
+ Duration int
+ Roomname string
+ Name string
+ Email string
+ SubscribeToMailinglist bool
+ Info string
+ Errors []string
+ Config config.Config
}
// Offer a form to add office hours and validate its input on receiving.
@@ -129,6 +130,9 @@ func (b *BaseHandler) AddOfficeHourHandler(w http.ResponseWriter, req *http.Requ
} else if !(b.config.Tutor.MailSuffix == "" || strings.HasSuffix(email.Address, "@"+b.config.Tutor.MailSuffix) || strings.HasSuffix(email.Address, "."+b.config.Tutor.MailSuffix)) {
errors = append(errors, fmt.Sprintf("Mailaddresse muss auf „%s“ enden.", b.config.Tutor.MailSuffix))
}
+
+ subscribeToMailinglist := req.FormValue("subscribeToMailinglist") == "subscribe"
+
info := req.FormValue("info")
allowed, err := b.officeHourRepo.AllowedAt(date, duration, room, true)
@@ -155,6 +159,7 @@ func (b *BaseHandler) AddOfficeHourHandler(w http.ResponseWriter, req *http.Requ
roomname,
name,
email.Address,
+ subscribeToMailinglist,
info,
errors,
b.config,
@@ -164,7 +169,7 @@ func (b *BaseHandler) AddOfficeHourHandler(w http.ResponseWriter, req *http.Requ
// if the data for a new office hour was sent correctly, save it.
officeHour := models.OfficeHour{Id: 0,
- Tutor: models.Tutor{Id: 0, Name: name, Email: email.Address},
+ Tutor: models.Tutor{Id: 0, Name: name, Email: email.Address, SubscribeToMailinglist: subscribeToMailinglist},
Date: date,
Room: room,
RoomName: roomname,
diff --git a/controllers/timetable.go b/controllers/timetable.go
index 1f9b413..5393709 100644
--- a/controllers/timetable.go
+++ b/controllers/timetable.go
@@ -37,7 +37,7 @@ func (b *BaseHandler) GetTimetable(officeHours []models.OfficeHour) (map[models.
}
}
slots := []int{1, 1, 1, 1, 1}
- for date, _ := range timetable {
+ for date := range timetable {
if slots[date.Day] < len(timetable[date]) {
slots[date.Day] = len(timetable[date])
}
diff --git a/models/request.go b/models/request.go
index 49d0386..fc71d76 100644
--- a/models/request.go
+++ b/models/request.go
@@ -12,7 +12,7 @@ type Request struct {
const (
RequestActivate RequestAction = iota // Fix integer to represent request for activation of an office hour.
- RequestDelete // Fix integer to represent request for deletion of an office hour.
+ RequestDelete // Fix integer to represent request for deletion of an office hour.
)
type RequestRepository interface {
diff --git a/models/tutor.go b/models/tutor.go
index 7cf8295..feb039a 100644
--- a/models/tutor.go
+++ b/models/tutor.go
@@ -5,6 +5,10 @@ type Tutor struct {
Id int
Name string
Email string
+
+ // Does the tutor want to subscribe to the mailinglist for student assistents?
+ // This information has to be extracted from the database by hand.
+ SubscribeToMailinglist bool
}
type TutorRepository interface {
diff --git a/officeHoursMysql.sql b/officeHoursMysql.sql
index fd8ef8c..9583ab1 100644
--- a/officeHoursMysql.sql
+++ b/officeHoursMysql.sql
@@ -21,7 +21,8 @@ CREATE TABLE `room` (
CREATE TABLE `tutor` (
`id` INTEGER PRIMARY KEY AUTO_INCREMENT,
`name` tinytext DEFAULT NULL,
- `email` tinytext DEFAULT NULL
+ `email` tinytext DEFAULT NULL,
+ `subscribeToMailinglist` BOOL DEFAULT false
);
--
diff --git a/officeHoursSQLite.sql b/officeHoursSQLite.sql
index 70f7109..39b54e6 100644
--- a/officeHoursSQLite.sql
+++ b/officeHoursSQLite.sql
@@ -53,7 +53,8 @@ DROP TABLE IF EXISTS `tutor`;
CREATE TABLE `tutor` (
`id` INTEGER PRIMARY KEY,
`name` tinytext DEFAULT NULL,
- `email` tinytext DEFAULT NULL
+ `email` tinytext DEFAULT NULL,
+ `subscribeToMailinglist` BOOL DEFAULT false
);
--
diff --git a/repositories/tutor.go b/repositories/tutor.go
index 77fc32c..6523861 100644
--- a/repositories/tutor.go
+++ b/repositories/tutor.go
@@ -50,7 +50,7 @@ func (r *TutorRepo) Add(tutor models.Tutor) (int, error) {
//Don't add identical tutors
existentTutor, err := r.FindByNameAndEmail(tutor.Name, tutor.Email)
if errors.Is(err, sql.ErrNoRows) {
- sqlResult, err := r.db.Exec("INSERT INTO `tutor` (name, email) VALUES (?,?)", tutor.Name, tutor.Email)
+ sqlResult, err := r.db.Exec("INSERT INTO `tutor` (name, email, subscribeToMailinglist) VALUES (?,?,?)", tutor.Name, tutor.Email, tutor.SubscribeToMailinglist)
if err != nil {
err = fmt.Errorf("SQL-error inserting new tutor: %w", err)
log.Println(err.Error())
@@ -67,7 +67,7 @@ func (r *TutorRepo) Add(tutor models.Tutor) (int, error) {
func (r *TutorRepo) getFromRow(row *sql.Row) (models.Tutor, error) {
var tutor models.Tutor
- if err := row.Scan(&tutor.Id, &tutor.Name, &tutor.Email); err != nil {
+ if err := row.Scan(&tutor.Id, &tutor.Name, &tutor.Email, &tutor.SubscribeToMailinglist); err != nil {
err = fmt.Errorf("SQL-error scanning tutor row: %w", err)
log.Println(err.Error())
return models.Tutor{}, err
@@ -79,7 +79,7 @@ func (r *TutorRepo) getFromRows(rows *sql.Rows) ([]models.Tutor, error) {
var tutors []models.Tutor
for rows.Next() {
var tutor models.Tutor
- if err := rows.Scan(&tutor.Id, &tutor.Name, &tutor.Email); err != nil {
+ if err := rows.Scan(&tutor.Id, &tutor.Name, &tutor.Email, &tutor.SubscribeToMailinglist); err != nil {
err = fmt.Errorf("Error scanning tutor row: %w", err)
log.Println(err.Error())
return tutors, err
diff --git a/templating/templates/addMask.html b/templating/templates/addMask.html
index e5a5e0d..295b005 100644
--- a/templating/templates/addMask.html
+++ b/templating/templates/addMask.html
@@ -31,6 +31,10 @@
{{end}}
Die Email-Adresse dient der Vermeidung von Spam und wird nicht veröffentlicht.
+
diff --git a/templating/templates/confirmationMail b/templating/templates/confirmationMail
index 80e1871..f996ee7 100644
--- a/templating/templates/confirmationMail
+++ b/templating/templates/confirmationMail
@@ -1,7 +1,7 @@
From: {{.Config.Mailer.FromName}}
To: {{.Request.OfficeHour.Tutor.Email}}
Subject: Sprechstunde {{if eq .Request.Action 0}}anlegen{{end}}{{if eq .Request.Action 1}}löschen{{end}}
-Message-Id: {{.MessageId}}
+Message-ID: {{.MessageId}}
Hallo {{.Request.OfficeHour.Tutor.Name}},
@@ -17,4 +17,4 @@ Falls dies richtig ist, so bestätige die Sprechstunde durch Abrufen der folgend
{{.Config.Server.Protocol}}://{{.Config.Server.Domain}}/confirmRequest?code={{.Request.Secret}}
Solltest du diese Email nicht erwartet haben, so kannst du sie einfach ignorieren.
-Deine Fachschaft Mathematik
\ No newline at end of file
+Deine Fachschaft Mathematik