Commit e8c038abcb0e0d020438a4ecc372ef6b8732f931
1 parent
ef94c456
Exists in
master
Redmine #4425
Showing
2 changed files
with
16 additions
and
11 deletions
Show diff stats
cit-contratos-web/src/main/resources/reports/eventoRecebimentoObjeto.jrxml
| ... | ... | @@ -452,19 +452,24 @@ $F{cnpjcontratado}.substring(12, 14)]]></textFieldExpression> |
| 452 | 452 | <textElement verticalAlignment="Middle"/> |
| 453 | 453 | <textFieldExpression><![CDATA[$F{objetocontratacao}]]></textFieldExpression> |
| 454 | 454 | </textField> |
| 455 | - <textField isStretchWithOverflow="true"> | |
| 456 | - <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="220" height="25" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="2a73e93e-b151-4d8a-be9d-32a7c4bb9c46"/> | |
| 457 | - <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5"> | |
| 458 | - <topPen lineWidth="1.0"/> | |
| 459 | - <leftPen lineWidth="1.0"/> | |
| 460 | - <bottomPen lineWidth="1.0"/> | |
| 461 | - <rightPen lineWidth="1.0"/> | |
| 455 | + <staticText> | |
| 456 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="220" height="25" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="b697919e-6546-4e35-bb57-82e78f0a99b2"> | |
| 457 | + <property name="com.jaspersoft.studio.unit.x" value="pixel"/> | |
| 458 | + <property name="com.jaspersoft.studio.unit.y" value="pixel"/> | |
| 459 | + <property name="com.jaspersoft.studio.unit.width" value="pixel"/> | |
| 460 | + <property name="com.jaspersoft.studio.unit.height" value="pixel"/> | |
| 461 | + </reportElement> | |
| 462 | + <box padding="5"> | |
| 463 | + <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> | |
| 464 | + <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> | |
| 465 | + <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> | |
| 466 | + <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> | |
| 462 | 467 | </box> |
| 463 | - <textElement verticalAlignment="Middle"> | |
| 468 | + <textElement verticalAlignment="Middle" markup="none"> | |
| 464 | 469 | <font isBold="true"/> |
| 465 | 470 | </textElement> |
| 466 | - <textFieldExpression><![CDATA["Nome do objeto:"]]></textFieldExpression> | |
| 467 | - </textField> | |
| 471 | + <text><![CDATA[Objeto da contratação:]]></text> | |
| 472 | + </staticText> | |
| 468 | 473 | </frame> |
| 469 | 474 | <frame> |
| 470 | 475 | <reportElement positionType="Float" x="0" y="200" width="555" height="25" uuid="faa702cf-c308-4c96-8ed0-b7b1e019d76f"> | ... | ... |
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_recebimentoobjeto.html
| ... | ... | @@ -84,7 +84,7 @@ |
| 84 | 84 | ng-id="contrato.objetoContratacao" |
| 85 | 85 | ng-label="LABEL.OBJETO_CONTRATACAO" |
| 86 | 86 | ng-disabled="true" |
| 87 | - ng-custom-maxlength="150" | |
| 87 | + ng-custom-maxlength="500" | |
| 88 | 88 | ng-model="contrato.objetoContratacao" |
| 89 | 89 | form="formDialogRecebimentoObjeto"/> |
| 90 | 90 | </div><!-- .col --> | ... | ... |