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

FIXES BUG #06880 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@50882 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2015-12-03 12:59:13 +00:00
parent 73e46fcaf4
commit 49834e6da1
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java
View File

@ -19,7 +19,6 @@ import org.zkoss.zul.Button;
import org.zkoss.zul.Combobox; import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.Textbox; import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.Aidf; import com.rjconsultores.ventaboletos.entidad.Aidf;
@ -29,6 +28,7 @@ import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.Estado;
import com.rjconsultores.ventaboletos.entidad.InscricaoEstadual; import com.rjconsultores.ventaboletos.entidad.InscricaoEstadual;
import com.rjconsultores.ventaboletos.service.AidfService; import com.rjconsultores.ventaboletos.service.AidfService;
import com.rjconsultores.ventaboletos.service.DetAbastoBoletoService;
import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.service.EstadoService; import com.rjconsultores.ventaboletos.service.EstadoService;
import com.rjconsultores.ventaboletos.service.MovimentacionBilhetesService; import com.rjconsultores.ventaboletos.service.MovimentacionBilhetesService;
@ -48,6 +48,9 @@ public class EditarAidfController extends MyGenericForwardComposer {
@Autowired @Autowired
private AidfService aidfService; private AidfService aidfService;
@Autowired
private DetAbastoBoletoService detAbastoBoletoService;
@Autowired @Autowired
private EstadoService estadoService; private EstadoService estadoService;
@ -79,7 +82,7 @@ public class EditarAidfController extends MyGenericForwardComposer {
private Textbox txtDocFiscal; private Textbox txtDocFiscal;
private Textbox txtAcFiscal; private Textbox txtAcFiscal;
private Textbox txtSerie; private Textbox txtSerie;
private Intbox txtSubSerie; private Textbox txtSubSerie;
private Textbox txtFormInicial; private Textbox txtFormInicial;
private Textbox txtFormFinal; private Textbox txtFormFinal;
private Textbox txtFecAquisicao; private Textbox txtFecAquisicao;
@ -90,6 +93,7 @@ public class EditarAidfController extends MyGenericForwardComposer {
private Textbox txtFormfinal; private Textbox txtFormfinal;
private Button btnApagar; private Button btnApagar;
private Button btnSalvar;
private Datebox dtbFecadquisicion; private Datebox dtbFecadquisicion;
private Datebox dtbFecvencimiento; private Datebox dtbFecvencimiento;
@ -115,6 +119,11 @@ public class EditarAidfController extends MyGenericForwardComposer {
if (aidf.getAidfId() == null) { if (aidf.getAidfId() == null) {
btnApagar.setVisible(Boolean.FALSE); btnApagar.setVisible(Boolean.FALSE);
} }
if(detAbastoBoletoService.buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(aidf).size() >0){
btnSalvar.setVisible(Boolean.FALSE);
btnApagar.setVisible(Boolean.FALSE);
}
} }
public void onClick$btnSalvar(Event ev) throws InterruptedException { public void onClick$btnSalvar(Event ev) throws InterruptedException {
@ -275,11 +284,11 @@ public class EditarAidfController extends MyGenericForwardComposer {
this.txtSerie = txtSerie; this.txtSerie = txtSerie;
} }
public Intbox getTxtSubSerie() { public Textbox getTxtSubSerie() {
return txtSubSerie; return txtSubSerie;
} }
public void setTxtSubSerie(Intbox txtSubSerie) { public void setTxtSubSerie(Textbox txtSubSerie) {
this.txtSubSerie = txtSubSerie; this.txtSubSerie = txtSubSerie;
} }
@ -378,4 +387,13 @@ public class EditarAidfController extends MyGenericForwardComposer {
public void setTxtFormfinal(Textbox txtFormfinal) { public void setTxtFormfinal(Textbox txtFormfinal) {
this.txtFormfinal = txtFormfinal; this.txtFormfinal = txtFormfinal;
} }
public Button getBtnSalvar() {
return btnSalvar;
}
public void setBtnSalvar(Button btnSalvar) {
this.btnSalvar = btnSalvar;
}
} }

4
web/gui/gr/editarAidf.zul
View File

@ -3,7 +3,7 @@
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?> <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winEditarAidf"?> <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winEditarAidf"?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?> <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<zk> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winEditarAidf" <window id="winEditarAidf"
title="${c:l('editarAidfController.window.title')}" title="${c:l('editarAidfController.window.title')}"
apply="${editarAidfController}" contentStyle="overflow:auto" apply="${editarAidfController}" contentStyle="overflow:auto"
@ -81,7 +81,7 @@
<row> <row>
<label <label
value="${c:l('busquedaAidfController.subserie.label')}" /> value="${c:l('busquedaAidfController.subserie.label')}" />
<intbox id="txtSubserie" width="30px" maxlength="3" <textbox id="txtSubserie" width="30px" maxlength="3"
value="@{winEditarAidf$composer.aidf.subserie}"/> value="@{winEditarAidf$composer.aidf.subserie}"/>
</row> </row>
<row> <row>