From 6e3a655c711fab54c4fb217bd7101bafb2943bfd Mon Sep 17 00:00:00 2001 From: gleimar Date: Thu, 21 Mar 2013 15:22:22 +0000 Subject: [PATCH] =?UTF-8?q?-=20corre=C3=A7=C3=A3o=20na=20gera=C3=A7=C3=A3o?= =?UTF-8?q?=20de=20corridas=20com=20exce=C3=A7=C3=A3o=20de=20tempo=20maior?= =?UTF-8?q?=20que=2024=20hrs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@25299 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../EditarTramosController.java | 3 +-- .../utilerias/render/RenderTramoServicio.java | 2 +- .../utilerias/render/RenderTramoTiempo.java | 21 ++++++++++++++++++- web/WEB-INF/i3-label_pt_BR.label | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramosController.java index 568853166..2bce139f3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramosController.java @@ -394,8 +394,7 @@ public class EditarTramosController extends MyGenericForwardComposer { tramoTiempo.setIndaplicvie(vie.isChecked()); tramoTiempo.setIndaplicsab(sab.isChecked()); tramoTiempo.setIndaplicdom(dom.isChecked()); - tramoTiempo.setTiemporecorrido(DateUtil.getFecInicio(spHoraTiempo.getValue(), - spMinutoTiempo.getValue()).getTime()); + tramoTiempo.setTiemporecorrido(DateUtil.getFecInicio(spHoraTiempo.getValue(),spMinutoTiempo.getValue()).getTime()); tramoTiempo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); tramoTiempo.setFecmodif(Calendar.getInstance().getTime()); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTramoServicio.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTramoServicio.java index 3137ced72..0c721bb32 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTramoServicio.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTramoServicio.java @@ -31,7 +31,7 @@ public class RenderTramoServicio implements ListitemRenderer { } else { Calendar c = Calendar.getInstance(); c.setTime(serv.getTiemporecorrido()); - System.out.println(DateUtil.getFecInicio().getTime()+ " " + c.getTime()); + Long tempo = DateUtil.getElapsedMinutos(DateUtil.getFecInicio().getTime(), c.getTime()); long minutos = (tempo % 60); int horas = (tempo.intValue() / 60); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTramoTiempo.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTramoTiempo.java index eeaf81598..348d0b30a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTramoTiempo.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTramoTiempo.java @@ -5,7 +5,11 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; import com.rjconsultores.ventaboletos.entidad.TramoTiempo; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + import java.text.SimpleDateFormat; +import java.util.Calendar; + import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -29,8 +33,23 @@ public class RenderTramoTiempo implements ListitemRenderer { lc = new Listcell(sf.format(tramoTiempo.getHorafin())); lc.setParent(lstm); + + + + if (tramoTiempo.getTiemporecorrido() == null) { + lc = new Listcell(""); + } else { + Calendar c = Calendar.getInstance(); + c.setTime(tramoTiempo.getTiemporecorrido()); + + Long tempo = DateUtil.getElapsedMinutos(DateUtil.getFecInicio().getTime(), c.getTime()); + long minutos = (tempo % 60); + int horas = (tempo.intValue() / 60); - lc = new Listcell(sf.format(tramoTiempo.getTiemporecorrido())); + + String sMinutos = String.valueOf(minutos); + lc = new Listcell(horas + ":" + ((sMinutos.length() < 2) ? "0" + sMinutos : sMinutos)); + } lc.setParent(lstm); lc = new Listcell((tramoTiempo.getIndapliclun()) ? "Sim" : "Não"); diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 488b2647b..7305a336f 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7,7 +7,7 @@ # . . = XXX #Versao do VentaBoleto: -versao = ADM_20130320_1RC132 +versao = ADM_20130321_1RC133 # MSG Defaut: MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100