From e934ffa5d89afd66bf02cd82f0ed779a2258b49e Mon Sep 17 00:00:00 2001 From: Dickson Ukang'a Date: Thu, 15 Jun 2017 03:56:39 +0300 Subject: [PATCH] Include all repeat fields in CSV exports which maintains the order closes #1042 --- onadata/libs/utils/csv_builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onadata/libs/utils/csv_builder.py b/onadata/libs/utils/csv_builder.py index 4725e047c3..b8caf2292d 100644 --- a/onadata/libs/utils/csv_builder.py +++ b/onadata/libs/utils/csv_builder.py @@ -32,6 +32,7 @@ GROUP_DELIMITER_DOT = '.' DEFAULT_GROUP_DELIMITER = GROUP_DELIMITER_SLASH GROUP_DELIMITERS = [GROUP_DELIMITER_SLASH, GROUP_DELIMITER_DOT] +DEFAULT_NA_REP = getattr(settings, 'NA_REP', NA_REP) def remove_dups_from_list_maintain_order(l): @@ -348,8 +349,7 @@ def get_ordered_repeat_value(xpath, repeat_value): for elem in children: xp = elem.get_abbreviated_xpath() - if xp in repeat_value: - item[xp] = repeat_value[xp] + item[xp] = repeat_value.get(xp, DEFAULT_NA_REP) return item