dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1219
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-12-11 22:00:23 +0100
message:
  Removed images from reports from now, they are not very portable.
modified:
  resources/jrxml/anctt.jrxml
  resources/jrxml/feedback.jrxml
  resources/jrxml/immunization.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 'resources/jrxml/anctt.jrxml'
--- resources/jrxml/anctt.jrxml	2009-12-10 16:59:09 +0000
+++ resources/jrxml/anctt.jrxml	2009-12-11 21:00:23 +0000
@@ -56,7 +56,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="96" splitType="Stretch">
+		<band height="100" splitType="Stretch">
 			<staticText>
 				<reportElement x="144" y="10" width="266" height="31" forecolor="#4F6E96"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -71,46 +71,13 @@
 				</textElement>
 				<text><![CDATA[Sierra Leone Ministry of Health]]></text>
 			</staticText>
-			<image>
-				<reportElement x="38" y="10" width="83" height="62"/>
-				<imageExpression class="java.lang.String"><![CDATA["C:\\development\\jrxml\\sierra_leone_coat_of_arms.jpg"]]></imageExpression>
-			</image>
 		</band>
 	</title>
 	<pageHeader>
-		<band height="47" splitType="Stretch">
-			<staticText>
-				<reportElement x="24" y="0" width="76" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="SansSerif" size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
-				</textElement>
-				<text><![CDATA[Month:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="100" y="0" width="109" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="SansSerif" size="8"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{reporting_month_name}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="24" y="20" width="76" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="SansSerif" size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
-				</textElement>
-				<text><![CDATA[Organisation unit:]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="100" y="20" width="109" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="SansSerif" size="8"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{organisationunitname}]]></textFieldExpression>
-			</textField>
-		</band>
+		<band splitType="Stretch"/>
 	</pageHeader>
 	<columnHeader>
-		<band height="64" splitType="Stretch">
+		<band height="70" splitType="Stretch">
 			<staticText>
 				<reportElement x="149" y="39" width="40" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -208,6 +175,34 @@
 				</textElement>
 				<text><![CDATA[Data element]]></text>
 			</staticText>
+			<staticText>
+				<reportElement x="24" y="20" width="76" height="20"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="SansSerif" size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<text><![CDATA[Organisation unit:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="100" y="20" width="109" height="20"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="SansSerif" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{organisationunitname}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="24" y="0" width="76" height="20"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="SansSerif" size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<text><![CDATA[Month:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="100" y="0" width="109" height="20"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="SansSerif" size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{reporting_month_name}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>

=== modified file 'resources/jrxml/feedback.jrxml'
--- resources/jrxml/feedback.jrxml	2009-12-10 23:11:16 +0000
+++ resources/jrxml/feedback.jrxml	2009-12-11 21:00:23 +0000
@@ -71,10 +71,6 @@
 	</background>
 	<title>
 		<band height="88" splitType="Stretch">
-			<image>
-				<reportElement x="25" y="11" width="83" height="62"/>
-				<imageExpression class="java.lang.String"><![CDATA["C:\\development\\jrxml\\sierra_leone_coat_of_arms.jpg"]]></imageExpression>
-			</image>
 			<staticText>
 				<reportElement mode="Transparent" x="127" y="11" width="301" height="42" forecolor="#42B83B"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">

=== modified file 'resources/jrxml/immunization.jrxml'
--- resources/jrxml/immunization.jrxml	2009-12-10 23:11:16 +0000
+++ resources/jrxml/immunization.jrxml	2009-12-11 21:00:23 +0000
@@ -41,10 +41,6 @@
 	</background>
 	<title>
 		<band height="70" splitType="Stretch">
-			<image>
-				<reportElement x="50" y="0" width="83" height="62"/>
-				<imageExpression class="java.lang.String"><![CDATA["C:\\development\\jrxml\\sierra_leone_coat_of_arms.jpg"]]></imageExpression>
-			</image>
 			<staticText>
 				<reportElement x="151" y="0" width="253" height="46" forecolor="#354781"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">