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

fixes bug#18132 

dev:Frederico
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@100179 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago 2020-02-12 17:57:42 +00:00
parent a934a255d3
commit 4b6647cec9
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java
View File

@ -242,41 +242,43 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
public void onClick$btnCopiar(Event ev) throws CloneNotSupportedException, InterruptedException {
if(!clone){
ConfRestricaoCanalVenta confRestricaoCanalVentaNovo = confRestricaoCanalVenta.getNewConfRestricaoCanalVenta(confRestricaoCanalVenta);
confRestricaoCanalVenta.setConfRestricaoCanalVentaId(null);
Constraint constraint = txtDescConf.getConstraint();
txtDescConf.setConstraint("");
confRestricaoCanalVenta.setDescConfRestricaoCanalVenta("");
confRestricaoCanalVentaNovo.setDescConfRestricaoCanalVenta("");
txtDescConf.setValue("");
txtDescConf.setConstraint(constraint);
clone = Boolean.TRUE;
//Copiar as listas existentes sem retirar do registro original - mantis 0011070
List<ConfRestricaoPtovta> listaAux = confRestricaoCanalVenta.getLsConfRestricaoPtovta();
confRestricaoCanalVenta.setLsConfRestricaoPtovta(new ArrayList<ConfRestricaoPtovta>());
List<ConfRestricaoPtovta> listaAux = confRestricaoCanalVentaNovo.getLsConfRestricaoPtovta();
confRestricaoCanalVentaNovo.setLsConfRestricaoPtovta(new ArrayList<ConfRestricaoPtovta>());
for (ConfRestricaoPtovta pt : listaAux){
confRestricaoPtovtaDataList.removeItem(pt);
pt.setConfRestricaoPtovtaId(null);
confRestricaoCanalVenta.getLsConfRestricaoPtovta().add(pt);
confRestricaoCanalVentaNovo.getLsConfRestricaoPtovta().add(pt);
confRestricaoPtovtaDataList.addItemNovo(pt);
}
List<ConfRestricaoExcecao> listaAuxExcecao = confRestricaoCanalVenta.getLsConfRestricaoExcecao();
confRestricaoCanalVenta.setLsConfRestricaoExcecao(new ArrayList<ConfRestricaoExcecao>());
List<ConfRestricaoExcecao> listaAuxExcecao = confRestricaoCanalVentaNovo.getLsConfRestricaoExcecao();
confRestricaoCanalVentaNovo.setLsConfRestricaoExcecao(new ArrayList<ConfRestricaoExcecao>());
for (ConfRestricaoExcecao ex : listaAuxExcecao){
excecaoDataList.removeItem(ex);
ex.setConfRestricaoExcecaoId(null);
confRestricaoCanalVenta.getLsConfRestricaoExcecao().add(ex);
confRestricaoCanalVentaNovo.getLsConfRestricaoExcecao().add(ex);
excecaoDataList.addItemNovo(ex);
}
confRestricaoCanalVenta = confRestricaoCanalVentaNovo;
}
}
public void onClick$btnSalvar(Event ev) throws InterruptedException {
if( cmbRuta.getSelectedItem() == null && txtServico.getValue() == null) {
if( (cmbRuta.getModel() == null || cmbRuta.getModel().getSize() <= 0) && txtServico.getValue() == null) {
Messagebox.show(
Labels.getLabel("editarConfRestricaoCanalVentaController.MSG.servicoOuRutaObrigatorios"),
Labels.getLabel("editarConfRestricaoCanalVentaController.window.title"),
@ -297,8 +299,6 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
return;
}
Parada origen = cmbOrigen.getSelectedItem() == null ? null : ((Parada) cmbOrigen.getSelectedItem().getValue());
Parada destino = cmbDestino.getSelectedItem() == null ? null : ((Parada) cmbDestino.getSelectedItem().getValue());
for (ConfRestricaoTramo confRestricaoTramo : lsConfRestricaoTramo) {
if(validaOrigemEDestinoDaRuta(confRestricaoTramo.getOrigem(), confRestricaoTramo.getDestino())) {
return;

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java
View File

@ -333,7 +333,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom
lsNumPuntoVenta = new ArrayList(Arrays.asList(puntoVentaSelList.getData()));
filtro.append("Agência(s): ");
if (lsNumPuntoVenta.size() > 0) {
if (!lsNumPuntoVenta.isEmpty()) {
parametros.put("NUMPUNTOVENTA", lsNumPuntoVenta);
parametros.put("ISNUMPUNTOVENTATODOS", "N");
filtro.append(lsNumPuntoVenta.size() + " selecionada(s);");
@ -344,7 +344,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom
}
filtro.append("Estados(s): ");
if (estadoList.getSelectedsItens().size() > 0) {
if (!estadoList.getSelectedsItens().isEmpty()) {
parametros.put("ESTADO_ID", estadoList.getSelectedsItens());
filtro.append(estadoList.getSelectedsItens().size() + " selecionado(s);");
}

3
src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxRuta.java
View File

@ -27,7 +27,6 @@ public class MyComboboxRuta extends Combobox {
*
*/
private static final long serialVersionUID = 1L;
private static Logger log = Logger.getLogger(MyComboboxParada.class);
private final static int minLength = 2;
@Autowired
@ -56,9 +55,9 @@ public class MyComboboxRuta extends Combobox {
if (!stringConsulta.isEmpty()) {
rutas = rutaService.buscaLikeComboBox(stringConsulta);
setIndiceSelected(null);
BindingListModel listModelRutas = new BindingListModelList(rutas, true);
MyComboboxRuta.this.setModel(listModelRutas);
setIndiceSelected(null);
if (!rutas.isEmpty()) {
setIndiceSelected(0);
}