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 {