lucifer/new-server
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'asmodeus' of git.aiterp.net:lucifer/new-server into asmodeus
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Stian Fredrik Aune
2021-10-03 19:10:06 +02:00
parent 251687b85d ade49589a9
commit d91bd472dd
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/timeofday.go
+1 -1
View File
@@ -82,7 +82,7 @@ func (t TimeOfDay) IsBetween(from TimeOfDay, to TimeOfDay) bool {
} }
func CurrentTimeOfDay() TimeOfDay { func CurrentTimeOfDay() TimeOfDay {
return TimeOfDayFromDate(time.Now()) return TimeOfDayFromDate(time.Now().Local())
} }
func TimeOfDayFromDate(date time.Time) TimeOfDay { func TimeOfDayFromDate(date time.Time) TimeOfDay {
models/timeofday_test.go
+2
View File
@@ -27,6 +27,8 @@ func TestTimeOfDay_IsBetween(t *testing.T) {
{ tod("04:13:57"), tod("21:30"), tod("07"), true }, { tod("04:13:57"), tod("21:30"), tod("07"), true },
{ tod("16:14:43"), tod("15:30"), tod("16:00"), false }, { tod("16:14:43"), tod("15:30"), tod("16:00"), false },
{ tod("16:14:43"), tod("15:30"), tod("16:15"), true }, { tod("16:14:43"), tod("15:30"), tod("16:15"), true },
{ tod("08:45:43"), tod("07:00:00"), tod("21:30:00"), true },
{ tod("07:00:00"), tod("07:00:00"), tod("21:30:00"), true },
} }
for i, row := range table { for i, row := range table {