diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..b01cc5123
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,23 @@
+FROM jboss/wildfly:22.0.1.Final
+
+#set do diretorio de trabalho
+WORKDIR /opt/jboss/wildfly
+
+#copy do driver
+#ADD target/ventaboletosadm/WEB-INF/lib/ojdbc8.jar /target/ojdbc8-21.7.0.0.jar
+
+# adicionando usuario adm
+#CMD ["/opt/jboss/wildfly/bin/add-user.sh", "-a", "admin", "rjmaster09@"]
+
+ENV SCO_URL jdbc:oracle:thin:@138.219.88.188:1524/ORCLCDB
+ENV SCO_USER vtabol
+ENV SCO_PWD dev_rj_20
+
+ENV READ_URL jdbc:oracle:thin:@138.219.88.188:1524/ORCLCDB
+ENV READ_USER vtabol
+ENV READ_PWD dev_rj_20
+
+#ADD ./conf /opt/jboss/wildfly/standalone/configuration
+
+#ADD target/*.war /opt/jboss/wildfly/standalone/deployments/
+EXPOSE 8080 9990
\ No newline at end of file
diff --git a/Jenkinsfile-Adm-Publish b/Jenkinsfile-Adm-Publish
new file mode 100644
index 000000000..3a1ca24f3
--- /dev/null
+++ b/Jenkinsfile-Adm-Publish
@@ -0,0 +1,379 @@
+pipeline {
+ agent any
+
+ stages {
+ stage('Publicação') {
+ steps {
+ script{
+ dir("/var/jenkins_home/jobs/Adm/jobs/Adm-Project-Build/builds/$Adm_Build_NUMBER/archive/target") {
+
+ if(! fileExists('ventaboletosadm.war')){
+ currentBuild.result = 'FAILURE'
+ error('Artefato não encontrado, favor reconstruir a versão')
+ }
+
+ switch( Empresa ){
+ case "Local RJ - Qualidade":
+ atualizarQa()
+ break
+ case "Local RJ - Dev":
+ atualizarDev()
+ break
+ case "Ouro e Prata - Homolog":
+ atualizarOuroPrata()
+ break
+ case "Garcia - Homolog":
+ atualizarGarcia()
+ break
+ case "Andorinha - Homolog":
+ atualizarAndorinha()
+ break
+ case "Planalto - Homolog":
+ atualizarPlanalto()
+ break
+ case "Passaro Marron - Homolog":
+ atualizarPMarron()
+ break
+ case "Ambiente QA 2":
+ atualizarAmbienteQA2()
+ break
+ case "Unica Facil - Homolog":
+ atualizarUnicaFacil()
+ break
+ default:
+ echo "Empresa não configurada"
+ break
+ }
+ }
+ }
+ }
+ }
+ }
+
+ post {
+ always {
+ script {
+ //resolvendo o card
+ // step([$class: 'JiraIssueUpdateBuilder', comment: '', jqlSearch: "issue = ${Ticket}", workflowActionName: 'Em Testes'])
+ currentBuild.displayName = "${Adm_Build_NAME} em ${Empresa}"
+ }
+ }
+ }
+}
+
+//=======================================================================================================================
+
+def atualizarQa(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Local RJ - QA',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /home/rjconsultores/dist
+
+ echo "Iniciando atualização ADM QUALIDADE"
+
+ /dados/wildfly_qualidade_adm/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:10390 --commands="deployment deploy-file --replace /home/rjconsultores/dist/ventaboletosadm.war"
+
+ echo "Reiniciando ADM"
+
+ sudo systemctl restart wildfly_qualidade_adm
+
+ echo "*******************************Finalizando Atualização ADM ${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: false,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/home/rjconsultores/dist',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
+
+def atualizarDev(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Local RJ - DEV',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /tmp/adm
+
+ echo "Iniciando atualização ADM DEV"
+
+ export JAVA_HOME=/dados/jdk-11.0.5
+
+ /dados/wildfly_adm_dev/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9990 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
+
+ /usr/bin/sleep 15
+
+ echo "Reiniciando ADM"
+
+ sudo systemctl restart wildfly_adm_dev
+
+ echo "*******************************Finalizando Atualização ADM ${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: true,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/tmp/adm',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
+
+def atualizarOuroPrata(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Ouro e Prata - Homolog',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /tmp/adm
+
+ echo "**********Iniciando atualização ADM Ouro e Prata ${BUILD_NUMBER}**********"
+
+ /dados/wildfly_ouroeprata_adm_hml/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9990 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
+
+ echo "Reiniciando ADM"
+
+ sudo systemctl restart wildfly_ouroeprata_adm_hml
+
+ echo "*******************************Finalizando Atualização Ouro e Prata ADM ${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: false,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/tmp/adm',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
+
+def atualizarGarcia(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Garcia - Homolog',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /tmp/adm
+
+ echo "**********Iniciando atualização ADM Garcia - Homolog #${Adm_Build_NUMBER}**********"
+
+ /dados/wildfly_garcia_homolog/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:16990 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
+
+ echo "Reiniciando ADM"
+
+ sudo systemctl restart wildfly_garcia_homolog
+
+ echo "*******************************Finalizando Atualização ADM Garcia - Homolog #${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: false,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/tmp/adm',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
+
+def atualizarAndorinha(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Andorinha - Homolog',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /tmp/adm
+
+ echo "**********Iniciando atualização ADM Andorinha - Homolog #${Adm_Build_NUMBER}**********"
+
+ /dados/wildfly_andorinha_homolog/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:16590 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
+
+ echo "Reiniciando ADM"
+
+ sudo systemctl restart wildfly_andorinha_homolog
+
+ echo "*******************************Finalizando Atualização ADM Andorinha - Homolog #${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: false,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/tmp/adm',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
+
+def atualizarPlanalto(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Planalto - Homolog',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /tmp/adm
+
+ echo "**********Iniciando atualização ADM Planalto ${Adm_Build_NUMBER}**********"
+
+ export JAVA_HOME=/dados/jdk-11.0.5
+
+ /dados/wildfly_adm_planalto_homolog/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9991 --commands="deployment deploy-file --replace /home/gleimar/ventaboletosadm.war"
+
+ echo "Reiniciando ADM"
+
+ sudo systemctl restart wildfly_adm_planalto_homolog
+
+ echo "*******************************Finalizando Atualização Planalto ADM ${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: false,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/tmp/adm',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
+
+def atualizarPMarron(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Passaro Marron - Homolog',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /tmp/adm
+
+ echo "**********Iniciando atualização ADM Passaro Marron - Homolog #${Adm_Build_NUMBER}******************""
+
+ export JAVA_HOME=/dados/jdk-11.0.5
+
+ /dados/wildfly_pmarron_homolog/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9990 --commands="deployment deploy-file --replace /home/gleimar/ventaboletosadm.war"
+
+ /bin/sleep 15
+
+ echo "Reiniciando ADM"
+
+ systemctl restart wildfly_pmarron_homolog
+
+ echo "*******************************Finalizando Atualização ADM Passaro Marron - Homolog #${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: false,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/tmp/adm',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
+
+def atualizarAmbienteQA2(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Ambiente QA 2',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /tmp/adm
+
+
+ echo "**********Iniciando atualização ADM Ambiente QA 2 ${BUILD_NUMBER}******************""
+
+ export JAVA_HOME=/dados/jdk-11.0.5
+
+ sudo /dados/wildfly_testefailover/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9990 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
+
+
+
+ /bin/sleep 15
+
+ sudo systemctl restart wildfly_testefailover
+
+ echo "*******************************Finalizando AtualizaçãoADM ${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: false,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/tmp/adm',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
+
+def atualizarUnicaFacil(){
+ sshPublisher(publishers:
+ [sshPublisherDesc(configName: 'Unica Facil - Homolog',
+ transfers:
+ [sshTransfer(cleanRemote: true,
+ excludes: '',
+ execCommand: '''ls -la /tmp/adm
+
+
+ echo "**********Iniciando atualização ADM Unica Facil Homolog ${BUILD_NUMBER}******************""
+
+ export JAVA_HOME=/dados/jdk-11.0.5
+
+ /dados/wildfly_unicafacilhomolog_adm/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9992 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
+
+ /bin/sleep 15
+
+ systemctl restart wildfly_unicafacilhomolog_adm.service
+
+ echo "*******************************Finalizando AtualizaçãoADM ${Adm_Build_NUMBER}*******************************"''',
+ execTimeout: 120000,
+ flatten: false,
+ makeEmptyDirs: false,
+ noDefaultExcludes: false,
+ patternSeparator: '[, ]+',
+ remoteDirectory: '/tmp/adm',
+ remoteDirectorySDF: false,
+ removePrefix: '',
+ sourceFiles: '**/*.war')],
+ usePromotionTimestamp: false,
+ useWorkspaceInPromotion: false,
+ verbose: false)])
+}
+
+//=======================================================================================================================
\ No newline at end of file
diff --git a/conf/standalone b/conf/standalone
new file mode 100644
index 000000000..185af71d2
--- /dev/null
+++ b/conf/standalone
@@ -0,0 +1,591 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${SCO_URL}
+ oracle.jdbc.driver.OracleDriver
+ ojdbc8.jar
+
+ ${SCO_USER}
+ ${SCO_PWD}
+
+
+ 1
+ 10
+ false
+
+
+
+ true
+
+
+
+
+
+ ${READ_URL}
+ oracle.jdbc.driver.OracleDriver
+ ojdbc8.jar
+
+ ${READ_USER}
+ ${READ_PWD}
+
+
+ 1
+ 10
+ false
+
+
+
+ true
+
+
+
+
+
+ jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+ h2
+
+ sa
+ sa
+
+
+
+
+ org.h2.jdbcx.JdbcDataSource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${jboss.bind.address:127.0.0.1}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a02cc08a7..93cf65aee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.19.2
+ 1.20.0
war
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java
index 63ad873dc..d1dddd11e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java
@@ -5,15 +5,12 @@ package com.rjconsultores.ventaboletos.relatorios.impl;
import java.sql.Connection;
import java.sql.ResultSet;
-import java.sql.Timestamp;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
-import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
@@ -27,13 +24,9 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
Map parametros = this.relatorio.getParametros();
Date dataIncial = (Date) parametros.get("DATA_INICIAL");
-
- Date dataFinal = (Date) parametros.get("DATA_FINAL");
-
+ Date dataFinal = (Date) parametros.get("DATA_FINAL");
Integer empresa = (Integer) parametros.get("EMPRESA");
-
- Integer agencia = (Integer) parametros.get("AGENCIA");
-
+ Integer agencia = (Integer) parametros.get("AGENCIA");
Short formaPagoId = (Short) parametros.get("FORMA_PAGO");
StringBuilder where = new StringBuilder();
@@ -54,6 +47,7 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
if (agencia != null) {
where.append(" AND pv.PUNTOVENTA_ID = " + agencia + " ");
}
+
if (formaPagoId != null) {
where.append(" AND cfp.FORMAPAGO_ID = " + formaPagoId + " ");
}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties
index c079735d2..ae386fa5a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties
@@ -9,9 +9,19 @@ FORMA_PAG = FORMA DE PAG.
VALOR = TARIFA
PEDAGIO = PEDÁGIO
SEGURO = SEGURO
-SEGURO_OPCIONAL = SEGURO OPCIONAL
+SEGURO_OPCIONAL = SEG. OPCION.
TAXAS = TAXAS
TOTAL = TOTAL
QTDE = QTDE
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impresso por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+
msg.noData=Não foi possivel obter dados com os parâmetros informados.
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
index c079735d2..f0f1a5f0c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
@@ -14,4 +14,14 @@ TAXAS = TAXAS
TOTAL = TOTAL
QTDE = QTDE
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impresso por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+
msg.noData=Não foi possivel obter dados com os parâmetros informados.
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jasper
index ad6de2c5a..cda990abf 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml
index b28ec4765..16df8c448 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml
@@ -1,12 +1,19 @@
-
+
+
+
+
+
+
+
-
+
+
@@ -45,133 +52,172 @@
-
+
+
-
-
-
+
+
+
+
+
-
+
-
+
+
+
-
+
-
-
+
+
+
+
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
-
-
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
-
-
-
+
+
+
-
+
+
+
@@ -180,59 +226,109 @@
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -242,72 +338,133 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java
index 9ea3ef9d0..9e8b525cb 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java
@@ -45,6 +45,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
@Scope("prototype")
public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
+ private static final String TODAS = "Todas; ";
/**
*
*/
@@ -146,14 +147,15 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
this.fecInicio = fecInicio;
}
- @SuppressWarnings("unchecked")
public void onClick$btnInforme(Event e) throws Exception {
+ StringBuilder filtro = new StringBuilder();
+
Date dataInicio = fecInicio.getValue();
Date dataFinal = fecFinal.getValue();
SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy");
- Map argsInforme = new HashMap();
+ Map argsInforme = new HashMap<>();
if(!considerarRuta.isChecked()){
argsInforme.put("DATA_INICIAL", dataInicio);
@@ -163,35 +165,58 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
argsInforme.put("DATA_FINAL", dt.format(dataFinal));
}
+ filtro.append("Periodo: ");
+ filtro.append(dt.format(dataInicio)).append(" a ");
+ filtro.append(dt.format(dataFinal)).append("; ");
+
argsInforme.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
- argsInforme.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario().toString());
+ argsInforme.put("USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario());
+ filtro.append("Empresa: ");
if (cmbEmpresa.isValid() && cmbEmpresa.getSelectedItem() != null) {
- Integer empresaId = ((Empresa)cmbEmpresa.getSelectedItem().getValue()).getEmpresaId();
- argsInforme.put("EMPRESA", empresaId);
+ Empresa empresa = ((Empresa)cmbEmpresa.getSelectedItem().getValue());
+ argsInforme.put("EMPRESA", empresa.getEmpresaId());
+ filtro.append(empresa.getNombempresa()).append("; ");
+ }else {
+ filtro.append(TODAS);
}
+ filtro.append("Agência: ");
if (cmbAgencia.getSelectedItem() != null) {
- Integer agencia = ((PuntoVenta) cmbAgencia.getSelectedItem().getValue()).getPuntoventaId();
- argsInforme.put("AGENCIA", agencia);
+ PuntoVenta agencia = ((PuntoVenta) cmbAgencia.getSelectedItem().getValue());
+ argsInforme.put("AGENCIA", agencia.getPuntoventaId());
+ filtro.append(agencia.getNombpuntoventa()).append("; ");
+ }else {
+ filtro.append(TODAS);
}
+ filtro.append("Linha: ");
if (considerarRuta.isChecked() && listSelectedRutas != null && !listSelectedRutas.isEmpty()) {
- String idsRutas = "";
+ StringBuilder idsRutas = new StringBuilder();
+ StringBuilder linhas = new StringBuilder();
for(Ruta r : listSelectedRutas){
- idsRutas = idsRutas + r.getRutaId()+",";
+ idsRutas.append(r.getRutaId()).append(", ");
+ linhas.append(r.getDescruta()).append(", ");
}
- argsInforme.put("RUTAS_IDS", idsRutas.substring(0, idsRutas.length()-1));
+ argsInforme.put("RUTAS_IDS", idsRutas.substring(0, idsRutas.length()-2));
+ filtro.append(linhas.substring(0, idsRutas.length()-2));
+ }else {
+ filtro.append(TODAS);
}
+ filtro.append("Forma de Pagamento: ");
if (cmbFormaPago.getSelectedItem() != null) {
- Short formaPagoId = ((FormaPago) cmbFormaPago.getSelectedItem().getValue()).getFormapagoId();
- argsInforme.put("FORMA_PAGO", formaPagoId);
+ FormaPago formaPago= ((FormaPago) cmbFormaPago.getSelectedItem().getValue());
+ argsInforme.put("FORMA_PAGO", formaPago.getFormapagoId());
+ filtro.append(formaPago.getDescpago()).append("; ");
+ }else {
+ filtro.append(TODAS);
}
RelatorioFormaPagamentoAgencia relatorio =null;
RelatorioFormaPagamentoAgenciaRutaTramo relatorioRutaTramo =null;
+ argsInforme.put("FILTROS", filtro.toString());
if(!considerarRuta.isChecked()){
relatorio = new RelatorioFormaPagamentoAgencia(argsInforme, dataSourceRead.getConnection());
}else{
@@ -199,20 +224,19 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
}
- Map args = new HashMap();
+ Map args = new HashMap<>();
if(!considerarRuta.isChecked()){
args.put("relatorio", relatorio);
}else{
args.put("relatorio", relatorioRutaTramo);
- }
-
+ }
openWindow("/component/reportView.zul",
Labels.getLabel("formaPagamentoAgenciaController.window.title"), args, MODAL);
}
- public void onClick$btnAddRuta(Event ev) throws InterruptedException {
+ public void onClick$btnAddRuta(Event ev) {
if (cmbRuta.getSelectedItem() != null) {
listSelectedRutas.add((Ruta) cmbRuta.getSelectedItem().getValue());
selectedRutasList.setData(listSelectedRutas);
@@ -220,7 +244,7 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
}
}
- public void onClick$btnRemoveRuta(Event ev) throws InterruptedException {
+ public void onClick$btnRemoveRuta(Event ev) {
Ruta ruta = (Ruta) selectedRutasList.getSelected();
listSelectedRutas.remove(ruta);
selectedRutasList.setData(listSelectedRutas);