[#1264] Added goals overview

akvo · Mar 2, 2015 · d69595a · d69595a
1 parent 342a4fe
commit d69595a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/akvo/rsr/static/rsr/v3/js/src/react-project-main.js b/akvo/rsr/static/rsr/v3/js/src/react-project-main.js
@@ -33,14 +33,20 @@ var AccordionInstance = React.createClass({displayName: 'AccordionInstance',
         } else {
             sustainability = null;
         }
+        if (this.props.source.goals_overview != "") {
+            goals_overview = Panel(  {className:"goals_overview", header:"Goals overview", key:'goals_overview'}, this.props.source.goals_overview);
+        } else {
+            goals_overview = null;
+        }
 
         return (
             Accordion(null, 
                 background,
                 current_status,
                 project_plan,
                 target_group,
-                sustainability
+                sustainability,
+                goals_overview
             )
             );
     }

diff --git a/akvo/rsr/static/rsr/v3/js/src/react-project-main.jsx b/akvo/rsr/static/rsr/v3/js/src/react-project-main.jsx
@@ -33,6 +33,11 @@ var AccordionInstance = React.createClass({
         } else {
             sustainability = null;
         }
+        if (this.props.source.goals_overview != "") {
+            goals_overview = <Panel  className="goals_overview" header="Goals overview" key={'goals_overview'}>{this.props.source.goals_overview}</Panel>;
+        } else {
+            goals_overview = null;
+        }
 
         return (
             <Accordion>
@@ -41,6 +46,7 @@ var AccordionInstance = React.createClass({
                 {project_plan}
                 {target_group}
                 {sustainability}
+                {goals_overview}
             </Accordion>
             );
     }

diff --git a/akvo/rsr/views/project.py b/akvo/rsr/views/project.py
@@ -29,6 +29,7 @@ def _get_accordion_data(project):
     accordion_data['project_plan'] = project.project_plan
     accordion_data['target_group'] = project.target_group
     accordion_data['sustainability'] = project.sustainability
+    accordion_data['goals_overview'] = project.goals_overview
     return accordion_data