MVP: Handle extra fields to export

src/formpack/reporting/export.py

@@ -90,6 +90,17 @@ def __init__(
             tag_cols_for_header = []
         self.tag_cols_for_header = tag_cols_for_header
 
+        self.t_lang_codes = []
+        _filter_fields = []
+        for item in self.filter_fields:
+            item = re.sub(r'^_supplementalDetails/', '', item)
+            if item.split('/')[-1].startswith('transcript'):
+                self.t_lang_codes.append(item.split('_')[-1])
+                _filter_fields.append(f"{item.split('/')[0]}/transcript")
+            else:
+                _filter_fields.append(item)
+        self.filter_fields = _filter_fields
+
         # If some fields need to be arbitrarily copied, add them
         # to the first section
         if copy_fields:
@@ -268,6 +279,7 @@ def get_fields_labels_tags_for_all_versions(
                     hierarchy_in_labels=hierarchy_in_labels,
                     multiple_select=self.multiple_select,
                     include_media_url=self.include_media_url,
+                    t_lang_codes=self.t_lang_codes,
                 )
             )
 
@@ -297,6 +309,7 @@ def get_fields_labels_tags_for_all_versions(
                 value_names = field.get_value_names(
                     multiple_select=self.multiple_select,
                     include_media_url=self.include_media_url,
+                    t_lang_codes=self.t_lang_codes,
                 )
                 name_lists.append(value_names)
 
@@ -487,6 +500,7 @@ def _get_value_from_entry(
                         xls_types_as_text=self.xls_types_as_text,
                         attachment=attachment,
                         include_media_url=self.include_media_url,
+                        t_lang_codes=self.t_lang_codes,
                     )
 
                     # save fields value if they match parent mapping fields.

src/formpack/schema/fields.py

@@ -484,6 +484,7 @@ def get_labels(
         group_sep='/',
         hierarchy_in_labels=False,
         multiple_select='both',
+        t_lang_codes=[],
         *args,
         **kwargs,
     ):
@@ -493,10 +494,17 @@ def get_labels(
             if self._is_translation:
                 return [f'{source_label} - translation ({self.language})']
             elif self._is_transcript:
-                return [
-                    f'{source_label} - transcript ({code})'
-                    for code in self.languages
-                ]
+                if t_lang_codes:
+                    return [
+                        f'{source_label} - transcript ({code})'
+                        for code in self.languages
+                        if code in t_lang_codes
+                    ]
+                else:
+                    return [
+                        f'{source_label} - transcript ({code})'
+                        for code in self.languages
+                    ]
         return [self._get_label(*args)]
 
     def get_stats(self, metrics, lang=UNSPECIFIED_TRANSLATION, limit=100):
@@ -514,12 +522,21 @@ def get_stats(self, metrics, lang=UNSPECIFIED_TRANSLATION, limit=100):
 
         return stats
 
-    def get_value_names(self, multiple_select='both', *args, **kwargs):
+    def get_value_names(
+        self, multiple_select='both', t_lang_codes=[], *args, **kwargs
+    ):
         if self._is_transcript:
-            return [
-                f'{self.source_field.name} - transcript ({code})'
-                for code in self.languages
-            ]
+            if t_lang_codes:
+                return [
+                    f'{self.source_field.name} - transcript ({code})'
+                    for code in self.languages
+                    if code in t_lang_codes
+                ]
+            else:
+                return [
+                    f'{self.source_field.name} - transcript ({code})'
+                    for code in self.languages
+                ]
         return super().get_value_names()
 
     @property
@@ -538,6 +555,7 @@ def format(
         hierarchy_in_labels=False,
         multiple_select='both',
         xls_types_as_text=True,
+        t_lang_codes=[],
         *args,
         **kwargs,
     ):
@@ -550,11 +568,13 @@ def format(
             except KeyError:
                 val = ''
         elif self._is_transcript:
-            cells = dict.fromkeys(self.get_value_names(), '')
+            cells = dict.fromkeys(
+                self.get_value_names(t_lang_codes=t_lang_codes), ''
+            )
             if isinstance(val, dict):
-                cells[
-                    f'{self.source_field.name} - transcript ({val["languageCode"]})'
-                ] = val['value']
+                name = f'{self.source_field.name} - transcript ({val["languageCode"]})'
+                if name in cells:
+                    cells[name] = val['value']
             return cells
 
         return {self.name: val}

tests/test_additional_field_exports.py

@@ -15,10 +15,11 @@ def test_additional_field_exports_without_labels():
         'versions': 'v1',
         'filter_fields': [
             'record_a_note',
-            'record_a_note/transcript',
-            'record_a_note/translation_en',
-            'record_a_note/translation_es',
-            'record_a_note/acme_timestamp',
+            '_supplementalDetails/record_a_note/transcript_en',
+            '_supplementalDetails/record_a_note/transcript_es',
+            '_supplementalDetails/record_a_note/translation_en',
+            '_supplementalDetails/record_a_note/translation_es',
+            '_supplementalDetails/record_a_note/acme_timestamp',
         ],
     }
     export = pack.export(**options)
@@ -55,10 +56,11 @@ def test_additional_field_exports_with_labels():
         'versions': 'v1',
         'filter_fields': [
             'record_a_note',
-            'record_a_note/transcript',
-            'record_a_note/translation_en',
-            'record_a_note/translation_es',
-            'record_a_note/acme_timestamp',
+            '_supplementalDetails/record_a_note/transcript_en',
+            '_supplementalDetails/record_a_note/transcript_es',
+            '_supplementalDetails/record_a_note/translation_en',
+            '_supplementalDetails/record_a_note/translation_es',
+            '_supplementalDetails/record_a_note/acme_timestamp',
         ],
         'lang': 'English (en)',
     }
@@ -424,8 +426,8 @@ def test_additional_field_exports_all_versions_exclude_fields():
         'versions': pack.versions,
         'filter_fields': [
             'record_a_note',
-            'clerk_details/name_of_shop',
-            'clerk_details/name_of_clerk',
+            '_supplementalDetails/clerk_details/name_of_shop',
+            '_supplementalDetails/clerk_details/name_of_clerk',
         ],
     }
     export = pack.export(**options)