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

fixes bug #8273 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@62830 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2016-11-23 19:33:25 +00:00
parent 192d23cd8e
commit 2a30798b5b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
View File

@ -13,7 +13,6 @@ import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Radio;
import com.rjconsultores.ventaboletos.constantes.Constantes;
import com.rjconsultores.ventaboletos.entidad.ClasseIndicePeaje;
import com.rjconsultores.ventaboletos.entidad.EmpresaImposto;
import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente;
import com.rjconsultores.ventaboletos.entidad.Ruta;
@ -72,6 +71,10 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
for (Integer orgaoConcedenteId : Constantes.ORGAOS_CONCEDENTES_CALCULO_ARTESP) {
lsOrgaoConcedente.add(orgaoConcedenteService.obtenerID(orgaoConcedenteId));
}
List<OrgaoConcedente> ls1 = orgaoConcedenteService.buscar("AGEPAN");
if(!ls1.isEmpty()){
lsOrgaoConcedente.add(ls1.get(0));
}
}
public void onClick$btnCalcularPeaje(Event ev) throws InterruptedException {

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java
View File

@ -14,7 +14,7 @@ public class RenderClasseIndicePeaj implements ListitemRenderer {
public void render(Listitem arg0, Object arg1) throws Exception {
ClasseIndicePeaje classeIndicePeaje = (ClasseIndicePeaje) arg1;
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
DecimalFormat decimalFormat = new DecimalFormat("#0.000");
Listcell lc = new Listcell(classeIndicePeaje.getClasseServicio().getDescclase());
lc.setParent(arg0);

4
web/gui/catalogos/editarOrgaoConcedente.zul
View File

@ -66,7 +66,7 @@
value="${c:l('busquedaOrgaoConcedenteController.indicePeaje.label')}" />
<textbox id="txtIndicePeaje"
maxlength="8" mold="rounded"
constraint=" no negative, /[0-9]+(\,[0-9][0-9]?)?|/ "
constraint=" no negative, /[0-9]+(\,[0-9][0-9][0-9]?)?|/ "
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" />
</row>
<row>
@ -91,7 +91,7 @@
value="${c:l('busquedaOrgaoConcedenteController.indicePeaje.label')}" />
<textbox id="txtIndicePeajClasse"
maxlength="8" mold="rounded"
constraint=" no negative, /[0-9]+(\,[0-9][0-9]?)?|/ "
constraint=" no negative, /[0-9]+(\,[0-9][0-9][0-9]?)?|/ "
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" />
<button id="btnAdicionarClassePeaje"