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

Pricing - Ocupação / Antecipação 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@32055 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2013-11-14 19:24:00 +00:00
parent 8dd1af499e
commit 352bf7ec64
3 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
View File

@ -1808,7 +1808,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
Map args = new HashMap(); Map args = new HashMap();
args.put("pricingOcupaAntecipa", pOcupaAntecipa); args.put("pricingOcupaAntecipa", pOcupaAntecipa);
args.put("pricing", pricing);
args.put("pricingOcupaAntecipaList", pricingOcupaAntecipaList); args.put("pricingOcupaAntecipaList", pricingOcupaAntecipaList);
openWindow("/gui/pricing/editarPricingOcupaAntecipa.zul", openWindow("/gui/pricing/editarPricingOcupaAntecipa.zul",

18
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java
View File

@ -38,14 +38,13 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
private Intbox cantasientosmax; private Intbox cantasientosmax;
private Decimalbox porcentaje; private Decimalbox porcentaje;
private Decimalbox importe; private Decimalbox importe;
private Pricing pricing;
private ConstraintPorcentagem ct; private ConstraintPorcentagem ct;
private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class); private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
ct = new ConstraintPorcentagem(); ct = new ConstraintPorcentagem();
pricing = (Pricing) Executions.getCurrent().getArg().get("pricing");
pricingOcupaAntecipa = (PricingOcupaAntecipa) Executions.getCurrent().getArg().get("pricingOcupaAntecipa"); pricingOcupaAntecipa = (PricingOcupaAntecipa) Executions.getCurrent().getArg().get("pricingOcupaAntecipa");
pricingOcupaAntecipaList = (MyListbox) Executions.getCurrent().getArg().get("pricingOcupaAntecipaList"); pricingOcupaAntecipaList = (MyListbox) Executions.getCurrent().getArg().get("pricingOcupaAntecipaList");
@ -70,18 +69,8 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
Boolean podeSalvar = Boolean.FALSE;
if (cantasientosmin.getValue() != null && cantasientosmax.getValue() != null) {
podeSalvar = pricingOcupaAntecipaService.podeSalvar(pricing, pricingOcupaAntecipa);
} else {
if (cantdiasmin.getValue() < cantdiasmax.getValue()) {
podeSalvar = Boolean.TRUE;
}
}
List<PricingOcupaAntecipa> lsPricingOcupacion = pricingOcupaAntecipaService.obtenerPorPricing(pricingOcupaAntecipa.getPricing()); List<PricingOcupaAntecipa> lsPricingOcupacion = pricingOcupaAntecipaService.obtenerPorPricing(pricingOcupaAntecipa.getPricing());
if (podeSalvar) {
if (pricingOcupaAntecipa != null) { if (pricingOcupaAntecipa != null) {
lsPricingOcupacion.remove(pricingOcupaAntecipa); lsPricingOcupacion.remove(pricingOcupaAntecipa);
} }
@ -94,11 +83,6 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
pricingOcupaAntecipaList.addItemNovo(pricingOcupaAntecipa); pricingOcupaAntecipaList.addItemNovo(pricingOcupaAntecipa);
} }
closeWindow(); closeWindow();
} else {
Messagebox.show(Labels.getLabel("editarPricingController.ocupacionErrada"),
Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} }
} }

4
web/gui/pricing/editarPricingOcupaAntecipa.zul
View File

@ -57,8 +57,8 @@
value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.porcentaje}" /> value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.porcentaje}" />
<label <label
value="${c:l('editarPricingController.importe.value')}" /> value="${c:l('editarPricingController.importe.value')}" />
<decimalbox id="importe" maxlength="5" <decimalbox id="importe" maxlength="7"
format="###.##" format="#####.##"
value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.importe}" /> value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.importe}" />
</row> </row>