Merge urgent changes to master branch into WIP dev branch (easier merging later)

Author: Danielle

CHANGELOG.md

@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Upcoming additions of other language forms to CDI
 - Addition of English-language short forms
 
+## [1.1.2] - 2018-06-21
+### Added
+- Added translations for Spanish-language CDI instructions
+
+### Changed
+- Greater tolerance of non-ascii characters in parent-reported text
+
+
 ## [1.1.1] - 2018-05-11
 ### Changed
 - Marked CDI form instructions for Spanish-language translations

webcdi/cdi_forms/models.py

@@ -15,7 +15,6 @@ class requests_log(models.Model):
     request_type = models.CharField(max_length=4)
     timestamp = models.DateTimeField(auto_now = True)
 
-
 # Method for ensuring that a value is positive
 def validate_g_zero(value):
         if value <= 0:

webcdi/cdi_forms/views.py

@@ -303,6 +303,7 @@ def prefilled_cdi_data(administration_instance):
                             section['type'] = item_type['type']
 
                         x = cdi_items(group_objects, section['type'], prefilled_data, item_type['id'])
+
                         section['objects'] = x
                         if administration_instance.study.show_feedback: raw_objects.extend(x)
                         if any(['*' in x['definition'] for x in section['objects']]):

webcdi/researcher_UI/views.py

@@ -783,7 +783,7 @@ def import_data(request, study_name):
             PROJECT_ROOT = settings.BASE_DIR
             instruments_json = json.load(open(os.path.realpath(PROJECT_ROOT + '/static/json/instruments.json')))
             header_file_path = filter(lambda x: x['language'] == study_obj.instrument.language and x['form'] == study_obj.instrument.form, instruments_json)[0]['fillable_headers']
-            pdf_header_df = pd.read_csv(header_file_path)
+            pdf_header_df = pd.read_csv(open(os.path.realpath(PROJECT_ROOT + '/' +header_file_path)))
 
             default_dict = {
             'annual_income': u'Prefer not to disclose', 'birth_order': 0, 'birth_weight_kg': None,

webcdi/supplementtut/views.py

@@ -21,6 +21,7 @@
 from django.contrib.auth import login, authenticate
 from django.contrib.sites.models import Site
 
+
 def save_researcher_profile_receiver(sender, user, profile, request, **kwargs):
     researcher_profile, created = researcher.objects.get_or_create(user = profile.user)
     profile.user.first_name = profile.supplement.first_name