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

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@22110 d1611594-4594-4d17-8e1d-87c2c4800839

master
rodrigo 2012-10-16 21:57:50 +00:00
parent 58c160b109
commit a013f2ab64
7 changed files with 82 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/ConfigLayoutImpressaoBoletoController.java
View File

@ -19,6 +19,7 @@ import org.zkoss.zk.ui.event.UploadEvent;
import org.zkoss.zul.Combobox; import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Intbox; import org.zkoss.zul.Intbox;
import org.zkoss.zul.Row;
import org.zkoss.zul.Textbox; import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfigCoordenadas; import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfigCoordenadas;
@ -32,10 +33,12 @@ public class ConfigLayoutImpressaoBoletoController extends MyGenericForwardCompo
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private MyListbox campoCoordenadasList; private MyListbox campoCoordenadasList;
private Row rowMensagem;
private Combobox cmbCampo; private Combobox cmbCampo;
private Intbox txtLinha; private Intbox txtLinha;
private Intbox txtColuna; private Intbox txtColuna;
private Textbox txtLayout; private Textbox txtLayout;
private Textbox txtMensagem;
private Integer linha; private Integer linha;
private Integer coluna; private Integer coluna;
private List<ConfigCoordenadas> lsConfigCoordenadas; private List<ConfigCoordenadas> lsConfigCoordenadas;
@ -60,6 +63,9 @@ public class ConfigLayoutImpressaoBoletoController extends MyGenericForwardCompo
txt.append(c.getCampo()).append(".linha=").append(c.getLinha()).append("\n"); txt.append(c.getCampo()).append(".linha=").append(c.getLinha()).append("\n");
txt.append(c.getCampo()).append(".coluna=").append(c.getColuna()).append("\n"); txt.append(c.getCampo()).append(".coluna=").append(c.getColuna()).append("\n");
if (c.getCampo().equals("getMensagem")) {
txt.append(c.getCampo()).append(".str=").append(c.getMensagem()).append("\n");
}
} }
String nomeArquivo = "coordenadas.properties"; String nomeArquivo = "coordenadas.properties";
@ -89,6 +95,7 @@ public class ConfigLayoutImpressaoBoletoController extends MyGenericForwardCompo
configCoordenadas.setCampo(campo); configCoordenadas.setCampo(campo);
configCoordenadas.setLinha(linha); configCoordenadas.setLinha(linha);
configCoordenadas.setColuna(coluna); configCoordenadas.setColuna(coluna);
configCoordenadas.setMensagem(txtMensagem.getValue());
if ((!campo.equals("VAZIO")) && (linha != null) && (coluna != null)) { if ((!campo.equals("VAZIO")) && (linha != null) && (coluna != null)) {
if (!lsConfigCoordenadas.contains(configCoordenadas)) { if (!lsConfigCoordenadas.contains(configCoordenadas)) {
@ -142,4 +149,16 @@ public class ConfigLayoutImpressaoBoletoController extends MyGenericForwardCompo
props.load(in); props.load(in);
in.close(); in.close();
} }
public void onChange$cmbCampo(Event ev) {
String campo = "VAZIO";
Comboitem cbiCampo = cmbCampo.getSelectedItem();
if (cbiCampo != null) {
campo = (String) cbiCampo.getValue();
}
if (campo.equals("getMensagem")) {
rowMensagem.setVisible(Boolean.TRUE);
}
}
} }

3
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderEstacion.java
View File

@ -60,6 +60,9 @@ public class RenderEstacion implements ListitemRenderer {
lc = new Listcell(estacion.getNomeArquivoLayout()); lc = new Listcell(estacion.getNomeArquivoLayout());
lc.setParent(lstm); lc.setParent(lstm);
lc = new Listcell(estacion.getNomeImpressoraRelatorio());
lc.setParent(lstm);
PuntoVenta pv = estacion.getPuntoVenta(); PuntoVenta pv = estacion.getPuntoVenta();
if (pv != null) { if (pv != null) {
lc = new Listcell(pv.getNombpuntoventa()); lc = new Listcell(pv.getNombpuntoventa());

31
src/java/spring-config.xml
View File

@ -1,17 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
<!-- Hibernate config --> <!-- Hibernate config -->
<context:property-placeholder location="classpath:/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties" /> <context:property-placeholder
location="classpath:/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties" />
<context:component-scan base-package="com.rjconsultores.ventaboletos" /> <context:component-scan base-package="com.rjconsultores.ventaboletos" />
<tx:annotation-driven transaction-manager="transactionManager" /> <tx:annotation-driven transaction-manager="transactionManager" />
<bean id="sessionFactory" class="com.rjconsultores.ventaboletos.utilerias.spring.MyAnnotationSessionFactoryBean"> <bean id="sessionFactory"
class="com.rjconsultores.ventaboletos.utilerias.spring.MyAnnotationSessionFactoryBean">
<property name="dataSource"> <property name="dataSource">
<ref local="dataSource" /> <ref local="dataSource" />
</property> </property>
@ -286,11 +290,13 @@
</property> </property>
</bean> </bean>
<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager"> <bean id="transactionManager"
class="org.springframework.orm.hibernate3.HibernateTransactionManager">
<property name="sessionFactory" ref="sessionFactory" /> <property name="sessionFactory" ref="sessionFactory" />
</bean> </bean>
<bean id="contextApplicationContextProvider" class="com.rjconsultores.ventaboletos.web.utilerias.spring.ApplicationContextProvider"> <bean id="contextApplicationContextProvider"
class="com.rjconsultores.ventaboletos.web.utilerias.spring.ApplicationContextProvider">
</bean> </bean>
<!-- <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean"> --> <!-- <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean"> -->
@ -309,14 +315,19 @@
<!-- ====================================================== --> <!-- ====================================================== -->
<!-- Search class from Hibernate-Generic-DAO framework --> <!-- Search class from Hibernate-Generic-DAO framework -->
<!-- ====================================================== --> <!-- ====================================================== -->
<bean id="hibernateSearchSupport" scope="prototype" class="com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchSupportImpl"> <bean id="hibernateSearchSupport" scope="prototype"
class="com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchSupportImpl">
<property name="sessionFactory" ref="sessionFactory" /> <property name="sessionFactory" ref="sessionFactory" />
<property name="hibernateSearchProcessor"> <property name="hibernateSearchProcessor">
<bean class="com.trg.search.hibernate.HibernateSearchProcessor" factory-method="getInstanceForSessionFactory"> <bean class="com.trg.search.hibernate.HibernateSearchProcessor"
factory-method="getInstanceForSessionFactory">
<constructor-arg ref="sessionFactory" /> <constructor-arg ref="sessionFactory" />
</bean> </bean>
</property> </property>
</bean> </bean>
<bean id="sqlFactory" class="com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLFactory" /> <bean id="sqlFactory"
<bean id="sqlBuilder" class="com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder" factory-bean="sqlFactory" factory-method="getBuilder" /> class="com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLFactory" />
<bean id="sqlBuilder"
class="com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder"
factory-bean="sqlFactory" factory-method="getBuilder" />
</beans> </beans>

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

@ -2543,6 +2543,7 @@ busquedaEstacionController.lhNumCaja.label = Caixa
busquedaEstacionController.lhPuntoVenta.label = Ponto Venda busquedaEstacionController.lhPuntoVenta.label = Ponto Venda
busquedaEstacionController.btnPesquisa.label = Pesquisa busquedaEstacionController.btnPesquisa.label = Pesquisa
busquedaEstacionController.nomeImpressora.label = Impressora busquedaEstacionController.nomeImpressora.label = Impressora
busquedaEstacionController.nomeImpressoraRelatorio.label = Impressora Relatório
busquedaEstacionController.nomeArquivoLayout.label = Arquivo Layout busquedaEstacionController.nomeArquivoLayout.label = Arquivo Layout
# Editar Estacion # Editar Estacion
@ -3798,6 +3799,7 @@ configLayoutImpressaoBoletoController.layout.label = Layout
configLayoutImpressaoBoletoController.campo.label = Campo configLayoutImpressaoBoletoController.campo.label = Campo
configLayoutImpressaoBoletoController.coluna.label = Coluna configLayoutImpressaoBoletoController.coluna.label = Coluna
configLayoutImpressaoBoletoController.linha.label = Linha configLayoutImpressaoBoletoController.linha.label = Linha
configLayoutImpressaoBoletoController.mensagem.label = Mensagem
#TramoService #TramoService
tramoServiceImpl.msg.validacionVia=A via não pode ser alterada tramoServiceImpl.msg.validacionVia=A via não pode ser alterada

7
web/gui/configuraciones_comerciales/configLayoutImpressaoBoleto.zul
View File

@ -104,6 +104,8 @@
label="Rodape - Hora Viagem" /> label="Rodape - Hora Viagem" />
<comboitem value="getSaltoBilhete" <comboitem value="getSaltoBilhete"
label="Salto Bilhete" /> label="Salto Bilhete" />
<comboitem value="getMensagem"
label="Mensagem" />
</combobox> </combobox>
</row> </row>
<row> <row>
@ -116,6 +118,11 @@
value="${c:l('configLayoutImpressaoBoletoController.coluna.label')}" /> value="${c:l('configLayoutImpressaoBoletoController.coluna.label')}" />
<intbox id="txtColuna" /> <intbox id="txtColuna" />
</row> </row>
<row id="rowMensagem" visible="false">
<label
value="${c:l('configLayoutImpressaoBoletoController.mensagem.label')}" />
<textbox id="txtMensagem" />
</row>
</rows> </rows>
</grid> </grid>

7
web/gui/seguridad/busquedaEstacion.zul
View File

@ -8,7 +8,7 @@
<window id="winBusquedaEstacion" <window id="winBusquedaEstacion"
title="${c:l('busquedaEstacionController.window.title')}" title="${c:l('busquedaEstacionController.window.title')}"
apply="${busquedaEstacionController}" contentStyle="overflow:auto" apply="${busquedaEstacionController}" contentStyle="overflow:auto"
height="500px" width="950px" border="normal"> height="500px" width="1100px" border="normal">
<toolbar> <toolbar>
<button id="btnRefresh" image="/gui/img/refresh.png" <button id="btnRefresh" image="/gui/img/refresh.png"
@ -81,6 +81,11 @@
<listheader image="/gui/img/create_doc.gif" <listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaEstacionController.nomeArquivoLayout.label')}" label="${c:l('busquedaEstacionController.nomeArquivoLayout.label')}"
sort="auto(nomeArquivoLayout)" /> sort="auto(nomeArquivoLayout)" />
<listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaEstacionController.nomeImpressoraRelatorio.label')}"
sort="auto(nomeImpressoraRelatorio)" />
<listheader image="/gui/img/create_doc.gif" <listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaEstacionController.lhPuntoVenta.label')}" label="${c:l('busquedaEstacionController.lhPuntoVenta.label')}"
sort="auto(puntoVenta.nombpuntoventa)" /> sort="auto(puntoVenta.nombpuntoventa)" />

37
web/gui/seguridad/editarEstacion.zul
View File

@ -6,7 +6,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winEditarEstacion" border="normal" <window id="winEditarEstacion" border="normal"
apply="${editarEstacionController}" width="500px" height="300px" apply="${editarEstacionController}" width="500px"
contentStyle="overflow:auto" contentStyle="overflow:auto"
title="${c:l('editarEstacionController.window.title')}"> title="${c:l('editarEstacionController.window.title')}">
<toolbar> <toolbar>
@ -26,8 +26,8 @@
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>
<column width="40%" /> <column width="30%" />
<column width="60%" /> <column width="70%" />
</columns> </columns>
<rows> <rows>
<row> <row>
@ -53,7 +53,6 @@
constraint="no empty" maxlength="10" constraint="no empty" maxlength="10"
value="@{winEditarEstacion$composer.estacion.numcaja}" /> value="@{winEditarEstacion$composer.estacion.numcaja}" />
</row> </row>
<row> <row>
<label <label
value="${c:l('busquedaEstacionController.nomeImpressora.label')}" /> value="${c:l('busquedaEstacionController.nomeImpressora.label')}" />
@ -68,6 +67,13 @@
maxlength="20" maxlength="20"
value="@{winEditarEstacion$composer.estacion.nomeArquivoLayout}" /> value="@{winEditarEstacion$composer.estacion.nomeArquivoLayout}" />
</row> </row>
<row>
<label
value="${c:l('busquedaEstacionController.nomeImpressoraRelatorio.label')}" />
<textbox id="txtNomImpressoaraRelatorio" width="90%"
maxlength="20"
value="@{winEditarEstacion$composer.estacion.nomeImpressoraRelatorio}" />
</row>
<row> <row>
<label <label
value="${c:l('busquedaEstacionController.lhPuntoVenta.label')}" /> value="${c:l('busquedaEstacionController.lhPuntoVenta.label')}" />
@ -78,15 +84,20 @@
mold="rounded" buttonVisible="true" width="90%" /> mold="rounded" buttonVisible="true" width="90%" />
</row> </row>
<row> <row>
<label value="${c:l('editarEstacionController.conexion')}"/> <label
<combobox id="cmbConexion" width="90%" mold="rounded" buttonVisible="true" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" value="${c:l('editarEstacionController.conexion')}" />
selectedItem="@{winEditarEstacion$composer.estacion.conexionBancaria}"> <combobox id="cmbConexion" width="90%"
<!-- comboitem value="B" label="${c:l('editarEstacionController.IndTipo.1')}" /--> mold="rounded" buttonVisible="true"
<comboitem value="M" label="${c:l('editarEstacionController.IndTipo.2')}" /> use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
<!-- comboitem value="S" label="${c:l('editarEstacionController.IndTipo.3')}" /--> selectedItem="@{winEditarEstacion$composer.estacion.conexionBancaria}">
<comboitem value="E" label="${c:l('editarEstacionController.IndTipo.4')}" /> <!-- comboitem value="B" label="${c:l('editarEstacionController.IndTipo.1')}" /-->
</combobox> <comboitem value="M"
</row> label="${c:l('editarEstacionController.IndTipo.2')}" />
<!-- comboitem value="S" label="${c:l('editarEstacionController.IndTipo.3')}" /-->
<comboitem value="E"
label="${c:l('editarEstacionController.IndTipo.4')}" />
</combobox>
</row>
</rows> </rows>
</grid> </grid>