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

fixed bug#12818 

qua:Renato
dev:Valdir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@88551 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2019-01-04 18:34:48 +00:00
parent 5a2e5cc7ac
commit d4f37e1d35
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/CopiarPricingEspecificoController.java
View File

@ -13,6 +13,7 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Textbox; import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.PricingEspecifico; import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria;
import com.rjconsultores.ventaboletos.service.PricingEspecificoService; import com.rjconsultores.ventaboletos.service.PricingEspecificoService;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
@ -28,12 +29,13 @@ public class CopiarPricingEspecificoController extends MyGenericForwardComposer
private Textbox nombrePricing; private Textbox nombrePricing;
private PricingEspecifico pricingEspecifico; private PricingEspecifico pricingEspecifico;
private List<PricingEspecificoCategoria> pricingCategoriaList;
private MyListbox pricingList; private MyListbox pricingList;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico"); pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico");
pricingCategoriaList = (List<PricingEspecificoCategoria>) Executions.getCurrent().getArg().get("pricingCategoriaList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
} }
@ -45,7 +47,7 @@ public class CopiarPricingEspecificoController extends MyGenericForwardComposer
if (lsPricing == null || if (lsPricing == null ||
lsPricing.isEmpty()) { lsPricing.isEmpty()) {
PricingEspecifico clone = pricingEspecificoService.clonarPricing(pricingEspecifico.getPricingespecificoId(), nombrePricing.getText()); PricingEspecifico clone = pricingEspecificoService.clonarPricing(pricingEspecifico.getPricingespecificoId(), nombrePricing.getText(), pricingCategoriaList);
if (clone != null) { if (clone != null) {

27
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
View File

@ -1145,13 +1145,38 @@ public class EditarPricingEspecificoController extends PricingController {
} }
public void onClick$btnCopiar(Event ev) throws InterruptedException { public void onClick$btnCopiar(Event ev) throws InterruptedException {
incluiCategoriasPadroesAntesCopiar();
Map args = new HashMap(); Map args = new HashMap();
args.put("pricingEspecifico", pricingEspecifico); args.put("pricingEspecifico", pricingEspecifico);
args.put("pricingCategoriaList", pricingEspecifico.getPricingEspecificoCategoriaList());
openWindow("/gui/pricing/copiarPricingEspecifico.zul", openWindow("/gui/pricing/copiarPricingEspecifico.zul",
Labels.getLabel("copiarPricingEspecificoController.window.title"), args, MODAL); Labels.getLabel("copiarPricingEspecificoController.window.title"), args, MODAL);
}
private void incluiCategoriasPadroesAntesCopiar() {
if (ApplicationProperties.getInstance().usaPadraoPricingTipoPassagemPET()) {
Categoria categoriaNormal = getCategoriaNormal();
Categoria categoriaPET = getCategoriaPET();
Boolean existeNormal = false;
Boolean existePET = false;
for (PricingEspecificoCategoria c : pricingEspecifico.getPricingEspecificoCategoriaList()) {
if (c.getCategoria().equals(categoriaNormal)) {
existeNormal = true;
}
if (c.getCategoria().equals(categoriaPET)) {
existePET = true;
}
}
if (!existeNormal) {
incluirCategoriaNormal(categoriaNormal);
}
if (!existePET) {
incluirCategoriaPet(categoriaPET);
}
}
} }
@Override @Override