From ce46c6e447d350dcc561037e8857b4db91fba986 Mon Sep 17 00:00:00 2001
From: Caroline Salib <carolinesalibc@gmail.com>
Date: Sat, 8 Jul 2017 22:43:55 -0300
Subject: [PATCH] Ajustado todos os relatórios para atender a nova fábrica; Refs #193

---
 ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jasper     | Bin 0 -> 60186 bytes
 ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jrxml      |   2 ++
 ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jasper      | Bin 0 -> 60510 bytes
 ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jrxml       |   2 ++
 ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jasper           | Bin 0 -> 59790 bytes
 ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jrxml            |   4 +++-
 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jasper        | Bin 0 -> 52523 bytes
 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jrxml         |   2 ++
 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jasper      | Bin 0 -> 59386 bytes
 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jrxml       |   2 ++
 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jasper         | Bin 0 -> 68869 bytes
 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jrxml          |   2 ++
 ieducar/modules/Reports/ReportSources/portabilis_boletim.jasper                 | Bin 0 -> 109206 bytes
 ieducar/modules/Reports/ReportSources/portabilis_boletim.jrxml                  |  54 ++++++++++++++++++++++++++++--------------------------
 ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jasper | Bin 0 -> 216300 bytes
 ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jrxml  | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
 16 files changed, 115 insertions(+), 100 deletions(-)
 create mode 100644 ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jasper
 create mode 100644 ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jasper
 create mode 100644 ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jasper
 create mode 100644 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jasper
 create mode 100644 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jasper
 create mode 100644 ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jasper
 create mode 100644 ieducar/modules/Reports/ReportSources/portabilis_boletim.jasper
 create mode 100644 ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jasper

diff --git a/ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jasper b/ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jasper
new file mode 100644
index 0000000..03f8ee0
Binary files /dev/null and b/ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jasper differ
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jrxml b/ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jrxml
index 7006cd4..6e3471e 100644
--- a/ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jrxml
+++ b/ieducar/modules/Reports/ReportSources/portabilis_atestado_frequencia.jrxml
@@ -16,6 +16,8 @@
 		<defaultValueExpression><![CDATA[new java.lang.Integer(0)]]></defaultValueExpression>
 	</parameter>
 	<parameter name="logo" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String"/>
+	<parameter name="database" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT fcn_upper(instituicao.nm_instituicao) AS nm_instituicao,
        fcn_upper(instituicao.nm_responsavel) AS nm_responsavel,
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jasper b/ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jasper
new file mode 100644
index 0000000..2811136
Binary files /dev/null and b/ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jasper differ
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jrxml b/ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jrxml
index ede0e40..9e33674 100644
--- a/ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jrxml
+++ b/ieducar/modules/Reports/ReportSources/portabilis_atestado_matricula.jrxml
@@ -16,6 +16,8 @@
 		<defaultValueExpression><![CDATA[new java.lang.Integer(0)]]></defaultValueExpression>
 	</parameter>
 	<parameter name="logo" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String"/>
+	<parameter name="database" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT fcn_upper(instituicao.nm_instituicao) AS nm_instituicao,
        fcn_upper(instituicao.nm_responsavel) AS nm_responsavel,
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jasper b/ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jasper
new file mode 100644
index 0000000..e11d673
Binary files /dev/null and b/ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jasper differ
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jrxml b/ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jrxml
index 7081bc9..cf7f77d 100644
--- a/ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jrxml
+++ b/ieducar/modules/Reports/ReportSources/portabilis_atestado_vaga.jrxml
@@ -2,7 +2,7 @@
 <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="portabilis_atestado_vaga" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0cebf96a-c86e-439d-b777-7239a5c2af6a">
 	<property name="ireport.zoom" value="1.1"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="341"/>
+	<property name="ireport.y" value="320"/>
 	<parameter name="instituicao" class="java.lang.Integer">
 		<defaultValueExpression><![CDATA[new java.lang.Integer(0)]]></defaultValueExpression>
 	</parameter>
@@ -22,6 +22,8 @@
 		<defaultValueExpression><![CDATA[new java.lang.Integer(0)]]></defaultValueExpression>
 	</parameter>
 	<parameter name="logo" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String"/>
+	<parameter name="database" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT public.fcn_upper(nm_instituicao) AS nome_instituicao,
        public.fcn_upper(nm_responsavel) AS nm_responsavel,
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jasper b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jasper
new file mode 100644
index 0000000..5aa29c3
Binary files /dev/null and b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jasper differ
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jrxml b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jrxml
index c4462b4..b715b99 100644
--- a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jrxml
+++ b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_autor.jrxml
@@ -11,6 +11,8 @@
 	</parameter>
 	<parameter name="logo" class="java.lang.String"/>
 	<parameter name="ordem" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String"/>
+	<parameter name="database" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT public.fcn_upper(instituicao.nm_instituicao) as nm_instituicao,
        cod_acervo_autor,
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jasper b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jasper
new file mode 100644
index 0000000..0065ca5
Binary files /dev/null and b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jasper differ
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jrxml b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jrxml
index 5bb07e2..c33e53d 100644
--- a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jrxml
+++ b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_editora.jrxml
@@ -10,6 +10,8 @@
 		<defaultValueExpression><![CDATA[new java.lang.Integer(0)]]></defaultValueExpression>
 	</parameter>
 	<parameter name="logo" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String"/>
+	<parameter name="database" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT public.fcn_upper(instituicao.nm_instituicao) as nm_instituicao,
        acervo_editora.cod_acervo_editora,
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jasper b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jasper
new file mode 100644
index 0000000..872b761
Binary files /dev/null and b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jasper differ
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jrxml b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jrxml
index 3f00235..46f2fc4 100644
--- a/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jrxml
+++ b/ieducar/modules/Reports/ReportSources/portabilis_biblioteca_obra.jrxml
@@ -10,6 +10,8 @@
 		<defaultValueExpression><![CDATA[new java.lang.Integer(0)]]></defaultValueExpression>
 	</parameter>
 	<parameter name="logo" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String"/>
+	<parameter name="database" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT public.fcn_upper(instituicao.nm_instituicao) as nm_instituicao,
        acervo.cod_acervo,
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_boletim.jasper b/ieducar/modules/Reports/ReportSources/portabilis_boletim.jasper
new file mode 100644
index 0000000..864f4a9
Binary files /dev/null and b/ieducar/modules/Reports/ReportSources/portabilis_boletim.jasper differ
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_boletim.jrxml b/ieducar/modules/Reports/ReportSources/portabilis_boletim.jrxml
index d553348..8321652 100644
--- a/ieducar/modules/Reports/ReportSources/portabilis_boletim.jrxml
+++ b/ieducar/modules/Reports/ReportSources/portabilis_boletim.jrxml
@@ -25,6 +25,8 @@
 		<defaultValueExpression><![CDATA[new java.lang.Integer(0)]]></defaultValueExpression>
 	</parameter>
 	<parameter name="logo" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String"/>
+	<parameter name="database" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT (SELECT escola_ano_letivo.ano
           FROM pmieducar.escola_ano_letivo
@@ -196,7 +198,7 @@ nome_disciplina,
 
               componente_curricular.id as id_disciplina,
 
-       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = 10 THEN
+       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = '10' THEN
 			                   '10,0'
 			               WHEN char_length(nota_componente_curricular.nota_arredondada) = 1 THEN
 			                   replace(nota_componente_curricular.nota_arredondada,'.',',') || ',0'
@@ -208,11 +210,11 @@ nome_disciplina,
 	     WHERE nota_componente_curricular.nota_aluno_id = nota_aluno.id AND
 	           nota_componente_curricular.componente_curricular_id = componente_curricular.id AND
 	           nota_aluno.matricula_id = matricula.cod_matricula AND
-             nota_componente_curricular.etapa = 1
+             nota_componente_curricular.etapa = '1'
       ) AS nota1,
 
 
-       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = 10 THEN
+       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = '10' THEN
 			                   '10,0'
 			               WHEN char_length(nota_componente_curricular.nota_arredondada) = 1 THEN
 			                   replace(nota_componente_curricular.nota_arredondada,'.',',') || ',0'
@@ -224,10 +226,10 @@ nome_disciplina,
 	     WHERE nota_componente_curricular.nota_aluno_id = nota_aluno.id AND
 	           nota_componente_curricular.componente_curricular_id = componente_curricular.id AND
 	           nota_aluno.matricula_id = matricula.cod_matricula AND
-             nota_componente_curricular.etapa = 2
+             nota_componente_curricular.etapa = '2'
       ) AS nota2,
 
-       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = 10 THEN
+       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = '10' THEN
 			                   '10,0'
 			               WHEN char_length(nota_componente_curricular.nota_arredondada) = 1 THEN
 			                   replace(nota_componente_curricular.nota_arredondada,'.',',') || ',0'
@@ -239,10 +241,10 @@ nome_disciplina,
 	     WHERE nota_componente_curricular.nota_aluno_id = nota_aluno.id AND
 	           nota_componente_curricular.componente_curricular_id = componente_curricular.id AND
 	           nota_aluno.matricula_id = matricula.cod_matricula AND
-             nota_componente_curricular.etapa = 3
+             nota_componente_curricular.etapa = '3'
       ) AS nota3,
 
-       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = 10 THEN
+       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = '10' THEN
 			                   '10,0'
 			               WHEN char_length(nota_componente_curricular.nota_arredondada) = 1 THEN
 			                   replace(nota_componente_curricular.nota_arredondada,'.',',') || ',0'
@@ -254,11 +256,11 @@ nome_disciplina,
 	     WHERE nota_componente_curricular.nota_aluno_id = nota_aluno.id AND
 	           nota_componente_curricular.componente_curricular_id = componente_curricular.id AND
 	           nota_aluno.matricula_id = matricula.cod_matricula AND
-             nota_componente_curricular.etapa = 4
+             nota_componente_curricular.etapa = '4'
       ) AS nota4,
 
 
-       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = 10 THEN
+       (SELECT CASE  WHEN nota_componente_curricular.nota_arredondada = '10' THEN
 			                   '10,0'
 			               WHEN char_length(nota_componente_curricular.nota_arredondada) = 1 THEN
 			                   replace(nota_componente_curricular.nota_arredondada,'.',',') || ',0'
@@ -274,7 +276,7 @@ nome_disciplina,
       ) AS nota_exame,
 
 
-       (SELECT CASE  WHEN nota_componente_curricular_media.media_arredondada = 10 THEN
+       (SELECT CASE  WHEN nota_componente_curricular_media.media_arredondada = '10' THEN
 			                   '10,0'
 			               WHEN char_length(nota_componente_curricular_media.media_arredondada) = 1 THEN
 			                   replace(nota_componente_curricular_media.media_arredondada,'.',',') || ',0'
@@ -337,7 +339,7 @@ nome_disciplina,
                 modules.falta_aluno
           WHERE falta_geral.falta_aluno_id = falta_aluno.id AND
                 falta_aluno.matricula_id = matricula.cod_matricula AND
-                falta_geral.etapa = 1 AND
+                falta_geral.etapa = '1' AND
 				falta_aluno.tipo_falta = 1) as total_faltas_et1,
 
         (SELECT sum(falta_geral.quantidade)
@@ -345,7 +347,7 @@ nome_disciplina,
                 modules.falta_aluno
           WHERE falta_geral.falta_aluno_id = falta_aluno.id AND
                 falta_aluno.matricula_id = matricula.cod_matricula AND
-                falta_geral.etapa = 2 AND
+                falta_geral.etapa = '2' AND
 				falta_aluno.tipo_falta = 1) as total_faltas_et2,
 
         (SELECT sum(falta_geral.quantidade)
@@ -353,7 +355,7 @@ nome_disciplina,
                 modules.falta_aluno
           WHERE falta_geral.falta_aluno_id = falta_aluno.id AND
                 falta_aluno.matricula_id = matricula.cod_matricula AND
-                falta_geral.etapa = 3 AND
+                falta_geral.etapa = '3' AND
                 falta_aluno.tipo_falta = 1) as total_faltas_et3,
 
         (SELECT sum(falta_geral.quantidade)
@@ -361,7 +363,7 @@ nome_disciplina,
                 modules.falta_aluno
           WHERE falta_geral.falta_aluno_id = falta_aluno.id AND
                 falta_aluno.matricula_id = matricula.cod_matricula AND
-                falta_geral.etapa = 4 AND
+                falta_geral.etapa = '4' AND
 				falta_aluno.tipo_falta = 1) as total_faltas_et4,
 
         (SELECT sum(falta_geral.quantidade)
@@ -376,7 +378,7 @@ nome_disciplina,
                 modules.falta_aluno
           WHERE falta_componente_curricular.falta_aluno_id = falta_aluno.id AND
                 falta_aluno.matricula_id = matricula.cod_matricula AND
-                falta_componente_curricular.etapa = 1 AND
+                falta_componente_curricular.etapa = '1' AND
 	      falta_componente_curricular.componente_curricular_id = componente_curricular.id AND
                 falta_aluno.tipo_falta = 2) as faltas_componente_et1,
 
@@ -385,7 +387,7 @@ nome_disciplina,
                 modules.falta_aluno
           WHERE falta_componente_curricular.falta_aluno_id = falta_aluno.id AND
                 falta_aluno.matricula_id = matricula.cod_matricula AND
-                falta_componente_curricular.etapa = 2 AND
+                falta_componente_curricular.etapa = '2' AND
 				falta_componente_curricular.componente_curricular_id = componente_curricular.id AND
 				falta_aluno.tipo_falta = 2) as faltas_componente_et2,
 
@@ -394,7 +396,7 @@ nome_disciplina,
                 modules.falta_aluno
           WHERE falta_componente_curricular.falta_aluno_id = falta_aluno.id AND
                 falta_aluno.matricula_id = matricula.cod_matricula AND
-                falta_componente_curricular.etapa = 3 AND
+                falta_componente_curricular.etapa = '3' AND
 				falta_componente_curricular.componente_curricular_id = componente_curricular.id AND
 				falta_aluno.tipo_falta = 2) as faltas_componente_et3,
 
@@ -403,7 +405,7 @@ nome_disciplina,
                 modules.falta_aluno
           WHERE falta_componente_curricular.falta_aluno_id = falta_aluno.id AND
                 falta_aluno.matricula_id = matricula.cod_matricula AND
-                falta_componente_curricular.etapa = 4 AND
+                falta_componente_curricular.etapa = '4' AND
 				falta_componente_curricular.componente_curricular_id = componente_curricular.id AND
 				falta_aluno.tipo_falta = 2) as faltas_componente_et4,
 
@@ -425,7 +427,7 @@ nome_disciplina,
 				falta_aluno.tipo_falta = 2) as total_geral_faltas_componente,
 
 
-  (SELECT to_number((((select serie.dias_letivos
+  (SELECT ((((select serie.dias_letivos
                        from pmieducar.serie
                       where serie.cod_serie = matricula.ref_ref_cod_serie)::float -
                    (SELECT sum(falta_geral.quantidade)
@@ -433,9 +435,9 @@ nome_disciplina,
                             modules.falta_aluno
                       WHERE falta_geral.falta_aluno_id = falta_aluno.id AND
                             falta_aluno.matricula_id = matricula.cod_matricula AND
-                            falta_geral.etapa in('1','2','3','4')))::float * 100::float )::float / (select serie.dias_letivos from pmieducar.serie where serie.cod_serie = matricula.ref_ref_cod_serie) :: float,'999')) AS frequencia,
+                            falta_geral.etapa in('1','2','3','4')))::float * 100::float )::float / (select serie.dias_letivos from pmieducar.serie where serie.cod_serie = matricula.ref_ref_cod_serie) :: float,'999')::varchar) AS frequencia,
 
-    (SELECT sum(to_number(componente_curricular_ano_escolar.carga_horaria,'999'))
+    (SELECT sum(to_number(componente_curricular_ano_escolar.carga_horaria::varchar,'999'))
        FROM modules.componente_curricular_ano_escolar
      WHERE componente_curricular_ano_escolar.componente_curricular_id = componente_curricular.id) AS            carga_horaria,
 
@@ -556,14 +558,14 @@ ORDER BY nome_aluno, nome_disciplina]]>
 	<field name="faltas_componente_et4" class="java.lang.Long"/>
 	<field name="total_faltas_componente" class="java.lang.Long"/>
 	<field name="total_geral_faltas_componente" class="java.lang.Long"/>
-	<field name="frequencia" class="java.math.BigDecimal"/>
+	<field name="frequencia" class="java.lang.String"/>
 	<field name="carga_horaria" class="java.math.BigDecimal"/>
 	<field name="curso_hora_falta" class="java.lang.Double"/>
 	<field name="carga_horaria_componente" class="java.lang.Integer"/>
 	<field name="carga_horaria_serie" class="java.lang.Double"/>
 	<field name="frequencia_boletim" class="java.lang.Double"/>
 	<field name="frequencia_boletim_componente" class="java.lang.Double"/>
-	<field name="tipo_presenca" class="java.lang.Integer"/>
+	<field name="tipo_presenca" class="java.lang.String"/>
 	<group name="matricula">
 		<groupExpression><![CDATA[$F{matricula}]]></groupExpression>
 		<groupHeader>
@@ -1012,7 +1014,7 @@ ORDER BY nome_aluno, nome_disciplina]]>
 				</textField>
 				<textField isBlankWhenNull="true">
 					<reportElement uuid="1017fdae-39da-41ac-a63d-2b175117bcd0" x="510" y="145" width="26" height="11" printWhenGroupChanges="matricula">
-						<printWhenExpression><![CDATA[$F{tipo_presenca} = 1]]></printWhenExpression>
+						<printWhenExpression><![CDATA[$F{tipo_presenca} == 1]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Center">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -1021,7 +1023,7 @@ ORDER BY nome_aluno, nome_disciplina]]>
 				</textField>
 				<textField isBlankWhenNull="true">
 					<reportElement uuid="1017fdae-39da-41ac-a63d-2b175117bcd0" x="510" y="145" width="26" height="11" printWhenGroupChanges="matricula">
-						<printWhenExpression><![CDATA[$F{tipo_presenca} = 2]]></printWhenExpression>
+						<printWhenExpression><![CDATA[$F{tipo_presenca} == 2]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Center">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -1248,7 +1250,7 @@ ORDER BY nome_aluno, nome_disciplina]]>
 			</line>
 			<textField pattern="#,##0 %" isBlankWhenNull="true">
 				<reportElement uuid="1017fdae-39da-41ac-a63d-2b175117bcd0" x="510" y="1" width="26" height="15" printWhenGroupChanges="matricula">
-					<printWhenExpression><![CDATA[$F{tipo_presenca} = 2]]></printWhenExpression>
+					<printWhenExpression><![CDATA[$F{tipo_presenca} == 2]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Center">
 					<font fontName="DejaVu Sans" size="8" isBold="false"/>
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jasper b/ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jasper
new file mode 100644
index 0000000..3bf85f0
Binary files /dev/null and b/ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jasper differ
diff --git a/ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jrxml b/ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jrxml
index e5d2d17..0d63596 100644
--- a/ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jrxml
+++ b/ieducar/modules/Reports/ReportSources/portabilis_historico_escolar_9anos.jrxml
@@ -21,6 +21,7 @@
 	<parameter name="logo" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
 	</parameter>
+	<parameter name="database" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[select nm_disciplina,
 	MAX(nota) AS NOTA,
@@ -267,7 +268,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 1) as nota_1serie,
+               substring(nm_serie,1,1) = '1') as nota_1serie,
 
        (select CASE WHEN replace(substring(trim(hd.nota),1,3),'.',',') = '10,' THEN
                       '10,0'
@@ -278,7 +279,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 2) as nota_2serie,
+               substring(nm_serie,1,1) = '2') as nota_2serie,
 
        (select CASE WHEN replace(substring(trim(hd.nota),1,3),'.',',') = '10,' THEN
                       '10,0'
@@ -289,7 +290,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 3) as nota_3serie,
+               substring(nm_serie,1,1) = '3') as nota_3serie,
 
        (select CASE WHEN replace(substring(trim(hd.nota),1,3),'.',',') = '10,' THEN
                       '10,0'
@@ -300,7 +301,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 4) as nota_4serie,
+               substring(nm_serie,1,1) = '4') as nota_4serie,
 
        (select CASE WHEN replace(substring(trim(hd.nota),1,3),'.',',') = '10,' THEN
                       '10,0'
@@ -311,7 +312,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 5) as nota_5serie,
+               substring(nm_serie,1,1) = '5') as nota_5serie,
 
        (select CASE WHEN replace(substring(trim(hd.nota),1,3),'.',',') = '10,' THEN
                       '10,0'
@@ -322,7 +323,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 6) as nota_6serie,
+               substring(nm_serie,1,1) = '6') as nota_6serie,
 
        (select CASE WHEN replace(substring(trim(hd.nota),1,3),'.',',') = '10,' THEN
                       '10,0'
@@ -333,7 +334,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 7) as nota_7serie,
+               substring(nm_serie,1,1) = '7') as nota_7serie,
 
        (select CASE WHEN replace(substring(trim(hd.nota),1,3),'.',',') = '10,' THEN
                       '10,0'
@@ -344,7 +345,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 8) as nota_8serie,
+               substring(nm_serie,1,1) = '8') as nota_8serie,
 
        (select CASE WHEN replace(substring(trim(hd.nota),1,3),'.',',') = '10,' THEN
                       '10,0'
@@ -355,7 +356,7 @@ SELECT nm_disciplina,
          where  hd.sequencial = historico_disciplinas.sequencial AND
                hd.ref_ref_cod_aluno = historico_disciplinas.ref_ref_cod_aluno AND
                hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
-               substring(nm_serie,1,1) = 9) as nota_9serie,
+               substring(nm_serie,1,1) = '9') as nota_9serie,
 
         (select ano
           from  pmieducar.historico_escolar he,
@@ -365,7 +366,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 1) as ano_1serie,
+                substring(nm_serie,1,1) = '1') as ano_1serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -375,7 +376,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 1) as escola_1serie,
+                substring(nm_serie,1,1) = '1') as escola_1serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -385,7 +386,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 1) as escola_cidade_1serie,
+                substring(nm_serie,1,1) = '1') as escola_cidade_1serie,
 
 
         (select escola_uf
@@ -396,7 +397,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 1) as escola_uf_1serie,
+                substring(nm_serie,1,1) = '1') as escola_uf_1serie,
 
         (select ano
           from  pmieducar.historico_escolar he,
@@ -406,7 +407,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 2) as ano_2serie,
+                substring(nm_serie,1,1) = '2') as ano_2serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -416,7 +417,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 2) as escola_2serie,
+                substring(nm_serie,1,1) = '2') as escola_2serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -426,7 +427,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 2) as escola_cidade_2serie,
+                substring(nm_serie,1,1) = '2') as escola_cidade_2serie,
 
 
         (select escola_uf
@@ -437,7 +438,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 2) as escola_uf_2serie,
+                substring(nm_serie,1,1) = '2') as escola_uf_2serie,
 
         (select ano
           from  pmieducar.historico_escolar he,
@@ -447,7 +448,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 3) as ano_3serie,
+                substring(nm_serie,1,1) = '3') as ano_3serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -457,7 +458,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 3) as escola_3serie,
+                substring(nm_serie,1,1) = '3') as escola_3serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -467,7 +468,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 3) as escola_cidade_3serie,
+                substring(nm_serie,1,1) = '3') as escola_cidade_3serie,
 
 
         (select escola_uf
@@ -478,7 +479,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 3) as escola_uf_3serie,
+                substring(nm_serie,1,1) = '3') as escola_uf_3serie,
 
 		(select ano
           from  pmieducar.historico_escolar he,
@@ -488,7 +489,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 4) as ano_4serie,
+                substring(nm_serie,1,1) = '4') as ano_4serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -498,7 +499,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 4) as escola_4serie,
+                substring(nm_serie,1,1) = '4') as escola_4serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -508,7 +509,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 4) as escola_cidade_4serie,
+                substring(nm_serie,1,1) = '4') as escola_cidade_4serie,
 
 
         (select escola_uf
@@ -519,7 +520,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 4) as escola_uf_4serie,
+                substring(nm_serie,1,1) = '4') as escola_uf_4serie,
 
         (select ano
           from  pmieducar.historico_escolar he,
@@ -529,7 +530,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 5) as ano_5serie,
+                substring(nm_serie,1,1) = '5') as ano_5serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -539,7 +540,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 5) as escola_5serie,
+                substring(nm_serie,1,1) = '5') as escola_5serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -549,7 +550,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 5) as escola_cidade_5serie,
+                substring(nm_serie,1,1) = '5') as escola_cidade_5serie,
 
 
         (select escola_uf
@@ -560,7 +561,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 5) as escola_uf_5serie,
+                substring(nm_serie,1,1) = '5') as escola_uf_5serie,
 
 		(select ano
           from  pmieducar.historico_escolar he,
@@ -570,7 +571,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 6) as ano_6serie,
+                substring(nm_serie,1,1) = '6') as ano_6serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -580,7 +581,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 6) as escola_6serie,
+                substring(nm_serie,1,1) = '6') as escola_6serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -590,7 +591,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 6) as escola_cidade_6serie,
+                substring(nm_serie,1,1) = '6') as escola_cidade_6serie,
 
 
         (select escola_uf
@@ -601,7 +602,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 6) as escola_uf_6serie,
+                substring(nm_serie,1,1) = '6') as escola_uf_6serie,
 
 		(select ano
           from  pmieducar.historico_escolar he,
@@ -611,7 +612,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 7) as ano_7serie,
+                substring(nm_serie,1,1) = '7') as ano_7serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -621,7 +622,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 7) as escola_7serie,
+                substring(nm_serie,1,1) = '7') as escola_7serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -631,7 +632,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 7) as escola_cidade_7serie,
+                substring(nm_serie,1,1) = '7') as escola_cidade_7serie,
 
 
         (select escola_uf
@@ -642,7 +643,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 7) as escola_uf_7serie,
+                substring(nm_serie,1,1) = '7') as escola_uf_7serie,
 
         (select ano
           from  pmieducar.historico_escolar he,
@@ -652,7 +653,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 8) as ano_8serie,
+                substring(nm_serie,1,1) = '8') as ano_8serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -662,7 +663,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 8) as escola_8serie,
+                substring(nm_serie,1,1) = '8') as escola_8serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -672,7 +673,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 8) as escola_cidade_8serie,
+                substring(nm_serie,1,1) = '8') as escola_cidade_8serie,
 
 
         (select escola_uf
@@ -683,7 +684,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 8) as escola_uf_8serie,
+                substring(nm_serie,1,1) = '8') as escola_uf_8serie,
 
         (select ano
           from  pmieducar.historico_escolar he,
@@ -693,7 +694,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 9) as ano_9serie,
+                substring(nm_serie,1,1) = '9') as ano_9serie,
 
         (select escola
           from  pmieducar.historico_escolar he,
@@ -703,7 +704,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 9) as escola_9serie,
+                substring(nm_serie,1,1) = '9') as escola_9serie,
 
         (select escola_cidade
           from  pmieducar.historico_escolar he,
@@ -713,7 +714,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 9) as escola_cidade_9serie,
+                substring(nm_serie,1,1) = '9') as escola_cidade_9serie,
 
 
         (select escola_uf
@@ -724,7 +725,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 9) as escola_uf_9serie,
+                substring(nm_serie,1,1) = '9') as escola_uf_9serie,
 
         to_char(CURRENT_DATE,'dd/mm/yyyy') as data_atual,
 
@@ -746,7 +747,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 1) as obs1,
+                substring(nm_serie,1,1) = '1') as obs1,
 
         (select he.observacao
           from  pmieducar.historico_escolar he,
@@ -756,7 +757,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 2) as obs2,
+                substring(nm_serie,1,1) = '2') as obs2,
 
         (select he.observacao
           from  pmieducar.historico_escolar he,
@@ -766,7 +767,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 3) as obs3,
+                substring(nm_serie,1,1) = '3') as obs3,
 
         (select he.observacao
           from  pmieducar.historico_escolar he,
@@ -776,7 +777,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 4) as obs4,
+                substring(nm_serie,1,1) = '4') as obs4,
 
         (select he.observacao
           from  pmieducar.historico_escolar he,
@@ -786,7 +787,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 5) as obs5,
+                substring(nm_serie,1,1) = '5') as obs5,
 
         (select he.observacao
           from  pmieducar.historico_escolar he,
@@ -796,7 +797,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 6) as obs6,
+                substring(nm_serie,1,1) = '6') as obs6,
 
         (select he.observacao
           from  pmieducar.historico_escolar he,
@@ -806,7 +807,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 7) as obs7,
+                substring(nm_serie,1,1) = '7') as obs7,
 
         (select he.observacao
           from  pmieducar.historico_escolar he,
@@ -816,7 +817,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 8) as obs8,
+                substring(nm_serie,1,1) = '8') as obs8,
 
         (select he.observacao
           from  pmieducar.historico_escolar he,
@@ -826,7 +827,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 9) as obs9,
+                substring(nm_serie,1,1) = '9') as obs9,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -836,7 +837,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 1) as freq1,
+                substring(nm_serie,1,1) = '1') as freq1,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -846,7 +847,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 2) as freq2,
+                substring(nm_serie,1,1) = '2') as freq2,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -856,7 +857,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 3) as freq3,
+                substring(nm_serie,1,1) = '3') as freq3,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -866,7 +867,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 4) as freq4,
+                substring(nm_serie,1,1) = '4') as freq4,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -876,7 +877,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 5) as freq5,
+                substring(nm_serie,1,1) = '5') as freq5,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -886,7 +887,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 6) as freq6,
+                substring(nm_serie,1,1) = '6') as freq6,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -896,7 +897,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 7) as freq7,
+                substring(nm_serie,1,1) = '7') as freq7,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -906,7 +907,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 8) as freq8,
+                substring(nm_serie,1,1) = '8') as freq8,
 
         (select he.frequencia
           from  pmieducar.historico_escolar he,
@@ -916,7 +917,7 @@ SELECT nm_disciplina,
                 hd.ref_sequencial = historico_disciplinas.ref_sequencial AND
                 hd.ref_ref_cod_aluno = he.ref_cod_aluno AND
                 hd.ref_sequencial = he.sequencial AND
-                substring(nm_serie,1,1) = 9) as freq9,
+                substring(nm_serie,1,1) = '9') as freq9,
 
        (SELECT distinct
          (CASE WHEN he.aceleracao = 1 THEN
@@ -930,7 +931,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 1 AND
+            substring(nm_serie,1,1) = '1' AND
             he.sequencial = historico_escolar.sequencial) as status_serie1,
 
 
@@ -945,7 +946,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 2 AND
+            substring(nm_serie,1,1) = '2' AND
             he.sequencial = historico_escolar.sequencial) as status_serie2,
 
 
@@ -960,7 +961,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 3 AND
+            substring(nm_serie,1,1) = '3' AND
             he.sequencial = historico_escolar.sequencial) as status_serie3,
 
 
@@ -975,7 +976,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 4 AND
+            substring(nm_serie,1,1) = '4' AND
             he.sequencial = historico_escolar.sequencial) as status_serie4,
 
 
@@ -990,7 +991,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 5 AND
+            substring(nm_serie,1,1) = '5' AND
             he.sequencial = historico_escolar.sequencial) as status_serie5,
 
 
@@ -1005,7 +1006,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 6 AND
+            substring(nm_serie,1,1) = '6' AND
             he.sequencial = historico_escolar.sequencial) as status_serie6,
 
 
@@ -1020,7 +1021,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 7 AND
+            substring(nm_serie,1,1) = '7' AND
             he.sequencial = historico_escolar.sequencial) as status_serie7,
 
 
@@ -1035,7 +1036,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 8 AND
+            substring(nm_serie,1,1) = '8' AND
             he.sequencial = historico_escolar.sequencial) as status_serie8,
 
 
@@ -1050,7 +1051,7 @@ SELECT nm_disciplina,
             he.ref_cod_aluno = historico_escolar.ref_cod_aluno AND
 				    he.ativo = 1 AND
             he.ano = historico_escolar.ano AND
-            substring(nm_serie,1,1) = 9 AND
+            substring(nm_serie,1,1) = '9' AND
             he.sequencial = historico_escolar.sequencial) as status_serie9,
 
 
@@ -1077,7 +1078,7 @@ SELECT nm_disciplina,
                                             FROM pmieducar.historico_escolar he
                                            WHERE he.ref_cod_aluno = $P{aluno})) AS num_folha,
 
-( select CASE WHEN ((substring(nm_serie,1,1) = 8) or (substring(nm_serie,1,1) = 9)) THEN
+( select CASE WHEN ((substring(nm_serie,1,1) = '8') or (substring(nm_serie,1,1) = '9')) THEN
                  'concluiu o ENSINO FUNDAMENTAL (8 ANOS)'
              ELSE
                  'concluiu o ' || substring(nm_serie,1,1) || ' ano'
--
libgit2 0.21.2