From e5cb4cdb873446c55b48ef47d6bf7008a1ffc671 Mon Sep 17 00:00:00 2001 From: Alexander Amezhenko Date: Sat, 4 May 2024 13:47:52 +0500 Subject: [PATCH] =?UTF-8?q?8.05=20(=D1=87=D1=82)=20=D0=B8=2009.05=20(?= =?UTF-8?q?=D0=BF=D1=82)=20-=20=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- schedule.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/schedule.go b/schedule.go index 582f170..f433128 100644 --- a/schedule.go +++ b/schedule.go @@ -15,16 +15,16 @@ func (s Schedule) GetToOfficeText(now time.Time) (string, string) { prefix := "*Рейсы в офис*\n\n" //suffix := "\nСубботний рейс в " + s.SaturdayRouteToOffice.String() //suffix := "\nВ выходные дни трансфера нет" - suffix := "\nПн, Вт, Ср праздничный день - трансфера нет" + suffix := "\nЧт и Пт праздничные дни - трансфера нет" //suffix := "\nНовогодние каникулы до 8го января - трансфера нет" timeAgnosticRoute := prefix + s.WorkDayRouteToOffice.String() + suffix //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { - if now.Weekday() == time.Sunday || now.Weekday() == time.Monday || now.Weekday() == time.Tuesday || now.Weekday() == time.Wednesday { - //if now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { - //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday || now.Weekday() == time.Monday { - //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday || now.Weekday() == time.Monday || now.Weekday() == time.Tuesday { - //if now.Weekday() == time.Thursday || now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + //if now.Weekday() == time.Sunday || now.Weekday() == time.Monday || now.Weekday() == time.Tuesday || now.Weekday() == time.Wednesday { + //if now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday || now.Weekday() == time.Monday { + //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday || now.Weekday() == time.Monday || now.Weekday() == time.Tuesday { + if now.Weekday() == time.Thursday || now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { //if now.Weekday() == time.Wednesday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { return timeAgnosticRoute, "" } @@ -42,16 +42,16 @@ func (s Schedule) GetFromOfficeText(now time.Time) (string, string) { prefix := "*Рейсы из офиса*\n\n" //suffix := "\nСубботний дежурный в " + s.SaturdayRouteFromOffice.String() //suffix := "\nВ выходные дни трансфера нет" - suffix := "\nПн, Вт, Ср праздничный день - трансфера нет" + suffix := "\nЧт и Пт праздничные дни - трансфера нет" //suffix := "\nНовогодние каникулы до 8го января - трансфера нет" timeAgnosticRoute := prefix + s.WorkDayRouteFromOffice.String() + suffix //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { - if now.Weekday() == time.Sunday || now.Weekday() == time.Monday || now.Weekday() == time.Tuesday || now.Weekday() == time.Wednesday { - //if now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { - //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday || now.Weekday() == time.Monday { - //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday || now.Weekday() == time.Monday || now.Weekday() == time.Tuesday { - //if now.Weekday() == time.Thursday || now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + //if now.Weekday() == time.Sunday || now.Weekday() == time.Monday || now.Weekday() == time.Tuesday || now.Weekday() == time.Wednesday { + //if now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday || now.Weekday() == time.Monday { + //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday || now.Weekday() == time.Monday || now.Weekday() == time.Tuesday { + if now.Weekday() == time.Thursday || now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { //if now.Weekday() == time.Wednesday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { return timeAgnosticRoute, "" }