From 6ef9af7f953e27fc90b0256907f45ff7ff73b4e5 Mon Sep 17 00:00:00 2001 From: Alexander Amezhenko Date: Fri, 14 Jun 2024 18:30:06 +0500 Subject: [PATCH] remove holiday --- schedule.go | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/schedule.go b/schedule.go index 83be09a..6feb04b 100644 --- a/schedule.go +++ b/schedule.go @@ -14,18 +14,18 @@ type Schedule struct { func (s Schedule) GetToOfficeText(now time.Time) (string, string) { prefix := "*Рейсы в офис*\n\n" //suffix := "\nСубботний рейс в " + s.SaturdayRouteToOffice.String() - //suffix := "\nВ выходные дни трансфера нет" - suffix := "\n12.06 (Ср) праздничный день - трансфера нет" + suffix := "\nВ выходные дни трансфера нет" + //suffix := "\n12.06 (Ср) праздничный день - трансфера нет" //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.Wednesday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + 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.Wednesday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { return timeAgnosticRoute, "" } @@ -41,18 +41,18 @@ 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 := "\n12.06 (Ср) праздничный день - трансфера нет" + suffix := "\nВ выходные дни трансфера нет" + //suffix := "\n12.06 (Ср) праздничный день - трансфера нет" //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.Wednesday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { + 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.Wednesday || now.Weekday() == time.Saturday || now.Weekday() == time.Sunday { return timeAgnosticRoute, "" }