Merge pull request #158 from unicef/bugfix/remove-unique-key-from-account-fieldset

Modify fields in document and account fieldsets

Author: datamik

src/country_workspace/versioning/scripts/0009_add_document_and_account_fieldsets.py

@@ -28,6 +28,7 @@
 
 document_fields = [
     ("document_number", {"field_type": forms.CharField}, {}),
+    ("type", {"field_type": forms.CharField}, {}),
     ("photo", {"field_type": Base64ImageField}, {}),
     ("issuance_date", {"field_type": forms.DateField}, {}),
     ("expiry_date", {"field_type": forms.DateField}, {}),
@@ -36,9 +37,9 @@
 
 account_fields = [
     ("number", {"field_type": forms.CharField}, {}),
-    ("data", {"field_type": forms.JSONField}, {}),
-    ("unique_key", {"field_type": forms.CharField}, {}),
+    ("account_type", {"field_type": forms.CharField}, {}),
     ("financial_institution", {"name": "FinancialInstitutionChoice"}, {}),
+    ("data", {"field_type": forms.JSONField}, {}),
 ]
 
 

tests/functional/test_f_import_data.py

@@ -59,16 +59,19 @@ def browser_program_beneficiary(browser, program_beneficiary):
 
 
 @pytest.mark.selenium
-def test_rdi_import_tab(browser_program):
+def test_rdi_import_tab(browser_program, program):
     browser_program.assert_element_visible("#tab-rdi")
     browser_program.assert_element_not_visible("#tab-aurora")
     browser_program.assert_element_not_visible("#tab-kobo")
     browser_program.assert_element_present('button[data-input-value="rdi"].selected')
 
     browser_program.assert_element_visible("#id_rdi-batch_name")
-    browser_program.assert_element_visible("#id_rdi-pk_column_name")
-    browser_program.assert_element_visible("#id_rdi-master_column_label")
-    browser_program.assert_element_visible("#id_rdi-detail_column_label")
+    if program.beneficiary_group.master_detail:
+        browser_program.assert_element_visible("#id_rdi-pk_column_name")
+        browser_program.assert_element_visible("#id_rdi-master_column_label")
+        browser_program.assert_element_visible("#id_rdi-detail_column_label")
+    else:
+        browser_program.assert_element_visible("#id_rdi-people_column_prefix")
     browser_program.assert_element_visible("#id_rdi-first_line")
     browser_program.assert_element_visible("#id_rdi-file")
     browser_program.assert_element_visible("#id_rdi-check_before")