Merge pull request #11 from AlexJCosta/master

Completed issues #3 #4 #5 #6
pauloborba · Mar 17, 2017 · eac562a · eac562a
2 parents 94d43fb + 8914da6
commit eac562a
Show file tree

Hide file tree

Showing 97 changed files with 4,837 additions and 3,117 deletions.
diff --git a/.classpath b/.classpath
@@ -22,6 +22,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="relatorios"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

diff --git a/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow b/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pageflow:Pageflow xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf14891719765510" configfile="/lattes-analysis/src/main/webapp/WEB-INF/faces-config.xml"/>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,7 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/relatorios"/>
         <property name="context-root" value="ProfessorAssessment"/>
         <property name="java-output-path" value="/lattes-analysis/target/classes"/>
     </wb-module>

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language: java
+script:
+ - mvn test
+ - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+jdk:
+ - oraclejdk7
diff --git a/pom.xml b/pom.xml
@@ -22,6 +22,11 @@
 	</build>
 
 	<dependencies>
+		<dependency>
+			<groupId>net.sf.jasperreports</groupId>
+			<artifactId>jasperreports</artifactId>
+			<version>5.6.0</version>
+		</dependency>
 		<dependency>
 			<groupId>com.sun.faces</groupId>
 			<artifactId>jsf-api</artifactId>
@@ -45,7 +50,7 @@
 		<dependency>
 			<groupId>org.primefaces</groupId>
 			<artifactId>primefaces</artifactId>
-			<version>5.3</version>
+			<version>6.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

diff --git a/relatorios/iReportLattes.jasper b/relatorios/iReportLattes.jasper
diff --git a/relatorios/iReportLattes.jrxml b/relatorios/iReportLattes.jrxml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="listagemGeralDeFuncionarios" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="BlankPage" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="9bf9ac34-3740-4469-b2b9-30191fadda97">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<subDataset name="Table Dataset 1" uuid="868925df-c1c6-4a33-af80-76c1b374329c"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
+		<defaultValueExpression><![CDATA["C:\\Users\\Alex\\workspace\\lattes-analysis\\relatorios\\"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="parametroDataInicio" class="java.lang.String">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<parameter name="parametroDataFim" class="java.lang.String">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[SELECT
+    COUNT(p.title),
+    q.classification,
+(SELECT
+            COUNT(p.title)
+        FROM
+            lattes.publication p
+                INNER JOIN
+            lattes.publicationtype pt ON pt.identifier = p.publicationType_identifier
+                INNER JOIN
+            lattes.qualis q ON pt.name LIKE CONCAT('%', q.name, '%')
+        WHERE
+            pt.type = 0
+                AND (CASE WHEN $P{parametroDataInicio} IS NOT NULL AND $P{parametroDataFim} IS NOT NULL
+		THEN p.year BETWEEN $P{parametroDataInicio} and $P{parametroDataFim} ELSE 1=1 END)) AS 'total'
+FROM
+    lattes.publication p
+        INNER JOIN
+    lattes.publicationtype pt ON pt.identifier = p.publicationType_identifier
+        INNER JOIN
+    lattes.qualis q ON pt.name LIKE CONCAT('%', q.name, '%')
+WHERE
+    pt.type = 0
+       AND (CASE WHEN $P{parametroDataInicio} IS NOT NULL AND $P{parametroDataFim} IS NOT NULL
+		THEN p.year BETWEEN $P{parametroDataInicio} and $P{parametroDataFim} ELSE 1=1 END)
+GROUP BY q.classification;]]>
+	</queryString>
+	<field name="COUNT(p.title)" class="java.lang.Long"/>
+	<field name="classification" class="java.lang.Integer">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="total" class="java.lang.Long"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="129" splitType="Stretch">
+			<staticText>
+				<reportElement x="282" y="61" width="85" height="28" uuid="0c1e32f9-ab63-40a0-ab2d-34e14be84380"/>
+				<textElement>
+					<font size="20" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Período:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="371" y="61" width="50" height="28" uuid="59d04a4a-c5e0-4b36-acdd-7abbcf3a3f29"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="20"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{parametroDataInicio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="454" y="61" width="50" height="28" uuid="041ea6b2-9e4c-4da8-8629-de23259da7c2"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="20"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{parametroDataFim}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="421" y="61" width="33" height="28" uuid="d2c9cb34-656c-4b13-b2b7-cb05c3180fc1"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="20" isBold="true"/>
+				</textElement>
+				<text><![CDATA[a]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="0" width="802" height="61" uuid="32db3912-8bf7-4962-9d15-b5c581a8a73d"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="30"/>
+				</textElement>
+				<text><![CDATA[Totalização da produção do projeto]]></text>
+			</staticText>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="304" splitType="Stretch">
+			<subreport>
+				<reportElement x="437" y="34" width="237" height="30" uuid="d7134078-950e-4c6d-acb8-4e44771eaed2"/>
+				<subreportParameter name="parametroDataInicio">
+					<subreportParameterExpression><![CDATA[$P{parametroDataInicio}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="parametroDataFim">
+					<subreportParameterExpression><![CDATA[$P{parametroDataFim}]]></subreportParameterExpression>
+				</subreportParameter>
+				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "iReportLattes_subreport_livros.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport>
+				<reportElement x="437" y="64" width="237" height="30" uuid="bd16ceb3-d53a-4f72-9837-dc5b6c036ac6"/>
+				<subreportParameter name="parametroDataInicio">
+					<subreportParameterExpression><![CDATA[$P{parametroDataInicio}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="parametroDataFim">
+					<subreportParameterExpression><![CDATA[$P{parametroDataFim}]]></subreportParameterExpression>
+				</subreportParameter>
+				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "iReportLattes_subreport_capituloslivros.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport>
+				<reportElement x="437" y="94" width="237" height="198" uuid="b2a4ab09-63cb-4c6e-b687-0a80bb851e47"/>
+				<subreportParameter name="parametroDataInicio">
+					<subreportParameterExpression><![CDATA[$P{parametroDataInicio}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="parametroDataFim">
+					<subreportParameterExpression><![CDATA[$P{parametroDataFim}]]></subreportParameterExpression>
+				</subreportParameter>
+				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "iReportLattes_subreport_orientacoes.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport>
+				<reportElement x="437" y="4" width="237" height="30" uuid="ea586d56-0cc3-4dba-ad6e-bbe58bd99b14"/>
+				<subreportParameter name="parametroDataInicio">
+					<subreportParameterExpression><![CDATA[$P{parametroDataInicio}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="parametroDataFim">
+					<subreportParameterExpression><![CDATA[$P{parametroDataFim}]]></subreportParameterExpression>
+				</subreportParameter>
+				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "iReportLattes_subreport_conferencias.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport>
+				<reportElement x="164" y="4" width="230" height="288" uuid="2cc35a9f-1115-4b29-b3f7-55bd39660bc4"/>
+				<subreportParameter name="parametroDataInicio">
+					<subreportParameterExpression><![CDATA[$P{parametroDataInicio}]]></subreportParameterExpression>
+				</subreportParameter>
+				<subreportParameter name="parametroDataFim">
+					<subreportParameterExpression><![CDATA[$P{parametroDataFim}]]></subreportParameterExpression>
+				</subreportParameter>
+				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "iReportLattes_subreport_periodicos.jasper"]]></subreportExpression>
+			</subreport>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="13" splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band height="10" splitType="Stretch"/>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="10" splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="11" splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/relatorios/iReportLattesChapter.jasper b/relatorios/iReportLattesChapter.jasper
diff --git a/relatorios/iReportLattesChapter.jrxml b/relatorios/iReportLattesChapter.jrxml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="listagemGeralDeFuncionarios" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="BlankPage" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="9bf9ac34-3740-4469-b2b9-30191fadda97">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<subDataset name="Table Dataset 1" uuid="868925df-c1c6-4a33-af80-76c1b374329c"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
+		<defaultValueExpression><![CDATA["C:\\Users\\Alex\\workspace\\lattes-analysis\\relatorios\\"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="parametroDataInicio" class="java.lang.String">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<parameter name="parametroDataFim" class="java.lang.String">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[SELECT
+    GROUP_CONCAT(ba.autores) AS 'authors',
+    b.titulo,
+    b.ano,
+    b.tituloDoLivro,
+(SELECT
+
+            count(distinct b.titulo)
+
+        FROM
+            lattes.chapter b
+        INNER JOIN
+    lattes.chapter_autores ba ON b.id = ba.Chapter_id
+        WHERE
+         (CASE WHEN $P{parametroDataInicio} IS NOT NULL AND $P{parametroDataFim} IS NOT NULL
+ 		THEN b.ano BETWEEN $P{parametroDataInicio} and $P{parametroDataFim} ELSE 1=1 END) ) AS 'total'
+FROM
+     lattes.chapter b
+        INNER JOIN
+    lattes.chapter_autores ba ON b.id = ba.Chapter_id
+WHERE
+   (CASE WHEN $P{parametroDataInicio} IS NOT NULL AND $P{parametroDataFim} IS NOT NULL
+		THEN b.ano BETWEEN $P{parametroDataInicio} and $P{parametroDataFim} ELSE 1=1 END)
+ group by b.titulo
+ORDER BY b.titulo ASC;]]>
+	</queryString>
+	<field name="authors" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="titulo" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="ano" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="tituloDoLivro" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
+	<field name="total" class="java.lang.Long"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="129" splitType="Stretch">
+			<staticText>
+				<reportElement x="348" y="61" width="85" height="28" uuid="0c1e32f9-ab63-40a0-ab2d-34e14be84380"/>
+				<textElement>
+					<font size="20" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Período:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="437" y="61" width="50" height="28" uuid="59d04a4a-c5e0-4b36-acdd-7abbcf3a3f29"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="20"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{parametroDataInicio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="520" y="61" width="50" height="28" uuid="041ea6b2-9e4c-4da8-8629-de23259da7c2"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="20"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{parametroDataFim}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="487" y="61" width="33" height="28" uuid="d2c9cb34-656c-4b13-b2b7-cb05c3180fc1"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="20" isBold="true"/>
+				</textElement>
+				<text><![CDATA[a]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="0" width="802" height="61" uuid="32db3912-8bf7-4962-9d15-b5c581a8a73d"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="28"/>
+				</textElement>
+				<text><![CDATA[Detalhamento das publicações de capítulo de livro do projeto]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="291" y="61" width="57" height="28" uuid="a11d8aee-8cbc-4328-aec9-a98d8e2423ee"/>
+				<textElement verticalAlignment="Middle">
+					<font size="20"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="232" y="61" width="59" height="28" uuid="32cfe1d1-2b2e-4502-961f-1fc4f7b6c614"/>
+				<textElement>
+					<font size="20" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Total:]]></text>
+			</staticText>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="32" splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="20" splitType="Stretch">
+			<staticText>
+				<reportElement x="557" y="0" width="197" height="20" uuid="d8840cfb-0e6d-4f15-a0cd-c9b1430a9715"/>
+				<textElement verticalAlignment="Middle">
+					<font size="15" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Editora]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="241" y="0" width="316" height="20" uuid="5546441f-07b2-45c8-b0e8-1e4696ebdce0"/>
+				<textElement verticalAlignment="Middle">
+					<font size="15" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Título]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="0" width="231" height="20" uuid="8bd3951b-d704-4db8-95d3-1f4a2bdc1c66"/>
+				<textElement verticalAlignment="Middle">
+					<font size="15" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Autores]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="754" y="0" width="48" height="20" uuid="596a5b76-49ef-4317-b150-51b84bcdc0b1"/>
+				<textElement verticalAlignment="Middle">
+					<font size="15" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Ano]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="20" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="231" height="20" uuid="df9641c2-082f-48eb-8dc3-89d3809a5bee"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{authors} != null ? $F{authors} : "----"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="241" y="0" width="316" height="20" uuid="59a265ef-aae2-4876-8610-dbbb4ddd8d4a"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{titulo} != null ? $F{titulo} : "----"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="557" y="0" width="197" height="20" uuid="0ba3c6d7-1618-4f4b-bd4a-9d2ceb254c70"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{tituloDoLivro} != null ? $F{tituloDoLivro} : "----"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="754" y="0" width="48" height="20" uuid="f4a1adf0-7917-4912-b97a-d245b20c5176"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{ano} != null ? $F{ano} : "----"]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="10" splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="11" splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/relatorios/iReportLattesConferencias.jasper b/relatorios/iReportLattesConferencias.jasper
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8"?>
		<pageflow:Pageflow xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf14891719765510" configfile="/lattes-analysis/src/main/webapp/WEB-INF/faces-config.xml"/>