Added more logging

This commit is contained in:
Infineon\Ouellette 2024-11-18 11:44:13 -07:00
parent a045121d45
commit 93d65b8bf5

View File

@ -678,35 +678,47 @@ Service SendPMNotifications()
PMRec<PM_EARLY_NOTIF_SENT$> = Datetime() PMRec<PM_EARLY_NOTIF_SENT$> = Datetime()
Database_Services('WriteDataRow', 'PM', PMKey, PMRec, 1, 0, 1) Database_Services('WriteDataRow', 'PM', PMKey, PMRec, 1, 0, 1)
if Error_Services('NoError') then if Error_Services('NoError') then
Recipients = PM_Services('GetPMNotificationRecipients', PMSpecKey) UpdatedPMRec = Database_Services('ReadDataRow', 'PM', PMKey, True$, 0, False$)
if Error_Services('NoError') then If UpdatedPMRec<PM_EARLY_NOTIF_SENT$> NE '' then
LogData = '' Recipients = PM_Services('GetPMNotificationRecipients', PMSpecKey)
LogData<1> = LoggingDTM;//Defined at entry of subroutine if Error_Services('NoError') then
LogData<2> = Tool LogData = ''
LogData<3> = PMDesc LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<4> = 'EARLY NOTIFICATIONS Prechecks passed, message okay to send.' LogData<2> = Tool
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) LogData<3> = PMDesc
LogData<4> = 'EARLY NOTIFICATIONS Prechecks passed, message okay to send.'
Subject = 'PM Task Coming Due' Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
Message = 'Tool: ': Tool : ' - ' :PMDesc:" is coming due. Scheduled due by " : OCONV(PMStatusLine<1,COL$DUEBY>, 'DT')
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup Subject = 'PM Task Coming Due'
obj_Notes('Create',Parms) Message = 'Tool: ': Tool : ' - ' :PMDesc:" is coming due. Scheduled due by " : OCONV(PMStatusLine<1,COL$DUEBY>, 'DT')
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
LogData = '' obj_Notes('Create',Parms)
LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool LogData = ''
LogData<3> = PMDesc LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<4> = 'EARLY NOTIFICATIONS OBJ_Notes has been called by this point, message should have been sent.' LogData<2> = Tool
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) LogData<3> = PMDesc
LogData<4> = 'EARLY NOTIFICATIONS OBJ_Notes has been called by this point, message should have been sent.'
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end else
errMessage = Error_Services('GetMessage')
LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool
LogData<3> = PMDesc
LogData<4> = 'EARLY notification failed - ' : errMessage
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end
end else end else
errMessage = Error_Services('GetMessage') errMessage = 'EARLY Notifcation wasn not marked as completed when it should have been.'
LogData = '' LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool LogData<2> = Tool
LogData<3> = PMDesc LogData<3> = PMDesc
LogData<4> = 'EARLY notification failed - ' : errMessage LogData<4> = 'EARLY notification failed - ' : errMessage
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end end
end else end else
errMessage = Error_Services('GetMessage') errMessage = Error_Services('GetMessage')
LogData = '' LogData = ''
@ -731,34 +743,46 @@ Service SendPMNotifications()
PMRec<PM_DUE_NOTIF_SENT$> = Datetime() PMRec<PM_DUE_NOTIF_SENT$> = Datetime()
Database_Services('WriteDataRow', 'PM', PMKey, PMRec, 1, 0, 1) Database_Services('WriteDataRow', 'PM', PMKey, PMRec, 1, 0, 1)
if Error_Services('NoError') then if Error_Services('NoError') then
Recipients = PM_Services('GetPMNotificationRecipients', PMSpecKey) UpdatedPMRec = Database_Services('ReadDataRow', 'PM', PMKey, True$, 0, False$)
if Error_Services('NoError') then If UpdatedPMRec<PM_DUE_NOTIF_SENT$> NE '' then
LogData = '' Recipients = PM_Services('GetPMNotificationRecipients', PMSpecKey)
LogData<1> = LoggingDTM;//Defined at entry of subroutine if Error_Services('NoError') then
LogData<2> = Tool LogData = ''
LogData<3> = PMDesc LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<4> = 'DUE NOTIFICATIONS Prechecks passed, message okay to send.' LogData<2> = Tool
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) LogData<3> = PMDesc
LogData<4> = 'DUE NOTIFICATIONS Prechecks passed, message okay to send.'
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
Subject = 'PM Task Due'
Message = 'Tool: ': Tool : ' - ' :PMDesc:" is due. Scheduled due by " : OCONV(PMStatusLine<1,COL$DUEBY>, 'DT')
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
obj_Notes('Create',Parms)
LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool
LogData<3> = PMDesc
LogData<4> = 'DUE NOTIFICATIONS OBJ_Notes has been called by this point, message should have been sent.'
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end else
errMessage = Error_Services('GetMessage')
LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool
LogData<3> = PMDesc
LogData<4> = 'DUE notification failed - ' : errMessage
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end
Subject = 'PM Task Due'
Message = 'Tool: ': Tool : ' - ' :PMDesc:" is due. Scheduled due by " : OCONV(PMStatusLine<1,COL$DUEBY>, 'DT')
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
obj_Notes('Create',Parms)
LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool
LogData<3> = PMDesc
LogData<4> = 'DUE NOTIFICATIONS OBJ_Notes has been called by this point, message should have been sent.'
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end else end else
errMessage = Error_Services('GetMessage') errMessage = 'DUE Notifcation was not marked as completed when it should have been.'
LogData = '' LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool LogData<2> = Tool
LogData<3> = PMDesc LogData<3> = PMDesc
LogData<4> = 'DUE notification failed - ' : errMessage LogData<4> = 'DUE notification failed - ' : errMessage
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end end
end else end else
errMessage = Error_Services('GetMessage') errMessage = Error_Services('GetMessage')
@ -768,7 +792,7 @@ Service SendPMNotifications()
LogData<3> = PMDesc LogData<3> = PMDesc
LogData<4> = 'DUE notification failed - ' : errMessage LogData<4> = 'DUE notification failed - ' : errMessage
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end end
end else end else
LogData = '' LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine LogData<1> = LoggingDTM;//Defined at entry of subroutine
@ -784,34 +808,47 @@ Service SendPMNotifications()
PMRec<PM_LATE_NOTIF_SENT$> = Datetime() PMRec<PM_LATE_NOTIF_SENT$> = Datetime()
Database_Services('WriteDataRow', 'PM', PMKey, PMRec, 1, 0, 1) Database_Services('WriteDataRow', 'PM', PMKey, PMRec, 1, 0, 1)
if Error_Services('NoError') then if Error_Services('NoError') then
Recipients = PM_Services('GetPMNotificationRecipients', PMSpecKey) //Check to make sure this change is commited by rereading in the record
if Error_Services('NoError') then UpdatedPMRec = Database_Services('ReadDataRow', 'PM', PMKey, True$, 0, False$)
LogData = '' If UpdatedPMRec<PM_LATE_NOTIF_SENT$> NE '' then
LogData<1> = LoggingDTM;//Defined at entry of subroutine Recipients = PM_Services('GetPMNotificationRecipients', PMSpecKey)
LogData<2> = Tool if Error_Services('NoError') then
LogData<3> = PMDesc LogData = ''
LogData<4> = 'LATE NOTIFICATIONS Prechecks passed, message okay to send.' LogData<1> = LoggingDTM;//Defined at entry of subroutine
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) LogData<2> = Tool
LogData<3> = PMDesc
LogData<4> = 'LATE NOTIFICATIONS Prechecks passed, message okay to send.'
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
Subject = 'PM overdue'
Message = 'Tool: ': Tool : ' - ' :PMDesc:" is overdue. Scheduled due by " : OCONV(PMStatusLine<1,COL$DUEBY>, 'DT')
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
obj_Notes('Create',Parms)
LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool
LogData<3> = PMDesc
LogData<4> = 'LATE NOTIFICATIONS OBJ_Notes has been called by this point, message should have been sent.'
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end else
errMessage = Error_Services('GetMessage')
LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool
LogData<3> = PMDesc
LogData<4> = 'LATE notification failed - ' : errMessage
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end
Subject = 'PM overdue'
Message = 'Tool: ': Tool : ' - ' :PMDesc:" is overdue. Scheduled due by " : OCONV(PMStatusLine<1,COL$DUEBY>, 'DT')
Parms = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
obj_Notes('Create',Parms)
LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool
LogData<3> = PMDesc
LogData<4> = 'LATE NOTIFICATIONS OBJ_Notes has been called by this point, message should have been sent.'
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end else end else
errMessage = Error_Services('GetMessage') errMessage = 'LATE Notifcation was not marked as completed when it should have been.'
LogData = '' LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine LogData<1> = LoggingDTM;//Defined at entry of subroutine
LogData<2> = Tool LogData<2> = Tool
LogData<3> = PMDesc LogData<3> = PMDesc
LogData<4> = 'LATE notification failed - ' : errMessage LogData<4> = 'LATE notification failed - ' : errMessage
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end end
end else end else
errMessage = Error_Services('GetMessage') errMessage = Error_Services('GetMessage')
@ -822,6 +859,7 @@ Service SendPMNotifications()
LogData<4> = 'LATE notification failed - ' : errMessage LogData<4> = 'LATE notification failed - ' : errMessage
Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$) Logging_Services('AppendLog', objLogNotifications, LogData, @RM, @FM, False$)
end end
end else end else
LogData = '' LogData = ''
LogData<1> = LoggingDTM;//Defined at entry of subroutine LogData<1> = LoggingDTM;//Defined at entry of subroutine