small refactor of sonarqube issue
Some checks failed
Tests / Run Go Tests (push) Failing after 1m37s
Some checks failed
Tests / Run Go Tests (push) Failing after 1m37s
This commit is contained in:
@@ -39,35 +39,39 @@ type WorkDay struct {
|
||||
|
||||
func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay {
|
||||
var allDays map[string]IWorkDay = make(map[string]IWorkDay)
|
||||
var sortedDays []IWorkDay
|
||||
|
||||
for _, day := range GetWorkDays(user, tsFrom, tsTo) {
|
||||
allDays[day.Date().Format("2006-01-02")] = &day
|
||||
}
|
||||
absences, err := GetAbsencesByCardUID(user.CardUID, tsFrom, tsTo)
|
||||
if err != nil {
|
||||
log.Println("Error gettings absences for all Days!", err)
|
||||
return sortedDays
|
||||
return nil
|
||||
}
|
||||
for _, day := range absences {
|
||||
if helper.IsWeekend(day.Date()) {
|
||||
continue
|
||||
}
|
||||
if day.AbwesenheitTyp.WorkTime == 1 {
|
||||
if workDay, ok := allDays[day.Date().Format("2006-01-02")].(*WorkDay); ok {
|
||||
if len(workDay.Bookings) > 0 {
|
||||
workDay.kurzArbeit = true
|
||||
workDay.kurzArbeitAbsence = day
|
||||
}
|
||||
if workDay, ok := allDays[day.Date().Format("2006-01-02")].(*WorkDay); ok && len(workDay.Bookings) > 0 {
|
||||
workDay.kurzArbeit = true
|
||||
workDay.kurzArbeitAbsence = day
|
||||
}
|
||||
} else {
|
||||
allDays[day.Date().Format("2006-01-02")] = &day
|
||||
}
|
||||
}
|
||||
|
||||
for _, day := range allDays {
|
||||
sortedDays := sortDays(allDays, orderedForward)
|
||||
return sortedDays
|
||||
}
|
||||
|
||||
func sortDays(days map[string]IWorkDay, forward bool) []IWorkDay {
|
||||
var sortedDays []IWorkDay
|
||||
for _, day := range days {
|
||||
sortedDays = append(sortedDays, day)
|
||||
}
|
||||
if orderedForward {
|
||||
if forward {
|
||||
sort.Slice(sortedDays, func(i, j int) bool {
|
||||
return sortedDays[i].Date().After(sortedDays[j].Date())
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user