fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'AL-2326' (!98) from AL-2326 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/98
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master 1.0.79
Célio de Souza Ribeiro JR 2023-03-17 14:36:02 +00:00
parent 7ff3ee9cf0 86c3da3ad6
commit 8f9d7fcf27
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.0.78</version>
<version>1.0.79</version>
<packaging>war</packaging>
<properties>

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java
View File

@ -56,7 +56,7 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio {
String corridaIds = "", rutaIds = "";
GrupoRuta grupoRuta = (GrupoRuta) parametros.get("GRUPORUTA");
Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID");
Boolean isPorData = parametros.get("ISPORDATA") == null ? false : true;
Boolean isPorData = parametros.get("ISPORDATA") == null ? false : (Boolean) parametros.get("ISPORDATA");
if (lsNumServico != null && !lsNumServico.isEmpty()) {
corridaIds = retornaFiltro(lsNumServico, null);
}

15
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
View File

@ -122,7 +122,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
parametros.put("DATA_FINAL", DateUtil.fimFecha(this.datFinal.getValue()));
parametros.put("ISSIMPLIFICADO", chkSimplificado.isChecked());
parametros.put("ISSIMPLIFICADO", chkSimplificadoPorData.isChecked());
parametros.put("ISPORDATA", chkSimplificadoPorData.isChecked());
parametros.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
parametros.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario().toString());
@ -162,7 +162,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
parametros.put("lsNumServico", lsNumServico);
Relatorio relatorio = null;
String tituloRelatorio = "";
if(!chkSimplificado.isChecked()) {
if(!chkSimplificado.isChecked() && !chkSimplificadoPorData.isChecked()) {
relatorio = new RelatorioLinhasHorario(parametros, dataSourceRead.getConnection());
tituloRelatorio = "relatorioLinhasHorarioController.window.title";
}else {
@ -267,10 +267,10 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
public void onEvent(Event event) {
boolean isChecked = chkSimplificado.isChecked();
if (!isChecked) {
if (isChecked) {
chkSimplificadoPorData.setChecked(false);
chkSimplificadoPorData.setDisabled(true);
} else {
} else if (!isChecked) {
chkSimplificadoPorData.setDisabled(false);
}
}
@ -280,8 +280,11 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
public void onEvent(Event event) {
boolean isChecked = chkSimplificadoPorData.isChecked();
if (isChecked && !chkSimplificado.isChecked()) {
chkSimplificado.setChecked(true);
if (isChecked ) {
chkSimplificado.setChecked(false);
chkSimplificado.setDisabled(true);
} else if (!isChecked) {
chkSimplificado.setDisabled(false);
}
}
});