diff --git a/service/rest_admin_service/handlers/dashboard/handlers.go b/service/rest_admin_service/handlers/dashboard/handlers.go index c42b7c4..e874929 100644 --- a/service/rest_admin_service/handlers/dashboard/handlers.go +++ b/service/rest_admin_service/handlers/dashboard/handlers.go @@ -567,7 +567,7 @@ type dashboardAbsenceMetadata struct { } var dashboardAbsenceDateRe = regexp.MustCompile(`(\d{1,2})[.,](\d{1,2})\.(\d{4})`) -var dashboardAbsenceTimeRe = regexp.MustCompile(`(\d{1,2})[:\.](\d{2}).*?(\d{1,2})[:\.](\d{2})`) +var dashboardAbsenceTimeRe = regexp.MustCompile(`с\s*(\d{1,2})[:\.](\d{2})\s+до\s*(\d{1,2})[:\.](\d{2})`) func (s *DashboardReg) getAbsentToday(ctx context.Context) []map[string]interface{} { loc, err := time.LoadLocation("Europe/Moscow") diff --git a/service/telegram_service/scheduler/daily_reminder.go b/service/telegram_service/scheduler/daily_reminder.go index 9fdfa76..ac6ddbf 100644 --- a/service/telegram_service/scheduler/daily_reminder.go +++ b/service/telegram_service/scheduler/daily_reminder.go @@ -288,7 +288,7 @@ type AbsentEmployeeInfo struct { var absenceDateRe = regexp.MustCompile(`(\d{1,2})[.,](\d{1,2})\.(\d{4})`) -var absenceTimeRe = regexp.MustCompile(`(\d{1,2})[:\.](\d{2}).*?(\d{1,2})[:\.](\d{2})`) +var absenceTimeRe = regexp.MustCompile(`с\s*(\d{1,2})[:\.](\d{2})\s+до\s*(\d{1,2})[:\.](\d{2})`) func (dr *DailyReminder) getAbsentEmployeesToday(ctx context.Context, mskLocation *time.Location) []AbsentEmployeeInfo { today := time.Now().In(mskLocation)