From 02fd44c4e0c95cb2e6ca78fac3dae5228573ece8 Mon Sep 17 00:00:00 2001
From: Ertonilson <ertonilson@gmail.com>
Date: Sun, 16 Feb 2020 19:24:19 -0300
Subject: [PATCH 1/4] =?UTF-8?q?Ajuste=20de=20cabe=C3=A7alho=20da=20tabela?=
 =?UTF-8?q?=20de=20rela=C3=A7=C3=A3o=20de=20alunos.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ajuste de cabeçalho com alteração da ordem de títulos.
---
 .project                                   | 11 +++++
 .settings/org.eclipse.core.resources.prefs |  2 +
 DataAdapter.xml                            |  2 +
 ReportSources/students-per-class.jrxml     | 51 ++++++++--------------
 4 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 .project
 create mode 100644 .settings/org.eclipse.core.resources.prefs
 create mode 100644 DataAdapter.xml

diff --git a/.project b/.project
new file mode 100644
index 0000000000..7eb85c8490
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>i-educar-reports-package</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..29efd367f8
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//ReportSources/students-per-class.jrxml=UTF-8
diff --git a/DataAdapter.xml b/DataAdapter.xml
new file mode 100644
index 0000000000..72b224852d
--- /dev/null
+++ b/DataAdapter.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<jdbcDataAdapter class="net.sf.jasperreports.data.jdbc.JdbcDataAdapterImpl"><name>BD Ieducar Adapter</name><driver>org.postgresql.Driver</driver><username>ieducar</username><password>qwerasdf</password><savePassword>true</savePassword><url>jdbc:postgresql://192.168.0.153:5432/ieducar</url><database></database><serverAddress></serverAddress></jdbcDataAdapter>
\ No newline at end of file
diff --git a/ReportSources/students-per-class.jrxml b/ReportSources/students-per-class.jrxml
index b9d1e67a94..834244c665 100644
--- a/ReportSources/students-per-class.jrxml
+++ b/ReportSources/students-per-class.jrxml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.6.0  -->
+<!-- Created with Jaspersoft Studio version 6.11.0.final using JasperReports Library version 6.11.0-0c4056ccaa4d25a5a8c45672d2f764ea3498bebb  -->
 <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="students-per-class" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="660c525a-0168-4141-8483-3075f389d9a9">
 	<property name="ireport.zoom" value="1.9965000000000017"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="91"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="DataAdapter.xml"/>
 	<parameter name="ano" class="java.lang.Integer">
 		<defaultValueExpression><![CDATA[0]]></defaultValueExpression>
 	</parameter>
@@ -86,14 +87,14 @@
 		<groupHeader>
 			<band height="88">
 				<textField>
-					<reportElement x="-1" y="74" width="172" height="13" uuid="ffc67a05-c330-41aa-89fc-0bcdf8afd812"/>
+					<reportElement x="0" y="46" width="172" height="13" uuid="ffc67a05-c330-41aa-89fc-0bcdf8afd812"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="8" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA["Turma: "+$F{nome_turma}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="171" y="74" width="122" height="13" uuid="bb0f828b-67c5-4407-9730-7d0a1008d96e"/>
+					<reportElement x="220" y="46" width="122" height="13" uuid="bb0f828b-67c5-4407-9730-7d0a1008d96e"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="8" isBold="true"/>
 					</textElement>
@@ -107,56 +108,49 @@
 					<textFieldExpression><![CDATA["Curso: "+$F{nome_curso}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="381" y="45" width="18" height="13" uuid="fbf2ba34-a989-463f-9790-1f5fd63b8faf"/>
+					<reportElement x="358" y="67" width="18" height="13" uuid="fbf2ba34-a989-463f-9790-1f5fd63b8faf"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="7"/>
 					</textElement>
 					<text><![CDATA[Sexo]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="399" y="45" width="41" height="13" uuid="92f9b1d6-8562-42db-ab67-7720721b5c0b"/>
+					<reportElement x="382" y="67" width="41" height="13" uuid="92f9b1d6-8562-42db-ab67-7720721b5c0b"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="7"/>
 					</textElement>
 					<text><![CDATA[Dt. nasc]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="442" y="45" width="62" height="13" uuid="82a2bf46-863b-4b09-8d5c-540067b4a2f6"/>
+					<reportElement x="429" y="67" width="62" height="13" uuid="82a2bf46-863b-4b09-8d5c-540067b4a2f6"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="7"/>
 					</textElement>
 					<text><![CDATA[NIS/PIS/PASEP]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="171" y="45" width="100" height="13" uuid="e939bb3f-f2d8-4b35-8f61-bf3d18687718"/>
+					<reportElement x="114" y="67" width="100" height="13" uuid="e939bb3f-f2d8-4b35-8f61-bf3d18687718"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="7"/>
 					</textElement>
 					<text><![CDATA[Aluno(a)]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="16" y="45" width="33" height="13" uuid="687c656f-e35b-4cc1-b449-13fe2ebbf46b"/>
+					<reportElement x="16" y="67" width="33" height="13" uuid="687c656f-e35b-4cc1-b449-13fe2ebbf46b"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="7"/>
 					</textElement>
 					<text><![CDATA[Código]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="504" y="45" width="51" height="13" uuid="09572446-9a8f-4b30-bdc7-c3635659d445"/>
+					<reportElement x="495" y="67" width="51" height="13" uuid="09572446-9a8f-4b30-bdc7-c3635659d445"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="7"/>
 					</textElement>
 					<text><![CDATA[Situação]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="49" y="45" width="48" height="18" uuid="64911ed2-4589-4dd7-8275-8cb573db5489"/>
-					<textElement>
-						<font fontName="DejaVu Sans" size="7"/>
-					</textElement>
-					<text><![CDATA[Cód. rede estadual]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="112" y="45" width="36" height="13" uuid="656cfbd4-aa39-44b8-a9ea-2428c36e4a80"/>
+					<reportElement x="50" y="67" width="36" height="13" uuid="656cfbd4-aa39-44b8-a9ea-2428c36e4a80"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="7"/>
 					</textElement>
@@ -198,7 +192,7 @@
 					<text><![CDATA[Sala:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="0" y="45" width="16" height="13" uuid="687c656f-e35b-4cc1-b449-13fe2ebbf46b"/>
+					<reportElement x="0" y="67" width="16" height="13" uuid="687c656f-e35b-4cc1-b449-13fe2ebbf46b"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="7"/>
 					</textElement>
@@ -265,24 +259,17 @@
 	<detail>
 		<band height="15" splitType="Stretch">
 			<rectangle>
-				<reportElement mode="Opaque" x="0" y="1" width="554" height="13" forecolor="#FFFFFF" backcolor="#F0F0F0" uuid="31f4ee65-09f0-489c-b178-f91ba385052f">
+				<reportElement mode="Opaque" x="0" y="1" width="555" height="13" forecolor="#FFFFFF" backcolor="#F0F0F0" uuid="31f4ee65-09f0-489c-b178-f91ba385052f">
 					<printWhenExpression><![CDATA[new Boolean(($V{COLUMN_COUNT} % 2) == 1)]]></printWhenExpression>
 				</reportElement>
 			</rectangle>
 			<textField isBlankWhenNull="true">
-				<reportElement x="112" y="3" width="57" height="10" uuid="4f37cf3e-6a99-4ce1-9701-2e141ec2c11b"/>
+				<reportElement x="50" y="3" width="57" height="10" uuid="4f37cf3e-6a99-4ce1-9701-2e141ec2c11b"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{inep}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="49" y="3" width="64" height="10" uuid="f2d583f9-12eb-41c3-b4a4-b6266cf22545"/>
-				<textElement>
-					<font fontName="DejaVu Sans" size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{serie_ciasc}]]></textFieldExpression>
-			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="16" y="3" width="33" height="10" uuid="2cab2d18-4400-4777-a35c-ace3e6779167"/>
 				<textElement>
@@ -291,35 +278,35 @@
 				<textFieldExpression><![CDATA[$F{cod_aluno}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="171" y="3" width="210" height="10" uuid="90e15dde-6e9f-4f2e-b735-ab822cb771b1"/>
+				<reportElement x="114" y="3" width="222" height="10" uuid="90e15dde-6e9f-4f2e-b735-ab822cb771b1"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[($F{dependencia} ? "*" : "")+$F{nome_aluno}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="381" y="3" width="18" height="10" uuid="abb1859c-61ff-4f61-bdc5-3926b1a665bc"/>
+				<reportElement x="358" y="3" width="18" height="10" uuid="abb1859c-61ff-4f61-bdc5-3926b1a665bc"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sexo}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="399" y="3" width="41" height="10" uuid="873ef749-5afb-4916-b375-6768f9064860"/>
+				<reportElement x="382" y="3" width="41" height="10" uuid="873ef749-5afb-4916-b375-6768f9064860"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{data_nasc}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="442" y="3" width="65" height="10" uuid="cd478d80-f266-46fb-ab6e-6d9ff8a5727d"/>
+				<reportElement x="429" y="3" width="62" height="10" uuid="cd478d80-f266-46fb-ab6e-6d9ff8a5727d"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nis_pis_pasep}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="504" y="3" width="51" height="10" uuid="fc721837-3bfa-40d2-a624-a8d9697c71f1"/>
+				<reportElement x="495" y="3" width="60" height="10" uuid="fc721837-3bfa-40d2-a624-a8d9697c71f1"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="7"/>
 				</textElement>

From b3ab35ced4698a58a1d9b9e0649a6441f2282349 Mon Sep 17 00:00:00 2001
From: Erton <ertonilson@gmail.com>
Date: Sun, 17 Jan 2021 11:17:27 -0300
Subject: [PATCH 2/4] Delete DataAdapter.xml

---
 DataAdapter.xml | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 DataAdapter.xml

diff --git a/DataAdapter.xml b/DataAdapter.xml
deleted file mode 100644
index 72b224852d..0000000000
--- a/DataAdapter.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<jdbcDataAdapter class="net.sf.jasperreports.data.jdbc.JdbcDataAdapterImpl"><name>BD Ieducar Adapter</name><driver>org.postgresql.Driver</driver><username>ieducar</username><password>qwerasdf</password><savePassword>true</savePassword><url>jdbc:postgresql://192.168.0.153:5432/ieducar</url><database></database><serverAddress></serverAddress></jdbcDataAdapter>
\ No newline at end of file

From bce8c02a57eef9ed7420dc616ed85cb7d61b1939 Mon Sep 17 00:00:00 2001
From: Erton <ertonilson@gmail.com>
Date: Sun, 17 Jan 2021 11:18:16 -0300
Subject: [PATCH 3/4] Delete org.eclipse.core.resources.prefs

---
 .settings/org.eclipse.core.resources.prefs | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .settings/org.eclipse.core.resources.prefs

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 29efd367f8..0000000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding//ReportSources/students-per-class.jrxml=UTF-8

From 989492c30962a7392ac314a41aa40ab21f653c1c Mon Sep 17 00:00:00 2001
From: Erton <ertonilson@gmail.com>
Date: Sun, 17 Jan 2021 11:18:45 -0300
Subject: [PATCH 4/4] Delete .project

---
 .project | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 .project

diff --git a/.project b/.project
deleted file mode 100644
index 7eb85c8490..0000000000
--- a/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>i-educar-reports-package</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>