Repository: akvo/akvo-rsr

Issue:
Make progress indicator less confusing for percentage indicators
We can have indicators which are percentages, and having a completion percentage displayed along side the completion percentage value can get confusing.  Change the progress indicator slightly to make this less confusing
Results and Indicators Overview Report is not pulling the results data correctly from the New Results Framework
The results data appearing in the Results and Indicators Overview doesn't seem to be pulling the correct data saved in the new results framework: 

<img width="1030" alt="screen shot 2017-06-21 at 11 51 46" src="https://user-images.githubusercontent.com/26227538/27378533-7cd7725e-5678-11e7-923c-b6489cf1896f.png">

<img width="1190" alt="screen shot 2017-06-21 at 11 52 09" src="https://user-images.githubusercontent.com/26227538/27378557-932eca02-5678-11e7-94a6-ac1bfa79c7ef.png">



Discussion:

Resolving patch:
diff --git a/akvo/rest/views/user.py b/akvo/rest/views/user.py
--- a/akvo/rest/views/user.py
+++ b/akvo/rest/views/user.py
@@ -130,7 +130,7 @@ def request_organisation(request, pk=None):
         data = EmploymentSerializer(employment).data
         if data['country']:
             data['country_full'] = employment.iati_country().name
-            data['country_name'] = str(employment.iati_country())
+            data['country_name'] = unicode(employment.iati_country())
         else:
             data['country_full'] = ''
         data['organisation_full'] = OrganisationSerializer(organisation).data
diff --git a/akvo/rsr/models/employment.py b/akvo/rsr/models/employment.py
--- a/akvo/rsr/models/employment.py
+++ b/akvo/rsr/models/employment.py
@@ -76,7 +76,7 @@ def iati_country(self):
         return codelist_value(codelist_models.Country, self, 'country')
 
     def iati_country_unicode(self):
-        return str(self.iati_country())
+        return unicode(self.iati_country())
 
     def approve(self, approved_by):
         """
diff --git a/akvo/rsr/views/project.py b/akvo/rsr/views/project.py
--- a/akvo/rsr/views/project.py
+++ b/akvo/rsr/views/project.py
@@ -45,6 +45,10 @@ def directory(request):
     """The project list view."""
     qs = remove_empty_querydict_items(request.GET)
 
+    # iati_status was renamed to sector in fa8094647b
+    if 'status' not in qs:
+        qs['status'] = qs.pop('iati_status', [''])[0]
+
     # Set show_filters to "in" if any filter is selected
     show_filters = "in"  # To simplify template use bootstrap class
     available_filters = [
@@ -128,6 +132,7 @@ def directory(request):
         'current_org': org_filter,
         'map_projects': map_projects,
         'sectors_dict': sectors_dict,
+        'limit': limit,
     }
     return render(request, 'project_directory.html', context)
 


Test patch:
diff --git a/akvo/rsr/tests/rest/test_user.py b/akvo/rsr/tests/rest/test_user.py
--- a/akvo/rsr/tests/rest/test_user.py
+++ b/akvo/rsr/tests/rest/test_user.py
@@ -12,6 +12,7 @@
 from django.conf import settings
 from django.test import TransactionTestCase, Client
 
+from akvo.codelists.models import Country, Version
 from akvo.rsr.models import Employment, Organisation, User
 from akvo.utils import check_auth_groups
 
@@ -31,6 +32,13 @@ def setUp(self):
         self.user = self._create_user('abc@example.com', self.user_password)
         self.c.login(username=self.user.username, password=self.user_password)
 
+        version = Version.objects.create(code=settings.IATI_VERSION)
+        self.country = Country.objects.create(
+            code='CI',
+            name=u'CI - C\xc3\xb4te Divoire',
+            version=version
+        )
+
     def test_request_organisation_simple(self):
         # Given
         data = {'organisation': self.org.id}
@@ -48,7 +56,7 @@ def test_request_organisation_simple(self):
 
     def test_request_organisation_once(self):
         # Given
-        data = {'organisation': self.org.id, 'country': '', 'job_title': ''}
+        data = {'organisation': self.org.id, 'country': 'CI', 'job_title': ''}
         pk = self.user.id
 
         # When