From 6b265b14d9c16c1a4b131fc1c82bf49264d401bf Mon Sep 17 00:00:00 2001
From: Billy Larru <blarru.ti@sacooliveros.edu.pe>
Date: Thu, 4 Oct 2018 07:51:06 -0500
Subject: [PATCH] [RENAME cambiando la extension de jsp a jspf a los que faltaban]
---
.classpath | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
.project | 23 +++++++++++++++++++++++
.settings/org.eclipse.core.resources.prefs | 5 +++++
.settings/org.eclipse.jdt.apt.core.prefs | 2 ++
.settings/org.eclipse.jdt.core.prefs | 7 +++++++
.settings/org.eclipse.m2e.core.prefs | 4 ++++
src/main/java/asistencia/filters/RequestsFilter.java | 10 +++++-----
src/main/webapp/js/pages/asignar_monto_amanecida.js | 2 +-
src/main/webapp/js/pages/control_asistencia_policias.js | 2 +-
src/main/webapp/js/pages/evaluar_justificacion.js | 2 +-
src/main/webapp/js/pages/listado_justificacion.js | 2 +-
src/main/webapp/js/pages/mantenimiento_sede.js | 4 ++--
src/main/webapp/js/pages/tolerancia_individual.js | 6 +++---
src/main/webapp/js/pages/tolerancia_masiva.js | 2 +-
src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jspf | 78 ------------------------------------------------------------------------------
16 files changed, 183 insertions(+), 93 deletions(-)
create mode 100644 .classpath
create mode 100644 .project
create mode 100644 .settings/org.eclipse.core.resources.prefs
create mode 100644 .settings/org.eclipse.jdt.apt.core.prefs
create mode 100644 .settings/org.eclipse.jdt.core.prefs
create mode 100644 .settings/org.eclipse.m2e.core.prefs
create mode 100644 src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp
delete mode 100644 src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jspf
diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..39abf1c
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="target/generated-sources/annotations">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="ignore_optional_problems" value="true"/>
+ <attribute name="m2e-apt" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="ignore_optional_problems" value="true"/>
+ <attribute name="m2e-apt" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 0000000..74bf919
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Asistencia</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..839d647
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..d4313d4
--- /dev/null
+++ b/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..5592a0a
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/src/main/java/asistencia/filters/RequestsFilter.java b/src/main/java/asistencia/filters/RequestsFilter.java
index 888b68b..58a3033 100644
--- a/src/main/java/asistencia/filters/RequestsFilter.java
+++ b/src/main/java/asistencia/filters/RequestsFilter.java
@@ -46,11 +46,11 @@ public class RequestsFilter implements Filter {
HttpServletResponse response = (HttpServletResponse) resp;
String uri = request.getRequestURI();
-// if (uri.contains("vistas/modals/")) {
-// chain.doFilter(req, resp);
-// return;
-// }
-
+ if (uri.contains("vistas/modals/")) {
+ chain.doFilter(req, resp);
+ return;
+ }
+ System.out.println("ha pasado el if modals");
if (uri.endsWith("vistas/index.jsp")) {
if (request.getSession().getAttribute("codigo") != null) {
response.sendRedirect("main.jsp");
diff --git a/src/main/webapp/js/pages/asignar_monto_amanecida.js b/src/main/webapp/js/pages/asignar_monto_amanecida.js
index 545f604..ee69437 100644
--- a/src/main/webapp/js/pages/asignar_monto_amanecida.js
+++ b/src/main/webapp/js/pages/asignar_monto_amanecida.js
@@ -128,7 +128,7 @@ function mostrarMensajeResultadoModal(result = {}){
}
function mostrarModalEdicion(data = {}) {
- ajaxModal.get("policias/asignarMontoAmanecida/editarMontoConcepto.jsp").then((response) => {
+ ajaxModal.get("policias/asignarMontoAmanecida/editarMontoConcepto.jspf").then((response) => {
swal({
title: '<strong>Editar Montos de amanecidas</strong>',
html: response.data,
diff --git a/src/main/webapp/js/pages/control_asistencia_policias.js b/src/main/webapp/js/pages/control_asistencia_policias.js
index 32fa4dc..f29cae2 100644
--- a/src/main/webapp/js/pages/control_asistencia_policias.js
+++ b/src/main/webapp/js/pages/control_asistencia_policias.js
@@ -215,7 +215,7 @@ function mostrarMensajeResultadoModal(result = {}) {
}
function mostrarModalRegistroAsistencia(data = {}) {
- ajaxModal.get("policias/controlAsistencia/registrarAsistencia.jsp").then((response) => {
+ ajaxModal.get("policias/controlAsistencia/registrarAsistencia.jspf").then((response) => {
swal({
title: '<strong>Registrar Asistencia</strong>',
html: response.data,
diff --git a/src/main/webapp/js/pages/evaluar_justificacion.js b/src/main/webapp/js/pages/evaluar_justificacion.js
index 54f24b6..82963c8 100644
--- a/src/main/webapp/js/pages/evaluar_justificacion.js
+++ b/src/main/webapp/js/pages/evaluar_justificacion.js
@@ -201,7 +201,7 @@ const justificar = (estadoJustificacion = 1) => {
showConfirmButton: false,
timer: 1500
}).then((result) => {
- window.location.href = `${contextPath}vistas/listadoJustificacion.jsp`
+ window.location.href = `${contextPath}vistas/listadoJustificacion.jspf`
});
}
})
diff --git a/src/main/webapp/js/pages/listado_justificacion.js b/src/main/webapp/js/pages/listado_justificacion.js
index 48d15db..a8c9e79 100644
--- a/src/main/webapp/js/pages/listado_justificacion.js
+++ b/src/main/webapp/js/pages/listado_justificacion.js
@@ -80,7 +80,7 @@ const mostrarModalVerDetalleJustificacion = (data) => {
debugger
localStorage.setItem('data', JSON.stringify(data))
// localStorage.setItem('filtros', JSON.stringify(filtros))
- location.href = `${baseURLModals}justificaciones/evaluarJustificacion.jsp`
+ location.href = `${baseURLModals}justificaciones/evaluarJustificacion.jspf`
}
const listarJustificaciones = (objParams = {}) => {
ajaxWebService.get(URI_JUSTIFICACION, objParams).then((response) => {
diff --git a/src/main/webapp/js/pages/mantenimiento_sede.js b/src/main/webapp/js/pages/mantenimiento_sede.js
index b41663d..fc691b8 100644
--- a/src/main/webapp/js/pages/mantenimiento_sede.js
+++ b/src/main/webapp/js/pages/mantenimiento_sede.js
@@ -126,7 +126,7 @@ function mostrarMensajeResultadoModalRegistrar(result = {}){
}
function mostrarModalEdicion(data = {}) {
- ajaxModal.get("policias/mantenimientoSedes/editarConceptoSede.jsp").then((response) => {
+ ajaxModal.get("policias/mantenimientoSedes/editarConceptoSede.jspf").then((response) => {
swal({
title: '<strong>Editar</strong>',
html: response.data,
@@ -194,7 +194,7 @@ function mostrarModalEliminacion(data) {
}
function mostrarModalRegistrar(data = {}) {
- ajaxModal.get("policias/mantenimientoSedes/registrarConceptoSede.jsp").then((response) => {
+ ajaxModal.get("policias/mantenimientoSedes/registrarConceptoSede.jspf").then((response) => {
swal({
title: '<strong>Asignar concepto a sede</strong>',
html: response.data,
diff --git a/src/main/webapp/js/pages/tolerancia_individual.js b/src/main/webapp/js/pages/tolerancia_individual.js
index 3af2cc7..a3e86e3 100644
--- a/src/main/webapp/js/pages/tolerancia_individual.js
+++ b/src/main/webapp/js/pages/tolerancia_individual.js
@@ -204,7 +204,7 @@ const registrarNuevaTolerancia = () => {
};
const mostrarModalNuevaTolerancia = () => {
- ajaxModal.get("administrativos/tolerancia/individual/registroTolerancia.jsp").then((response) => {
+ ajaxModal.get("administrativos/tolerancia/individual/registroTolerancia.jspf").then((response) => {
swal({
title: '<strong>Nueva Tolerancia</strong>',
// type: 'info',
@@ -280,7 +280,7 @@ const inicializarInputsModalVerDetalleTolerancia = (data) => {
const mostrarModalVerDetalleTolerancia = (data) => {
- ajaxModal.get("administrativos/tolerancia/individual/detalleTolerancia.jsp").then((response) => {
+ ajaxModal.get("administrativos/tolerancia/individual/detalleTolerancia.jspf").then((response) => {
swal({
title: '<strong>Detalle Tolerancia</strong>',
// type: 'info',
@@ -301,7 +301,7 @@ const mostrarModalVerDetalleTolerancia = (data) => {
});
};
const mostrarModalEditarTolerancia = (data) => {
- ajaxModal.get("administrativos/tolerancia/individual/editarTolerancia.jsp").then((response) => {
+ ajaxModal.get("administrativos/tolerancia/individual/editarTolerancia.jspf").then((response) => {
swal({
title: '<strong>Editar Tolerancia</strong>',
// type: 'info',
diff --git a/src/main/webapp/js/pages/tolerancia_masiva.js b/src/main/webapp/js/pages/tolerancia_masiva.js
index af3dbcd..c562a1e 100644
--- a/src/main/webapp/js/pages/tolerancia_masiva.js
+++ b/src/main/webapp/js/pages/tolerancia_masiva.js
@@ -114,7 +114,7 @@ const registrarToleranciaMasiva = () => {
const mostrarModalAsignarTolerancia = () => {
- ajaxModal.get("administrativos/tolerancia/masiva/registroTolerancia.jsp").then((response) => {
+ ajaxModal.get("administrativos/tolerancia/masiva/registroTolerancia.jspf").then((response) => {
swal({
title: '<strong>Registro de Tolerancia Masiva</strong>',
// type: 'info',
diff --git a/src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp b/src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp
new file mode 100644
index 0000000..29b88ae
--- /dev/null
+++ b/src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp
@@ -0,0 +1,78 @@
+<jsp:include page="/vistas/templates/validar.jsp" />
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+ <head>
+ <jsp:include page="/vistas/templates/header.jsp" />
+ <!--template-core-->
+ <!--css de la pagina-->
+ <link href="${pageContext.request.contextPath}/css/lib/sweetalert2.min.css" rel="stylesheet" type="text/css"/>
+ <!--css-->
+ </head>
+ <body>
+ <jsp:include page="/vistas/templates/header-body.jsp" />
+ <!-- content -->
+ <div class="col-md-4 col-md-offset-4">
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <h5 class="panel-title">Información del personal</h5>
+ </div>
+
+ <div class="panel-body">
+ <div class="row">
+ <div class="col-md-6 form-group">
+ <label>Personal</label>
+ <span class="label label-left border-left border-left-primary label-striped form-control" id="spanNombres"></span>
+ </div>
+ <div class="col-md-6 form-group">
+ <label>Cargo</label>
+ <span class="label label-left border-left border-left-primary label-striped form-control" id="spanCargo"></span>
+ </div>
+
+ </div>
+ <div class="row">
+ <div class="col-md-6 form-group">
+ <label>Horario</label>
+ <span class="label label-left border-left border-left-primary label-striped form-control" id="spanHorario"></span>
+ </div>
+ <div class="col-md-6 form-group">
+ <label>Costo día</label>
+ <span class="label label-left border-left border-left-primary label-striped form-control" id="spanCostoDia"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="col-md-10 col-md-offset-1">
+ <div class="panel panel-primary card-3" style="margin-top: 30px">
+ <div class="panel-heading" style="padding: 8px 15px">
+ <h6 class="panel-title" style="font-size: 15px; font-family: inherit">Descuentos de Asistencia</h6>
+ <div class="heading-elements">
+ <div class="btn-group heading-btn">
+ <button type="button" class="btn bg-slate border-slate-600 btn-icon dropdown-toggle" data-toggle="dropdown"><i class="icon-menu6"></i> <span class="caret"></span></button>
+ <ul class="dropdown-menu dropdown-menu-right">
+ <li><a href="#" id="btnFirmo">Vincular a una justificación</a></li>
+ <li><a href="#" id="btnNoFirmo">Modificar descuento</a></li>
+ </div>
+ </div>
+ </div>
+ <div id="divDatatable"></div>
+ </div>
+ </div>
+ <!-- / content -->
+
+ <jsp:include page="/vistas/templates/footer-body.jsp" />
+ <!--js de la pagina-->
+ <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script>
+ <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script>
+ <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/pickers/datepicker.js" type="text/javascript"></script>
+ <script src="${pageContext.request.contextPath}/js/lib/bootstrap-select.min.js" type="text/javascript"></script>
+ <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/selects/select2.min.js"></script>
+ <script src="${pageContext.request.contextPath}/js/lib/lodash.js" type="text/javascript"></script>
+ <script src="${pageContext.request.contextPath}/js/pages/detalle_montos_administrativos.js" type="text/javascript"></script>
+ <!--js-->
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jspf b/src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jspf
deleted file mode 100644
index 29b88ae..0000000
--- a/src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jspf
+++ /dev/null
@@ -1,78 +0,0 @@
-<jsp:include page="/vistas/templates/validar.jsp" />
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html>
- <head>
- <jsp:include page="/vistas/templates/header.jsp" />
- <!--template-core-->
- <!--css de la pagina-->
- <link href="${pageContext.request.contextPath}/css/lib/sweetalert2.min.css" rel="stylesheet" type="text/css"/>
- <!--css-->
- </head>
- <body>
- <jsp:include page="/vistas/templates/header-body.jsp" />
- <!-- content -->
- <div class="col-md-4 col-md-offset-4">
- <div class="panel panel-primary">
- <div class="panel-heading">
- <h5 class="panel-title">Información del personal</h5>
- </div>
-
- <div class="panel-body">
- <div class="row">
- <div class="col-md-6 form-group">
- <label>Personal</label>
- <span class="label label-left border-left border-left-primary label-striped form-control" id="spanNombres"></span>
- </div>
- <div class="col-md-6 form-group">
- <label>Cargo</label>
- <span class="label label-left border-left border-left-primary label-striped form-control" id="spanCargo"></span>
- </div>
-
- </div>
- <div class="row">
- <div class="col-md-6 form-group">
- <label>Horario</label>
- <span class="label label-left border-left border-left-primary label-striped form-control" id="spanHorario"></span>
- </div>
- <div class="col-md-6 form-group">
- <label>Costo día</label>
- <span class="label label-left border-left border-left-primary label-striped form-control" id="spanCostoDia"></span>
- </div>
- </div>
- </div>
- </div>
- </div>
-
-
- <div class="col-md-10 col-md-offset-1">
- <div class="panel panel-primary card-3" style="margin-top: 30px">
- <div class="panel-heading" style="padding: 8px 15px">
- <h6 class="panel-title" style="font-size: 15px; font-family: inherit">Descuentos de Asistencia</h6>
- <div class="heading-elements">
- <div class="btn-group heading-btn">
- <button type="button" class="btn bg-slate border-slate-600 btn-icon dropdown-toggle" data-toggle="dropdown"><i class="icon-menu6"></i> <span class="caret"></span></button>
- <ul class="dropdown-menu dropdown-menu-right">
- <li><a href="#" id="btnFirmo">Vincular a una justificación</a></li>
- <li><a href="#" id="btnNoFirmo">Modificar descuento</a></li>
- </div>
- </div>
- </div>
- <div id="divDatatable"></div>
- </div>
- </div>
- <!-- / content -->
-
- <jsp:include page="/vistas/templates/footer-body.jsp" />
- <!--js de la pagina-->
- <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script>
- <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script>
- <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/pickers/datepicker.js" type="text/javascript"></script>
- <script src="${pageContext.request.contextPath}/js/lib/bootstrap-select.min.js" type="text/javascript"></script>
- <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/selects/select2.min.js"></script>
- <script src="${pageContext.request.contextPath}/js/lib/lodash.js" type="text/javascript"></script>
- <script src="${pageContext.request.contextPath}/js/pages/detalle_montos_administrativos.js" type="text/javascript"></script>
- <!--js-->
-
- </body>
-</html>
\ No newline at end of file
--
libgit2 0.26.0