Commit 023e64e5 authored by wenjie.zheng's avatar wenjie.zheng

Worklist.py: add causality state comparision in Worklist.

parent 06b485f9
...@@ -58,8 +58,6 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject): ...@@ -58,8 +58,6 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
description = '' description = ''
var_matches = None # Compared with catalog when set. var_matches = None # Compared with catalog when set.
matched_portal_type = '' matched_portal_type = ''
matched_validation_state = None
matched_simulation_state = None
actbox_name = '' actbox_name = ''
actbox_url = '' actbox_url = ''
actbox_icon = '' actbox_icon = ''
...@@ -126,8 +124,9 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject): ...@@ -126,8 +124,9 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
if self.getMatchedValidationState() is not None: if self.getMatchedValidationState() is not None:
key_list.append('portal_type') key_list.append('portal_type')
key_list.append('validation_state') key_list.append('validation_state')
if self.getMatchedSimulationState() is not None and self.getMatchedValidationState() is not None: if self.getMatchedCausalityState() is not None:
raise NotImplementedError(' Please only fill the field of the state variable defined in this workflow.') key_list.append('portal_type')
key_list.append('causality_state')
return key_list return key_list
def getVarMatch(self, id): def getVarMatch(self, id):
...@@ -153,6 +152,12 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject): ...@@ -153,6 +152,12 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
for state_id in matches_id_list: for state_id in matches_id_list:
matches_ref_list.append(self.getParent()._getOb(state_id).getReference()) matches_ref_list.append(self.getParent()._getOb(state_id).getReference())
matches = tuple(matches_ref_list) matches = tuple(matches_ref_list)
elif id == 'causality_state':
matches_id_list = self.getMatchedCausalityStateList()
matches_ref_list = []
for state_id in matches_id_list:
matches_ref_list.append(self.getParent()._getOb(state_id).getReference())
matches = tuple(matches_ref_list)
else: else:
raise NotImplementedError ("Cataloged variable '%s' matching error in Worklist.py"%id) raise NotImplementedError ("Cataloged variable '%s' matching error in Worklist.py"%id)
if matches is not None: if matches is not None:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment