phares3757/open-insight
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Incorrect calendar start date in GetShiftByDate.

Browse Source
This commit is contained in:
Infineon\Ouellette 2024-10-30 16:14:19 -07:00
parent 23442f0515
commit e0de2ca1f6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LSL2/STPROC/LSL_USERS_SERVICES.txt
View File

@ -163,7 +163,6 @@ end service
Service GetOnShiftUsersByClass(Class, IncludeNextShift) Service GetOnShiftUsersByClass(Class, IncludeNextShift)
DatetimeNow = OConv(SRP_DateTime("Now"), 'DT') DatetimeNow = OConv(SRP_DateTime("Now"), 'DT')
NextShiftTime = OConv(SRP_Datetime('AddHours', Datetime(), 12) , 'DT') NextShiftTime = OConv(SRP_Datetime('AddHours', Datetime(), 12) , 'DT')
CurrentShift = Lsl_Users_Services('GetShiftByDate', DatetimeNow) CurrentShift = Lsl_Users_Services('GetShiftByDate', DatetimeNow)
@ -195,7 +194,6 @@ end service
Service GetOnShiftUsers() Service GetOnShiftUsers()
DatetimeNow = OConv(SRP_DateTime("Now"), 'DT') DatetimeNow = OConv(SRP_DateTime("Now"), 'DT')
CurrentShift = Lsl_Users_Services('GetShiftByDate', DatetimeNow) CurrentShift = Lsl_Users_Services('GetShiftByDate', DatetimeNow)
Open 'DICT.LSL_USERS' to DictLSLUsers then Open 'DICT.LSL_USERS' to DictLSLUsers then
@ -217,14 +215,13 @@ end service
Service GetShiftByDate(Date, GenerateFlag) Service GetShiftByDate(Date, GenerateFlag)
OnShift = ''; *Return Value OnShift = ''; *Return Value
if Date EQ '' then if Date EQ '' then
Error_Services('Add', 'Error in LSL_USERS_SERVICES. No Date Supplied.') Error_Services('Add', 'Error in LSL_USERS_SERVICES. No Date Supplied.')
return return
end end
DateConv = Iconv(Date, "DT") DateConv = Iconv(Date, "DT")
CalStartDate = 18998; *Arbitrary Start Date to base calendar off of. Jan 5, 2020 Beginning of short shift 1 CalStartDate = 19005; *Arbitrary Start Date to base calendar off of. Jan 12, 2020 Beginning of short shift 1
DaysSinceStart = SRP_DateTime("DaySpan", CalStartDate, DateConv, 0) DaysSinceStart = SRP_DateTime("DaySpan", CalStartDate, DateConv, 0)
WeeksSinceStart = SRP_Math("FLOOR", DaysSinceStart / 7) WeeksSinceStart = SRP_Math("FLOOR", DaysSinceStart / 7)
WeekType = '' WeekType = ''
@ -462,3 +459,4 @@ Service UpdateNotificationGroups()
end service end service