Fix 360 w/ titles roundtrip

Author: Bjwebb

flattentool/json_input.py

@@ -55,6 +55,8 @@ def sheet_key_title(sheet, key, id_key=None):
     If the key has a corresponding title, return that. If doesn't, create it in the sheet and return it.
 
     """
+    if id_key: # call sheet_key_field instead
+        return sheet_key_field(sheet, key, id_key)
     title_lookup = {v: k for k, v in sheet.titles.items()}
     if key in title_lookup:
         return title_lookup[key]

flattentool/tests/fixtures/WellcomeTrust-grants_fixed_2_grants.json

@@ -26,7 +26,6 @@
             ], 
             "Surname of applicant": "Addison", 
             "Grant number": "105177/Z/14/Z", 
-            "amountAwarded": 152505, 
             "recipientOrganization": [
                 {
                     "addressLocality": "London", 
@@ -71,7 +70,6 @@
             ], 
             "Surname of applicant": "Sandell", 
             "Grant number": "105182/Z/14/Z", 
-            "amountAwarded": 178990, 
             "Grant type": "Large Arts Awards", 
             "Full name of applicant": "Prof Richard Sandell", 
             "awardDate": "24/07/2014"

flattentool/tests/test_roundtrip.py

@@ -31,7 +31,7 @@ def test_roundtrip(tmpdir, output_format):
     assert original_json == roundtripped_json
 
 
-@pytest.mark.parametrize('use_titles', [False, pytest.mark.xfail(True)])
+@pytest.mark.parametrize('use_titles', [False, True])
 @pytest.mark.parametrize('output_format', ['xlsx'])#, 'csv'])
 def test_roundtrip_360(tmpdir, output_format, use_titles):
     input_name = 'flattentool/tests/fixtures/WellcomeTrust-grants_fixed_2_grants.json'