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

bug#13595 

dev:lucas

qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@89790 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2019-02-12 21:49:28 +00:00
parent 639c958a66
commit 3b4ad710da
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java
View File

@ -213,7 +213,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
tarifaMinima.setFecmodif(Calendar.getInstance().getTime());
tarifaMinima.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
tarifaMinima.setActivo(Boolean.TRUE);
Comboitem cbiRuta = cmbRuta.getSelectedItem();
Ruta ruta = null;
if (cbiRuta != null) {
@ -251,9 +251,10 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
}
}
} catch (Exception ex) {
log.error("Editar tarida minimas: " + ex);
log.error("Editar tarifa minimas: " , ex);
MensagensUtils.showMessageError(MSG_ERROR, TITULO_TARIFA_MINIMA);
}
}
private boolean isCamposObrigatoriosValidos() {
@ -289,6 +290,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
private void salvarEdicaoTarifa() {
tarifaMinimaService.actualizacion(tarifaMinima);
tarifaMinimaList.updateItem(tarifaMinima);
salvarTarifaMinimaCategoria();
MensagensUtils.showMessageInformation("editarTarifaMinimaController.btnFechar.MSG.SuscbrirOK", TITULO_TARIFA_MINIMA);
closeWindow();
}
@ -298,6 +300,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
if (listaTarifaMinima.isEmpty()) {
tarifaMinimaService.suscribir(tarifaMinima);
tarifaMinimaList.addItem(tarifaMinima);
salvarTarifaMinimaCategoria();
MensagensUtils.showMessageInformation("editarTarifaMinimaController.btnFechar.MSG.SuscbrirOK", TITULO_TARIFA_MINIMA);
closeWindow();
} else {
@ -320,21 +323,19 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
closeWindow();
}
} catch (Exception ex) {
log.error(ex);
log.error("", ex);
}
}
public void onClick$btnAdicionarCategoria(Event ev) throws InterruptedException {
try {
Categoria categoria = (Categoria) cmbCategorias.getSelectedItem().getValue();
Categoria categoria = (Categoria) (cmbCategorias.getSelectedItem() != null ? cmbCategorias.getSelectedItem().getValue() : null);
if(categoria != null) {
TarifaMinimaCategoria tarifaMinimaCategoria = new TarifaMinimaCategoria();
tarifaMinimaCategoria.setCategoria(categoria);
tarifaMinimaCategoria.setTarifaMinima(tarifaMinima);
tarifaMinimaCategoria = tarifaMinimaService.adicionarTarifaMinimaCategoria(tarifaMinimaCategoria);
tarifaMinimaCategoriaList.updateItem(tarifaMinimaCategoria);
@ -354,7 +355,6 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) {
TarifaMinimaCategoria tarifaMinimaCategoria = (TarifaMinimaCategoria) tarifaMinimaCategoriaList.getSelected();
tarifaMinimaService.removerTarifaMinimaCategoria(tarifaMinimaCategoria);
tarifaMinimaCategoriaList.removeItem(tarifaMinimaCategoria);
MensagensUtils.showMessageInformation("editarTarifaMinimaController.msg.removerTarifaMinimaCategoria", TITULO_TARIFA_MINIMA);
@ -388,6 +388,17 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
cmbRuta.setModel(l);
}
private void salvarTarifaMinimaCategoria() {
//Remove todas categorias salvas e insere de acordo com o escolhido para salvar
List<TarifaMinimaCategoria> tarifaMinimaCategoriaSalva = (List<TarifaMinimaCategoria>) (tarifaMinima.getTarifaMinimaCategorias() == null ? tarifaMinimaCategoriaList.getModel() : tarifaMinima.getTarifaMinimaCategorias());
for (TarifaMinimaCategoria tarifaMinimaCategoria : tarifaMinimaCategoriaSalva) {
tarifaMinimaService.removerTarifaMinimaCategoria(tarifaMinimaCategoria);
}
for (int i = 0; i < tarifaMinimaCategoriaList.getModel().getSize(); i++) {
TarifaMinimaCategoria tarifaMinimaCategoria = (TarifaMinimaCategoria) tarifaMinimaCategoriaList.getModel().getElementAt(i);
tarifaMinimaCategoria = tarifaMinimaService.adicionarTarifaMinimaCategoria(tarifaMinimaCategoria);
}
}
public List<OrgaoConcedente> getLsOrgaoConcedente() {
return lsOrgaoConcedente;

8
web/gui/tarifas/editarTarifasMinimas.zul
View File

@ -142,7 +142,7 @@
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"/>
</row>
<row visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}">
<row>
<label id="lblCategorias"
value="${c:l('editarConfiguracionCategoriaController.lblCategorias.value')}" />
<combobox id="cmbCategorias"
@ -159,20 +159,20 @@
image="/gui/img/add.png"
width="35px"
tooltiptext="${c:l('editarTarifaMinimaController.btnAdicionarCategoria.tooltiptext')}"
visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}" />
/>
<button id="btnRemoverCategoria"
height="20"
image="/gui/img/remove.png"
width="35px"
tooltiptext="${c:l('editarTarifaMinimaController.btnRemoverCategoria.tooltiptext')}"
visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}" />
/>
<listbox id="tarifaMinimaCategoriaList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true"
multiple="false"
height="150px"
visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}">
>
<listhead sizable="true">
<listheader image="/gui/img/create_doc.gif"
label="${c:l('editarConfiguracionCategoriaController.lblCategorias.value')}" />