dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2573
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-01-14 20:17:45 +0100
message:
  Added line, chart values, name of period/orgunit to jasper report table
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm


--
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-commons/src/main/resources/grid.vm'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm	2011-01-14 18:53:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm	2011-01-14 19:17:45 +0000
@@ -27,6 +27,27 @@
 				</textElement>
 				<text><![CDATA[${grid.title}]]></text>
 			</staticText>
+			<textField>
+				<reportElement x="12" y="67" width="253" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[${dollar}F{reporting_month_name}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="289" y="67" width="255" height="20"/>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[${dollar}F{organisationunitname}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="265" y="67" width="24" height="20"/>
+				<textElement textAlignment="Center">
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[-]]></text>
+			</staticText>
 			<bar3DChart>
 				<chart evaluationTime="Report">
 					<reportElement x="12" y="114" width="532" height="210"/>
@@ -48,9 +69,11 @@
 					#end
 					#end
 				</categoryDataset>
-				<bar3DPlot>
+				<bar3DPlot isShowLabels="true">
 					<plot/>
-					<itemLabel color="#000000" backgroundColor="#FFFFFF"/>
+					<itemLabel color="#000000" backgroundColor="#FFFFFF">
+						<font isBold="true"/>
+					</itemLabel>
 					<categoryAxisFormat>
 						<axisFormat>
 							<labelFont/>
@@ -86,6 +109,9 @@
 			</staticText>
 			#set( $x = ( $x + $offset ) )
 			#end
+			<line>
+				<reportElement x="10" y="44" width="${x}" height="1"/>
+			</line>
 		</band>
 	</columnHeader>
 	<detail>