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

fixes bug #6989 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@52706 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-02-05 17:44:52 +00:00
parent ac0b1bf2e3
commit ffc6843f52
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,9 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
txtImportancia.focus(); txtImportancia.focus();
tarifaMinimaCategoriaList.setItemRenderer(new RenderTarifaMinimaCategoria()); tarifaMinimaCategoriaList.setItemRenderer(new RenderTarifaMinimaCategoria());
tarifaMinimaCategoriaList.setData(tarifaMinima.getTarifaMinimaCategorias()); if(tarifaMinima.getTarifaMinimaCategorias() != null) {
tarifaMinimaCategoriaList.setData(tarifaMinima.getTarifaMinimaCategorias());
}
} }
public void onClick$btnSalvar(Event ev) throws InterruptedException { public void onClick$btnSalvar(Event ev) throws InterruptedException {
@ -446,4 +448,9 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
public void setLsCategorias(List<Categoria> lsCategorias) { public void setLsCategorias(List<Categoria> lsCategorias) {
this.lsCategorias = lsCategorias; this.lsCategorias = lsCategorias;
} }
public Boolean isTarifaMinimaSalva() {
return getTarifaMinima().getTarifaminimaId() != null;
}
} }

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

@ -24,7 +24,7 @@
</hbox> </hbox>
</toolbar> </toolbar>
<grid fixedLayout="true"> <grid fixedLayout="true" >
<columns> <columns>
<column width="30%" /> <column width="30%" />
<column width="70%" /> <column width="70%" />
@ -95,7 +95,7 @@
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.claseServicio}"/> selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.claseServicio}"/>
</row> </row>
<row> <row visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}">
<label id="lblCategorias" <label id="lblCategorias"
value="${c:l('editarConfiguracionCategoriaController.lblCategorias.value')}" /> value="${c:l('editarConfiguracionCategoriaController.lblCategorias.value')}" />
<combobox id="cmbCategorias" <combobox id="cmbCategorias"
@ -110,18 +110,21 @@
height="20" height="20"
image="/gui/img/add.png" image="/gui/img/add.png"
width="35px" width="35px"
tooltiptext="${c:l('editarTarifaMinimaController.btnAdicionarCategoria.tooltiptext')}" /> tooltiptext="${c:l('editarTarifaMinimaController.btnAdicionarCategoria.tooltiptext')}"
visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}" />
<button id="btnRemoverCategoria" <button id="btnRemoverCategoria"
height="20" height="20"
image="/gui/img/remove.png" image="/gui/img/remove.png"
width="35px" width="35px"
tooltiptext="${c:l('editarTarifaMinimaController.btnRemoverCategoria.tooltiptext')}" /> tooltiptext="${c:l('editarTarifaMinimaController.btnRemoverCategoria.tooltiptext')}"
visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}" />
<listbox id="tarifaMinimaCategoriaList" <listbox id="tarifaMinimaCategoriaList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" vflex="true"
multiple="false" multiple="false"
height="150px"> height="150px"
visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}">
<listhead sizable="true"> <listhead sizable="true">
<listheader image="/gui/img/create_doc.gif" <listheader image="/gui/img/create_doc.gif"
label="${c:l('editarConfiguracionCategoriaController.lblCategorias.value')}" /> label="${c:l('editarConfiguracionCategoriaController.lblCategorias.value')}" />