Skip to content

T
trismegisto-planilla
Commit 558c0390 by Luis Gangas
Options

Merge branches 'lgangas' and 'master' of… 

Merge branches 'lgangas' and 'master' of http://version.sacooliveros.edu.pe/lgangas/trismegisto-planilla into lgangas
parents 84fdacb0 baf0585c
Showing with 94 additions and 41 deletions
.idea/workspace.xml
......@@ -4,6 +4,7 @@
<list default="true" id="f1229581-2498-4c33-b7b4-f715a5fbe428" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/web/js/pages/contratos.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/web/vistas/contratos.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/java/trismegistoplanilla/mysqldao/FichaLaboralMysqlDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/trismegistoplanilla/mysqldao/FichaLaboralMysqlDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/java/trismegistoplanilla/mysqldao/LoteFichaMysqlDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/trismegistoplanilla/mysqldao/LoteFichaMysqlDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/java/trismegistoplanilla/mysqldao/UbigeoMysqlDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/trismegistoplanilla/mysqldao/UbigeoMysqlDAO.java" afterDir="false" />
......@@ -22,12 +23,12 @@
<session id="1890756217">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="5" />
<entry key="project.closed" value="4" />
<entry key="project.open.time.0" value="1" />
<entry key="project.open.time.11" value="1" />
<entry key="project.open.time.12" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.opened" value="4" />
<entry key="project.opened" value="3" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
......@@ -65,6 +66,9 @@
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
......@@ -128,12 +132,13 @@
<workItem from="1541776578549" duration="539000" />
<workItem from="1542033991862" duration="854000" />
<workItem from="1542041168541" duration="651000" />
<workItem from="1542129782940" duration="342000" />
<workItem from="1542131520488" duration="128000" />
<workItem from="1542131715493" duration="780000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5069000" />
<option name="totallyTimeSpent" value="5646000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
......
catalog.xml
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
<system systemId="http://app8.sacooliveros.edu.pe:8080/WebservicesSeguridad/UsuarioWebService?WSDL" uri="src/conf/xml-resources/web-service-references/UsuarioWebService/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/UsuarioWebService.wsdl"/>
<system systemId="http://app8.sacooliveros.edu.pe:8080/WebservicesSeguridad/UsuarioWebService?xsd=1" uri="src/conf/xml-resources/web-service-references/UsuarioWebService/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/UsuarioWebService.xsd_1.xsd"/>
<system systemId="http://app8.sacooliveros.edu.pe:8080/WebservicesSeguridad/MenuWebService?WSDL" uri="src/conf/xml-resources/web-service-references/MenuWebService/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/MenuWebService.wsdl"/>
<system systemId="http://app8.sacooliveros.edu.pe:8080/WebservicesSeguridad/MenuWebService?xsd=1" uri="src/conf/xml-resources/web-service-references/MenuWebService/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/MenuWebService.xsd_1.xsd"/>
<system systemId="http://app8.sacooliveros.edu.pe:8080/WebservicesSeguridad/ProyectoWebService?WSDL" uri="src/conf/xml-resources/web-service-references/ProyectoWebService/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/ProyectoWebService.wsdl"/>
<system systemId="http://app8.sacooliveros.edu.pe:8080/WebservicesSeguridad/ProyectoWebService?xsd=1" uri="src/conf/xml-resources/web-service-references/ProyectoWebService/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/ProyectoWebService.xsd_1.xsd"/>
<system systemId="http://app8.sacooliveros.edu.pe:8080/WebservicesSeguridad/UsuarioWebService?WSDL" uri="src/conf/xml-resources/web-service-references/UsuarioWebService/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/UsuarioWebService.wsdl"/>
<system systemId="http://app8.sacooliveros.edu.pe:8080/WebservicesSeguridad/UsuarioWebService?xsd=1" uri="src/conf/xml-resources/web-service-references/UsuarioWebService/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/UsuarioWebService.xsd_1.xsd"/>
</catalog>
\ No newline at end of file
src/java/trismegistoplanilla/mysqldao/FichaMysqlDAO.java
......@@ -467,7 +467,7 @@ public class FichaMysqlDAO implements FichaDAO {
psActualizarPersona.setInt(5, data.getInt("codigoUbigeoNacimiento"));
}
if (data.getString("telefonoFijo").equals("")) {
psActualizarPersona.setString(6, "000-0000");
psActualizarPersona.setNull(6, Types.VARCHAR);
} else {
psActualizarPersona.setString(6, data.getString("telefonoFijo"));
}
......@@ -479,7 +479,7 @@ public class FichaMysqlDAO implements FichaDAO {
psActualizarPersona.setString(12, data.getString("longitudResidencia"));
psActualizarPersona.setString(13, data.getString("foto"));
if (data.getString("ruc").equals("")) {
psActualizarPersona.setString(14, "");
psActualizarPersona.setNull(14, Types.VARCHAR);
} else {
psActualizarPersona.setString(14, data.getString("ruc"));
}
......@@ -546,7 +546,7 @@ public class FichaMysqlDAO implements FichaDAO {
}
psActualizarPersona.setString(9, null);
if (data.getString("telefonoFijo").equals("")) {
psActualizarPersona.setString(10, "000-0000");
psActualizarPersona.setNull(10, Types.VARCHAR);
} else {
psActualizarPersona.setString(10, data.getString("telefonoFijo"));
}
......@@ -613,7 +613,7 @@ public class FichaMysqlDAO implements FichaDAO {
}
psActualizarPersona.setString(9, null);
if (data.getString("telefonoFijo").equals("")) {
psActualizarPersona.setString(10, "000-0000");
psActualizarPersona.setNull(10, Types.VARCHAR);
} else {
psActualizarPersona.setString(10, data.getString("telefonoFijo"));
}
......@@ -625,7 +625,7 @@ public class FichaMysqlDAO implements FichaDAO {
psActualizarPersona.setString(16, data.getString("longitudResidencia"));
psActualizarPersona.setString(17, data.getString("foto"));
if (data.getString("ruc").equals("")) {
psActualizarPersona.setString(18, "");
psActualizarPersona.setNull(18, Types.VARCHAR);
} else {
psActualizarPersona.setString(18, data.getString("ruc"));
}
......@@ -1283,10 +1283,25 @@ public class FichaMysqlDAO implements FichaDAO {
+ " DATE_FORMAT( "
+ " estado_ficha.fecha_registro, "
+ " '%d/%m/%Y' "
+ ") + ' ' + INSERT ( "
+ " REPLACE ( "
+ " RIGHT ( "
+ " DATE_FORMAT( "
+ " estado_ficha.fecha_registro, "
+ " 0 "
+ " ), "
+ " 7 "
+ " ), "
+ " ' ', "
+ " '0' "
+ " ), "
+ " 6, "
+ " 0, "
+ " ' ' "
+ ") fecharegistroficha, "
+ " tipo_estado_ficha.codigo_tipo_estado_ficha codigoTipoEstadoFicha, "
+ " tipo_estado_ficha.nombre estadoficha, "
+ " CONCAT('<span class=\"',tipo_estado_ficha.estilo, '\">', tipo_estado_ficha.nombre,'</span>' ) estilo "
+ " '<span class=\"' + tipo_estado_ficha.estilo + '\">' + tipo_estado_ficha.nombre + '</span>' estilo "
+ "FROM "
+ " ficha "
+ "INNER JOIN personal ON personal.codper = ficha.codigo_persona "
......@@ -1534,6 +1549,7 @@ public class FichaMysqlDAO implements FichaDAO {
// + "inner join area ON area.codigo_area = area_cargo.codigo_area "
// + "inner join cargo ON cargo.codigo_cargo = area_cargo.codigo_cargo "
// + "where ficha_laboral.codigo_ficha = ?";
<<<<<<<<< Temporary merge branch 1
String sql = "SELECT "
+ " ficha.codigo_ficha codigoficha, "
+ " personal.codper codigopersona, "
......@@ -3100,5 +3116,6 @@ public class FichaMysqlDAO implements FichaDAO {
JOvalidarFichaActiva = new JSONObject(response);
return JOvalidarFichaActiva;
}
>>>>>>>>> Temporary merge branch 2
}
src/java/trismegistoplanilla/servlets/UsuarioServlet.java
......@@ -22,6 +22,9 @@ import trismegistoplanilla.servicesMysql.TrabajadorResponsableService;
public class UsuarioServlet extends HttpServlet {
@WebServiceRef(wsdlLocation = "WEB-INF/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/UsuarioWebService.wsdl")
private UsuarioWebService_Service service;
private static final long serialVersionUID = 6883195532697593722L;
@WebServiceRef(wsdlLocation = "WEB-INF/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/ProyectoWebService.wsdl")
......@@ -30,9 +33,6 @@ public class UsuarioServlet extends HttpServlet {
@WebServiceRef(wsdlLocation = "WEB-INF/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/MenuWebService.wsdl")
private MenuWebService_Service menuservice;
@WebServiceRef(wsdlLocation = "WEB-INF/wsdl/app8.sacooliveros.edu.pe_8080/WebservicesSeguridad/UsuarioWebService.wsdl")
private UsuarioWebService_Service usuarioservice;
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String param = request.getParameter("accion");
......@@ -191,20 +191,6 @@ public class UsuarioServlet extends HttpServlet {
}
private UsuarioBean consultarDatosWebservice(java.lang.String usuario, java.lang.String clave, int proyecto) {
// Note that the injected javax.xml.ws.Service reference as well as port objects are not thread safe.
// If the calling of port operations may lead to race condition some synchronization is required.
pe.siso.webservicesseguridad.webservices.UsuarioWebService port = usuarioservice.getUsuarioWebServicePort();
return port.consultarDatosWebservice(usuario, clave, proyecto);
}
private Integer validarUsuarioWebservice(java.lang.String usuario, java.lang.String clave, int proyecto) {
// Note that the injected javax.xml.ws.Service reference as well as port objects are not thread safe.
// If the calling of port operations may lead to race condition some synchronization is required.
pe.siso.webservicesseguridad.webservices.UsuarioWebService port = usuarioservice.getUsuarioWebServicePort();
return port.validarUsuarioWebservice(usuario, clave, proyecto);
}
private java.util.List<pe.siso.webservicesseguridad.webservices.MenuBean> listarCategoriaWebservice(int codigoProyectoDetalle) {
// Note that the injected javax.xml.ws.Service reference as well as port objects are not thread safe.
// If the calling of port operations may lead to race condition some synchronization is required.
......@@ -247,4 +233,18 @@ public class UsuarioServlet extends HttpServlet {
return port.listarProyectoUsuario(codigoUsuario);
}
private UsuarioBean consultarDatosWebservice(java.lang.String usuario, java.lang.String clave, int proyecto) {
// Note that the injected javax.xml.ws.Service reference as well as port objects are not thread safe.
// If the calling of port operations may lead to race condition some synchronization is required.
pe.siso.webservicesseguridad.webservices.UsuarioWebService port = service.getUsuarioWebServicePort();
return port.consultarDatosWebservice(usuario, clave, proyecto);
}
private Integer validarUsuarioWebservice(java.lang.String usuario, java.lang.String clave, int proyecto) {
// Note that the injected javax.xml.ws.Service reference as well as port objects are not thread safe.
// If the calling of port operations may lead to race condition some synchronization is required.
pe.siso.webservicesseguridad.webservices.UsuarioWebService port = service.getUsuarioWebServicePort();
return port.validarUsuarioWebservice(usuario, clave, proyecto);
}
}
web/js/pages/contratos.js
/* global Ladda, icon */
"use strict";
$(document).ready(() => {
initSelect2();
criterioBusqueda();
......@@ -16,12 +17,14 @@ $(document).ready(() => {
imprimirFicha();
imprimirActividadFicha();
});
// INICIALIZACION
//========================================
let JOCriterioBusqueda = {};
let tipoEntrada = '';
let paramCodigoFicha = 0;
/** inicializa el select */
function initSelect2() {
$('.select').select2({
......
web/vistas/contratos.jsp
......@@ -42,7 +42,7 @@
</form>
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="col-md-4 col-md-offset-4">
<div class="panel so-card-2">
<div class="panel-heading bg-primary">
<h6 class="panel-title text-semibold">
......@@ -54,26 +54,55 @@
<div class="panel-body">
<form action="#" method="post" id="formBuscarFichas" name="formBuscarFichas">
<div class="row">
<div class="col-md-4">
<div class="col-md-6">
<div class="form-group">
<label for="txtNumeroDocumentoIdentidad" class="text-semibold">N° Documento de Identidad <span class="text-danger">(*)</span></label>
<input type="text" class="form-control text-uppercase" placeholder="Ingresar nro documento" id="txtNumeroDocumentoIdentidad" name="txtNumeroDocumentoIdentidad" minlength="8" maxlength="8" autocomplete="off" aria-required="true">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="txtApellidos" class="text-semibold">Apellidos <span class="text-danger">(*)</span></label>
<input type="text" class="form-control text-uppercase" placeholder="Apellidos" id="txtApellidos" name="txtApellidos" minlength="8" maxlength="8" autocomplete="off" aria-required="true">
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label for="cboCriterioBusqueda" class="text-semibold">Criterio de búsqueda <span class="text-danger">(*)</span></label>
<select class="select" id="cboCriterioBusqueda" name="cboCriterioBusqueda">
<label for="cboTipoContratoPlanilla" class="text-semibold">Tipo de contrato <span class="text-danger">(*)</span></label>
<select class="select" id="cboTipoContratoPlanilla" name="cboTipoContratoPlanilla">
<option value="0">[SELECCIONAR]</option>
<option value="1">TIPO DE DOCUMENTO</option>
<option value="2">APELLIDOS</option>
<option value="3">TIPO DE CONTRATO</option>
<option value="4">RAZÓN SOCIAL</option>
<option value="1">POR NECESIDAD DE MERCADO</option>
<option value="2">TIEMPO PARCIAL</option>
<option value="3">MENSUAL POR HORA</option>
<option value="4">RECIBO POR HONORARIOS</option>
<option value="5">TIEMPO PARCIAL POR HORA</option>
</select>
</div>
</div>
<div id="divRowFiltro1"></div>
<div id="divRowFiltro2"></div>
<div class="col-md-6">
<div class="form-group">
<label for="cboRazonSocial" class="text-semibold">Razón Social <span class="text-danger">(*)</span></label>
<select class="select" id="cboRazonSocial" name="cboRazonSocial">
<option value="0">[SELECCIONAR]</option>
<option value="1">ACE SACO OLIVEROS</option>
<option value="2">ACE SISTEMA HELICOIDAL</option>
<option value="5">ACE APEIRON</option>
</select>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 text-danger text-right text-semibold">
(*) Campos obligatorios
</div>
</div>
<div class="row">
<div class="col-md-12 text-center">
<button type="submit" class="btn bg-primary text-center" id="btnBuscarFichas"><i class="fa fa-search fa-lg position-left"></i> Buscar </button>
......@@ -93,8 +122,6 @@
************************* PANEL DE BUSQUEDA DE FICHAS *************************
-->
<!--
************************* PANEL DE LISTADO DE FICHAS *************************
-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment