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

Merge pull request 'Bolivariano - Adequações Conexão entre linhas feat bug#AL-4465' (!676) from AL-4465 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/676
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
master 1.129.0
Valdir Cordeiro 2024-08-23 13:30:16 +00:00
parent 06814fb4e9 cf29b9b8da
commit 793c8347ed
7 changed files with 18320 additions and 15574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.128.6</version>
<version>1.129.0</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.98.1</modelWeb.version>
<flyway.version>1.86.0</flyway.version>
<modelWeb.version>1.99.0</modelWeb.version>
<flyway.version>1.87.0</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

38
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java
View File

@ -25,8 +25,10 @@ import org.zkoss.zul.Doublebox;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.ListModelList;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Row;
import org.zkoss.zul.Tab;
import org.zkoss.zul.Textbox;
import org.zkoss.zul.api.Hbox;
import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.entidad.Conexion;
@ -55,6 +57,8 @@ import com.rjconsultores.ventaboletos.service.ConexionService;
import com.rjconsultores.ventaboletos.service.RutaEmpresaService;
import com.rjconsultores.ventaboletos.service.RutaService;
import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService;
import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties;
import com.rjconsultores.ventaboletos.utilerias.CustomEnum;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO;
import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO;
@ -141,7 +145,6 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
private Combobox cmbOrigemConexao;
private Combobox cmbDestinoConexao;
private Button btnFiltrar;
List<ParadaVOConexionRuta> localidadesGeradasFiltro;
private List<Parada> lsOrigemConexao;
private List<Parada> lsDestinoConexao;
@ -149,6 +152,18 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
private boolean isConexionGerada;
private Checkbox chkBloqueioTrechoA;
private Checkbox chkBloqueioTrechoB;
private Checkbox chkBloqueioTrechoC;
private Hbox rowTrechoA;
private Hbox rowTrechoB;
private Hbox rowTrechoC;
private Row linhaBloqueio;
private Intbox txtTempoAteSaida;
private Intbox txtPorcentagemOcupacao;
@Override
public void doAfterCompose(Component comp) throws Exception {
@ -165,8 +180,14 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
conexionRutaConfList = (MyListbox) Executions.getCurrent().getArg().get("conexionRutaConfList");
conexoesCtrl = new ArrayList<>();
if (!ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.USA_BLOQUEIO_TRECHO_CONEXAO.getDescricao())) {
rowTrechoA.setVisible(Boolean.FALSE);
rowTrechoB.setVisible(Boolean.FALSE);
rowTrechoC.setVisible(Boolean.FALSE);
linhaBloqueio.setVisible(Boolean.FALSE);
}
if (conexionRutaConf != null) {
btnSalvar.setDisabled(false);
btnApagar.setDisabled(false);
@ -176,6 +197,12 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
txtTiempoMax.setValue(conexionRutaConf.getTiempoMax());
txtDesconto.setValue(conexionRutaConf.getDescuento() == null ? null : conexionRutaConf.getDescuento().doubleValue());
txtTempoAteSaida.setValue(conexionRutaConf.getMinutosAntesPartida());
txtPorcentagemOcupacao.setValue(conexionRutaConf.getPorcentagemOcupacao());
chkBloqueioTrechoA.setChecked(conexionRutaConf.getIsBloqueioTrechoA());
chkBloqueioTrechoB.setChecked(conexionRutaConf.getIsBloqueioTrechoB());
chkBloqueioTrechoC.setChecked(conexionRutaConf.getIsBloqueioTrechoC());
configuraExcecaoPorPontoVenda();
configuraExcecaoPorTipoVenda();
@ -397,6 +424,13 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
conexionRutaConf.setTiempoMin(txtTiempoMin.getValue());
conexionRutaConf.setTiempoMax(txtTiempoMax.getValue());
conexionRutaConf.setMinutosAntesPartida(txtTempoAteSaida.getValue());
conexionRutaConf.setPorcentagemOcupacao(txtPorcentagemOcupacao.getValue());
conexionRutaConf.setIsBloqueioTrechoA(chkBloqueioTrechoA.isChecked());
conexionRutaConf.setIsBloqueioTrechoB(chkBloqueioTrechoB.isChecked());
conexionRutaConf.setIsBloqueioTrechoC(chkBloqueioTrechoC.isChecked());
Double desconto = txtDesconto.getValue() == null ? 0d : txtDesconto.getValue();
Boolean descontoAlterado = false;
BigDecimal descontoAnterior = conexionRutaConf.getDescuento();

8443
web/WEB-INF/i3-label_en.label
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

8443
web/WEB-INF/i3-label_fr_FR.label
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

37
web/gui/esquema_operacional/gerarConexionPorRuta.zul
View File

@ -33,9 +33,9 @@
<grid fixedLayout="true">
<columns>
<column width="10%" />
<column width="15%" />
<column width="40%" />
<column width="50%" />
<column width="45%" />
</columns>
<rows>
<row spans="1,2">
@ -60,6 +60,21 @@
<doublebox id="txtDesconto" maxlength="7"/>
</hlayout>
</row>
<row id="linhaBloqueio">
<label value="${c:l('editarConexionController.bloqueioTrecho.configuracao')}" />
<hlayout>
<label value="${c:l('editarConexionController.bloqueioTrecho.tempoAteSaida')}" />
<intbox id="txtTempoAteSaida" maxlength="7"/>
</hlayout>
<hlayout>
<label value="${c:l('editarConexionController.bloqueioTrecho.porcentagemOcupacao')}" />
<intbox id="txtPorcentagemOcupacao" maxlength="7"/>
</hlayout>
</row>
</rows>
</grid>
@ -95,6 +110,12 @@
</row>
<row>
<vbox height="100%" width="100%">
<hbox id="rowTrechoA" style="padding:1%">
<label value="${c:l('editarConexionController.bloqueioTrecho.bloquearTrechos')}" />
<checkbox id="chkBloqueioTrechoA" />
</hbox>
<hbox>
<label
value="${c:l('editarConexionPorRutaController.labelLinhaA.value')}" />
@ -121,6 +142,12 @@
</listbox>
</vbox>
<vbox height="100%" width="100%">
<hbox id="rowTrechoB" style="padding:1%">
<label value="${c:l('editarConexionController.bloqueioTrecho.bloquearTrechos')}" />
<checkbox id="chkBloqueioTrechoB" />
</hbox>
<hbox>
<label
value="${c:l('editarConexionPorRutaController.labelLinhaB.value')}" />
@ -147,6 +174,12 @@
</listbox>
</vbox>
<vbox height="100%" width="100%">
<hbox id="rowTrechoC" style="padding:1%">
<label value="${c:l('editarConexionController.bloqueioTrecho.bloquearTrechos')}" />
<checkbox id="chkBloqueioTrechoC" />
</hbox>
<hbox>
<label
value="${c:l('editarConexionPorRutaController.labelLinhaC.value')}" />