tricc-oo 1.4.25__tar.gz → 1.4.27__tar.gz

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.25
+Version: 1.4.27
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.4.25"
+version = "1.4.27"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 requires-python = ">=3.8"

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/tricc_oo/models/base.py

@@ -630,6 +630,8 @@ def not_clean(a):
 # @param list_or
 # @param and elm use upstream
 def clean_or_list(list_or, elm_and=None):
+    if TriccStatic(True) in list_or:
+        return [TriccStatic(True)]
     for a in list(list_or):
         if isinstance(a, TriccOperation) and a.operator == TriccOperator.OR:
             list_or.remove(a)
@@ -694,7 +696,7 @@ def simple_and_join(left, right):
         )
 
 def or_join(list_or, elm_and=None):
-    cleaned_list  = clean_or_list(list_or, elm_and)
+    cleaned_list  = clean_or_list(set(list_or), elm_and)
     if len(cleaned_list) == 1:
         return cleaned_list[0]
     elif len(cleaned_list)>1: 

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/tricc_oo/models/ordered_set.py

@@ -106,7 +106,7 @@ class OrderedSet(Sequence):
         
         # If the object is not in the OrderedSet, start from the end
         if obj not in self._od:
-            start_index = len(keys) - 1
+            start_index = len(keys)
         else:
             # Find the index of the given object
             start_index = keys.index(obj)

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/tricc_oo/serializers/xls_form.py

@@ -21,8 +21,6 @@ from tricc_oo.visitors.tricc import (
     get_applicability_expression,
     get_prev_instance_skip_expression,
     get_process_skip_expression,
-    get_next_version,
-    set_last_version_false,
 )
 
 logger = logging.getLogger("default")

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/tricc_oo/strategies/output/xls_form.py

@@ -633,8 +633,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
                     # we don't overright if define in the diagram
                     if node.constraint is None:
                         if isinstance(node, TriccNodeSelectMultiple):
-                            node.constraint = TriccOperation(
-                                TriccOperator.OR,
+                            node.constraint = or_join(
                                 [
                                     TriccOperation(TriccOperator.EQUAL, ['$this', TriccStatic('opt_none')]),
                                     TriccOperation(TriccOperator.NOT, [

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/tricc_oo/visitors/tricc.py

@@ -74,7 +74,7 @@ def get_node_expressions(node, processed_nodes, process=None):
         expression = get_node_expression(node, processed_nodes=processed_nodes, is_calculate=is_calculate, process=process)
         
     if is_calculate:
-        if expression  and (not isinstance(expression, str) or expression != '') and  expression is not True  :
+        if expression  and (not isinstance(expression, str) or expression != '') and  expression is not True :
             num_expression = TriccOperation(
                 TriccOperator.CAST_NUMBER,
                 [expression]
@@ -96,7 +96,7 @@ def get_node_expressions(node, processed_nodes, process=None):
 def set_last_version_false(node, processed_nodes):
     node_name = node.name if not isinstance(node, TriccNodeEnd) else node.get_reference()
     #last_version = get_last_version(node_name, processed_nodes) if issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(node, TriccNodeSelectOption)  else  None
-    last_version = processed_nodes.find_prev(node, lambda item: item.id != node.id and hasattr(item, 'name') and item.name == node.name and  issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(node, TriccNodeSelectOption))
+    last_version = processed_nodes.find_prev(node, lambda item: item.id != node.id and hasattr(item, 'name') and item.name == node_name and  issubclass(item.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(item, TriccNodeSelectOption))
     if last_version and getattr(node, 'process', '') != 'pause':
         # 0-100 for manually specified instance.  100-200 for auto instance 
         node.version = get_next_version(node.name, processed_nodes, last_version.version + 1, 0)
@@ -152,8 +152,7 @@ def get_version_inheritance(node, last_version, processed_nodes):
 def merge_expression(expression, last_version):
     datatype = expression.get_datatype()
     if datatype == 'boolean':
-        expression = TriccOperation(
-            TriccOperator.OR,
+        expression = or_join(
             [TriccOperation(TriccOperator.ISTRUE, [last_version]), expression]
         )
     
@@ -1498,7 +1497,7 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
             if isinstance(node, TriccNodeMainStart):
                 expression =  get_applicability_expression(node.activity, processed_nodes, process, expression )
         elif isinstance(node, (TriccNodeActivityStart)):
-            return None
+            return TriccStatic(True)
         
     elif isinstance(node, TriccNodeWait):
         if is_prev:
@@ -1557,9 +1556,7 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
         #         TriccOperator.CAST_NUMBER,
         #         [node.expression_reference])
         # else:    
-        expression = node.expression_reference
-    elif not is_prev and hasattr(node, 'relevance') and isinstance(node.relevance, TriccOperation):
-        expression = node.relevance     
+        expression = node.expression_reference  
     elif is_prev and isinstance(node, TriccNodeSelectOption):
         if negate:
             negate_expression = get_selected_option_expression(node, negate)
@@ -1579,9 +1576,12 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
             negate_expression = get_calculation_terms(node, processed_nodes=processed_nodes, is_calculate=is_calculate, negate=True, process=process)
         else:
             expression = get_calculation_terms(node, processed_nodes=processed_nodes, is_calculate=is_calculate, process=process)
+    
+    elif (not is_prev or not ONE_QUESTION_AT_A_TIME) and hasattr(node, 'relevance') and isinstance(node.relevance, (TriccOperation, TriccStatic)):
+        expression = node.relevance  
     elif ONE_QUESTION_AT_A_TIME and is_prev and not is_calculate and hasattr(node, 'required') and node.required:
         expression = get_required_node_expression(node)
-    
+ 
     if expression is None:
         expression = get_prev_node_expression(node, processed_nodes=processed_nodes, is_calculate=is_calculate, process=process)
             # in_node not in processed_nodes is need for calculates that can but run after the end of the activity
@@ -1841,8 +1841,7 @@ def get_prev_node_expression( node, processed_nodes, is_calculate=False, exclude
         expression = expression_inputs[0]
     
     elif expression_inputs:
-        expression = TriccOperation(
-            TriccOperator.OR,
+        expression = or_join(
             expression_inputs
         )
         # if isinstance(node,  TriccNodeExclusive):
@@ -2188,7 +2187,7 @@ def get_calculation_terms( node, processed_nodes, is_calculate=False, negate=Fal
     
 # Function that add element to array is not None or ''
 def add_sub_expression(array, sub):
-    if isinstance(sub, TriccOperation) or  sub:
+    if isinstance(sub, (TriccOperation, TriccStatic)):
         not_sub = negate_term(sub)
         if not_sub in array:
             # avoid having 2 conditions that are complete opposites
@@ -2196,6 +2195,8 @@ def add_sub_expression(array, sub):
             array.append(TriccStatic(True))
         else:
             array.append(sub)
+    else:
+        pass
     # elif sub is None:
     #     array.append(TriccStatic(True))
         

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/tricc_oo/visitors/xform_pd.py

@@ -173,7 +173,7 @@ def get_tasksstrings(hidden_names, df_survey):
 
 
 def get_task_js(form_id, calculate_name, title, form_types, hidden_names, df_survey, repalce_dots=False, task_title="'id: '+getField(report, 'g_registration.p_id')+'; age: '+getField(report, 'p_age')+getField(report, 'g_registration.p_gender')+' months; '+getField(report, 'p_weight') + 'kg; ' + getField(report, 'g_fever.p_temp')+'°'"):
-    task_name = f"{form_id}_{calculate_name}"
+    task_name = f"{form_id}"
     task_name_upper = task_name.upper()
 
     
@@ -181,17 +181,16 @@ def get_task_js(form_id, calculate_name, title, form_types, hidden_names, df_sur
 /* eslint-disable no-use-before-define */
 /* eslint-disable */
 
-const {{injectDataFromForm, isFormArrayHasSourceId}} = require('./stph-extras'); -> isFormArrayHasSourceId was missing from the imports
+const {{injectDataFromForm, isFormArrayHasSourceId}} = require('./stph-extras');
 
 const CASE_DATA = ['{"','".join(hidden_names)}'];
     
-const {{injectDataFromForm}} = require('./stph-extras');
 
 const {task_name_upper}_FORMS = ['{"','".join(form_types)}'];
 
 var task_title = "{task_title}"
 
-const {task_name_upper}_TASK_FORM = '{form_id}_{calculate_name}';
+const {task_name_upper}_TASK_FORM = '{form_id}';
 
 const {task_name}Content =  function (content, contact, report){{
 
@@ -213,9 +212,12 @@ function {task_name}ContactLabel (){{
 
 
 function {task_name}ResolveIf(contact, report, event, dueDate) {{
-  return isFormArrayHasSourceId( report, contact.reports, event, dueDate, {task_name_upper}_TASK_FORMS);
+  return isFormArrayHasSourceId( report, contact.reports, event, dueDate, {task_name_upper}_TASK_FORM);
 }}
 
+function {task_name}AppliesIf(contact, report, event, dueDate) {{
+  return report.{calculate_name};
+}}
 
 module.exports = {{
   {task_name_upper}_TASK_FORM,
@@ -223,6 +225,7 @@ module.exports = {{
   {task_name}Content,
   {task_name}ContactLabel,
   {task_name}ResolveIf,
+  {task_name}AppliesIf,
 }}
 // 
 //// to be copied in task
@@ -232,7 +235,8 @@ module.exports = {{
 //  {task_name_upper}_FORMS,
 //  {task_name}Content,
 //  {task_name}ContactLabel,
-//  {task_name}ResolveIf, }} = require('./{task_name}');
+//  {task_name}ResolveIf, 
+//  {task_name}AppliesIf, }} = require('./{task_name}');
 //
 //module.exports = [
 //
@@ -242,6 +246,7 @@ module.exports = {{
 //        title: 'diagnostic',
 //        appliesTo: 'reports',
 //        appliesToType: {task_name_upper}_FORMS,
+//        appliesIf: {task_name}AppliesIf,
 //        actions: [
 //            {{
 //                type: 'report',

{tricc_oo-1.4.25 → tricc_oo-1.4.27}/tricc_oo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.25
+Version: 1.4.27
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues