------------------------------------------------------------ revno: 2074 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Tue 2010-11-16 14:25:15 +0100 message: Removed unused templates from reporting module removed: dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/tabular_template.xml dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/template.xml
-- 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
=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template' === removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/tabular_template.xml' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/tabular_template.xml 2009-03-03 16:46:36 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/tabular_template.xml 1970-01-01 00:00:00 +0000 @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- Created with iReport - A designer for JasperReports --> -<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";> -<jasperReport - name="tabular_template" - columnCount="1" - printOrder="Vertical" - orientation="Landscape" - pageWidth="842" - pageHeight="595" - columnWidth="822" - columnSpacing="0" - leftMargin="10" - rightMargin="10" - topMargin="15" - bottomMargin="15" - whenNoDataType="NoPages" - isFloatColumnFooter="true" - isTitleNewPage="false" - isSummaryNewPage="false"> - <property name="ireport.scriptlethandling" value="0" /> - <property name="ireport.encoding" value="UTF-8" /> - <import value="java.util.*" /> - <import value="net.sf.jasperreports.engine.*" /> - <import value="net.sf.jasperreports.engine.data.*" /> - - <style - name="Arial" - isDefault="true" - fontName="Arial" - fontSize="10" - isBold="false" - isItalic="false" - isUnderline="false" - isStrikeThrough="false" - pdfFontName="Arial" - pdfEncoding="Cp1251" - isPdfEmbedded="false" - /> - - <parameter name="ReportName" isForPrompting="false" class="java.lang.String"/> - <parameter name="OrganisationUnit" isForPrompting="false" class="java.lang.String"/> - <parameter name="Period" isForPrompting="false" class="java.lang.String"/> - - <field name="tabularColumn" class="java.lang.String"/> - <field name="tabularRow" class="java.lang.String"/> - - <background> - <band height="0" isSplitAllowed="true" > - </band> - </background> - <title> - <band height="0" isSplitAllowed="true" > - </band> - </title> - <pageHeader> - <band height="259" isSplitAllowed="true" > - <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - x="180" - y="22" - width="250" - height="20" - key="textField"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement> - <font fontName="Arial" pdfFontName="arial.ttf" pdfEncoding ="Cp1251"/> - </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{ReportName}]]></textFieldExpression> - </textField> - <staticText> - <reportElement - style="Arial" - x="15" - y="22" - width="140" - height="20" - key="staticText-9"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement> - <font fontName="Arial" pdfFontName="arial.ttf" pdfEncoding ="Cp1251"/> - </textElement> - <text><![CDATA[Report]]></text> - </staticText> - <staticText> - <reportElement - style="Arial" - x="15" - y="52" - width="140" - height="20" - key="staticText-10"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement> - <font fontName="Arial" pdfFontName="arial.ttf" pdfEncoding ="Cp1251"/> - </textElement> - <text><![CDATA[Organisation Unit]]></text> - </staticText> - <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - x="180" - y="52" - width="250" - height="20" - key="textField"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement> - <font fontName="Arial" pdfFontName="arial.ttf" pdfEncoding ="Cp1251"/> - </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{OrganisationUnit}]]></textFieldExpression> - </textField> - <staticText> - <reportElement - style="Arial" - x="15" - y="82" - width="140" - height="20" - key="staticText-11"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement> - <font fontName="Arial" pdfFontName="arial.ttf" pdfEncoding ="Cp1251"/> - </textElement> - <text><![CDATA[Period]]></text> - </staticText> - <textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - x="180" - y="82" - width="250" - height="20" - key="textField"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement> - <font fontName="Arial" pdfFontName="arial.ttf" pdfEncoding ="Cp1251"/> - </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{Period}]]></textFieldExpression> - </textField> - - </band> - </pageHeader> - <columnHeader> - <band height="0" isSplitAllowed="true" > - </band> - </columnHeader> - <detail> - <band height="16" isSplitAllowed="true" > - <textField isStretchWithOverflow="true" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - x="0" - y="0" - width="130" - height="16" - key="textField" - stretchType="RelativeToBandHeight"> - <printWhenExpression><![CDATA[new Boolean (!$F{tabularRow}.equalsIgnoreCase( "null" ))]]></printWhenExpression> - </reportElement> - <box topBorder="1Point" topBorderColor="#000000" leftBorder="1Point" leftBorderColor="#000000" rightBorder="1Point" rightBorderColor="#000000" bottomBorder="1Point" bottomBorderColor="#000000"/> - <textElement> - <font fontName="Arial" pdfFontName="arial.ttf" pdfEncoding ="Cp1251"/> - </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$F{tabularRow}]]></textFieldExpression> - </textField> - </band> - </detail> - <columnFooter> - <band height="15" isSplitAllowed="true" > - </band> - </columnFooter> - <pageFooter> - <band height="0" isSplitAllowed="true" > - </band> - </pageFooter> - <summary> - <band height="0" isSplitAllowed="true" > - </band> - </summary> -</jasperReport> === removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/template.xml' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/template.xml 2009-03-03 16:46:36 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/template/template.xml 1970-01-01 00:00:00 +0000 @@ -1,198 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- Created with iReport - A designer for JasperReports --> -<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";> -<jasperReport - name="template" - columnCount="1" - printOrder="Vertical" - orientation="Portrait" - pageWidth="595" - pageHeight="842" - columnWidth="535" - columnSpacing="0" - leftMargin="30" - rightMargin="30" - topMargin="20" - bottomMargin="20" - whenNoDataType="NoPages" - isTitleNewPage="false" - isSummaryNewPage="false"> - - <property name="ireport.scriptlethandling" value="0" /> - <property name="ireport.encoding" value="UTF-8" /> - <import value="java.util.*" /> - <import value="net.sf.jasperreports.engine.*" /> - <import value="net.sf.jasperreports.engine.data.*" /> - - <parameter name="ReportName" isForPrompting="false" class="java.lang.String"/> - <parameter name="OrganisationUnit" isForPrompting="false" class="java.lang.String"/> - <parameter name="Period" isForPrompting="false" class="java.lang.String"/> - - <field name="name" class="java.lang.String"/> - <field name="value" class="java.lang.Double"/> - - <background> - <band height="0" isSplitAllowed="true" > - </band> - </background> - <title> - <band height="98" isSplitAllowed="true" > - <staticText> - <reportElement - mode="Transparent" - x="7" - y="15" - width="92" - height="18" - forecolor="#000000" - backcolor="#FFFFFF" - key="staticText-1" - stretchType="NoStretch" - positionType="FixRelativeToTop" - isPrintRepeatedValues="true" - isRemoveLineWhenBlank="false" - isPrintInFirstWholeBand="false" - isPrintWhenDetailOverflows="false"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single"> - <font fontName="Times New Roman" pdfFontName="Times-Roman" size="24" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" /> - </textElement> - <text><![CDATA[ÃÂðøüõýþòðýøõ ÷ðñþûõòðýøù]]></text> - </staticText> - <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - mode="Transparent" - x="104" - y="15" - width="376" - height="18" - forecolor="#000000" - backcolor="#FFFFFF" - key="textField" - stretchType="NoStretch" - positionType="FixRelativeToTop" - isPrintRepeatedValues="true" - isRemoveLineWhenBlank="false" - isPrintInFirstWholeBand="false" - isPrintWhenDetailOverflows="false"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single"> - <font fontName="Times New Roman" pdfFontName="Times-Roman" size="24" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" /> - </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{ReportName}]]></textFieldExpression> - </textField> - <staticText> - <reportElement - mode="Transparent" - x="7" - y="38" - width="92" - height="16" - forecolor="#000000" - backcolor="#FFFFFF" - key="staticText-4" - stretchType="NoStretch" - positionType="FixRelativeToTop" - isPrintRepeatedValues="true" - isRemoveLineWhenBlank="false" - isPrintInFirstWholeBand="false" - isPrintWhenDetailOverflows="false"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single"> - <font fontName="Times New Roman" pdfFontName="Times-Roman" size="24" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" /> - </textElement> - <text><![CDATA[ÃÂðøüõýþòðýøõ ÷ðñþûõòðýøù]]></text> - </staticText> - <staticText> - <reportElement - mode="Transparent" - x="7" - y="58" - width="92" - height="16" - forecolor="#000000" - backcolor="#FFFFFF" - key="staticText-5" - stretchType="NoStretch" - positionType="FixRelativeToTop" - isPrintRepeatedValues="true" - isRemoveLineWhenBlank="false" - isPrintInFirstWholeBand="false" - isPrintWhenDetailOverflows="false"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single"> - <font fontName="Times New Roman" pdfFontName="Times-Roman" size="24" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" /> - </textElement> - <text><![CDATA[ÃÂðøüõýþòðýøõ ÷ðñþûõòðýøù]]></text> - </staticText> - <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - mode="Transparent" - x="104" - y="38" - width="376" - height="16" - forecolor="#000000" - backcolor="#FFFFFF" - key="textField" - stretchType="NoStretch" - positionType="FixRelativeToTop" - isPrintRepeatedValues="true" - isRemoveLineWhenBlank="false" - isPrintInFirstWholeBand="false" - isPrintWhenDetailOverflows="false"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single"> - <font fontName="Times New Roman" pdfFontName="Times-Roman" size="24" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" /> - </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{OrganisationUnit}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > - <reportElement - mode="Transparent" - x="104" - y="58" - width="376" - height="16" - forecolor="#000000" - backcolor="#FFFFFF" - key="textField" - stretchType="NoStretch" - positionType="FixRelativeToTop" - isPrintRepeatedValues="true" - isRemoveLineWhenBlank="false" - isPrintInFirstWholeBand="false" - isPrintWhenDetailOverflows="false"/> - <box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single"> - <font fontName="Times New Roman" pdfFontName="Times-Roman" size="24" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" /> - </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{Period}]]></textFieldExpression> - </textField> - </band> - </title> - <pageHeader> - <band height="544" isSplitAllowed="true" > - </band> - </pageHeader> - <columnHeader> - <band height="0" isSplitAllowed="true" > - </band> - </columnHeader> - <detail> - <band height="0" isSplitAllowed="true" > - </band> - </detail> - <columnFooter> - <band height="0" isSplitAllowed="true" > - </band> - </columnFooter> - <pageFooter> - <band height="0" isSplitAllowed="true" > - </band> - </pageFooter> - <summary> - <band height="160" isSplitAllowed="true" > - </band> - </summary> -</jasperReport>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
