Commit f5525ac69c891d122a616a52a4aee324722ec3a7

Authored by Ciro Junior
1 parent 7763bc22
Exists in master

Corrigindo modal de recebimento de objeto

Adicionando propriedade BlankWhenNull no jasper.
cit-contratos-web/src/main/resources/reports/eventoRecebimentoObjeto.jrxml
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.0.final using JasperReports Library version 6.2.0 -->
  3 +<!-- 2016-03-29T15:21:55 -->
2 <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="eventoRecebimentoObjeto" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="e04cf746-a11a-488e-9c73-7c7069a15371"> 4 <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="eventoRecebimentoObjeto" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="e04cf746-a11a-488e-9c73-7c7069a15371">
3 <property name="com.jaspersoft.studio.data.sql.tables" value=""/> 5 <property name="com.jaspersoft.studio.data.sql.tables" value=""/>
4 <property name="com.jaspersoft.studio.data.defaultdataadapter" value="Postgres citgrpdb"/> 6 <property name="com.jaspersoft.studio.data.defaultdataadapter" value="Postgres citgrpdb"/>
@@ -121,7 +123,7 @@ where ro.id = $P{RECEBIMENTO_ID}]]&gt; @@ -121,7 +123,7 @@ where ro.id = $P{RECEBIMENTO_ID}]]&gt;
121 </textElement> 123 </textElement>
122 <text><![CDATA[Número/Ano do contrato:]]></text> 124 <text><![CDATA[Número/Ano do contrato:]]></text>
123 </staticText> 125 </staticText>
124 - <textField> 126 + <textField isBlankWhenNull="true">
125 <reportElement x="220" y="0" width="334" height="25" uuid="da6db458-7a73-4d3f-9329-64a8395a699e"> 127 <reportElement x="220" y="0" width="334" height="25" uuid="da6db458-7a73-4d3f-9329-64a8395a699e">
126 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 128 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
127 <property name="com.jaspersoft.studio.unit.width" value="pixel"/> 129 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
@@ -151,7 +153,7 @@ where ro.id = $P{RECEBIMENTO_ID}]]&gt; @@ -151,7 +153,7 @@ where ro.id = $P{RECEBIMENTO_ID}]]&gt;
151 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 153 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
152 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 154 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
153 </box> 155 </box>
154 - <textField> 156 + <textField isBlankWhenNull="true">
155 <reportElement x="220" y="0" width="334" height="25" uuid="64235334-1500-4493-bff1-afed55f86c8d"> 157 <reportElement x="220" y="0" width="334" height="25" uuid="64235334-1500-4493-bff1-afed55f86c8d">
156 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 158 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
157 </reportElement> 159 </reportElement>
@@ -193,7 +195,7 @@ where ro.id = $P{RECEBIMENTO_ID}]]&gt; @@ -193,7 +195,7 @@ where ro.id = $P{RECEBIMENTO_ID}]]&gt;
193 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 195 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
194 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 196 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
195 </box> 197 </box>
196 - <textField> 198 + <textField isBlankWhenNull="true">
197 <reportElement x="220" y="0" width="334" height="25" uuid="8feec219-5f33-448b-a922-99644d84a5e9"> 199 <reportElement x="220" y="0" width="334" height="25" uuid="8feec219-5f33-448b-a922-99644d84a5e9">
198 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 200 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
199 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 201 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -241,7 +243,7 @@ where ro.id = $P{RECEBIMENTO_ID}]]&gt; @@ -241,7 +243,7 @@ where ro.id = $P{RECEBIMENTO_ID}]]&gt;
241 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 243 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
242 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 244 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
243 </box> 245 </box>
244 - <textField> 246 + <textField isBlankWhenNull="true">
245 <reportElement x="220" y="0" width="334" height="25" uuid="23af906a-c755-4712-a77c-f203f802a8be"> 247 <reportElement x="220" y="0" width="334" height="25" uuid="23af906a-c755-4712-a77c-f203f802a8be">
246 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 248 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
247 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 249 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
@@ -311,7 +313,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -311,7 +313,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
311 </textElement> 313 </textElement>
312 <text><![CDATA[Número do recebimento:]]></text> 314 <text><![CDATA[Número do recebimento:]]></text>
313 </staticText> 315 </staticText>
314 - <textField> 316 + <textField isBlankWhenNull="true">
315 <reportElement x="220" y="0" width="334" height="25" uuid="bdd6406e-ff15-4635-bede-9f81e1e89103"> 317 <reportElement x="220" y="0" width="334" height="25" uuid="bdd6406e-ff15-4635-bede-9f81e1e89103">
316 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 318 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
317 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 319 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -361,7 +363,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -361,7 +363,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
361 </textElement> 363 </textElement>
362 <text><![CDATA[Data do recebimento:]]></text> 364 <text><![CDATA[Data do recebimento:]]></text>
363 </staticText> 365 </staticText>
364 - <textField> 366 + <textField isBlankWhenNull="true">
365 <reportElement x="220" y="0" width="334" height="25" uuid="754fbfd2-61b1-4243-9a32-ada714c37c5a"> 367 <reportElement x="220" y="0" width="334" height="25" uuid="754fbfd2-61b1-4243-9a32-ada714c37c5a">
366 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 368 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
367 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 369 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -409,7 +411,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -409,7 +411,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
409 </textElement> 411 </textElement>
410 <text><![CDATA[Tipo de recebimento:]]></text> 412 <text><![CDATA[Tipo de recebimento:]]></text>
411 </staticText> 413 </staticText>
412 - <textField> 414 + <textField isBlankWhenNull="true">
413 <reportElement x="220" y="0" width="334" height="25" uuid="fb98a783-3e38-45f0-8dbc-f01d8a4cfc4a"> 415 <reportElement x="220" y="0" width="334" height="25" uuid="fb98a783-3e38-45f0-8dbc-f01d8a4cfc4a">
414 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 416 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
415 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 417 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -439,7 +441,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -439,7 +441,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
439 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 441 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
440 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 442 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
441 </box> 443 </box>
442 - <textField isStretchWithOverflow="true"> 444 + <textField isStretchWithOverflow="true" isBlankWhenNull="true">
443 <reportElement stretchType="RelativeToBandHeight" x="220" y="0" width="334" height="25" isPrintWhenDetailOverflows="true" uuid="77c20d24-1d79-4a8d-9c78-1a80943dbe47"> 445 <reportElement stretchType="RelativeToBandHeight" x="220" y="0" width="334" height="25" isPrintWhenDetailOverflows="true" uuid="77c20d24-1d79-4a8d-9c78-1a80943dbe47">
444 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 446 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
445 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 447 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -500,7 +502,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -500,7 +502,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
500 </textElement> 502 </textElement>
501 <text><![CDATA[Número da liberação de pagamento:]]></text> 503 <text><![CDATA[Número da liberação de pagamento:]]></text>
502 </staticText> 504 </staticText>
503 - <textField> 505 + <textField isBlankWhenNull="true">
504 <reportElement positionType="Float" x="220" y="0" width="334" height="25" isPrintWhenDetailOverflows="true" uuid="f77062e1-3895-49e1-a56b-fe5e9e1454e5"> 506 <reportElement positionType="Float" x="220" y="0" width="334" height="25" isPrintWhenDetailOverflows="true" uuid="f77062e1-3895-49e1-a56b-fe5e9e1454e5">
505 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 507 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
506 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 508 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -548,7 +550,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -548,7 +550,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
548 </textElement> 550 </textElement>
549 <text><![CDATA[Status:]]></text> 551 <text><![CDATA[Status:]]></text>
550 </staticText> 552 </staticText>
551 - <textField> 553 + <textField isBlankWhenNull="true">
552 <reportElement positionType="Float" x="220" y="0" width="334" height="25" isPrintWhenDetailOverflows="true" uuid="2e1ef580-a774-4432-9ddb-cf653517c107"> 554 <reportElement positionType="Float" x="220" y="0" width="334" height="25" isPrintWhenDetailOverflows="true" uuid="2e1ef580-a774-4432-9ddb-cf653517c107">
553 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 555 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
554 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 556 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -607,12 +609,12 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -607,12 +609,12 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
607 <text><![CDATA[2. Justificativa]]></text> 609 <text><![CDATA[2. Justificativa]]></text>
608 </staticText> 610 </staticText>
609 </frame> 611 </frame>
610 - <textField> 612 + <textField isBlankWhenNull="true">
611 <reportElement x="25" y="31" width="219" height="20" uuid="ecc80c23-477a-49be-877d-1a3876503cb1"/> 613 <reportElement x="25" y="31" width="219" height="20" uuid="ecc80c23-477a-49be-877d-1a3876503cb1"/>
612 <textElement verticalAlignment="Middle"/> 614 <textElement verticalAlignment="Middle"/>
613 <textFieldExpression><![CDATA[$F{tipoavaliacaoprazo}]]></textFieldExpression> 615 <textFieldExpression><![CDATA[$F{tipoavaliacaoprazo}]]></textFieldExpression>
614 </textField> 616 </textField>
615 - <textField> 617 + <textField isBlankWhenNull="true">
616 <reportElement x="25" y="51" width="220" height="20" uuid="15e72b22-9e2d-4e78-b5c0-6b857879d29d"/> 618 <reportElement x="25" y="51" width="220" height="20" uuid="15e72b22-9e2d-4e78-b5c0-6b857879d29d"/>
617 <textElement verticalAlignment="Middle"/> 619 <textElement verticalAlignment="Middle"/>
618 <textFieldExpression><![CDATA[$F{tipoavaliacaoadesao}]]></textFieldExpression> 620 <textFieldExpression><![CDATA[$F{tipoavaliacaoadesao}]]></textFieldExpression>
@@ -640,7 +642,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -640,7 +642,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
640 </staticText> 642 </staticText>
641 <frame> 643 <frame>
642 <reportElement x="0" y="58" width="554" height="95" uuid="0b4df176-5cee-454e-a17f-38c91c732840"/> 644 <reportElement x="0" y="58" width="554" height="95" uuid="0b4df176-5cee-454e-a17f-38c91c732840"/>
643 - <textField> 645 + <textField isBlankWhenNull="true">
644 <reportElement x="308" y="70" width="180" height="25" uuid="3b710920-0b1d-4c04-8085-9e89315b4273"> 646 <reportElement x="308" y="70" width="180" height="25" uuid="3b710920-0b1d-4c04-8085-9e89315b4273">
645 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 647 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
646 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 648 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -655,7 +657,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -655,7 +657,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
655 <textElement textAlignment="Center"/> 657 <textElement textAlignment="Center"/>
656 <text><![CDATA[Fiscal requisitante do contrato]]></text> 658 <text><![CDATA[Fiscal requisitante do contrato]]></text>
657 </staticText> 659 </staticText>
658 - <textField> 660 + <textField isBlankWhenNull="true">
659 <reportElement x="308" y="25" width="180" height="25" uuid="8d97efb4-ee7f-4ffd-a7e5-1be10ff6a725"> 661 <reportElement x="308" y="25" width="180" height="25" uuid="8d97efb4-ee7f-4ffd-a7e5-1be10ff6a725">
660 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 662 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
661 </reportElement> 663 </reportElement>
@@ -663,7 +665,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -663,7 +665,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
663 <textElement textAlignment="Center" verticalAlignment="Middle"/> 665 <textElement textAlignment="Center" verticalAlignment="Middle"/>
664 <textFieldExpression><![CDATA[$F{fiscaltecnico}]]></textFieldExpression> 666 <textFieldExpression><![CDATA[$F{fiscaltecnico}]]></textFieldExpression>
665 </textField> 667 </textField>
666 - <textField> 668 + <textField isBlankWhenNull="true">
667 <reportElement x="64" y="70" width="180" height="25" uuid="1a667a79-369f-4248-b766-e69f858b111f"> 669 <reportElement x="64" y="70" width="180" height="25" uuid="1a667a79-369f-4248-b766-e69f858b111f">
668 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 670 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
669 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 671 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
@@ -678,7 +680,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt; @@ -678,7 +680,7 @@ $F{cnpjcontratado}.substring(12, 14)]]&gt;&lt;/textFieldExpression&gt;
678 <textElement textAlignment="Center"/> 680 <textElement textAlignment="Center"/>
679 <text><![CDATA[Gestor do contrato]]></text> 681 <text><![CDATA[Gestor do contrato]]></text>
680 </staticText> 682 </staticText>
681 - <textField> 683 + <textField isBlankWhenNull="true">
682 <reportElement x="64" y="25" width="180" height="25" uuid="45e4348a-2802-46fc-88e1-d7764d3d5ba3"> 684 <reportElement x="64" y="25" width="180" height="25" uuid="45e4348a-2802-46fc-88e1-d7764d3d5ba3">
683 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 685 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
684 </reportElement> 686 </reportElement>
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_recebimentoobjeto.html
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 </div><!-- .col --> 69 </div><!-- .col -->
70 </div><!-- .row --> 70 </div><!-- .row -->
71 <div class="row"> 71 <div class="row">
72 - <div ng-if="recebimentoObjeto.id" ng-class="recebimentoObjeto.id ? 'col-sm-3' : 'col-sm-4'"> 72 + <div class="col-sm-4">
73 <label-input ng-type="text" 73 <label-input ng-type="text"
74 ng-id="recebimentoObjeto.registroSequencial.sequencialAno" 74 ng-id="recebimentoObjeto.registroSequencial.sequencialAno"
75 ng-label="LABEL.NUMERO_RECEBIMENTO_OBJETO" 75 ng-label="LABEL.NUMERO_RECEBIMENTO_OBJETO"
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 ng-mask="99999/9999" 79 ng-mask="99999/9999"
80 form="formDialogRecebimentoObjeto"/> 80 form="formDialogRecebimentoObjeto"/>
81 </div><!-- .col --> 81 </div><!-- .col -->
82 - <div ng-class="recebimentoObjeto.id ? 'col-sm-3' : 'col-sm-4'"> 82 + <div class="col-sm-4">
83 <label-input-data ng-id="recebimentoObjeto.dataRecebimento" 83 <label-input-data ng-id="recebimentoObjeto.dataRecebimento"
84 ng-label="LABEL.DATA_RECEBIMENTO_OBJETO" 84 ng-label="LABEL.DATA_RECEBIMENTO_OBJETO"
85 ng-disabled="!edit" 85 ng-disabled="!edit"
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 ng-obrigatorio="true" 88 ng-obrigatorio="true"
89 ng-format="dd/MM/yyyy"/> 89 ng-format="dd/MM/yyyy"/>
90 </div><!-- .col --> 90 </div><!-- .col -->
91 - <div ng-class="recebimentoObjeto.id ? 'col-sm-3' : 'col-sm-4'"> 91 + <div class="col-sm-4">
92 <label-select ng-id="recebimentoObjeto.tiposRecebimentos" 92 <label-select ng-id="recebimentoObjeto.tiposRecebimentos"
93 ng-label="LABEL.TIPO_RECEBIMENTO" 93 ng-label="LABEL.TIPO_RECEBIMENTO"
94 ng-model="recebimentoObjeto.tipoRecebimento" 94 ng-model="recebimentoObjeto.tipoRecebimento"
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <option value="">Selecione</option> 101 <option value="">Selecione</option>
102 </select> 102 </select>
103 </div><!--.col --> 103 </div><!--.col -->
104 - <div ng-class="recebimentoObjeto.id ? 'col-sm-3' : 'col-sm-4'"> 104 + <div class="col-sm-4">
105 <label-input ng-type="text" 105 <label-input ng-type="text"
106 ng-id="recebimentoObjeto.nomeObjeto" 106 ng-id="recebimentoObjeto.nomeObjeto"
107 ng-label="LABEL.NOME_OBJETO" 107 ng-label="LABEL.NOME_OBJETO"
@@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@
149 </label> 149 </label>
150 </div> 150 </div>
151 </div> 151 </div>
152 - 152 +
153 <div class="row"> 153 <div class="row">
154 <div class="col-sm-4"> 154 <div class="col-sm-4">
155 <label-select ng-id="tipoAvaliacaoPrazo" 155 <label-select ng-id="tipoAvaliacaoPrazo"