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

Merge mantis 7171 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@54118 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.penido 2016-03-22 12:31:25 +00:00
parent f3cb82f58c
commit c58d1444ab
4 changed files with 14 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/tarifas/CopiarTarifaOficialController.java
View File

@ -35,8 +35,6 @@ public class CopiarTarifaOficialController extends MyGenericForwardComposer {
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static Logger log = Logger.getLogger(CopiarTarifaOficialController.class);
@Autowired @Autowired
private VigenciaTarifaService vigenciaTarifaService; private VigenciaTarifaService vigenciaTarifaService;
@Autowired @Autowired
@ -46,6 +44,7 @@ public class CopiarTarifaOficialController extends MyGenericForwardComposer {
private Radio rdComPegagio; private Radio rdComPegagio;
private Radio rdComTarifa; private Radio rdComTarifa;
private Radio rdComTaxaEmbarque; private Radio rdComTaxaEmbarque;
private Radio rdComSeguro;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
@ -59,8 +58,9 @@ public class CopiarTarifaOficialController extends MyGenericForwardComposer {
Boolean calculaPedagio = (rdComPegagio.getValue() == null) ? Boolean.FALSE : rdComPegagio.isChecked(); Boolean calculaPedagio = (rdComPegagio.getValue() == null) ? Boolean.FALSE : rdComPegagio.isChecked();
Boolean calculaTarifa = (rdComTarifa.getValue() == null) ? Boolean.FALSE : rdComTarifa.isChecked(); Boolean calculaTarifa = (rdComTarifa.getValue() == null) ? Boolean.FALSE : rdComTarifa.isChecked();
Boolean calculaTaxaEmbarque = (rdComTaxaEmbarque.getValue() == null) ? Boolean.FALSE : rdComTaxaEmbarque.isChecked(); Boolean calculaTaxaEmbarque = (rdComTaxaEmbarque.getValue() == null) ? Boolean.FALSE : rdComTaxaEmbarque.isChecked();
Boolean calculaSeguro = (rdComSeguro.getValue() == null) ? Boolean.FALSE : rdComSeguro.isChecked();
tarifaOficialService.copiarParaTarifa((VigenciaTarifa) cmbVigencia.getSelectedItem().getValue(), calculaPedagio, calculaTarifa, calculaTaxaEmbarque); tarifaOficialService.copiarParaTarifa((VigenciaTarifa) cmbVigencia.getSelectedItem().getValue(), calculaPedagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro);
Messagebox.show(Labels.getLabel("copiarTarifaOficialController.MSG.copiaOK"), Messagebox.show(Labels.getLabel("copiarTarifaOficialController.MSG.copiaOK"),
Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"),

1
web/WEB-INF/i3-label_es_MX.label
View File

@ -4844,6 +4844,7 @@ copiarTarifaOficialController.SemTarifa.label = No
copiarTarifaOficialController.CalculaTaxaEmbarque.label = Actualizar Tasa de abordaje copiarTarifaOficialController.CalculaTaxaEmbarque.label = Actualizar Tasa de abordaje
copiarTarifaOficialController.ComTaxaEmbarque.label = Si copiarTarifaOficialController.ComTaxaEmbarque.label = Si
copiarTarifaOficialController.SemTaxaEmbarque.label = No copiarTarifaOficialController.SemTaxaEmbarque.label = No
copiarTarifaOficialController.CalculaSeguro.label = Atualizar Seguro
# Búsqueda TaxaEmbarqueKm # Búsqueda TaxaEmbarqueKm
busquedaTaxaEmbarqueKmController.window.title = Tasa de abordaje por intervalo de Km busquedaTaxaEmbarqueKmController.window.title = Tasa de abordaje por intervalo de Km

1
web/WEB-INF/i3-label_pt_BR.label
View File

@ -4902,6 +4902,7 @@ copiarTarifaOficialController.SemTarifa.label = Não
copiarTarifaOficialController.CalculaTaxaEmbarque.label = Atualizar Taxa de Embarque copiarTarifaOficialController.CalculaTaxaEmbarque.label = Atualizar Taxa de Embarque
copiarTarifaOficialController.ComTaxaEmbarque.label = Sim copiarTarifaOficialController.ComTaxaEmbarque.label = Sim
copiarTarifaOficialController.SemTaxaEmbarque.label = Não copiarTarifaOficialController.SemTaxaEmbarque.label = Não
copiarTarifaOficialController.CalculaSeguro.label = Atualizar Seguro
# Editar Tarifa por KM ARTESP # Editar Tarifa por KM ARTESP
editarTarifaKmController.window.title = Tarifa por Km - ARTESP editarTarifaKmController.window.title = Tarifa por Km - ARTESP

9
web/gui/tarifas/copiarTarifaOficial.zul
View File

@ -64,6 +64,15 @@
</hbox> </hbox>
</radiogroup> </radiogroup>
</row> </row>
<row>
<label value="${c:l('copiarTarifaOficialController.CalculaSeguro.label')}" />
<radiogroup id="rdSeguro">
<hbox align="center">
<radio id="rdComSeguro" label="${c:l('MSG.SI')}" />
<radio id="rdSemSeguro" label="${c:l('MSG.NO')}" checked="true"/>
</hbox>
</radiogroup>
</row>
</rows> </rows>
</grid> </grid>
</window> </window>