dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8979: Adjusted ireport template

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 12 Nov 2012 16:46:13 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 8979
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-11-12 17:45:54 +0100
message:
  Adjusted ireport template
modified:
  dhis-2/dhis-support/dhis-support-system/src/main/resources/template.jrxml


--
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-support/dhis-support-system/src/main/resources/template.jrxml'
--- dhis-2/dhis-support/dhis-support-system/src/main/resources/template.jrxml	2012-10-01 10:50:34 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/resources/template.jrxml	2012-11-12 16:45:54 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"; name="report1" pageWidth="792" pageHeight="612" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="752" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="df48aa2c-3795-40ea-8bb4-7e8988796c80">
+	<property name="ireport.zoom" value="1.3310000000000004"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
 	<parameter name="periods" class="java.lang.String"/>
+	<parameter name="period_name" class="java.lang.String"/>
 	<parameter name="organisationunits" class="java.lang.String"/>
 	<parameter name="organisationunit_name" class="java.lang.String"/>
 	<parameter name="organisationunit_level" class="java.lang.Integer"/>
@@ -9,7 +13,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="212" splitType="Stretch">
+		<band height="231" splitType="Stretch">
 			<staticText>
 				<reportElement uuid="ac60f476-8e83-423f-b4a9-626128dc5563" x="0" y="26" width="726" height="20"/>
 				<textElement>
@@ -18,52 +22,52 @@
 				<text><![CDATA[This template contains a set of parameters which you can use directly in SQL to make dynamic reports]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="b9814cb8-49b5-46c1-a31a-b9e0b3c38b91" x="0" y="91" width="568" height="20"/>
+				<reportElement uuid="b9814cb8-49b5-46c1-a31a-b9e0b3c38b91" x="0" y="92" width="568" height="20"/>
 				<textElement/>
 				<text><![CDATA[periods: string of comma-separated identifiers of the selected relative period]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="97dcf9d1-0d3b-4573-86b9-3b6349187063" x="0" y="112" width="568" height="20"/>
+				<reportElement uuid="97dcf9d1-0d3b-4573-86b9-3b6349187063" x="0" y="134" width="568" height="20"/>
 				<textElement/>
 				<text><![CDATA[organisationunits: identifier of the selected organisation unit]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="22c8da34-3b81-43c0-ac15-733ae130ea6c" x="0" y="133" width="568" height="20"/>
+				<reportElement uuid="22c8da34-3b81-43c0-ac15-733ae130ea6c" x="0" y="155" width="568" height="20"/>
 				<textElement/>
 				<text><![CDATA[organisationunit_name: name of the selected organisation unit]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c43ce8d1-73fe-47aa-9005-e8ff1ef77865" x="0" y="154" width="568" height="20"/>
+				<reportElement uuid="c43ce8d1-73fe-47aa-9005-e8ff1ef77865" x="0" y="176" width="568" height="20"/>
 				<textElement/>
 				<text><![CDATA[organisationunit_level: level of the selected organisation unit]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f5e4800f-0f16-4ea4-ac58-985b46b32373" x="0" y="175" width="568" height="20"/>
+				<reportElement uuid="f5e4800f-0f16-4ea4-ac58-985b46b32373" x="0" y="197" width="568" height="20"/>
 				<textElement/>
 				<text><![CDATA[organisationunit_level_column: name of the corresponding column in the _orgunitstructure resource table]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="83d8575f-02ee-4a79-b438-86d4047cef2c" x="568" y="91" width="158" height="20"/>
+				<reportElement uuid="83d8575f-02ee-4a79-b438-86d4047cef2c" x="568" y="92" width="158" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{periods}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="78bd3c7a-312a-49a5-9ec6-aa1a6a054620" x="568" y="112" width="158" height="20"/>
+				<reportElement uuid="78bd3c7a-312a-49a5-9ec6-aa1a6a054620" x="568" y="134" width="158" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{organisationunits}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="ced2e65b-fbd3-415f-b621-a32c2d747515" x="568" y="133" width="158" height="20"/>
+				<reportElement uuid="ced2e65b-fbd3-415f-b621-a32c2d747515" x="568" y="155" width="158" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{organisationunit_name}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="99fc81bf-ac4a-445a-9864-eafe0b7f8d40" x="568" y="154" width="158" height="20"/>
+				<reportElement uuid="99fc81bf-ac4a-445a-9864-eafe0b7f8d40" x="568" y="176" width="158" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{organisationunit_level}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="671106c8-b073-447f-ae80-5d616d191836" x="568" y="175" width="158" height="20"/>
+				<reportElement uuid="671106c8-b073-447f-ae80-5d616d191836" x="568" y="197" width="158" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{organisationunit_level_column}]]></textFieldExpression>
 			</textField>
@@ -72,6 +76,16 @@
 				<textElement/>
 				<text><![CDATA[Note that you can use the format $P!{periods} to evaluate the parameter as text for use e.g. in SQL IN clauses like "period in ($P!{periods})"]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="b9814cb8-49b5-46c1-a31a-b9e0b3c38b91" x="0" y="113" width="568" height="20"/>
+				<textElement/>
+				<text><![CDATA[period_name: name of the selected period]]></text>
+			</staticText>
+			<textField>
+				<reportElement uuid="066345c4-7cac-4e08-8d46-7d2cfbaa8b9e" x="568" y="113" width="158" height="20"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{period_name}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>