From ba2245c17c82faad9b33da1bd8448534a27c3719 Mon Sep 17 00:00:00 2001 From: Alexander Amezhenko Date: Sat, 24 Feb 2024 15:56:12 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=84=D1=83=20=D0=BE=20=D0=BF=D1=80=D0=B0=D0=B7=D0=B4=D0=BD?= =?UTF-8?q?=D0=B8=D1=87=D0=BD=D0=BE=D0=BC=20=D0=B4=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- schedule.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/schedule.go b/schedule.go index 857292f..df80ced 100644 --- a/schedule.go +++ b/schedule.go @@ -14,13 +14,13 @@ type Schedule struct { func (s Schedule) GetToOfficeText(now time.Time) (string, string) { prefix := "*Рейсы в офис*\n\n" //suffix := "\nСубботний рейс в " + s.SaturdayRouteToOffice.String() - //suffix := "\nВ выходные дни трансфера нет" - suffix := "\n23 февраля праздничный день - трансфера нет" + suffix := "\nВ выходные дни трансфера нет" + //suffix := "\n23 февраля праздничный день - трансфера нет" //suffix := "\nНовогодние каникулы до 8го января - трансфера нет" timeAgnosticRoute := prefix + s.WorkDayRouteToOffice.String() + suffix - if now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { - //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + //if now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + if 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 { @@ -40,13 +40,13 @@ func (s Schedule) GetToOfficeText(now time.Time) (string, string) { func (s Schedule) GetFromOfficeText(now time.Time) (string, string) { prefix := "*Рейсы из офиса*\n\n" //suffix := "\nСубботний дежурный в " + s.SaturdayRouteFromOffice.String() - //suffix := "\nВ выходные дни трансфера нет" - suffix := "\n23 февраля праздничный день - трансфера нет" + suffix := "\nВ выходные дни трансфера нет" + //suffix := "\n23 февраля праздничный день - трансфера нет" //suffix := "\nНовогодние каникулы до 8го января - трансфера нет" timeAgnosticRoute := prefix + s.WorkDayRouteFromOffice.String() + suffix - if now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { - //if now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + //if now.Weekday() == time.Friday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + if 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 {