------------------------------------------------------------
revno: 11017
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Mon 2013-05-27 16:11:49 +0200
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java
--
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-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl 2012-07-30 19:02:10 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl 2013-05-27 14:11:49 +0000
@@ -29,48 +29,6 @@
<td colspan="6">period yyyy-MM-dd (opt)</td>
</tr>
</table><br/>
-
- <table>
- <tr>
- <td>Dynamic Data</td>
- <td><a href="data.html">html</a></td>
- <td><a href="data.json">json</a></td>
- <td><a href="data.xls">xls</a></td>
- <td><a href="data.pdf">pdf</a></td>
- </tr>
- <tr>
- <td>in</td>
- <td>indicator uids</td>
- </tr>
- <tr>
- <td>de</td>
- <td>data element uids</td>
- </tr>
- <tr>
- <td>ds</td>
- <td>data set uids</td>
- </tr>
- <tr>
- <td>ou</td>
- <td>org unit uids</td>
- </tr>
- <tr>
- <td>crosstab</td>
- <td>crosstab dimensions</td>
- </tr>
- <tr>
- <td>orgUnitIsParent</td>
- <td>true/false</td>
- </tr>
- <tr>
- <td>minimal</td>
- <td>true/false</td>
- </tr>
- <tr>
- <td>[relative periods]</td>
- <td>[boolean values]</td>
- </tr>
- </table><br/>
<table>
<tr>
@@ -86,18 +44,6 @@
<td> <xsl:value-of select="@code" /> </td>
</tr>
<tr>
- <td>DoIndicators</td>
- <td> <xsl:value-of select="d:doIndicators" /> </td>
- </tr>
- <tr>
- <td>DoPeriods</td>
- <td> <xsl:value-of select="d:doPeriods" /> </td>
- </tr>
- <tr>
- <td>DoUnits</td>
- <td> <xsl:value-of select="d:doUnits" /> </td>
- </tr>
- <tr>
<td>Regression</td>
<td> <xsl:value-of select="d:regression" /> </td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java 2013-05-19 18:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java 2013-05-27 14:11:49 +0000
@@ -180,7 +180,7 @@
Period period = PeriodType.getPeriodFromIsoString( pe );
- Date date = period != null ? period.getStartDate() : new Date();
+ Date date = period != null ? period.getStartDate() : null;
grid = reportTableService.getReportTableGrid( uid, format, date, ou );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
