tricc-oo 1.5.19__py3-none-any.whl → 1.5.21__py3-none-any.whl

tricc_oo/models/base.py

@@ -203,7 +203,11 @@ class TriccGroup(TriccBaseModel):
         super().__init__(**data)
         if self.name is None:
             self.name = generate_id(str(data))
-
+    
+    def gen_name(self):
+        if self.name is None:
+            self.name = get_rand_name(self.id)
+            
     def get_name(self):
         result = str(super().get_name())
         name =  getattr(self, 'name', None) 

tricc_oo/strategies/output/xlsform_cht.py

@@ -301,6 +301,28 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",
             "",
         ]
+        
+        df_input.loc[len(df_input)] = [
+            "hidden",
+            "data_load",
+            *list(langs.get_trads("NO_LABEL", force_dict=True).values()),
+            *list(empty.values()),
+            *list(empty.values()),
+            "",
+            "hidden",
+            "",
+            *list(empty.values()),
+            "",
+            "",
+            "",
+            *list(empty.values()),
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+        ]
 
         df_input.loc[len(df_input)] = [
             "end_group",
@@ -451,27 +473,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
             "",  #'image'
             "",  # choice filter
         ]
-        df_input.loc[len(df_input)] = [
-            "hidden",
-            "data_load",
-            *list(langs.get_trads("NO_LABEL", force_dict=True).values()),
-            *list(empty.values()),
-            *list(empty.values()),
-            "",
-            "hidden",
-            "",
-            *list(empty.values()),
-            "",
-            "",
-            "",
-            *list(empty.values()),
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-        ]
+        
 
         for input in inputs:
             df_input.loc[len(df_input)] = get_input_calc_line(input)

{tricc_oo-1.5.19.dist-info → tricc_oo-1.5.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.5.19
+Version: 1.5.21
 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.5.19.dist-info → tricc_oo-1.5.21.dist-info}/RECORD

@@ -15,7 +15,7 @@ tricc_oo/converters/cql/cqlListener.py,sha256=ketvj7XvO7t047S6A3_gTPvp2MlYk1bojm
 tricc_oo/converters/cql/cqlParser.py,sha256=hIUdR907WX24P2Jlrxk-H0IT94n51yh_ZsCmwQhnFas,414730
 tricc_oo/converters/cql/cqlVisitor.py,sha256=SWSDIqVYBhucR4VgLn_EPNs7LV9yCqsOmzFZ0bmRSGc,33865
 tricc_oo/models/__init__.py,sha256=Rdk1fsNXHrbmXTQD1O7i0NC_A6os648Ap6CtWRliOg8,92
-tricc_oo/models/base.py,sha256=gXjEUGD5yRCqtfATxM2DIBJ17HVJWzMifrBvacm_p54,26054
+tricc_oo/models/base.py,sha256=jrOJuh4CufPXZo7qhRFUHpK4DXoPxKj8bxWvkOD7LXg,26172
 tricc_oo/models/calculate.py,sha256=60jSL8gbcTxqGYsZe1LoGZAdScIp6_suC88XlE0xg-c,7640
 tricc_oo/models/lang.py,sha256=SwKaoxyRhE7gH_ZlYyFXzGuTQ5RE19y47LWAA35zYxg,2338
 tricc_oo/models/ocl.py,sha256=ol35Gl1jCBp0Ven0yxOKzDIZkVL5Kx9uwaR_64pjxKI,8931
@@ -34,13 +34,13 @@ tricc_oo/strategies/output/base_output_strategy.py,sha256=YVQTgisOsbm3h2xWwXKQQP
 tricc_oo/strategies/output/spice.py,sha256=s_COahyYCoc4Xv5TGh_AW9evDOW6GOex0Xwa_JWeLsI,11280
 tricc_oo/strategies/output/xls_form.py,sha256=nJqMVI9Y8LF1MxG9-0cJK8g1Ag8iKqFPkjYVsG_UJ2M,31289
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=8ghPYH8K2DSzPY1jrJMQzrFmkvzu75jM0B1LpSS-y1E,9516
-tricc_oo/strategies/output/xlsform_cht.py,sha256=2GeQCmuoFo2CbKGuMIwr8Iq78edKMDb3AAsm6UVTHMU,24216
+tricc_oo/strategies/output/xlsform_cht.py,sha256=GF6uQp7PncrcJU7voI5ErF-IuDdBCgzwBBq4hgxxxjY,24234
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=VPx5_wLXLacJFTgVcwOJ7LVd77fmOrL_ZAycNZLxC6o,2281
 tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/visitors/tricc.py,sha256=e_6itYSgtc6EF2sOCKFvP3nri1NuELzRah_mBJdRVik,101851
 tricc_oo/visitors/utils.py,sha256=Gol4JNozPEd30Q1l8IPIPhx5fqVyy9R81GofGVebgD8,484
 tricc_oo/visitors/xform_pd.py,sha256=jgjBLbfElVdi0NmClhw6NK6qNcIgWYm4KMXfVwiQwXM,9705
-tricc_oo-1.5.19.dist-info/METADATA,sha256=L0rbZLJFADUCMrIESNtMxlOCNOop0IesDNSnLGJN3dY,7878
-tricc_oo-1.5.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tricc_oo-1.5.19.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.5.19.dist-info/RECORD,,
+tricc_oo-1.5.21.dist-info/METADATA,sha256=pU0BM8husOGhMqf0_g_XAXs9rzgk5eaN0ryv-bVy5uI,7878
+tricc_oo-1.5.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tricc_oo-1.5.21.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.5.21.dist-info/RECORD,,