Add country info in assessment registry export

the-deep · Dec 28, 2023 · cd30166 · cd30166
1 parent b27cbda
commit cd30166
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/apps/ary/export/affected_groups_info.py b/apps/ary/export/affected_groups_info.py
@@ -7,8 +7,9 @@
 
 def get_affected_groups_info(assessment):
     affected_group_type_dict = {choice.value: choice.label for choice in AssessmentRegistry.AffectedGroupType}
-    affected_groups = [affected_group_type_dict.get(group) for group in assessment.affected_groups]
-    levels = [f'Level {i+1}' for i in range(5)]
+    affected_groups = [affected_group_type_dict.get(group) for group in assessment.affected_groups if group]
+    max_level = max([len(v.split('/')) for k, v in AssessmentRegistry.AffectedGroupType.choices])
+    levels = [f'Level {i+1}' for i in range(max_level)]
     affected_grp_list = []
     for group in affected_groups:
         group = group.split("/")

diff --git a/apps/ary/export/common.py b/apps/ary/export/common.py
@@ -94,7 +94,7 @@ def get_assessment_meta(assessment):
         },
 
         'background': {
-            'country': 'Afghanistan',
+            'country': ', '.join(country.title for country in assessment.locations.all()),
             'crisis_type': assessment.get_bg_crisis_type_display(),
             'crisis_start_date': assessment.bg_crisis_start_date,
             'preparedness': assessment.get_bg_preparedness_display(),

diff --git a/apps/ary/export/questionaire.py b/apps/ary/export/questionaire.py
@@ -8,7 +8,7 @@ def get_questionaire(assessment):
     questionaire_dict = {}
     for sub_sector in sub_sector_list_set:
         questionaire_dict[sub_sector] = {
-            answer.question.question: answer.answer
+            answer.question.question: 1 if answer.answer else 0
             for answer in answers if answer.question.get_sub_sector_display() == sub_sector
         }
     return questionaire_dict
diff --git a/apps/assessment_registry/admin.py b/apps/assessment_registry/admin.py
@@ -12,7 +12,6 @@
     SummaryFocus,
     SummarySubDimensionIssue,
     SummaryIssue,
-    AdditionalDocument,
 )