diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderSeguroKm.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderSeguroKm.java index 19df72699..9addcada3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderSeguroKm.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderSeguroKm.java @@ -31,6 +31,9 @@ public class RenderSeguroKm implements ListitemRenderer { lc = new Listcell(taxaKm.getValortaxa().toString()); lc.setParent(lstm); + lc = new Listcell(taxaKm.getTipoSeguro()); + lc.setParent(lstm); + lstm.setAttribute("data", taxaKm); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderSeguroSemTpp.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderSeguroSemTpp.java new file mode 100644 index 000000000..2eb5818d3 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderSeguroSemTpp.java @@ -0,0 +1,40 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package com.rjconsultores.ventaboletos.web.utilerias.render; + +import com.rjconsultores.ventaboletos.entidad.SeguroKm; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +/** + * + * @author Desenvolvimento + */ +public class RenderSeguroSemTpp implements ListitemRenderer { + + public void render(Listitem lstm, Object o) throws Exception { + SeguroKm taxaKm = (SeguroKm) o; + + Listcell lc = new Listcell(taxaKm.getSegurokmId()==null?"-":taxaKm.getSegurokmId().toString()); + lc.setParent(lstm); + + lc = new Listcell(taxaKm.getOrgaoconcedente().getDescOrgao()); + lc.setParent(lstm); + + lc = new Listcell(taxaKm.getKmate().toString()); + lc.setParent(lstm); + + lc = new Listcell(taxaKm.getValortaxa().toString()); + lc.setParent(lstm); + + lc = new Listcell(taxaKm.getTipoSeguro().toString()); + lc.setParent(lstm); + + lstm.setAttribute("data", taxaKm); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifa.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifa.java index 48cbe76e1..7ebcb9e51 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifa.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifa.java @@ -12,6 +12,7 @@ import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; import com.rjconsultores.ventaboletos.entidad.Tarifa; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; /** * @@ -47,6 +48,12 @@ public class RenderTarifa implements ListitemRenderer { lc.setParent(lstm); lc = new Listcell(t.getImporteseguro() == null ? "" : df.format(t.getImporteseguro())); lc.setParent(lstm); + + if (ApplicationProperties.getInstance().exibeTpp()) { + lc = new Listcell(t.getImporteTPP() == null ? "" : df.format(t.getImporteTPP())); + lc.setParent(lstm); + } + lc = new Listcell(t.getImporteoutros() == null ? "" : df.format(t.getImporteoutros())); lc.setParent(lstm); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifaOficial.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifaOficial.java index bf9f6f6a0..75f1938b8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifaOficial.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifaOficial.java @@ -11,6 +11,7 @@ import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; import com.rjconsultores.ventaboletos.entidad.TarifaOficial; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; /** * @@ -46,6 +47,12 @@ public class RenderTarifaOficial implements ListitemRenderer { lc.setParent(lstm); lc = new Listcell(t.getImporteseguro() == null ? "" : df.format(t.getImporteseguro())); lc.setParent(lstm); + + if (ApplicationProperties.getInstance().exibeTpp()) { + lc = new Listcell(t.getImportetpp() == null ? "" : df.format(t.getImportetpp())); + lc.setParent(lstm); + } + lc = new Listcell(t.getImporteoutros() == null ? "" : df.format(t.getImporteoutros())); lc.setParent(lstm); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/SeguroPorIntervalo.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/SeguroPorIntervalo.java new file mode 100644 index 000000000..9aea5ecbd --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/SeguroPorIntervalo.java @@ -0,0 +1,31 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package com.rjconsultores.ventaboletos.web.utilerias.render; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +/** + * + * @author Desenvolvimento + */ +public class SeguroPorIntervalo implements ListitemRenderer { + + public void render(Listitem lstm, Object o) throws Exception { + OrgaoConcedente orgao = (OrgaoConcedente) o; + + Listcell lc = new Listcell(orgao.getOrgaoConcedenteId()==null?"-":orgao.getOrgaoConcedenteId().toString()); + lc.setParent(lstm); + + lc = new Listcell(orgao.getDescOrgao()); + lc.setParent(lstm); + + lstm.setAttribute("data", orgao); + } + +}