Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jasper =================================================================== diff -u -r30481 -r30552 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jasper =================================================================== diff -u -r30464 -r30552 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml =================================================================== diff -u -r30481 -r30552 --- ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml (.../monthReportHideApplicationDepart.jrxml) (revision 30481) +++ ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml (.../monthReportHideApplicationDepart.jrxml) (revision 30552) @@ -1,5 +1,5 @@ - + @@ -82,7 +82,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="352" height="34"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -93,7 +93,7 @@ <summary> <band height="127" splitType="Stretch"> <crosstab> - <reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="450" height="103"/> + <reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="352" height="103"/> <crosstabParameter name="amountFormatParam"> <parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression> </crosstabParameter> @@ -112,16 +112,16 @@ <crosstabHeaderCell> <cellContents> <textField isBlankWhenNull="true"> - <reportElement uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a" style="Crosstab Data Text" x="0" y="0" width="236" height="95"/> + <reportElement uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="95" backcolor="#FFFFFF"/> <box> <pen lineWidth="0.5"/> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> <bottomPen lineWidth="0.5"/> <rightPen lineWidth="0.5"/> </box> - <textElement verticalAlignment="Middle"> - <font size="12" isBold="false" isItalic="false"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true" isItalic="false"/> </textElement> <textFieldExpression><![CDATA[$P{setDepartShowNameParam}]]></textFieldExpression> </textField> @@ -145,7 +145,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <staticText> - <reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="236" height="25" forecolor="#000000"/> + <reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25" forecolor="#000000"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -154,7 +154,7 @@ </cellContents> </crosstabTotalRowHeader> </rowGroup> - <rowGroup name="department" width="236" totalPosition="End"> + <rowGroup name="department" width="153" totalPosition="End"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{department}]]></bucketExpression> <orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression> @@ -165,7 +165,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="236" height="25"/> + <reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -230,9 +230,9 @@ <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> - <textField> - <reportElement uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e" style="Crosstab Data Text" x="0" y="0" width="81" height="95"/> - <textElement verticalAlignment="Middle"> + <textField isStretchWithOverflow="true"> + <reportElement uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{maxAmount}>0||$V{amountMeasure}!=0?$P{sumAmountShowNameParam}:$P{sumPriceShowNameParam}]]></textFieldExpression> @@ -246,8 +246,8 @@ </bucket> <crosstabColumnHeader> <cellContents> - <textField isBlankWhenNull="true"> - <reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="95" backcolor="#FFFFFF"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -271,13 +271,13 @@ <measure name="maxAmount" class="java.lang.Integer" calculation="Highest"> <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="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -286,13 +286,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="" isBlankWhenNull="true"> - <reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000"/> + <reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -315,13 +315,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="" isBlankWhenNull="true"> - <reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25"/> + <reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -330,13 +330,13 @@ </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> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000"/> + <reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -345,7 +345,7 @@ </textField> </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"/> @@ -359,7 +359,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"/> Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml =================================================================== diff -u -r30464 -r30552 --- ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml (.../monthReportShowApplicationDepart.jrxml) (revision 30464) +++ ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml (.../monthReportShowApplicationDepart.jrxml) (revision 30552) @@ -112,30 +112,30 @@ <crosstabHeaderCell> <cellContents> <textField isBlankWhenNull="true"> - <reportElement uuid="08fc6f93-10d2-4d55-8b65-3e3d2f0f7aa9" style="Crosstab Data Text" x="0" y="0" width="290" height="95"/> + <reportElement uuid="08fc6f93-10d2-4d55-8b65-3e3d2f0f7aa9" style="table_TH" x="0" y="0" width="153" height="95" backcolor="#FFFFFF"/> <box> <pen lineWidth="0.5"/> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> <bottomPen lineWidth="0.5"/> <rightPen lineWidth="0.5"/> </box> - <textElement verticalAlignment="Middle"> - <font size="12"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{appDepartShowNameParam}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a" style="Crosstab Data Text" x="290" y="0" width="236" height="95"/> + <reportElement uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a" style="table_TH" x="153" y="0" width="153" height="95" backcolor="#FFFFFF"/> <box> <pen lineWidth="0.5"/> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> <bottomPen lineWidth="0.5"/> <rightPen lineWidth="0.5"/> </box> - <textElement verticalAlignment="Middle"> - <font size="12"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{setDepartShowNameParam}]]></textFieldExpression> </textField> @@ -159,7 +159,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <staticText> - <reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="526" height="25" forecolor="#000000"/> + <reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="306" height="25" forecolor="#000000"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -168,21 +168,21 @@ </cellContents> </crosstabTotalRowHeader> </rowGroup> - <rowGroup name="applicationDepart" width="290"> + <rowGroup name="applicationDepart" width="153"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{applicationDepart}]]></bucketExpression> <orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression> </bucket> <crosstabRowHeader> <cellContents> - <textField isBlankWhenNull="true"> - <reportElement uuid="dcbc7276-883b-4b54-9de2-1123a51a99bc" style="Crosstab Data Text" x="0" y="0" width="290" height="25"/> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="dcbc7276-883b-4b54-9de2-1123a51a99bc" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25"/> <box> - <pen lineWidth="1.0"/> - <topPen lineWidth="1.0"/> - <leftPen lineWidth="1.0"/> - <bottomPen lineWidth="1.0"/> - <rightPen lineWidth="1.0"/> + <pen lineWidth="0.5"/> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> </box> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="12"/> @@ -195,7 +195,7 @@ <cellContents/> </crosstabTotalRowHeader> </rowGroup> - <rowGroup name="department" width="236" totalPosition="End"> + <rowGroup name="department" width="153" totalPosition="End"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{department}]]></bucketExpression> <orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression> @@ -206,7 +206,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="236" height="25"/> + <reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -271,9 +271,9 @@ <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> - <textField> - <reportElement uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e" style="Crosstab Data Text" x="0" y="0" width="81" height="95"/> - <textElement verticalAlignment="Middle"> + <textField isStretchWithOverflow="true"> + <reportElement uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{maxAmount}>0||$V{amountMeasure}!=0?$P{sumAmountShowNameParam}:$P{sumPriceShowNameParam}]]></textFieldExpression> @@ -288,9 +288,10 @@ <crosstabColumnHeader> <cellContents> <textField isBlankWhenNull="true"> - <reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="95" backcolor="#FFFFFF"/> + <reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> + <paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/> </textElement> <textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression> </textField> @@ -312,13 +313,13 @@ <measure name="maxAmount" class="java.lang.Integer" calculation="Highest"> <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="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -327,13 +328,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="" isBlankWhenNull="true"> - <reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000"/> + <reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -356,13 +357,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="" isBlankWhenNull="true"> - <reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25"/> + <reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -371,13 +372,13 @@ </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> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000"/> + <reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="100" height="25" forecolor="#000000"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -386,7 +387,7 @@ </textField> </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"/> @@ -400,7 +401,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"/>