branch feature/newReportBuilder updated (2c66058 -> 895be8f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git from 2c66058 refs #769 correction sur rapports pour journaux new 895be8f refs #769 correction sur rapports pour journaux The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 895be8fb73c871ee1e3e9fcd03ef08b4b497fe29 Author: dcosse <japbiw74> Date: Thu Nov 20 10:24:56 2014 +0100 refs #769 correction sur rapports pour journaux Summary of changes: .../provisionalEntryBook/EntryBookReport.jrxml | 24 +++++---------- .../FinancialPeriodReport.jrxml | 34 +++++++++++++++------- 2 files changed, 30 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git commit 895be8fb73c871ee1e3e9fcd03ef08b4b497fe29 Author: dcosse <japbiw74> Date: Thu Nov 20 10:24:56 2014 +0100 refs #769 correction sur rapports pour journaux --- .../provisionalEntryBook/EntryBookReport.jrxml | 24 +++++---------- .../FinancialPeriodReport.jrxml | 34 +++++++++++++++------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml b/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml index 3537e61..10ec51b 100644 --- a/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml +++ b/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2014-11-20T00:02:14 --> +<!-- 2014-11-20T10:09:23 --> <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="BalanceClassesReport" pageWidth="578" pageHeight="51" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -32,11 +32,12 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"> + <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <property name="local_mesure_unity" value="pixel"/> <property name="com.jaspersoft.studio.unit.y" value="px"/> + <printWhenExpression><![CDATA[new Boolean($V{PAGE_NUMBER} > 1)]]></printWhenExpression> </reportElement> <box> <topPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> @@ -45,7 +46,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> </box> <textField pattern="" isBlankWhenNull="true"> - <reportElement x="0" y="0" width="578" height="10" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"> + <reportElement mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"> <property name="local_mesure_unity" value="pixel"/> <property name="local_mesure_unitx" value="pixel"/> <property name="com.jaspersoft.studio.unit.x" value="px"/> @@ -70,7 +71,7 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"> + <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <property name="local_mesure_unity" value="pixel"/> @@ -83,7 +84,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> </box> <textField pattern="" isBlankWhenNull="true"> - <reportElement x="0" y="0" width="578" height="10" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"> + <reportElement mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"> <property name="local_mesure_unity" value="pixel"/> <property name="local_mesure_unitx" value="pixel"/> <property name="com.jaspersoft.studio.unit.x" value="px"/> @@ -102,24 +103,13 @@ </textField> </frame> <subreport isUsingCache="false" runToBottom="false"> - <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="10" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"> + <reportElement key="subreport-5" positionType="Float" mode="Opaque" x="0" y="10" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"> <property name="local_mesure_unity" value="pixel"/> <property name="com.jaspersoft.studio.unit.y" value="px"/> </reportElement> <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> </subreport> - <subreport isUsingCache="false" runToBottom="false"> - <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="ced66d43-be01-4bdd-abd0-7601fef03664"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <printWhenExpression><![CDATA[new Boolean($V{PAGE_NUMBER} == 1)]]></printWhenExpression> - </reportElement> - <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> - </subreport> </band> </detail> <columnFooter> diff --git a/lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml b/lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml index d1dbe71..d79a730 100644 --- a/lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml +++ b/lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2014-11-20T00:02:03 --> -<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="BalanceClassesReport" pageWidth="578" pageHeight="41" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] +<!-- 2014-11-20T10:16:20 --> +<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="BalanceClassesReport" pageWidth="578" pageHeight="51" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> <property name="com.jaspersoft.studio.unit." value="pixel"/> @@ -30,7 +30,7 @@ <variable name="generalEntryBookEntry" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{transaction})]]></variableExpression> </variable> - <title> + <pageHeader> <band height="10"> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> @@ -61,15 +61,15 @@ </box> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8" isBold="true" isItalic="true"/> - <paragraph lineSpacingSize="0.0" leftIndent="40"/> + <paragraph lineSpacingSize="0.0" leftIndent="80"/> </textElement> <textFieldExpression><![CDATA[new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> </textField> </frame> </band> - </title> + </pageHeader> <detail> - <band height="10"> + <band height="20" splitType="Stretch"> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> @@ -104,10 +104,22 @@ <textFieldExpression><![CDATA[new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> </textField> </frame> - </band> - <band height="10" splitType="Stretch"> <subreport isUsingCache="false" runToBottom="false"> - <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> + <reportElement key="subreport-5" positionType="Float" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"> + <printWhenExpression><![CDATA[new Boolean($V{PAGE_NUMBER} == 1)]]></printWhenExpression> + </reportElement> + <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> + <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + </subreport> + <subreport isUsingCache="false" runToBottom="false"> + <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="10" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="1095b1fb-ac01-4f55-b694-2e4e5ec17a76"> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> </subreport> @@ -146,7 +158,7 @@ </box> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8" isBold="true" isItalic="true"/> - <paragraph lineSpacingSize="0.0" leftIndent="40"/> + <paragraph lineSpacingSize="0.0" leftIndent="80"/> </textElement> <textFieldExpression><![CDATA["Sous-total pour " + new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> </textField> @@ -203,7 +215,7 @@ </box> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8" isBold="true" isItalic="true"/> - <paragraph lineSpacingSize="0.0" leftIndent="40"/> + <paragraph lineSpacingSize="0.0" leftIndent="60"/> </textElement> <textFieldExpression><![CDATA["Solde pour le journal " + $F{entryBookCode}]]></textFieldExpression> </textField> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm