CHANGE: added team view, with submitted bookings for team members and send form for own bookings
This commit is contained in:
@@ -1,9 +1,15 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"arbeitszeitmessung/helper"
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"github.com/alexedwards/scs/v2"
|
||||
)
|
||||
|
||||
type User struct {
|
||||
@@ -138,7 +144,26 @@ func (u *User) ChangePass(password, newPassword string) (bool, error) {
|
||||
|
||||
func (u *User) GetTeamMembers() ([]User, error) {
|
||||
var teamMembers []User
|
||||
teamMembers = append(teamMembers, *u)
|
||||
qStr, err := DB.Prepare(`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM personal_daten WHERE vorgesetzter_pers_nr = $1`)
|
||||
if err != nil {
|
||||
return teamMembers, err
|
||||
}
|
||||
defer qStr.Close()
|
||||
rows, err := qStr.Query(u.PersonalNummer)
|
||||
if err != nil {
|
||||
log.Println("Error getting rows!")
|
||||
return teamMembers, err
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
user, err := parseUser(rows)
|
||||
if err != nil {
|
||||
log.Println("Error parsing user!")
|
||||
return teamMembers, err
|
||||
}
|
||||
teamMembers = append(teamMembers, user)
|
||||
}
|
||||
|
||||
return teamMembers, nil
|
||||
}
|
||||
|
||||
@@ -159,3 +184,27 @@ func (u *User) GetNextWeek() WorkWeek {
|
||||
return week
|
||||
|
||||
}
|
||||
|
||||
func parseUser(rows *sql.Rows) (User, error) {
|
||||
var user User
|
||||
if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.Arbeitszeit); err != nil {
|
||||
log.Println("Error scanning row!", err)
|
||||
return user, err
|
||||
}
|
||||
return user, nil
|
||||
}
|
||||
|
||||
func (u *User) GetLastSubmission() time.Time {
|
||||
var lastSub time.Time
|
||||
qStr, err := DB.Prepare("SELECT woche_start FROM buchung_wochen WHERE personal_nummer = $1 ORDER BY woche_start DESC LIMIT 1")
|
||||
if err != nil {
|
||||
log.Println("Error preparing statement!", err)
|
||||
return lastSub
|
||||
}
|
||||
err = qStr.QueryRow(u.PersonalNummer).Scan(&lastSub)
|
||||
if err != nil {
|
||||
log.Println("Error executing query!", err)
|
||||
return lastSub
|
||||
}
|
||||
return lastSub
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user