Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml =================================================================== diff -u -r30149 -r30535 --- ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml (.../monthReportBranche.jrxml) (revision 30149) +++ ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml (.../monthReportBranche.jrxml) (revision 30535) @@ -1,5 +1,5 @@ - + @@ -67,7 +67,7 @@ <band height="34" splitType="Stretch"> <textField> - <reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="450" height="34"/> + <reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="468" height="34"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -79,7 +79,7 @@ <band height="127" splitType="Stretch"> <elementGroup> <crosstab> - <reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="450" height="103"/> + <reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="468" height="103"/> <crosstabParameter name="amountFormatParam"> <parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression> </crosstabParameter> @@ -227,7 +227,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField> - <reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="38"/> + <reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="100" height="38"/> <textElement verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -241,7 +241,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <staticText> - <reportElement uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d" x="0" y="0" width="81" height="80"/> + <reportElement uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d" x="0" y="0" width="100" height="80"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -257,7 +257,7 @@ <crosstabColumnHeader> <cellContents> <textField> - <reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="42" backcolor="#FFFFFF"/> + <reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="100" height="42" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -278,13 +278,13 @@ <measure name="amountMeasure" class="java.lang.Integer" calculation="Sum"> <measureExpression><![CDATA[$F{amount}]]></measureExpression> </measure> - <crosstabCell width="79" height="25"> + <crosstabCell width="100" height="25"> <cellContents> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField isStretchWithOverflow="true" pattern="###0.0000"> - <reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25"/> + <reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="100" height="25"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -293,13 +293,13 @@ </textField> </cellContents> </crosstabCell> - <crosstabCell width="79" height="25" rowTotalGroup="rowNum"> + <crosstabCell width="100" height="25" rowTotalGroup="rowNum"> <cellContents backcolor="#FFFFFF" mode="Transparent"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField isStretchWithOverflow="true" pattern=""> - <reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="79" height="25" forecolor="#000000" backcolor="#9BC2E6"/> + <reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="100" height="25" forecolor="#000000" backcolor="#9BC2E6"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -329,13 +329,13 @@ </box> </cellContents> </crosstabCell> - <crosstabCell width="81" height="25" columnTotalGroup="columnTitle"> + <crosstabCell width="100" height="25" columnTotalGroup="columnTitle"> <cellContents backcolor="#FFFFFF" mode="Transparent"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField isStretchWithOverflow="true" pattern=""> - <reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25" isRemoveLineWhenBlank="true"/> + <reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="100" height="25" isRemoveLineWhenBlank="true"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -344,14 +344,14 @@ </textField> </cellContents> </crosstabCell> - <crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle"> + <crosstabCell width="100" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle"> <cellContents backcolor="#FFFFFF" mode="Transparent"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <elementGroup> <textField isStretchWithOverflow="true" pattern=""> - <reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="81" height="25" forecolor="#000000" backcolor="#9BC2E6"/> + <reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="100" height="25" forecolor="#000000" backcolor="#9BC2E6"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -368,7 +368,7 @@ </elementGroup> </cellContents> </crosstabCell> - <crosstabCell width="79" height="0" rowTotalGroup="department"> + <crosstabCell width="100" height="0" rowTotalGroup="department"> <cellContents backcolor="#BFE1FF" mode="Opaque"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> @@ -382,7 +382,7 @@ </box> </cellContents> </crosstabCell> - <crosstabCell width="81" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle"> + <crosstabCell width="100" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle"> <cellContents backcolor="#BFE1FF" mode="Opaque"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> @@ -395,13 +395,13 @@ <crosstabCell rowTotalGroup="department" columnTotalGroup="columnName"> <cellContents/> </crosstabCell> - <crosstabCell width="79" height="0" rowTotalGroup="hospitalDistrict"> + <crosstabCell width="100" height="0" rowTotalGroup="hospitalDistrict"> <cellContents/> </crosstabCell> - <crosstabCell height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnNum"> + <crosstabCell width="0" height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnNum"> <cellContents/> </crosstabCell> - <crosstabCell height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnTitle"> + <crosstabCell width="100" height="0" rowTotalGroup="hospitalDistrict" columnTotalGroup="columnTitle"> <cellContents/> </crosstabCell> <crosstabCell rowTotalGroup="hospitalDistrict" columnTotalGroup="columnName"> Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper =================================================================== diff -u -r30149 -r30535 Binary files differ