Merge branch 'master' of http://version.sacooliveros.edu.pe/lgangas/trismegisto-planilla

src/java/trismegistoplanilla/mysqldao/AreaCargoMysqlDAO.java

@@ -68,6 +68,7 @@ public class AreaCargoMysqlDAO implements AreaCargoDAO {
 				e.printStackTrace();
 			}
 		}
+
 		JOObtenerAreaCargo = new JSONObject(response);
 		return JOObtenerAreaCargo;
 

src/java/trismegistoplanilla/mysqldao/CorreoMysqlDAO.java

@@ -17,7 +17,7 @@ public class CorreoMysqlDAO implements CorreoDAO {
 
 	@Override
 	public boolean enviarCorreo(Correo c) {
-		System.out.println("CorreoSqlserverDAO: enviarCorreo");
+		System.out.println("CorreoMysqlDAO: enviarCorreo");
 		boolean envio;
 
 		try {

src/java/trismegistoplanilla/mysqldao/FichaMysqlDAO.java

@@ -424,8 +424,7 @@ public class FichaMysqlDAO implements FichaDAO {
 			psDesactivarTokenFicha = null;
 
 		ResultSet rsObtenerEstadoFicha = null;
-		try {
-			// conectarse a la Variables.BD_NAME de datos
+		try {			
 			conexion = MysqlDAOFactory.obtenerConexion(Variables.MYSQL_NUEVO_BD_NAME);
 			conexion.setAutoCommit(false);
 

src/java/trismegistoplanilla/mysqldao/PersonaMysqlDAO.java

@@ -179,7 +179,7 @@ public class PersonaMysqlDAO implements PersonaDAO {
 			psPersona.setString(5, p.getNumeroDocumento());
 			psPersona.setString(6, p.getCorreo());
 			psPersona.setInt(7, p.getIsDefaultMail());
-			System.out.println(psPersona);
+
 			int resultRegistrarPersona = psPersona.executeUpdate();
 
 			if (resultRegistrarPersona > 0) {

src/java/trismegistoplanilla/servicesMysql/AreaCargoTipoPagoService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.DAOFactory;
 
 public class AreaCargoTipoPagoService {
 
-  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   AreaCargoTipoPagoDAO objAreaCargoTipoPagoDAO = factory.getAreaCargoTipoPagoDAO();
 
   public JSONObject obtenerAreaCargoTipoPago(AreaCargoTipoPagoBean actp) {

src/java/trismegistoplanilla/servicesMysql/CargaFamiliarService.java

@@ -8,7 +8,7 @@ import trismegistoplanilla.dao.DAOFactory;
 
 public class CargaFamiliarService {
 
-  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   CargaFamiliarDAO service = daoFactory.getCargaFamiliarDAO();
 
   public JSONObject validarExistenciaNumeroDocumento(CargaFamiliarBean cargaFamiliar) {

src/java/trismegistoplanilla/servicesMysql/CarreraProfesionalService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.DAOFactory;
 
 public class CarreraProfesionalService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     CarreraProfesionalDAO service = daoFactory.getCarreraProfesionalDAO();
 
     public JSONObject listarCarreraProfesional(String carrera) {

src/java/trismegistoplanilla/servicesMysql/DetalleLoteFichaDocenteService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.DetalleLoteFichaDocenteDAO;
 
 public class DetalleLoteFichaDocenteService {
 
-  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   DetalleLoteFichaDocenteDAO dao = daoFactory.getDetalleLoteFichaDocenteDAO();
 
   public JSONObject listarDetalleLoteFichaDocenteDT(LoteFichaBean loteFicha) {

src/java/trismegistoplanilla/servicesMysql/EscalafonService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.EscalafonDAO;
 
 public class EscalafonService {
 
-  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   EscalafonDAO dao = daoFactory.getEscalafonDAO();
 
   public JSONObject obtenerEscalafonAreaCargoTipoPago(AreaCargoTipoPagoBean actp) {

src/java/trismegistoplanilla/servicesMysql/EstadoCivilService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.EstadoCivilDAO;
 
 public class EstadoCivilService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     EstadoCivilDAO service = daoFactory.getEstadoCivilDAO();
 
     public JSONObject listarEstadoCivil() {

src/java/trismegistoplanilla/servicesMysql/EstadoEstudioService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.EstadoEstudioDAO;
 
 public class EstadoEstudioService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     EstadoEstudioDAO service = daoFactory.getEstadoEstudioDAO();
 
     public JSONObject validarExistenciaEstadoEstudio(EstadoEstudioBean estadoEstudio) {

src/java/trismegistoplanilla/servicesMysql/EstadoFichaService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.EstadoFichaDAO;
 
 public class EstadoFichaService {
 
-  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   EstadoFichaDAO objEstadoFichaDAO = factory.getEstadoFichaDAO();
 
   public JSONObject obtenerCodigoEstadoFicha(EstadoFichaBean ef) {

src/java/trismegistoplanilla/servicesMysql/ExpedienteService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.ExpedienteDAO;
 
 public class ExpedienteService {
 
-  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   ExpedienteDAO dao = daoFactory.getExpedienteDAO();
 
   public JSONObject listarTipoExpedientes() {

src/java/trismegistoplanilla/servicesMysql/ExperienciaLaboralService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.ExperienciaLaboralDAO;
 
 public class ExperienciaLaboralService {
 
-  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   ExperienciaLaboralDAO service = daoFactory.getExperienciaLaboralDAO();
 
   public JSONObject obtenerExperienciaLaboralPorPersona(PersonaBean persona) {

src/java/trismegistoplanilla/servicesMysql/FichaLaboralService.java

@@ -12,7 +12,7 @@ import trismegistoplanilla.dao.FichaLaboralDAO;
 
 public class FichaLaboralService {
 
-  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   FichaLaboralDAO objFichaLaboralDAO = factory.getFichaLaboralDAO();
 
   public JSONObject registrarFichaLaboral(FichaLaboralBean fl, PersonaBean p, JSONArray jaExpediente, SueldoAdministrativoBean sa, SueldoDocenteBean sd, UsuarioBean u) {

src/java/trismegistoplanilla/servicesMysql/FondoPensionService.java

@@ -16,7 +16,7 @@ import trismegistoplanilla.dao.FondoPensionDAO;
  */
 public class FondoPensionService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     FondoPensionDAO service = daoFactory.getFondoPensionDAO();
 
     public JSONObject listarFondoPension() {

src/java/trismegistoplanilla/servicesMysql/FormacionAcademicaService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.FormacionAcademicaDAO;
 
 public class FormacionAcademicaService {
 
-  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   FormacionAcademicaDAO service = daoFactory.getFormacionAcademicaDAO();
 
   public JSONObject obtenerFormacionAcademicaPorPersona(PersonaBean persona) {

src/java/trismegistoplanilla/servicesMysql/LoteFichaService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.LoteFichaDAO;
 
 public class LoteFichaService {
 
-  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   LoteFichaDAO dao = daoFactory.getLoteFichaDAO();
 
   public JSONObject listarFichasDT(String draw, String length, String start, JSONObject json) {

src/java/trismegistoplanilla/servicesMysql/NacionalidadService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.NacionalidadDAO;
 
 public class NacionalidadService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     NacionalidadDAO service = daoFactory.getNacionalidadDAO();
 
     public JSONObject listarNacionalidad() {

src/java/trismegistoplanilla/servicesMysql/NivelEstadoService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.NivelEstadoDAO;
 
 public class NivelEstadoService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     NivelEstadoDAO service = daoFactory.getNivelEstadoDAO();
 
     public JSONObject obtenerNivelEstado(NivelEstadoBean nivelEstado) {

src/java/trismegistoplanilla/servicesMysql/NivelEstudioService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.NivelEstudioDAO;
 
 public class NivelEstudioService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     NivelEstudioDAO service = daoFactory.getNivelEstudioDAO();
 
     public JSONObject validarExistenciaNivelEstudio(NivelEstudioBean nivelEstudio) {

src/java/trismegistoplanilla/servicesMysql/ParentescoService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.ParentescoDAO;
 
 public class ParentescoService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     ParentescoDAO service = daoFactory.getParentescoDAO();
 
     public JSONObject listarParentesco() {

src/java/trismegistoplanilla/servicesMysql/ReportePersonalService.java

@@ -6,7 +6,7 @@ import trismegistoplanilla.dao.ReportePersonalDAO;
 
 public class ReportePersonalService {
 
-  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   ReportePersonalDAO objReporte = factory.getReportePersonalDAO();
 
   public JSONObject validarExistenciaFilas(JSONObject jsonResult) {

src/java/trismegistoplanilla/servicesMysql/TipoEstadoFichaService.java

@@ -6,7 +6,7 @@ import trismegistoplanilla.dao.TipoEstadoFichaDAO;
 
 public class TipoEstadoFichaService {
 
-  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   TipoEstadoFichaDAO objTipoEstadoFichaDAO = factory.getTipoEstadoFichaDAO();
 
   public JSONObject listarTipoEstadoFicha() {

src/java/trismegistoplanilla/servicesMysql/TipoExpedienteService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.TipoExpedienteDAO;
 
 public class TipoExpedienteService {
 
-  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   TipoExpedienteDAO obj = factory.getTipoExpedienteDAO();
 
   public JSONObject listarTipoExpediente() {

src/java/trismegistoplanilla/servicesMysql/TipoPagoService.java

@@ -8,7 +8,7 @@ import trismegistoplanilla.dao.TipoPagoDAO;
 
 public class TipoPagoService {
 
-  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
   TipoPagoDAO objTipoPago = factory.getTipoPagoDAO();
 
   public JSONObject listarTipoPago(AreaCargoBean ac) {

src/java/trismegistoplanilla/servicesMysql/TokenFichaService.java

@@ -7,46 +7,46 @@ import trismegistoplanilla.dao.TokenFichaDAO;
 
 public class TokenFichaService {
 
-  DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
-  TokenFichaDAO objTokenFichaDAO = factory.getTokenFichaDAO();
+	DAOFactory factory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
+	TokenFichaDAO objTokenFichaDAO = factory.getTokenFichaDAO();
 
-  public JSONObject validarTokenURL(TokenFichaBean tf) {
-    JSONObject jsonObjValidarTokenURL = null;
-    try {
-      jsonObjValidarTokenURL = objTokenFichaDAO.validarTokenURL(tf);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return jsonObjValidarTokenURL;
-  }
+	public JSONObject validarTokenURL(TokenFichaBean tf) {
+		JSONObject jsonObjValidarTokenURL = null;
+		try {
+			jsonObjValidarTokenURL = objTokenFichaDAO.validarTokenURL(tf);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return jsonObjValidarTokenURL;
+	}
 
-  public JSONObject validarToken(TokenFichaBean tf) {
-    JSONObject jsonObjValidarExistenciaToken = null;
-    try {
-      jsonObjValidarExistenciaToken = objTokenFichaDAO.validarToken(tf);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return jsonObjValidarExistenciaToken;
-  }
+	public JSONObject validarToken(TokenFichaBean tf) {
+		JSONObject jsonObjValidarExistenciaToken = null;
+		try {
+			jsonObjValidarExistenciaToken = objTokenFichaDAO.validarToken(tf);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return jsonObjValidarExistenciaToken;
+	}
 
-  public JSONObject desactivarToken(TokenFichaBean tf) {
-    JSONObject jsonObjDesactivarToken = null;
-    try {
-      jsonObjDesactivarToken = objTokenFichaDAO.desactivarToken(tf);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return jsonObjDesactivarToken;
-  }
+	public JSONObject desactivarToken(TokenFichaBean tf) {
+		JSONObject jsonObjDesactivarToken = null;
+		try {
+			jsonObjDesactivarToken = objTokenFichaDAO.desactivarToken(tf);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return jsonObjDesactivarToken;
+	}
 
-  public JSONObject obtenerSedeAreaCargo(JSONObject datos) {
-    JSONObject jsonReturn = null;
-    try {
-      jsonReturn = objTokenFichaDAO.obtenerSedeAreaCargo(datos);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return jsonReturn;
-  }
+	public JSONObject obtenerSedeAreaCargo(JSONObject datos) {
+		JSONObject jsonReturn = null;
+		try {
+			jsonReturn = objTokenFichaDAO.obtenerSedeAreaCargo(datos);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return jsonReturn;
+	}
 }

src/java/trismegistoplanilla/servicesMysql/UbigeoService.java

@@ -7,7 +7,7 @@ import trismegistoplanilla.dao.UbigeoDAO;
 
 public class UbigeoService {
 
-    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.SQL_SERVER);
+    DAOFactory daoFactory = DAOFactory.getDAOFactory(DAOFactory.MYSQL);
     UbigeoDAO service = daoFactory.getUbigeoDAO();
 
     public JSONObject listarDepartamento() {