Merge pull request #2070 from akvo/#2011-results-improve

[#2011] Improve the results framework

akvo/rest/serializers/result.py

@@ -15,6 +15,8 @@ class ResultSerializer(BaseRSRSerializer):
 
     project_title = serializers.Field(source='project.title')
     type_label = serializers.Field(source='iati_type')
+    parent_project = serializers.Field(source='parent_project')
+    child_projects = serializers.Field(source='child_projects')
 
     class Meta:
         model = Result
@@ -24,6 +26,8 @@ class ResultsFrameworkSerializer(BaseRSRSerializer):
 
     indicators = IndicatorFrameworkSerializer(many=True, required=False, allow_add_remove=True)
     project_title = serializers.Field(source='project.title')
+    parent_project = serializers.Field(source='parent_project')
+    child_projects = serializers.Field(source='child_projects')
 
     class Meta:
         model = Result

akvo/rsr/models/result.py

@@ -112,6 +112,23 @@ def has_info(self):
     def is_calculated(self):
         return self.project.is_impact_project
 
+    def parent_project(self):
+        """
+        Return a dictionary of this result's parent project.
+        """
+        if self.parent_result:
+            return {self.parent_result.project.id: self.parent_result.project.title}
+        return {}
+
+    def child_projects(self):
+        """
+        Return a dictionary of this result's child projects.
+        """
+        projects = {}
+        for result in Result.objects.filter(parent_result=self):
+            projects[result.project.id] = result.project.title
+        return projects
+
     class Meta:
         app_label = 'rsr'
         verbose_name = _(u'result')