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

fixes bug#23184 

dev:lucas

qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@111963 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2022-04-20 21:35:10 +00:00
parent cfbebcd5a3
commit e84fc52091
2 changed files with 72 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarClaseServicioController.java
View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
@ -19,9 +20,12 @@ import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Button;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.api.Comboitem;
import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.enums.TipoClasseServicoBPe;
import com.rjconsultores.ventaboletos.enums.TipoDescontoMonitrip;
import com.rjconsultores.ventaboletos.service.ClaseServicioService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
@ -50,38 +54,8 @@ public class EditarClaseServicioController extends MyGenericForwardComposer {
private Button btnApagar;
private MyTextboxDecimal txtCoeficiente;
private Checkbox chkNaoVendeSeguroOpcional;
public ClaseServicio getClaseServicio() {
return claseServicio;
}
public void setClaseServicio(ClaseServicio claseServicio) {
this.claseServicio = claseServicio;
}
public MyTextbox getTxtNome() {
return txtNome;
}
public void setTxtNome(MyTextbox txtNome) {
this.txtNome = txtNome;
}
public Button getBtnApagar() {
return btnApagar;
}
public void setBtnApagar(Button btnApagar) {
this.btnApagar = btnApagar;
}
public MyTextboxDecimal getTxtCoeficiente() {
return txtCoeficiente;
}
public void setTxtCoeficiente(MyTextboxDecimal txtCoeficiente) {
this.txtCoeficiente = txtCoeficiente;
}
private Combobox cmbDescontoMonitrip;
private List<TipoDescontoMonitrip> lsTipoDescontoMonitrips;
@Override
public void doAfterCompose(Component comp) throws Exception {
@ -89,6 +63,7 @@ public class EditarClaseServicioController extends MyGenericForwardComposer {
claseServicio = (ClaseServicio) Executions.getCurrent().getArg().get("claseServicio");
claseServicioList = (MyListbox) Executions.getCurrent().getArg().get("claseServicioList");
lsTipoDescontoMonitrips = Arrays.asList(TipoDescontoMonitrip.values());
if (claseServicio.getClaseservicioId() == null) {
btnApagar.setVisible(Boolean.FALSE);
@ -132,6 +107,12 @@ public class EditarClaseServicioController extends MyGenericForwardComposer {
claseServicio.setCoeficiente(null != txtCoeficiente.getText() && !"".equals(txtCoeficiente.getText()) ? new BigDecimal(txtCoeficiente.getText()) : null);
claseServicio.setIndNaoVendeSeguroOpcional(chkNaoVendeSeguroOpcional.isChecked());
Comboitem cbDescontoMonitrip = cmbDescontoMonitrip.getSelectedItem();
claseServicio.setTipoDescontoMonitrip(null);
if(cbDescontoMonitrip != null) {
claseServicio.setTipoDescontoMonitrip((TipoDescontoMonitrip) cbDescontoMonitrip.getValue());
}
if (claseServicio.getClaseservicioId() == null) {
claseServicioService.suscribir(claseServicio);
claseServicioList.addItem(claseServicio);
@ -181,7 +162,56 @@ public class EditarClaseServicioController extends MyGenericForwardComposer {
}
}
public ClaseServicio getClaseServicio() {
return claseServicio;
}
public void setClaseServicio(ClaseServicio claseServicio) {
this.claseServicio = claseServicio;
}
public MyTextbox getTxtNome() {
return txtNome;
}
public void setTxtNome(MyTextbox txtNome) {
this.txtNome = txtNome;
}
public Button getBtnApagar() {
return btnApagar;
}
public void setBtnApagar(Button btnApagar) {
this.btnApagar = btnApagar;
}
public MyTextboxDecimal getTxtCoeficiente() {
return txtCoeficiente;
}
public void setTxtCoeficiente(MyTextboxDecimal txtCoeficiente) {
this.txtCoeficiente = txtCoeficiente;
}
public List<TipoClasseServicoBPe> getTiposClasseServicoBPe() {
return TipoClasseServicoBPe.getList();
}
public Combobox getCmbDescontoMonitrip() {
return cmbDescontoMonitrip;
}
public void setCmbDescontoMonitrip(Combobox cmbDescontoMonitrip) {
this.cmbDescontoMonitrip = cmbDescontoMonitrip;
}
public List<TipoDescontoMonitrip> getLsTipoDescontoMonitrips() {
return lsTipoDescontoMonitrips;
}
public void setLsTipoDescontoMonitrips(List<TipoDescontoMonitrip> lsTipoDescontoMonitrips) {
this.lsTipoDescontoMonitrips = lsTipoDescontoMonitrips;
}
}

9
web/gui/catalogos/editarClaseServicio.zul
View File

@ -44,6 +44,15 @@
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winEditarClaseServicio$composer.tiposClasseServicoBPe}">
</combobox>
</row>
<row>
<label
value="${c:l('editarCategoriaController.lbDescontoMonitrip.value')}" />
<combobox id="cmbDescontoMonitrip"
mold="rounded" buttonVisible="true" width="100%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winEditarClaseServicio$composer.lsTipoDescontoMonitrips}"
selectedItem="@{winEditarClaseServicio$composer.claseServicio.tipoDescontoMonitrip}" />
</row>
<row>
<label