Merge remote-tracking branch 'remotes/origin/cnt-1.0.0-alfa11'

Erick.sato
2 parents 540e6077 7ded5e4c
Showing 2 changed files with 9 additions and 9 deletions Show diff stats
cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java
cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml
@@ -628,7 +628,7 @@ public class StartupListenerContratos extends UtilStartup implements Application
 		internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.TITULO_LIST_ADITIVOS", "Aditivos do contrato", dominio, modulo));
  
 		internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_INICIO_ADITIVO_MAIOR_DATA_FINAL", "A data de início do aditivo deve ser maior que a data final do contrato!", dominio, modulo));
-		internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_INICIO_ADITIVO_MAIOR_DATA_FIM_ADITIVO", "A data de início do aditivo deve ser maior que a data fim!", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_INICIO_ADITIVO_MAIOR_DATA_FIM_ADITIVO", "A data de início do aditivo deve ser menor que a data fim!", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_EMISSAO_DENTRO_REFERENCIA", "A data de emissão do aditivo deve estar dentro da referência do contrato!", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_EMISSAO_12_MESES", "É preciso ter um intervalo de 12 meses após o último aditivo de prazo!", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.MAXIMO_ADITIVO_PRAZO", "Você já cadastrou 5 aditivos de prazo para este contrato. Não é possível cadastrar outro!", dominio, modulo));
@@ -99,7 +99,7 @@ limit 1]]&gt;
 			<frame>
 				<reportElement x="5" y="10" width="544" height="25" uuid="ca1de359-745c-40f6-9b5f-c57c1957f4ae"/>
 				<staticText>
-					<reportElement x="0" y="0" width="150" height="25" uuid="967d8fd8-d42e-4294-ae3f-8e9e9cc75a11">
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="25" uuid="967d8fd8-d42e-4294-ae3f-8e9e9cc75a11">
 						<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
@@ -112,7 +112,7 @@ limit 1]]&gt;
 					<text><![CDATA[Período:]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="150" y="0" width="394" height="25" uuid="1fb03a9d-ef90-4c2f-8da0-c9d02834b531">
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="1fb03a9d-ef90-4c2f-8da0-c9d02834b531">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box leftPadding="5" rightPadding="3"/>
@@ -126,7 +126,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
 			<frame>
 				<reportElement x="5" y="35" width="544" height="25" uuid="bcd4711f-c2a2-4ef5-bb90-a150b346a0cf"/>
 				<staticText>
-					<reportElement x="0" y="0" width="150" height="25" uuid="a6eead87-8e02-41a7-9499-59b318edef85">
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="25" uuid="a6eead87-8e02-41a7-9499-59b318edef85">
 						<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
@@ -137,7 +137,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
 					<text><![CDATA[Número / ano do contrato:]]></text>
 				</staticText>
 				<textField isBlankWhenNull="true">
-					<reportElement x="150" y="0" width="394" height="25" uuid="a0057589-19f8-437d-b135-9da3b94a8f28">
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="a0057589-19f8-437d-b135-9da3b94a8f28">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box padding="0" leftPadding="5" rightPadding="3"/>
@@ -238,7 +238,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
 									<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 								<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-									<reportElement x="0" y="0" width="90" height="30" isPrintWhenDetailOverflows="true" uuid="17e1d601-2f4b-4a1f-b380-1494c8286bb0"/>
+									<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="30" uuid="17e1d601-2f4b-4a1f-b380-1494c8286bb0"/>
 									<box padding="3">
 										<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 										<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -278,7 +278,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
 									<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 								<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-									<reportElement x="0" y="0" width="100" height="30" isPrintWhenDetailOverflows="true" uuid="210d7971-8daf-455b-a85c-321bda7fb0b5"/>
+									<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="30" uuid="210d7971-8daf-455b-a85c-321bda7fb0b5"/>
 									<box padding="3">
 										<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 										<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -318,7 +318,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
 									<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 								<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-									<reportElement x="0" y="0" width="172" height="30" isPrintWhenDetailOverflows="true" uuid="9fb27778-d8ca-4ca3-8050-afbf4ef71f2e"/>
+									<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="172" height="30" uuid="9fb27778-d8ca-4ca3-8050-afbf4ef71f2e"/>
 									<box padding="3">
 										<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 										<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -358,7 +358,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
 									<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 								<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-									<reportElement x="0" y="0" width="172" height="30" isPrintWhenDetailOverflows="true" uuid="8578f83b-3f28-4045-bbb5-9981bf617ee4"/>
+									<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="172" height="30" uuid="8578f83b-3f28-4045-bbb5-9981bf617ee4"/>
 									<box padding="3">
 										<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 										<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
...	...	@@ -628,7 +628,7 @@ public class StartupListenerContratos extends UtilStartup implements Application
628	628	internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.TITULO_LIST_ADITIVOS", "Aditivos do contrato", dominio, modulo));
629	629
630	630	internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_INICIO_ADITIVO_MAIOR_DATA_FINAL", "A data de início do aditivo deve ser maior que a data final do contrato!", dominio, modulo));
631		- internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_INICIO_ADITIVO_MAIOR_DATA_FIM_ADITIVO", "A data de início do aditivo deve ser maior que a data fim!", dominio, modulo));
	631	+ internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_INICIO_ADITIVO_MAIOR_DATA_FIM_ADITIVO", "A data de início do aditivo deve ser menor que a data fim!", dominio, modulo));
632	632	internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_EMISSAO_DENTRO_REFERENCIA", "A data de emissão do aditivo deve estar dentro da referência do contrato!", dominio, modulo));
633	633	internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_EMISSAO_12_MESES", "É preciso ter um intervalo de 12 meses após o último aditivo de prazo!", dominio, modulo));
634	634	internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.MAXIMO_ADITIVO_PRAZO", "Você já cadastrou 5 aditivos de prazo para este contrato. Não é possível cadastrar outro!", dominio, modulo));
...	...
...	...	@@ -99,7 +99,7 @@ limit 1]]>
99	99	<frame>
100	100	<reportElement x="5" y="10" width="544" height="25" uuid="ca1de359-745c-40f6-9b5f-c57c1957f4ae"/>
101	101	<staticText>
102		- <reportElement x="0" y="0" width="150" height="25" uuid="967d8fd8-d42e-4294-ae3f-8e9e9cc75a11">
	102	+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="25" uuid="967d8fd8-d42e-4294-ae3f-8e9e9cc75a11">
103	103	<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
104	104	<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
105	105	<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
...	...	@@ -112,7 +112,7 @@ limit 1]]>
112	112	<text><![CDATA[Período:]]></text>
113	113	</staticText>
114	114	<textField>
115		- <reportElement x="150" y="0" width="394" height="25" uuid="1fb03a9d-ef90-4c2f-8da0-c9d02834b531">
	115	+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="1fb03a9d-ef90-4c2f-8da0-c9d02834b531">
116	116	<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
117	117	</reportElement>
118	118	<box leftPadding="5" rightPadding="3"/>
...	...	@@ -126,7 +126,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
126	126	<frame>
127	127	<reportElement x="5" y="35" width="544" height="25" uuid="bcd4711f-c2a2-4ef5-bb90-a150b346a0cf"/>
128	128	<staticText>
129		- <reportElement x="0" y="0" width="150" height="25" uuid="a6eead87-8e02-41a7-9499-59b318edef85">
	129	+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="25" uuid="a6eead87-8e02-41a7-9499-59b318edef85">
130	130	<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
131	131	<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
132	132	</reportElement>
...	...	@@ -137,7 +137,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
137	137	<text><![CDATA[Número / ano do contrato:]]></text>
138	138	</staticText>
139	139	<textField isBlankWhenNull="true">
140		- <reportElement x="150" y="0" width="394" height="25" uuid="a0057589-19f8-437d-b135-9da3b94a8f28">
	140	+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="a0057589-19f8-437d-b135-9da3b94a8f28">
141	141	<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
142	142	</reportElement>
143	143	<box padding="0" leftPadding="5" rightPadding="3"/>
...	...	@@ -238,7 +238,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
238	238	<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
239	239	</box>
240	240	<textField isStretchWithOverflow="true" isBlankWhenNull="true">
241		- <reportElement x="0" y="0" width="90" height="30" isPrintWhenDetailOverflows="true" uuid="17e1d601-2f4b-4a1f-b380-1494c8286bb0"/>
	241	+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="30" uuid="17e1d601-2f4b-4a1f-b380-1494c8286bb0"/>
242	242	<box padding="3">
243	243	<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
244	244	<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
...	...	@@ -278,7 +278,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
278	278	<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
279	279	</box>
280	280	<textField isStretchWithOverflow="true" isBlankWhenNull="true">
281		- <reportElement x="0" y="0" width="100" height="30" isPrintWhenDetailOverflows="true" uuid="210d7971-8daf-455b-a85c-321bda7fb0b5"/>
	281	+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="30" uuid="210d7971-8daf-455b-a85c-321bda7fb0b5"/>
282	282	<box padding="3">
283	283	<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
284	284	<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
...	...	@@ -318,7 +318,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
318	318	<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
319	319	</box>
320	320	<textField isStretchWithOverflow="true" isBlankWhenNull="true">
321		- <reportElement x="0" y="0" width="172" height="30" isPrintWhenDetailOverflows="true" uuid="9fb27778-d8ca-4ca3-8050-afbf4ef71f2e"/>
	321	+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="172" height="30" uuid="9fb27778-d8ca-4ca3-8050-afbf4ef71f2e"/>
322	322	<box padding="3">
323	323	<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
324	324	<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
...	...	@@ -358,7 +358,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
358	358	<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
359	359	</box>
360	360	<textField isStretchWithOverflow="true" isBlankWhenNull="true">
361		- <reportElement x="0" y="0" width="172" height="30" isPrintWhenDetailOverflows="true" uuid="8578f83b-3f28-4045-bbb5-9981bf617ee4"/>
	361	+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="172" height="30" uuid="8578f83b-3f28-4045-bbb5-9981bf617ee4"/>
362	362	<box padding="3">
363	363	<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
364	364	<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
...	...