Fachschaft/sprechstunden-go
7
1
Fork 0
Code Issues 8 Pull requests Releases Activity

Compare commits

base: Fachschaft:d72914da0dfa6eab0a880cec7f05a28517ecc0b4
Branches Tags
Fachschaft:main
Fachschaft:configSupportMail
..
compare: Fachschaft:50b9f0c756c16e96ce3c2b68319ce79e8804b84a
Branches Tags
Fachschaft:main
Fachschaft:configSupportMail

No commits in common. "d72914da0dfa6eab0a880cec7f05a28517ecc0b4" and "50b9f0c756c16e96ce3c2b68319ce79e8804b84a" have entirely different histories.
d72914da0d ... 50b9f0c756

12 changed files with 23 additions and 44 deletions
Show stats Expand all files Collapse all files

3
.gitignore vendored
View file

@ -20,6 +20,3 @@ vendor/
# Go workspace file
go.work
#IDE files
*.geany

27
controllers/addOfficeHourHandler.go
View file

@ -25,17 +25,16 @@ type maskData struct {
Hour int
Minute int
}
SelectedCourse int
SelectedRoom int
Date models.Date
Duration int
Roomname string
Name string
Email string
SubscribeToMailinglist bool
Info string
Errors []string
Config config.Config
SelectedCourse int
SelectedRoom int
Date models.Date
Duration int
Roomname string
Name string
Email string
Info string
Errors []string
Config config.Config
}
// Offer a form to add office hours and validate its input on receiving.
@ -130,9 +129,6 @@ 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)
@ -159,7 +155,6 @@ func (b *BaseHandler) AddOfficeHourHandler(w http.ResponseWriter, req *http.Requ
roomname,
name,
email.Address,
subscribeToMailinglist,
info,
errors,
b.config,
@ -169,7 +164,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, SubscribeToMailinglist: subscribeToMailinglist},
Tutor: models.Tutor{Id: 0, Name: name, Email: email.Address},
Date: date,
Room: room,
RoomName: roomname,

2
controllers/timetable.go
View file

@ -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])
}

2
go.mod
View file

@ -2,6 +2,6 @@ module officeHours
go 1.18
require github.com/mattn/go-sqlite3 v1.14.19
require github.com/mattn/go-sqlite3 v1.14.18
require github.com/go-sql-driver/mysql v1.7.1

4
go.sum
View file

@ -1,4 +1,4 @@
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/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=

2
models/request.go
View file

@ -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 {

4
models/tutor.go
View file

@ -5,10 +5,6 @@ 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 {

3
officeHoursMysql.sql
View file

@ -21,8 +21,7 @@ CREATE TABLE `room` (
CREATE TABLE `tutor` (
`id` INTEGER PRIMARY KEY AUTO_INCREMENT,
`name` tinytext DEFAULT NULL,
`email` tinytext DEFAULT NULL,
`subscribeToMailinglist` BOOL DEFAULT false
`email` tinytext DEFAULT NULL
);
--

3
officeHoursSQLite.sql
View file

@ -53,8 +53,7 @@ DROP TABLE IF EXISTS `tutor`;
CREATE TABLE `tutor` (
`id` INTEGER PRIMARY KEY,
`name` tinytext DEFAULT NULL,
`email` tinytext DEFAULT NULL,
`subscribeToMailinglist` BOOL DEFAULT false
`email` tinytext DEFAULT NULL
);
--

6
repositories/tutor.go
View file

@ -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, subscribeToMailinglist) VALUES (?,?,?)", tutor.Name, tutor.Email, tutor.SubscribeToMailinglist)
sqlResult, err := r.db.Exec("INSERT INTO `tutor` (name, email) VALUES (?,?)", tutor.Name, tutor.Email)
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, &tutor.SubscribeToMailinglist); err != nil {
if err := row.Scan(&tutor.Id, &tutor.Name, &tutor.Email); 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, &tutor.SubscribeToMailinglist); err != nil {
if err := rows.Scan(&tutor.Id, &tutor.Name, &tutor.Email); err != nil {
err = fmt.Errorf("Error scanning tutor row: %w", err)
log.Println(err.Error())
return tutors, err

7
templating/templates/addMask.html
View file

@ -31,13 +31,6 @@
{{end}}
Die Email-Adresse dient der Vermeidung von Spam und wird nicht veröffentlicht.
</div>
</div>
<div class="form-floating mb-3">
<div class="form-check">
<input class="form-check-input" name="subscribeToMailinglist" id="subscribeToMailinglist" type="checkbox" value="subscribe" {{if eq .SubscribeToMailinglist true}}checked{{end}}>
<label class="form-check-label" for="subscribeToMailinglist"><a href="https://lists.mathebau.de/postorius/lists/shk.mathebau.de/">Mailingliste für SHK</a> abbonieren</label>
</div>
</div>
<div class="form-floating mb-3">

4
templating/templates/confirmationMail
View file

@ -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
Deine Fachschaft Mathematik