tricc-oo 1.5.9__py3-none-any.whl → 1.5.11__py3-none-any.whl

tricc_oo/converters/drawio_type_map.py

@@ -129,7 +129,7 @@ TYPE_MAP = {
     },
     TriccNodeType.rhombus: {
         "objects": ["UserObject", "object"],
-        "attributes": ["save", "expression", 'label'],
+        "attributes": ["save", "expression", 'label','priority'],
         "mandatory_attributes": ["reference"],
         "model": TriccNodeRhombus
     },

tricc_oo/models/calculate.py

@@ -53,7 +53,7 @@ class TriccNodeCount(TriccNodeDisplayCalculateBase):
 class TriccNodeProposedDiagnosis(TriccNodeDisplayCalculateBase):
     tricc_type: TriccNodeType = TriccNodeType.proposed_diagnosis
     severity: str = None
-    priority: Union[float, int, None] = None
+    
     
 class TriccNodeFakeCalculateBase(TriccNodeCalculateBase):
     ...
@@ -131,7 +131,6 @@ class TriccNodeRhombus(TriccNodeCalculateBase,TriccRhombusMixIn):
 class TriccNodeDiagnosis(TriccNodeDisplayCalculateBase):
     tricc_type: TriccNodeType = TriccNodeType.diagnosis
     severity: str = None
-    priority: Union[float, int, None] = None
     def __init__(self, **data):
         data['reference'] = f'"final.{data["name"]}" is true'
         super().__init__(**data)

tricc_oo/models/tricc.py

@@ -18,6 +18,7 @@ class TriccNodeCalculateBase(TriccNodeBaseModel):
     expression_reference: Union[str, TriccOperation] = None
     last: bool = None
     datatype: str = 'boolean'
+    priority: Union[float, int, None] = None
     # to use the enum value of the TriccNodeType
     class Config:
         use_enum_values = True  # <--

tricc_oo/serializers/xls_form.py

@@ -305,14 +305,14 @@ def gen_operation_hash(op):
 
 
 def generate_choice_filter(strategy, node):
-    if isinstance(node, TriccNodeSelectOption) and node.relevance:
+    if isinstance(node, TriccNodeSelectOption) and node.relevance and node.relevance != TriccStatic(True):
         return gen_operation_hash(node.relevance)
     if not isinstance(node, (TriccNodeSelectMultiple, TriccNodeSelectOne)):
         return
     relevances = {}
     option_filter = {}
     for o in node.options.values():
-        if o.relevance:
+        if o.relevance and o.relevance != TriccStatic(True):
             key = gen_operation_hash(o.relevance)
             if key not in relevances:
                 relevances[key] = o.relevance