diff --git a/akvo/templates/reportserver/BIRT/Project-results-single.rptdesign b/akvo/templates/reportserver/BIRT/Project-results-single.rptdesign
index 80a7bd7686..1dddcd0449 100644
--- a/akvo/templates/reportserver/BIRT/Project-results-single.rptdesign
+++ b/akvo/templates/reportserver/BIRT/Project-results-single.rptdesign
@@ -3442,6 +3442,18 @@ where (rsr_relatedproject.relation = '2') and (rsr_relatedproject.related_projec
row["title"]
html
+
+ 8pt
+ 8pt
+ 8pt
+ ((reportContext.getGlobalVariable("planned_start") ) ?
+"Planned "+ reportContext.getGlobalVariable("planned_start") + " - " + reportContext.getGlobalVariable("planned_end") :
+ "(No time period)")
+ +
+((reportContext.getGlobalVariable("actual_start") ) ?
+ "Actual "+ reportContext.getGlobalVariable("actual_start") + " - " + reportContext.getGlobalVariable("actual_end") + " (actual)" :"")
+ html
+
silver
0pt
@@ -3499,6 +3511,16 @@ where (rsr_relatedproject.relation = '2') and (rsr_relatedproject.related_projec
string
+
+
+
row["project_plan_summary"]
html
@@ -3592,7 +3614,7 @@ where (rsr_relatedproject.relation = '2') and (rsr_relatedproject.related_projec
true
- row ["city"] + ", " + row["countryname"]
+ row ["city"] + (row ["city"] ? ", ":"") + row["countryname"]
html
diff --git a/akvo/templates/reportserver/README.md b/akvo/templates/reportserver/README.md
index b50a385c5d..f59bc6beb2 100644
--- a/akvo/templates/reportserver/README.md
+++ b/akvo/templates/reportserver/README.md
@@ -4,7 +4,7 @@ These BIRT templates are intended to be installed on a ReportServer.
They were developed using the BIRT Report Designer plugin for Eclipse, version 4.4.
-The RSR projects used as test cases were 2849 and its parent project 2081.
+The RSR projects used as test cases were #2849 and its parent project #2081.
## Deployment to reportserver
@@ -21,7 +21,7 @@ Where format can be one of [WORD, PDF, HTML, PNG, EXCEL].
During development I found it convenient to:
-## Set up a readonly account for the database
+### Set up a readonly account for the database
```
sudo -u postgres psql
postgres=# create role rsr_readonly encrypted password '*************' login;
@@ -37,10 +37,10 @@ GRANT
```
-## Make an ssl tunnel to the DB server
+### Make an ssl tunnel to the DB server
```
-ssh -L 1234:psql.test.akvo-ops.org:5432 gabriel@psql.test.akvo-ops.org
+ssh -L 1234:psql.test.akvo-ops.org:5432 stellan@psql.test.akvo-ops.org
```
which allowed me to create a BIRT data source like this:
```