diff --git a/akvo/templates/reportserver/BIRT/Project-results-single.rptdesign b/akvo/templates/reportserver/BIRT/Project-results-single.rptdesign index 2c9d540e99..4c94978a54 100644 --- a/akvo/templates/reportserver/BIRT/Project-results-single.rptdesign +++ b/akvo/templates/reportserver/BIRT/Project-results-single.rptdesign @@ -111,26 +111,7 @@ nulls lowest - - - ResultRowNumber - integer - RUNNINGCOUNT - - - - id - measure - id - id - - - project_id - measure - project_id - project_id - title dimension @@ -138,40 +119,22 @@ title - type - dimension - type - type - - - aggregation_status + result_pk measure - aggregation_status - aggregation_status + result_pk + result_pk - description + indicator_title dimension - description - description + indicator_title + indicator_title - result_id + indicator_pk measure - result_id - result_id - - - measure - dimension - measure - measure - - - ascending - measure - ascending - ascending + indicator_pk + indicator_pk baseline_year @@ -179,12 +142,6 @@ baseline_year baseline_year - - baseline_value - dimension - baseline_value - baseline_value - baseline_comment dimension @@ -192,22 +149,28 @@ baseline_comment - indicator_id + baseline_value + dimension + baseline_value + baseline_value + + + indicatorperiod_pk measure - indicator_id - indicator_id + indicatorperiod_pk + indicatorperiod_pk - period_start + actual_value dimension - period_start - period_start + actual_value + actual_value - period_end + actual_comment dimension - period_end - period_end + actual_comment + actual_comment target_value @@ -222,16 +185,16 @@ target_comment - actual_value + period_start dimension - actual_value - actual_value + period_start + period_start - actual_comment + period_end dimension - actual_comment - actual_comment + period_end + period_end @@ -251,296 +214,196 @@ 1 - id - integer + title + string 2 - project_id + result_pk integer 3 - title + indicator_title string 4 - type - string + indicator_pk + integer 5 - aggregation_status + baseline_year integer 6 - description + baseline_comment string 7 - id_7 - integer + baseline_value + string 8 - result_id + indicatorperiod_pk integer 9 - title_9 + actual_value string 10 - measure + actual_comment string 11 - ascending - integer + target_value + string 12 - description_12 + target_comment string 13 - baseline_year - integer - - - 14 - baseline_value - string - - - 15 - baseline_comment - string - - - 16 - id_16 - integer - - - 17 - indicator_id - integer - - - 18 period_start date - 19 + 14 period_end date - - 20 - target_value - string - - - 21 - target_comment - string - - - 22 - actual_value - string - - - 23 - actual_comment - string - - - 24 - ResultRowNumber - integer - RSR-test 1 - id - id - integer - 4 + title + title + string + 12 2 - project_id - project_id + result_pk + result_pk integer 4 3 - title - title + indicator_title + indicator_title string 12 4 - type - type - string - 12 + indicator_pk + indicator_pk + integer + 4 5 - aggregation_status - aggregation_status + baseline_year + baseline_year integer - -7 + 4 6 - description - description + baseline_comment + baseline_comment string 12 7 - id_7 - id - integer - 4 + baseline_value + baseline_value + string + 12 8 - result_id - result_id + indicatorperiod_pk + indicatorperiod_pk integer 4 9 - title_9 - title + actual_value + actual_value string 12 10 - measure - measure + actual_comment + actual_comment string 12 11 - ascending - ascending - integer - -7 - - - 12 - description_12 - description - string - 12 - - - 13 - baseline_year - baseline_year - integer - 4 - - - 14 - baseline_value - baseline_value + target_value + target_value string 12 - 15 - baseline_comment - baseline_comment + 12 + target_comment + target_comment string 12 - 16 - id_16 - id - integer - 4 - - - 17 - indicator_id - indicator_id - integer - 4 - - - 18 + 13 period_start period_start date 91 - 19 + 14 period_end period_end date 91 - - 20 - target_value - target_value - string - 12 - - - 21 - target_comment - target_comment - string - 12 - - - 22 - actual_value - actual_value - string - 12 - - - 23 - actual_comment - actual_comment - string - 12 - - +where rsr_result.project_id = ? +order by rsr_result.id, rsr_indicator.id, rsr_indicatorperiod.period_start]]> 2.0 @@ -3366,6 +3229,125 @@ where (rsr_relatedproject.relation = '2') and (rsr_relatedproject.related_projec +]]> + + + + + number + measure + number + number + + + + + param_1 + + integer + 4 + 1 + 1 + true + false + + + param_2 + + integer + 4 + 2 + 1 + true + false + + + + + + 1 + number + integer + + + + RSR-test + + + 1 + number + number + integer + 4 + + + + + + 2.0 + + + + In + + + + 1 + + 4 + 0 + 0 + Unknown + + + + + + In + + + + 2 + + 4 + 0 + 0 + Unknown + + + + + + + + + + + seventeen + 1 + + 4 + 10 + 0 + Unknown + + seventeen + + + + seventeen + + 11 + + + + + + + ]]> @@ -3439,6 +3421,10 @@ where (rsr_relatedproject.relation = '2') and (rsr_relatedproject.related_projec string + row["title"] html @@ -3446,12 +3432,49 @@ where (rsr_relatedproject.relation = '2') and (rsr_relatedproject.related_projec 8pt 8pt 8pt - ((reportContext.getGlobalVariable("planned_start") ) ? -"Planned "+ reportContext.getGlobalVariable("planned_start") + " - " + reportContext.getGlobalVariable("planned_end") : + Project + + + date_start_planned + date_start_planned + dataSetRow["date_start_planned"] + date + + + date_end_planned + date_end_planned + dataSetRow["date_end_planned"] + date + + + date_start_actual + date_start_actual + dataSetRow["date_start_actual"] + date + + + date_end_actual + date_end_actual + dataSetRow["date_end_actual"] + date + + + + ((row["date_start_planned"]) ? + row["date_start_planned"] + " -- " + row["date_end_planned"] : "(No time period)") - + -((reportContext.getGlobalVariable("actual_start") ) ? - "Actual "+ reportContext.getGlobalVariable("actual_start") + " - " + reportContext.getGlobalVariable("actual_end") + " (actual)" :"") + + " <br>" + +((row["date_start_actual"] || row["date_end_actual"]) ? + (row["date_start_actual"] ? row["date_start_actual"] : "") + + " -- " + + (row["date_end_actual"] ? row["date_end_actual"] : "") + + " (actual)" : + "") html @@ -3495,6 +3518,8 @@ where (rsr_relatedproject.relation = '2') and (rsr_relatedproject.related_projec + 1 + 3 12pt 0pt @@ -3512,12 +3537,6 @@ where (rsr_relatedproject.relation = '2') and (rsr_relatedproject.related_projec - @@ -3526,104 +3545,93 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); - - - - - 4pt - 8pt - 12pt - 8pt - - Partners - - - name - name - dataSetRow["name"] - string - - - -
- - - -
- - - - - 14pt - bold - 1pt - 1pt - 1pt - 1pt - name - - - - -
- - - -
-
- - - - - - - - - - - 14pt - bold - 0pt - 0pt - 4pt - 8pt - 12pt - 8pt - Project - - - countryname - countryname - dataSetRow["countryname"] - string - - - city - dataSetRow["city"] - string - true - - - (row ["city"] ? row ["city"] + ", " : "") + row["countryname"] - html - - - - + + Partners + + + name + name + dataSetRow["name"] + string + + + +
+ + + +
+ + + + + 14pt + bold + 1pt + 8pt + 1pt + 8pt + name + + + + +
+ + + +
+
+ + + + + + + + + + + 14pt + bold + 0pt + 0pt + 4pt + 8pt + 12pt + 8pt + Project + + + countryname + countryname + dataSetRow["countryname"] + string + + + city + dataSetRow["city"] + string + true + + + (row ["city"] ? row ["city"] + ", " : "") + row["countryname"] + html + - +
Parent_projects @@ -3678,7 +3686,7 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]);
- +
Child_projects @@ -3744,7 +3752,8 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]);
- +
+ 8pt7.979166666666667inResults_indicators_periods @@ -3779,12 +3788,6 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); dataSetRow["title"] string - - title_9 - title - dataSetRow["title_9"] - string - period_end period_end @@ -3797,6 +3800,18 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); dataSetRow["actual_comment"] string + + indicator_title + indicator_title + dataSetRow["indicator_title"] + string + + + baseline_year + baseline_year + dataSetRow["baseline_year"] + integer + baseline_comment baseline_comment @@ -3804,6 +3819,8 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); string + 50 2.7083333333333335in @@ -3825,7 +3842,7 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); bold orange 8pt - 8pt + 0pt 8pt 8pt left @@ -3840,7 +3857,9 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); - var a = 1, b; + left + var a=1,b=1; +reportContext.getGlobalVariable('debug') html @@ -3863,7 +3882,7 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); 14pt aqua 8pt - 8pt + 0pt 1pt 8pt b=1, "Result " + a++; @@ -3871,7 +3890,7 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); 14pt - 8pt + 0pt 8pt 8pt title @@ -3890,31 +3909,47 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); NewTableGroup2 - row["title_9"] + row["indicator_title"] - row["title_9"] + row["indicator_title"] false
+ #F0F0F0 all - !row["title_9"] + !row["indicator_title"] 4 1 - 8pt - 8pt + 0pt + 0pt 4pt - 8pt + 0pt silver 12pt blue - "Indicator " + b++ + ": " + row["title_9"] +"<BR>&nbsp;Baseline: " + row["baseline_value"] + " " + (row["baseline_year"] ? "(" + row["baseline_year"] + ")" : "") + 8pt + "Indicator " + b++ + ": " + row["indicator_title"] + html + + + maroon + 8pt + 8pt + + + all + !(row["baseline_value"] && row["baseline_year"]) + + + "Baseline: " + row["baseline_value"] + " " + (row["baseline_year"] ? "(" + row["baseline_year"] + ")" : "") ++ " " + row["baseline_comment"] html @@ -3941,9 +3976,11 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]); + #F0F0F0 @@ -3968,21 +4005,18 @@ reportContext.setGlobalVariable("planned_end",row["date_end_planned"]);