CHANGE: added report section
This commit is contained in:
@@ -194,17 +194,38 @@ func parseUser(rows *sql.Rows) (User, error) {
|
||||
return user, nil
|
||||
}
|
||||
|
||||
// returns the start of the week, the last submission was made, submission == first booking or last send booking_report to team leader
|
||||
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")
|
||||
qStr, err := DB.Prepare(`
|
||||
SELECT COALESCE(
|
||||
(SELECT woche_start + INTERVAL '1 week' FROM wochen_report WHERE personal_nummer = $1 ORDER BY woche_start DESC LIMIT 1),
|
||||
(SELECT timestamp FROM anwesenheit WHERE card_uid = $2 ORDER BY timestamp LIMIT 1)
|
||||
) AS letzte_buchung;
|
||||
`)
|
||||
if err != nil {
|
||||
log.Println("Error preparing statement!", err)
|
||||
return lastSub
|
||||
}
|
||||
err = qStr.QueryRow(u.PersonalNummer).Scan(&lastSub)
|
||||
err = qStr.QueryRow(u.PersonalNummer, u.CardUID).Scan(&lastSub)
|
||||
if err != nil {
|
||||
log.Println("Error executing query!", err)
|
||||
return lastSub
|
||||
}
|
||||
log.Println("From DB: ", lastSub)
|
||||
lastSub = getMonday(lastSub)
|
||||
lastSub = lastSub.Round(24 * time.Hour)
|
||||
log.Println("After truncate: ", lastSub)
|
||||
return lastSub
|
||||
}
|
||||
|
||||
func getMonday(ts time.Time) time.Time {
|
||||
if ts.Weekday() != time.Monday {
|
||||
if ts.Weekday() == time.Sunday {
|
||||
ts = ts.AddDate(0, 0, -6)
|
||||
} else {
|
||||
ts = ts.AddDate(0, 0, -int(ts.Weekday()-1))
|
||||
}
|
||||
}
|
||||
return ts
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user