From da3792edbdc9e4311d4684db5534ff6e732015f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20L=C3=A9ger?= Date: Fri, 14 Dec 2018 10:26:50 -0500 Subject: [PATCH 1/5] Use FormPack.FormField.contextual_name for reports --- kobo/apps/reports/report_data.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kobo/apps/reports/report_data.py b/kobo/apps/reports/report_data.py index 1d3323dfb1..174f8f2e16 100644 --- a/kobo/apps/reports/report_data.py +++ b/kobo/apps/reports/report_data.py @@ -128,7 +128,7 @@ def data_by_identifiers(asset, field_names=None, submission_stream=None, _all_versions = pack.versions.keys() report = pack.autoreport(versions=_all_versions) fields_by_name = OrderedDict([ - (field.name, field) for field in + (field.contextual_name, field) for field in pack.get_fields_for_versions(versions=_all_versions) ]) if field_names is None: @@ -157,15 +157,15 @@ def _stat_dict_to_array(stat, field_name): 'percentages': percentages}) def _package_stat(field, _, stat, split_by): - identifier = kuids.get(field.name) + identifier = kuids.get(field.contextual_name) if not split_by: - _stat_dict_to_array(stat, field.name) + _stat_dict_to_array(stat, field.contextual_name) elif 'values' in stat: for _, sub_stat in stat['values']: - _stat_dict_to_array(sub_stat, field.name) + _stat_dict_to_array(sub_stat, field.contextual_name) return { - 'name': field.name, - 'row': {'type': fields_by_name.get(field.name).data_type}, + 'name': field.contextual_name, + 'row': {'type': fields_by_name.get(field.contextual_name).data_type}, 'data': stat, 'kuid': identifier, 'style': specified_styles.get(identifier, {}), From 130a45e38119aed83beb0aa7017df799ca881163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20L=C3=A9ger?= Date: Fri, 14 Dec 2018 11:21:55 -0500 Subject: [PATCH 2/5] Use FormPack commit #'dc693133429f1566ff62e440734e6021b5ae3d32' --- dependencies/pip/dev_requirements.txt | 2 +- dependencies/pip/external_services.txt | 2 +- dependencies/pip/requirements.in | 2 +- dependencies/pip/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt index f0904ef545..2b4645dddd 100644 --- a/dependencies/pip/dev_requirements.txt +++ b/dependencies/pip/dev_requirements.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/dev_requirements.txt dependencies/pip/dev_requirements.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@dc693133429f1566ff62e440734e6021b5ae3d32#egg=formpack amqp==2.1.4 anyjson==0.3.3 argparse==1.4.0 # via unittest2 diff --git a/dependencies/pip/external_services.txt b/dependencies/pip/external_services.txt index 968195aafc..07066206d7 100644 --- a/dependencies/pip/external_services.txt +++ b/dependencies/pip/external_services.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/external_services.txt dependencies/pip/external_services.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@dc693133429f1566ff62e440734e6021b5ae3d32#egg=formpack amqp==2.3.2 anyjson==0.3.3 argparse==1.4.0 # via unittest2 diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in index f23b119beb..0356967ab2 100644 --- a/dependencies/pip/requirements.in +++ b/dependencies/pip/requirements.in @@ -2,7 +2,7 @@ # https://github.com/bndr/pipreqs is a handy utility, too. # Formpack --e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@dc693133429f1566ff62e440734e6021b5ae3d32#egg=formpack # More up-to-date version of django-digest than PyPI seems to have. # Also, python-digest is an unlisted dependency thereof. diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt index cee18e5462..de9e6f2d8a 100644 --- a/dependencies/pip/requirements.txt +++ b/dependencies/pip/requirements.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/requirements.txt dependencies/pip/requirements.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@dc693133429f1566ff62e440734e6021b5ae3d32#egg=formpack amqp==2.3.2 anyjson==0.3.3 argparse==1.4.0 # via unittest2 From b219d7ffba8491b05f9b4be168ae30a197b44419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20L=C3=A9ger?= Date: Fri, 14 Dec 2018 15:39:45 -0500 Subject: [PATCH 3/5] Use FormPack commit 3985489bbba3b03e285ce1080b2ef6da6b3702b3 --- dependencies/pip/dev_requirements.txt | 2 +- dependencies/pip/external_services.txt | 2 +- dependencies/pip/requirements.in | 2 +- dependencies/pip/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt index 2b4645dddd..cd9e4cb6f7 100644 --- a/dependencies/pip/dev_requirements.txt +++ b/dependencies/pip/dev_requirements.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/dev_requirements.txt dependencies/pip/dev_requirements.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@dc693133429f1566ff62e440734e6021b5ae3d32#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@3985489bbba3b03e285ce1080b2ef6da6b3702b3#egg=formpack amqp==2.1.4 anyjson==0.3.3 argparse==1.4.0 # via unittest2 diff --git a/dependencies/pip/external_services.txt b/dependencies/pip/external_services.txt index 07066206d7..cd0de4b9b1 100644 --- a/dependencies/pip/external_services.txt +++ b/dependencies/pip/external_services.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/external_services.txt dependencies/pip/external_services.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@dc693133429f1566ff62e440734e6021b5ae3d32#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@3985489bbba3b03e285ce1080b2ef6da6b3702b3#egg=formpack amqp==2.3.2 anyjson==0.3.3 argparse==1.4.0 # via unittest2 diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in index 0356967ab2..64d601b279 100644 --- a/dependencies/pip/requirements.in +++ b/dependencies/pip/requirements.in @@ -2,7 +2,7 @@ # https://github.com/bndr/pipreqs is a handy utility, too. # Formpack --e git+https://github.com/kobotoolbox/formpack.git@dc693133429f1566ff62e440734e6021b5ae3d32#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@3985489bbba3b03e285ce1080b2ef6da6b3702b3#egg=formpack # More up-to-date version of django-digest than PyPI seems to have. # Also, python-digest is an unlisted dependency thereof. diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt index de9e6f2d8a..45fd27a929 100644 --- a/dependencies/pip/requirements.txt +++ b/dependencies/pip/requirements.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/requirements.txt dependencies/pip/requirements.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@dc693133429f1566ff62e440734e6021b5ae3d32#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@3985489bbba3b03e285ce1080b2ef6da6b3702b3#egg=formpack amqp==2.3.2 anyjson==0.3.3 argparse==1.4.0 # via unittest2 From e0069e9bb4c9f8b9389b90fe242a11b871111b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20L=C3=A9ger?= Date: Wed, 19 Dec 2018 12:21:04 -0500 Subject: [PATCH 4/5] Updated FormPack commit id in pip dependencies --- dependencies/pip/dev_requirements.txt | 2 +- dependencies/pip/external_services.txt | 2 +- dependencies/pip/requirements.in | 2 +- dependencies/pip/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt index 6d1ed51b3f..42a87757fd 100644 --- a/dependencies/pip/dev_requirements.txt +++ b/dependencies/pip/dev_requirements.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/dev_requirements.txt dependencies/pip/dev_requirements.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@50b5a2e82aa98078986e265c5f351e2ee5db5d0c#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@d1c54293d1bf1021b23bcd27fba0673098a16bb6#egg=formpack amqp==2.1.4 anyjson==0.3.3 argparse==1.4.0 # via unittest2 diff --git a/dependencies/pip/external_services.txt b/dependencies/pip/external_services.txt index f31ccacba3..f229c35257 100644 --- a/dependencies/pip/external_services.txt +++ b/dependencies/pip/external_services.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/external_services.txt dependencies/pip/external_services.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@50b5a2e82aa98078986e265c5f351e2ee5db5d0c#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@d1c54293d1bf1021b23bcd27fba0673098a16bb6#egg=formpack amqp==2.3.2 anyjson==0.3.3 argparse==1.4.0 # via unittest2 diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in index 8ac98cbe73..4d88e3f711 100644 --- a/dependencies/pip/requirements.in +++ b/dependencies/pip/requirements.in @@ -2,7 +2,7 @@ # https://github.com/bndr/pipreqs is a handy utility, too. # Formpack --e git+https://github.com/kobotoolbox/formpack.git@50b5a2e82aa98078986e265c5f351e2ee5db5d0c#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@d1c54293d1bf1021b23bcd27fba0673098a16bb6#egg=formpack # More up-to-date version of django-digest than PyPI seems to have. # Also, python-digest is an unlisted dependency thereof. diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt index 99da0a8765..b7b0ab7f9a 100644 --- a/dependencies/pip/requirements.txt +++ b/dependencies/pip/requirements.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/requirements.txt dependencies/pip/requirements.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@50b5a2e82aa98078986e265c5f351e2ee5db5d0c#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@d1c54293d1bf1021b23bcd27fba0673098a16bb6#egg=formpack amqp==2.3.2 anyjson==0.3.3 argparse==1.4.0 # via unittest2 From dfbf71a687dc925122e81d6c8a27a32f1198adcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20L=C3=A9ger?= Date: Thu, 20 Dec 2018 17:15:04 -0500 Subject: [PATCH 5/5] Updated FormPack commit id --- dependencies/pip/dev_requirements.txt | 2 +- dependencies/pip/external_services.txt | 2 +- dependencies/pip/requirements.in | 2 +- dependencies/pip/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt index 42a87757fd..7e39b9695d 100644 --- a/dependencies/pip/dev_requirements.txt +++ b/dependencies/pip/dev_requirements.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/dev_requirements.txt dependencies/pip/dev_requirements.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@d1c54293d1bf1021b23bcd27fba0673098a16bb6#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@f0ddf7d68b792cdf7c59101ee79dc631bbcd3d0b#egg=formpack amqp==2.1.4 anyjson==0.3.3 argparse==1.4.0 # via unittest2 diff --git a/dependencies/pip/external_services.txt b/dependencies/pip/external_services.txt index f229c35257..a7bcf1fcc2 100644 --- a/dependencies/pip/external_services.txt +++ b/dependencies/pip/external_services.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/external_services.txt dependencies/pip/external_services.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@d1c54293d1bf1021b23bcd27fba0673098a16bb6#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@f0ddf7d68b792cdf7c59101ee79dc631bbcd3d0b#egg=formpack amqp==2.3.2 anyjson==0.3.3 argparse==1.4.0 # via unittest2 diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in index 4d88e3f711..682528d1c7 100644 --- a/dependencies/pip/requirements.in +++ b/dependencies/pip/requirements.in @@ -2,7 +2,7 @@ # https://github.com/bndr/pipreqs is a handy utility, too. # Formpack --e git+https://github.com/kobotoolbox/formpack.git@d1c54293d1bf1021b23bcd27fba0673098a16bb6#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@f0ddf7d68b792cdf7c59101ee79dc631bbcd3d0b#egg=formpack # More up-to-date version of django-digest than PyPI seems to have. # Also, python-digest is an unlisted dependency thereof. diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt index b7b0ab7f9a..a43e324da3 100644 --- a/dependencies/pip/requirements.txt +++ b/dependencies/pip/requirements.txt @@ -5,7 +5,7 @@ # pip-compile --output-file dependencies/pip/requirements.txt dependencies/pip/requirements.in # -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest --e git+https://github.com/kobotoolbox/formpack.git@d1c54293d1bf1021b23bcd27fba0673098a16bb6#egg=formpack +-e git+https://github.com/kobotoolbox/formpack.git@f0ddf7d68b792cdf7c59101ee79dc631bbcd3d0b#egg=formpack amqp==2.3.2 anyjson==0.3.3 argparse==1.4.0 # via unittest2