dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22531
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10848: Minor
------------------------------------------------------------
revno: 10848
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-15 15:39:24 +0200
message:
Minor
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java
dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2013-05-15 10:10:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2013-05-15 13:39:24 +0000
@@ -417,8 +417,7 @@
public ReportTable( String name, List<DataElement> dataElements, List<Indicator> indicators,
List<DataSet> dataSets, List<Period> periods, List<Period> relativePeriods, List<OrganisationUnit> organisationUnits,
List<OrganisationUnit> relativeUnits, List<OrganisationUnitGroup> organisationUnitGroups,
- boolean doIndicators,
- boolean doPeriods, boolean doUnits, RelativePeriods relatives, ReportParams reportParams,
+ boolean doIndicators, boolean doPeriods, boolean doUnits, RelativePeriods relatives, ReportParams reportParams,
I18nFormat i18nFormat, String reportingPeriodName )
{
this.name = name;
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html'
--- dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html 2013-03-14 13:07:10 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html 2013-05-15 13:39:24 +0000
@@ -56,6 +56,8 @@
var name = orgUnitHierarchy[0].name;<br><br>
+var orgUnitChildren = dhis2.report.organisationUnitChildren; // An array with child org unit objects<br><br>
+
var periods = dhis2.report.periods; // An array with period identifiers<br><br>
var period = periods[0];