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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.27
+Version: 1.4.28
 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.27 → tricc_oo-1.4.28}/pyproject.toml

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

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

@@ -226,7 +226,7 @@ class TriccNodeBaseModel(TriccBaseModel):
     label: Optional[Union[str, Dict[str,str]]] = None
     next_nodes: OrderedSet[TriccNodeBaseModel] = OrderedSet()
     prev_nodes: OrderedSet[TriccNodeBaseModel] = OrderedSet()
-    expression: Optional[Union[Expression, TriccOperation]] = None  # will be generated based on the input
+    expression: Optional[Union[Expression, TriccOperation, TriccStatic]] = None  # will be generated based on the input
     expression_inputs: List[Expression] = []
     activity: Optional[FwTriccNodeBaseModel] = None
     ref_def: Optional[Union[int,str]]  = None# for medal creator

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

@@ -87,8 +87,8 @@ class XLSFormStrategy(BaseOutPutStrategy):
 
     def clean_coalesce(self, expression):   
         if re.match(r"^coalesce\(\${[^}]+},''\)$", str(expression)):
-            return expression[9:-4]
-        return expression
+            return str(expression[9:-4])
+        return str(expression)
 
     def generate_base(self, node, **kwargs):
         return self.generate_xls_form_condition(node, **kwargs) 

{tricc_oo-1.4.27 → tricc_oo-1.4.28}/tricc_oo/strategies/output/xlsform_cht.py

@@ -7,6 +7,7 @@ import pandas as pd
 
 from tricc_oo.models.lang import SingletonLangClass
 from tricc_oo.models.calculate import TriccNodeEnd
+from tricc_oo.models.tricc import TriccNodeDisplayModel
 from tricc_oo.serializers.xls_form import SURVEY_MAP, get_input_line, get_input_calc_line
 from tricc_oo.strategies.output.xlsform_cdss import XLSFormCDSSStrategy
 from tricc_oo.converters.tricc_to_xls_form import get_export_name
@@ -366,6 +367,23 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
         #df_summary.loc[len(df_summary)] = [ 'end group', '' ,'', '', '', '',  '',  '', '', '', '', '', '', '', '','', '' ]
         return df_summary
     
+    def get_last_prev_index(self, df, e, depth=0):
+        latest = None
+        for p in e.prev_nodes:
+            if issubclass(p.__class__, (TriccNodeDisplayModel)):
+                if hasattr(p, 'select'):
+                    p = latest.select
+                index = df.index[df['name'] == get_export_name(p)].tolist()
+            
+                if not latest or ( index and index[-1] > latest) :
+                    latest = index[-1]
+        if latest is None and depth > 5:
+            for p in e.prev_nodes:
+                index = get_last_prev_index(df, e, depth+1)
+                if not latest and index and index > latest :
+                    latest = index
+        return latest
+    
     def export(self, start_pages, version, **kwargs):
         form_id = None
         if start_pages[self.processes[0]].root.form_id is not None:
@@ -406,15 +424,13 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             ends_prev = []
             for e in ends:
                 
-                latest = None
-                for p in e.prev_nodes:
-                    if not latest or latest.path_len < p.path_len:
-                        latest = p
-                if hasattr(latest, 'select'):
-                    latest = latest.select 
-                ends_prev.append(
-                    (int(self.df_survey[self.df_survey.name == latest.export_name].index.values[0]), e,)
-                )
+                latest = self.get_last_prev_index(self.df_survey, e)
+                if latest:    
+                    ends_prev.append(
+                        (int(latest), e,)
+                    )
+                else:
+                    logger.critical(f"impossible to get last index before pause: {e.get_name()}")
             forms = [form_id]
             for i, e in ends_prev:
                 new_form_id = f"{form_id}_{clean_name(e.name)}"

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

@@ -74,13 +74,13 @@ 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 TriccStatic(True) :
             num_expression = TriccOperation(
                 TriccOperator.CAST_NUMBER,
                 [expression]
             )
-        elif expression is True or (not expression and is_calculate):
-            expression = TriccStatic(1)                
+        elif expression is TriccStatic(True)  or (not expression and is_calculate):
+            expression = TriccStatic(True)               
         else:
             expression = ''
     if (
@@ -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(item.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(item, TriccNodeSelectOption))
+    last_version = processed_nodes.find_prev(node, version_filter(node_name))
     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)

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

@@ -41,7 +41,8 @@ def make_breakpoints(df, pausepoint, calculate_name=None, replace_dots=False):
         raise ValueError("input end field not found in input dataframe")
     end_inputs_loc = df.index[df['name'] == 'input end'][0]
     next_begin_group_loc = min([i for i in df.index[df['type'] == 'begin group'] if i > end_inputs_loc])
-        
+    next_pause_point_begin_group_loc = min([i for i in df.index[df['type'] == 'begin group'] if i > pausepoint])
+    
     df_input = df.loc[next_begin_group_loc:pausepoint]
     
     # Define field types to handle
@@ -125,9 +126,8 @@ def make_breakpoints(df, pausepoint, calculate_name=None, replace_dots=False):
     ]).reset_index(drop=True)
     
     # Handle post-break section
-    df_after = df.loc[pausepoint+1:].reset_index(drop=True)
-    if df_after.iloc[0,0] == 'end group':
-        df_after = df_after.iloc[1:]
+    df_after = df.loc[next_pause_point_begin_group_loc:].reset_index(drop=True)
+
     
     # Final concatenation
     final_df = pd.concat([df_combined, df_after])
@@ -216,7 +216,7 @@ function {task_name}ResolveIf(contact, report, event, dueDate) {{
 }}
 
 function {task_name}AppliesIf(contact, report, event, dueDate) {{
-  return report.{calculate_name};
+  return report.{calculate_name} === '1';
 }}
 
 module.exports = {{

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.27
+Version: 1.4.28
 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