Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/jdmr/mateo
Browse files Browse the repository at this point in the history
  • Loading branch information
const3 committed Feb 25, 2014
2 parents 65968fb + fe0abe8 commit 1744f1d
Show file tree
Hide file tree
Showing 53 changed files with 1,844 additions and 83 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,15 @@
import java.util.HashMap;
import java.util.Map;
import mx.edu.um.mateo.colportor.dao.ReciboColportorDao;
import mx.edu.um.mateo.colportor.model.PedidoColportor;
import mx.edu.um.mateo.colportor.model.ReciboColportor;
import mx.edu.um.mateo.general.dao.BaseDao;
import mx.edu.um.mateo.general.utils.Constantes;
import org.hibernate.Criteria;
import org.hibernate.FetchMode;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Disjunction;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.Subqueries;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/

package mx.edu.um.mateo.colportor.model;

import java.util.Date;
import mx.edu.um.mateo.general.model.Usuario;

/**
* Esta clase se utiliza para pasar los valores a los reportes de ventas
* @author osoto
*/
public class PedidoColportorVO {
private String numPedido;
private Date fechaPedido;
private Date fechaEntrega;
private String formaPago;
private ClienteColportor cliente;
private Usuario colportor;
private PedidoColportorItem item;

public String getNumPedido() {
return numPedido;
}

public void setNumPedido(String numPedido) {
this.numPedido = numPedido;
}

public Date getFechaPedido() {
return fechaPedido;
}

public void setFechaPedido(Date fechaPedido) {
this.fechaPedido = fechaPedido;
}

public Date getFechaEntrega() {
return fechaEntrega;
}

public void setFechaEntrega(Date fechaEntrega) {
this.fechaEntrega = fechaEntrega;
}

public String getFormaPago() {
return formaPago;
}

public void setFormaPago(String formaPago) {
this.formaPago = formaPago;
}

public ClienteColportor getCliente() {
return cliente;
}

public void setCliente(ClienteColportor cliente) {
this.cliente = cliente;
}

public Usuario getColportor() {
return colportor;
}

public void setColportor(Usuario colportor) {
this.colportor = colportor;
}

public PedidoColportorItem getItem() {
return item;
}

public void setItem(PedidoColportorItem item) {
this.item = item;
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ public String lista(HttpServletRequest request, HttpServletResponse response,
if (ambiente.esAsociado()) {
log.debug("Entrando a Documentos como Asociado");
log.debug("clave" + clave);

if(clave == null || clave.isEmpty()){
if(request.getSession().getAttribute(Constantes.TEMPORADACOLPORTOR) != null) {
clave = ((TemporadaColportor)request.getSession().getAttribute(Constantes.TEMPORADACOLPORTOR)).getColportor().getClave();
}
}

if (clave != null && !clave.isEmpty()) {
Colportor colportor = colportorDao.obtiene(clave);
Expand All @@ -150,6 +156,7 @@ public String lista(HttpServletRequest request, HttpServletResponse response,
}

log.debug("Temporada Colportor {} ", temporadaColportor);
request.getSession().setAttribute(Constantes.TEMPORADACOLPORTOR, temporadaColportor);
modelo.addAttribute(Constantes.TEMPORADACOLPORTOR, temporadaColportor);
params.put("temporadaColportor", temporadaColportor.getId());
} else {
Expand Down Expand Up @@ -383,8 +390,8 @@ public String crea(HttpServletRequest request, HttpServletResponse response, @Va
}
else{
//Se requiere una clave de colportor
Colportor clp = colportorDao.obtiene(documento.getTemporadaColportor().getColportor().getClave());
Temporada tmp = temporadaDao.obtiene(documento.getTemporadaColportor().getTemporada().getId());
Colportor clp = colportorDao.obtiene(((TemporadaColportor)request.getSession().getAttribute(Constantes.TEMPORADACOLPORTOR)).getColportor().getClave());
Temporada tmp = temporadaDao.obtiene(((TemporadaColportor)request.getSession().getAttribute(Constantes.TEMPORADACOLPORTOR)).getTemporada().getId());
temporadaColportorTmp = temporadaColportorDao.obtiene(clp, tmp);
}
documento.setTemporadaColportor(temporadaColportorTmp);
Expand Down Expand Up @@ -445,7 +452,17 @@ public String actualiza(HttpServletRequest request, @Valid Documento documentos,
}

try {
documentos.setTemporadaColportor(temporadaColportorDao.obtiene((Colportor) ambiente.obtieneUsuario()));
TemporadaColportor temporadaColportorTmp = null;
if(ambiente.esColportor()){
temporadaColportorTmp = temporadaColportorDao.obtiene((Colportor) ambiente.obtieneUsuario());
}
else{
//Se requiere una clave de colportor
Colportor clp = colportorDao.obtiene(((TemporadaColportor)request.getSession().getAttribute(Constantes.TEMPORADACOLPORTOR)).getColportor().getClave());
Temporada tmp = temporadaDao.obtiene(((TemporadaColportor)request.getSession().getAttribute(Constantes.TEMPORADACOLPORTOR)).getTemporada().getId());
temporadaColportorTmp = temporadaColportorDao.obtiene(clp, tmp);
}
documentos.setTemporadaColportor(temporadaColportorTmp);
log.debug("Documento Fecha" + documentos.getFecha());
documentos = DocumentoDao.actualiza(documentos);
} catch (ConstraintViolationException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/
package mx.edu.um.mateo.colportor.web;


import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -13,8 +15,11 @@
import javax.validation.Valid;
import mx.edu.um.mateo.colportor.dao.ClienteColportorDao;
import mx.edu.um.mateo.colportor.dao.PedidoColportorDao;
import mx.edu.um.mateo.colportor.dao.PedidoColportorItemDao;
import mx.edu.um.mateo.colportor.model.FormaPago;
import mx.edu.um.mateo.colportor.model.PedidoColportor;
import mx.edu.um.mateo.colportor.model.PedidoColportorItem;
import mx.edu.um.mateo.colportor.model.PedidoColportorVO;
import mx.edu.um.mateo.general.dao.UsuarioDao;
import mx.edu.um.mateo.general.model.Usuario;
import mx.edu.um.mateo.general.utils.Constantes;
Expand Down Expand Up @@ -49,6 +54,8 @@ public class PedidoColportorController extends BaseController{
private UsuarioDao colportorDao;
@Autowired
private ClienteColportorDao clienteColportorDao;
@Autowired
private PedidoColportorItemDao pedidoColportorItemDao;

@SuppressWarnings("unchecked")
@RequestMapping
Expand Down Expand Up @@ -277,4 +284,47 @@ public String elimina(HttpServletRequest request, @RequestParam Long id,

return "redirect:" + Constantes.PEDIDO_COLPORTOR_PATH;
}

@RequestMapping("/finalizar/{id}")
public String finalizar(HttpServletRequest request, @PathVariable Long id, Model modelo) {
log.debug("Finalizando pedidoColportor {}", id);
PedidoColportor pedidoColportor = pedidoColportorDao.obtiene(id);

Map<String, Object> params = new HashMap<>();
params.put("pedido", id);
params = pedidoColportorItemDao.lista(params);

//Guardar los VO en params
List <PedidoColportorVO> voList = new ArrayList<>();
PedidoColportorVO vo = null;
for(PedidoColportorItem pci : (List<PedidoColportorItem>)params.get(Constantes.PEDIDO_COLPORTOR_ITEM_LIST)){
vo = new PedidoColportorVO();
vo.setNumPedido(pedidoColportor.getNumPedido());
vo.setFormaPago(pedidoColportor.getFormaPago());
vo.setFechaPedido(pedidoColportor.getFechaPedido());
vo.setFechaEntrega(pedidoColportor.getFechaEntrega());
vo.setColportor(pedidoColportor.getColportor());
vo.setItem(pci);
voList.add(vo);
}

Usuario usuario = ambiente.obtieneUsuario();

try {
log.debug("enviaCorreo");
enviaCorreo("PDF", voList,
request, "pedidoColportor", Constantes.EMP, usuario.getEmpresa().getId());
modelo.addAttribute("message", "lista.enviado.message");
modelo.addAttribute(
"messageAttrs",
new String[]{
messageSource.getMessage("pedidoColportor.lista.label",
null, request.getLocale()),
ambiente.obtieneUsuario().getUsername()});
} catch (ReporteException e) {
log.error("No se pudo enviar el reporte por correo", e);
}

return "redirect:" + Constantes.PEDIDO_COLPORTOR_PATH;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ public String nueva(Model modelo, HttpServletRequest request) {
modelo.addAttribute(Constantes.TEMPORADACOLPORTOR, new TemporadaColportor());

params.put("organizacion", ambiente.obtieneUsuario().getEmpresa().getOrganizacion().getId());
params.put("reporte", "");
params = temporadaDao.lista(params);
modelo.addAttribute(Constantes.TEMPORADA_LIST, (List) params.get(Constantes.TEMPORADA_LIST));

Expand All @@ -200,10 +201,6 @@ public String nueva(Model modelo, HttpServletRequest request) {
params = asociadoDao.lista(params);
modelo.addAttribute(Constantes.ASOCIADO_LIST, (List) params.get(Constantes.ASOCIADO_LIST));

Map<String, Object> temporadas = temporadaDao.lista(null);
params = temporadaDao.lista(params);
modelo.addAttribute(Constantes.TEMPORADA_LIST, (List)params.get(Constantes.TEMPORADA_LIST));

return Constantes.TEMPORADACOLPORTOR_PATH_NUEVA;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ public void inicializaEmpresa(Empresa empresa) {
nombres.add("tiposDeActivo");
//Colportores
nombres.add("censoColportores");
nombres.add("pedidoColportor");

empresa.getReportes().clear();
empresa.getReportes().addAll(inicializaReportes(nombres));
Expand Down
26 changes: 19 additions & 7 deletions src/main/java/mx/edu/um/mateo/general/utils/Constantes.java
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ public class Constantes {
* Tipo importe - Cantidad en efectivo.
*/
public static final String TIPOIMPORTE_IMP = "$";
public static final String EMPLEADOPERDED_KEY = "empleadoPerDedForm";
public static final String EMPLEADOPERDED_KEY = "empleadoPerDed";
public static final String EMPLEADOPERDED_LIST = "empleadoPerDedList";
// EmpleadoPerDed-END
// CalculoNomina-START
Expand Down Expand Up @@ -2448,12 +2448,12 @@ public class Constantes {
public static final String PATH_CONCEPTO_CREA = "/rh/catalogo/concepto/crea";
public static final String PATH_CONCEPTO_ACTUALIZA = "/rh/catalogo/concepto/actualiza";
public static final String PATH_CONCEPTO_ELIMINA = "/rh/catalogo/concepto/elimina";
public static final String PATH_PERDED = "/rh/empleado/perded";
public static final String PATH_PERDED_LISTA = "/rh/empleado/perded/lista";
public static final String PATH_PERDED_VER = "/rh/empleado/perded/ver";
public static final String PATH_PERDED_NUEVO = "/rh/empleado/perded/nuevo";
public static final String PATH_PERDED_EDITA = "/rh/empleado/perded/edita";
public static final String PATH_PERDED_GRABA = "/rh/empleado/perded/graba";
public static final String PATH_PERDED = "/nomina/catalogos/perded";
public static final String PATH_PERDED_LISTA = "/nomina/catalogos/perded/lista";
public static final String PATH_PERDED_VER = "/nomina/catalogos/perded/ver";
public static final String PATH_PERDED_NUEVO = "/nomina/catalogos/perded/nuevo";
public static final String PATH_PERDED_EDITA = "/nomina/catalogos/perded/edita";
public static final String PATH_PERDED_GRABA = "/nomina/catalogos/perded/graba";
public static final String PATH_EMPLEADOPUESTO = "/rh/empleado/empleadoPuesto";
public static final String PATH_EMPLEADOPUESTO_LISTA = "/rh/empleado/empleadoPuesto/lista";
public static final String PATH_EMPLEADOPUESTO_VER = "/rh/empleado/empleadoPuesto/ver";
Expand Down Expand Up @@ -3104,5 +3104,17 @@ public class Constantes {
public static final String PATH_JEFESECCION_ACTUALIZA = "/rh/catalogo/jefeSeccion/actualiza";
public static final String PATH_JEFESECCION_ELIMINA = "/rh/catalogo/jefeSeccion/elimina";
public static final String PATH_TRASPASDODATOSEMPLEADO = "/rh/empleado/traspasoDatosEmpleado";
/**
* @see mx.edu.um.mateo.rh.web.EmpleadoPerDed
* Valores para el controller de empleadoPerDed
*/
public static final String PATH_EMPLEADOPERDED = "/rh/empleado/empleadoPerded";
public static final String PATH_EMPLEADOPERDED_LISTA = "/rh/empleado/empleadoPerded/lista";
public static final String PATH_EMPLEADOPERDED_VER = "/rh/empleado/empleadoPerded/ver";
public static final String PATH_EMPLEADOPERDED_NUEVO = "/rh/empleado/empleadoPerded/nuevo";
public static final String PATH_EMPLEADOPERDED_EDITA = "/rh/empleado/empleadoPerded/edita";
public static final String PATH_EMPLEADOPERDED_GRABA = "/rh/empleado/empleadoPerded/graba";

public static final String FRECUENCIAPAGO_LIST = "frecuenciaPagoList";

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package mx.edu.um.mateo.rh.dao;
package mx.edu.um.mateo.nomina.dao;

import java.util.Map;
import mx.edu.um.mateo.general.model.Usuario;
import mx.edu.um.mateo.rh.model.PerDed;
import mx.edu.um.mateo.nomina.model.PerDed;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package mx.edu.um.mateo.rh.dao.impl;
package mx.edu.um.mateo.nomina.dao.impl;

import java.util.HashMap;
import java.util.Map;
import mx.edu.um.mateo.general.utils.Constantes;
import mx.edu.um.mateo.general.dao.BaseDao;
import mx.edu.um.mateo.general.model.Usuario;
import mx.edu.um.mateo.rh.dao.PerDedDao;
import mx.edu.um.mateo.rh.model.PerDed;
import mx.edu.um.mateo.nomina.dao.PerDedDao;
import mx.edu.um.mateo.nomina.model.PerDed;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Disjunction;
Expand Down Expand Up @@ -64,6 +64,7 @@ public Map<String, Object> lista(Map<String, Object> params) {
if (params.containsKey("filtro")) {
String filtro = (String) params.get("filtro");
Disjunction propiedades = Restrictions.disjunction();
propiedades.add(Restrictions.ilike("clave", filtro, MatchMode.ANYWHERE));
propiedades.add(Restrictions.ilike("nombre", filtro, MatchMode.ANYWHERE));
propiedades.add(Restrictions.ilike("status", filtro, MatchMode.ANYWHERE));
criteria.add(propiedades);
Expand Down
44 changes: 44 additions & 0 deletions src/main/java/mx/edu/um/mateo/nomina/model/EnumFrecuenciaPago.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/

package mx.edu.um.mateo.nomina.model;

/**
*
* @author osoto
*/
public enum EnumFrecuenciaPago {
SEMANAL(1, "Semanal"),
QUINCENA_1(2, "Quincena 1"),
QUINCENA_2(3, "Quincena 2"),
MENSUAL(4, "Mensual");

private Integer id;
private String nombre;

private EnumFrecuenciaPago(Integer id, String nombre){
this.id = id;
this.nombre = nombre;
}

public Integer getId() {
return id;
}

public void setId(Integer id) {
this.id = id;
}

public String getNombre() {
return nombre;
}

public void setNombre(String nombre) {
this.nombre = nombre;
}


}
Loading

0 comments on commit 1744f1d

Please sign in to comment.