resolving conflicts between the PR (remote version of feature/notifier) and feature/notifier.
This commit is contained in:
commit
267b53aa91
@ -95,6 +95,15 @@ class ValidationRules(ValidationRuleFunctions):
|
|||||||
shipcall_df.loc[:,"evaluation_message"] = violations
|
shipcall_df.loc[:,"evaluation_message"] = violations
|
||||||
shipcall_df.loc[:,"evaluation_time"] = evaluation_time
|
shipcall_df.loc[:,"evaluation_time"] = evaluation_time
|
||||||
shipcall_df.loc[:,"evaluation_notifications_sent"] = evaluation_notifications_sent
|
shipcall_df.loc[:,"evaluation_notifications_sent"] = evaluation_notifications_sent
|
||||||
|
#evaluation_time = self.get_notification_times(evaluation_states_new)
|
||||||
|
|
||||||
|
# build the list of 'evaluation_notifications_sent'. The value is 'False', when a notification should be created
|
||||||
|
#evaluation_notifications_sent = self.get_notification_states(evaluation_states_old, evaluation_states_new)
|
||||||
|
|
||||||
|
shipcall_df.loc[:,"evaluation"] = evaluation_states_new
|
||||||
|
shipcall_df.loc[:,"evaluation_message"] = violations
|
||||||
|
#shipcall_df.loc[:,"evaluation_time"] = evaluation_time
|
||||||
|
#shipcall_df.loc[:,"evaluation_notifications_sent"] = evaluation_notifications_sent
|
||||||
return shipcall_df
|
return shipcall_df
|
||||||
|
|
||||||
def concise_evaluation_message_if_too_long(self, violation):
|
def concise_evaluation_message_if_too_long(self, violation):
|
||||||
|
|||||||
Reference in New Issue
Block a user